Merge branch 'develop'

4 files changed, 30 insertions, 7 deletions

diff --git a/users/app/views/sessions/_admin_nav.html.haml b/users/app/views/sessions/_admin_nav.html.haml
new file mode 100644
index 0000000..14dfbdc
--- /dev/null
+++ b/users/app/views/sessions/_admin_nav.html.haml
@@ -0,0 +1,6 @@
+%a#admin-menu{"data-toggle" => "dropdown", :role => :button}
+  Admin
+%ul.dropdown-menu{:role => "menu", "aria-labelledby" => "admin-menu"}
+  %li
+    = link_to Ticket.model_name.human(:count => ""), tickets_path, {:tabindex => -1}
+    = link_to User.model_name.human(:count => ""), users_path, {:tabindex => -1}
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
new file mode 100644
index 0000000..5306d0e
--- /dev/null
+++ b/users/app/views/sessions/_nav.html.haml
@@ -0,0 +1,13 @@
+- if logged_in?
+  - if admin?
+    %li.dropdown
+      = render 'sessions/admin_nav'
+  %li
+    = link_to current_user.login, edit_user_path(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/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml
index 39ee7bf..a04f584 100644
--- a/users/app/views/sessions/new.html.haml
+++ b/users/app/views/sessions/new.html.haml
@@ -1,7 +1,8 @@
-%h2=t :login
-= simple_form_for :session, :url => sessions_path, :html => { :id => :new_session } do |f|
-  %legend=t :login_message
-  = f.input :login, :input_html => { :id => :srp_username }
-  = f.input :password, :required => true, :input_html => { :id => :srp_password }
-  = f.button :submit, :value => t(:login), :class => 'btn-primary' 
-  = link_to t(:cancel), root_url, :class => :btn
+.span8.offset2
+  %h2=t :login
+  = simple_form_for @session, :validate => true, :html => { :id => :new_session, :class => 'form-horizontal' } do |f|
+    %legend=t :login_message
+    = f.input :login, :input_html => { :id => :srp_username }
+    = f.input :password, :required => true, :input_html => { :id => :srp_password }
+    = f.button :submit, :value => t(:login), :class => 'btn-primary' 
+    = link_to t(:cancel), root_url, :class => :btn
diff --git a/users/app/views/sessions/new.json.erb b/users/app/views/sessions/new.json.erb
new file mode 100644
index 0000000..36154b8
--- /dev/null
+++ b/users/app/views/sessions/new.json.erb
@@ -0,0 +1,3 @@
+{
+"errors": <%= raw @errors.to_json %>
+}