From a6de1561461cc719fddd8175c93588a47513a4b8 Mon Sep 17 00:00:00 2001 From: jessib Date: Fri, 5 Oct 2012 15:41:03 -0700 Subject: Rough code to add & comment on tickets. --- app/views/home/index.html.haml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app') diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 11f18de..c27ba75 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -2,3 +2,11 @@ Try to fetch a = link_to "cert", cert_path + +%p +Try to create a += link_to "ticket", new_ticket_path + +%p +See all += link_to "tickets", tickets_path \ No newline at end of file -- cgit v1.2.3 From fe23b7896a04a50980c28a8b66c08ce2885ad0d3 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 17 Oct 2012 12:40:12 +0200 Subject: complete signup, login, logout workflow --- app/controllers/application_controller.rb | 7 +++++++ app/views/home/index.html.haml | 11 +++++++++++ 2 files changed, 18 insertions(+) (limited to 'app') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e8065d9..693bd86 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,10 @@ class ApplicationController < ActionController::Base protect_from_forgery + + helper_method :current_user + + private + def current_user + @current_user ||= User.find(session[:user_id]) if session[:user_id] + end end diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 11f18de..68e39bb 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -2,3 +2,14 @@ Try to fetch a = link_to "cert", cert_path + +-if current_user + %p + logged in as + = current_user.login + = link_to "logout", logout_path +-else + %p + = link_to "login", login_path + or + = link_to "signup", signup_path -- cgit v1.2.3 From dc0584f7d993ef7c75fbdd9d341ebb3337f3448d Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 17 Oct 2012 15:19:09 +0200 Subject: UI tweaks including newer version of bootstrap --- app/assets/javascripts/application.js | 1 + app/assets/stylesheets/application.scss | 1 + app/views/home/index.html.haml | 12 ------------ app/views/layouts/_navigation.html.haml | 10 ++++++++++ app/views/layouts/application.html.erb | 14 -------------- app/views/layouts/application.html.haml | 23 +++++++++++++++++++++++ 6 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 app/views/layouts/_navigation.html.haml delete mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/application.html.haml (limited to 'app') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a0b89db..dc975d4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,3 +15,4 @@ //= require srp //= require users //= require_tree . +//= require bootstrap diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cbd46a7..72c943a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1 +1,2 @@ @import "bootstrap"; +@import "bootstrap-responsive"; diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 68e39bb..0be7ca2 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,15 +1,3 @@ -%h1 Leap Web Demo Try to fetch a = link_to "cert", cert_path - --if current_user - %p - logged in as - = current_user.login - = link_to "logout", logout_path --else - %p - = link_to "login", login_path - or - = link_to "signup", signup_path diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml new file mode 100644 index 0000000..04d2356 --- /dev/null +++ b/app/views/layouts/_navigation.html.haml @@ -0,0 +1,10 @@ += link_to "Leap Web", root_path, :class => 'brand' +%ul.nav + - if current_user + %li + = link_to t(:logout), logout_path + - else + %li + = link_to t(:login), login_path + %li + = link_to t(:signup), signup_path diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index ce68ec8..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - LeapWeb - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml new file mode 100644 index 0000000..a57d65e --- /dev/null +++ b/app/views/layouts/application.html.haml @@ -0,0 +1,23 @@ +!!! +%html + %head + %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"} + %title= content_for?(:title) ? yield(:title) : "Leap Web" + %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"} + = stylesheet_link_tag "application", :media => "all" + = javascript_include_tag "application" + = csrf_meta_tags + = yield(:head) + %body + %header.navbar.navbar-fixed-top + %nav.navbar-inner + .container + = render 'layouts/navigation' + #main{:role => "main"} + .container + .content + .row + .span12 + //= render 'layouts/messages' + = yield + %footer -- cgit v1.2.3 From 93974e99296641822c734a3c192cc6c550efc696 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 19 Oct 2012 12:09:59 +0200 Subject: moved login navigation to the right --- app/views/layouts/_navigation.html.haml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 04d2356..b75eed7 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,10 +1,6 @@ = link_to "Leap Web", root_path, :class => 'brand' %ul.nav - - if current_user - %li - = link_to t(:logout), logout_path - - else - %li - = link_to t(:login), login_path - %li - = link_to t(:signup), signup_path + // = render '/tickets/nav' + +%ul.nav.pull-right + = render '/sessions/nav' -- cgit v1.2.3 From 4b7333eec8eaf0c01227ade9d77a21f7a879ff0b Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 31 Oct 2012 17:39:06 +0100 Subject: using controller extensions for application controller by hand --- app/controllers/application_controller.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'app') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 693bd86..be7aa1f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,10 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery - helper_method :current_user - - private - def current_user - @current_user ||= User.find(session[:user_id]) if session[:user_id] - end + ActiveSupport.run_load_hooks(:application_controller, self) end -- cgit v1.2.3 From 05ea71016fd54a14159c72299c25efbdc2f177bc Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 12 Nov 2012 19:16:19 +0100 Subject: adding client side validations to the mix --- app/assets/javascripts/application.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index dc975d4..f7ca1ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,3 +16,5 @@ //= require users //= require_tree . //= require bootstrap +//= require rails.validations +//= require rails.validations.simple_form -- cgit v1.2.3 From 13f53593551549d8e95e382fd42a92efc170943d Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 20 Nov 2012 10:34:13 +0100 Subject: ui tweaks to the menu --- app/assets/stylesheets/application.scss | 3 +++ app/views/layouts/_navigation.html.haml | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 72c943a..3465431 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,2 +1,5 @@ @import "bootstrap"; +body { + padding: 40px; +} @import "bootstrap-responsive"; diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index b75eed7..e72586a 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,6 +1,7 @@ = link_to "Leap Web", root_path, :class => 'brand' -%ul.nav - // = render '/tickets/nav' +.nav-collapse.collapse + %ul.nav + // = render '/tickets/nav' -%ul.nav.pull-right - = render '/sessions/nav' + %ul.nav.pull-right + = render '/sessions/nav' -- cgit v1.2.3 From a8cefdcb896736608fcd94456b8f42c8aafd8d7f Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 22 Nov 2012 10:31:09 +0100 Subject: don't collabse the nav --- app/views/layouts/_navigation.html.haml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index e72586a..b75eed7 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,7 +1,6 @@ = link_to "Leap Web", root_path, :class => 'brand' -.nav-collapse.collapse - %ul.nav - // = render '/tickets/nav' +%ul.nav + // = render '/tickets/nav' - %ul.nav.pull-right - = render '/sessions/nav' +%ul.nav.pull-right + = render '/sessions/nav' -- cgit v1.2.3 From 9afcef0648f34435f40644242e038cafb1dce117 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 26 Nov 2012 16:39:44 +0100 Subject: hide buttons in table-hover unless hovered over tr --- app/assets/stylesheets/application.scss | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app') diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3465431..8dec07d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,3 +3,12 @@ body { padding: 40px; } @import "bootstrap-responsive"; + + +table.table-hover .btn { + opacity: 0; +} + +table.table-hover tr:hover .btn { + opacity: 1; +} -- cgit v1.2.3