Basic site flow improvements and devise handling

app/views/devise/_links.html.slim

@@ -1,4 +1,4 @@
-ul.nav.nav-pills
+ul.nav.nav-pills.devise-nav
   - if controller_name != 'sessions'
     li= link_to t('devise.sessions.button'), new_session_path(resource_name), class: [:devise, :btn]
 

app/views/layouts/theme1-home.html.slim

@@ -10,6 +10,7 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     = stylesheet_link_tag "theme1/application", :media => "all"
+    = javascript_include_tag 'theme1/application'
     link href="/favicon.ico" rel="shortcut icon"
     link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
 
@@ -45,11 +46,11 @@ html lang="en"
           .main-inner
             .general-alerts
               - if flash[:alert].present?
-                .alert-box.warning
+                .flash-box.alert
                   div= flash[:alert]
                   a.close data-dismiss="alert" ×
               - if flash[:notice].present?
-                .alert-box
+                .flash-box.notice
                   div= flash[:notice]
                   a.close data-dismiss="alert" ×
             = yield :page_title
@@ -58,5 +59,4 @@ html lang="en"
         .footer-shadow
         .container
           .footer-content= render 'footer'
-          .footer-bottom © Qwaiter 2013
-    = javascript_include_tag "application"
+          .footer-bottom © Qwaiter 2014

app/views/layouts/theme1.html.slim

@@ -40,13 +40,13 @@ html lang="en"
         .container
           .main-inner
             - if flash[:alert].present?
-              .alert.alert-error
-                a.close data-dismiss="alert" ×
+              .flash-box.alert
                 div= flash[:alert]
-            - if flash[:notice].present?
-              .alert.alert-success
                 a.close data-dismiss="alert" ×
+            - if flash[:notice].present?
+              .flash-box.notice
                 div= flash[:notice]
+                a.close data-dismiss="alert" ×
             - if @page && @page.title.present?
               h1.page-title= @page.title
             = yield

app/views/suppliers/confirmations/new.html.slim

@@ -2,11 +2,8 @@ h2= t('devise.confirmations.title')
 
 = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal' }) do |f|
   = devise_error_messages!
-  .control-group
-    = f.label :email, class: 'control-label'
-    .controls
-      = f.email_field :email
-
-  .control-group
-    .controls= f.submit t('devise.confirmations.submit_text'), class: 'btn-primary'
+  = f.row :email do
+    .form-label= f.label :email, class: 'control-label'
+    .form-field= f.email_field :email
+  .form-row.form-actions= f.submit t('devise.confirmations.submit_text'), class: 'button'
 = render "links"

app/views/suppliers/passwords/edit.html.slim

@@ -2,13 +2,11 @@ h2= t('devise.passwords.edit.title')
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal', method: :put}) do |f| 
   = devise_error_messages!
   = f.hidden_field :reset_password_token
-  .control-group
-     = f.label :password, class: 'control-label'
-     .controls= f.password_field :password
-  .control-group
-     = f.label :password_confirmation, class: 'control-label'
-     .controls= f.password_field :password_confirmation
-  .control-group
-    .controls
-      = f.submit t('devise.passwords.edit.button'), class: 'btn btn-primary'
+  .form-row
+    .form-label= f.label :password
+    .form-field= f.password_field :password
+  = f.row :password_confirmation do
+    .form-label= f.label :password_confirmation
+    .form-field= f.password_field :password_confirmation
+  .form-row= f.submit t('devise.passwords.edit.button'), class: 'button'
 = render "links"

app/views/suppliers/passwords/new.html.slim

@@ -1,10 +1,8 @@
 h2= t('devise.passwords.title')
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
   = devise_error_messages!
-  .control-group
-     = f.label :email, class: 'control-label'
-     .controls= f.email_field :email
-  .control-group
-    .controls
-      = f.submit t('devise.passwords.button'), class: 'btn btn-primary'
+  = f.row :email do
+    .form-label= f.label :email, class: 'control-label'
+    .form-field= f.email_field :email
+  .form-row.form-actions= f.submit t('devise.passwords.button'), class: 'button'
 = render "links"

app/views/suppliers/registrations/new.html.slim

@@ -6,18 +6,17 @@ p
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
   = devise_error_messages!
   .control-group
-     = f.label :name, class: 'control-label'
-     .controls= f.text_field :name
-  .control-group
-     = f.label :email, class: 'control-label'
-     .controls= f.email_field :email
-  .control-group
-     = f.label :password, class: 'control-label'
-     .controls= f.password_field :password
-  .control-group
-     = f.label :password_confirmation, class: 'control-label'
-     .controls= f.password_field :password_confirmation
-  .control-group
-    .controls
-      = f.submit t('devise.registrations.button'), class: 'btn btn-primary'
+  = f.row :name do
+     .form-label= f.label :name, class: 'control-label'
+     .form-field= f.text_field :name
+  = f.row :email do
+     .form-label= f.label :email, class: 'control-label'
+     .form-field= f.email_field :email
+  = f.row :password do
+     .form-label= f.label :password, class: 'control-label'
+     .form-field= f.password_field :password
+  = f.row :password_confirmation do
+     .form-label= f.label :password_confirmation, class: 'control-label'
+     .form-field= f.password_field :password_confirmation
+  .form-row.form-actions= f.submit t('devise.registrations.button'), class: 'button'
 = render "links"

app/views/suppliers/sessions/new.html.slim

@@ -1,19 +1,14 @@
 h2= t('devise.sessions.title')
 = form_for(resource, :as => resource_name, :url => session_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
   = devise_error_messages!
-  .control-group
-     = f.label :email, class: 'control-label'
-     .controls= f.email_field :email
-  .control-group
-     = f.label :password, class: 'control-label'
-     .controls= f.password_field :password
-  .control-group
-    .controls
-      = f.label :remember_me do
-        = f.check_box :remember_me
-        | 
-        = t('devise.sessions.remember_me')
-  .control-group
-    .controls
-      = f.submit t('devise.sessions.button'), class: 'btn btn-primary'
+  = f.row :email do
+    .form-label= f.label :email
+    .form-field= f.email_field :email
+  .form-row
+    = f.label :remember_me do
+      = f.check_box :remember_me
+      | 
+      = t('devise.sessions.remember_me')
+  .form-row
+    = f.submit t('devise.sessions.button'), class: 'new-session-button'
 = render "links"