end of day commit

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

@@ -3,6 +3,6 @@ h2= t('devise.passwords.title')
   = devise_error_messages!
   = f.row :email do
     .form-label= f.label :email, class: 'control-label'
-    .form-field= f.email_field :email
+    .form-field= f.email_field :email, autofocus: true
   .form-row.form-actions= f.submit t('devise.passwords.button'), class: 'button'
 = render "devise/links"

app/views/new_suppliers/new.html.slim

@@ -1,3 +1,4 @@
+h1.page-title= t 'devise.registrations.title'
 .row
   .small-12.columns
     ul
@@ -10,28 +11,28 @@
           li Download the app on your phone to test as a user
           li Scan a qr-code from you restaurant screen with your phone, and you can test ordering products!!!
 .row
-  .large-7.large-offset-1.columns
+  .large-8.large-offset-1.columns
     = form_for @new_supplier do |f|
       = f.row :supplier_name
         .large-4.columns= f.label :supplier_name
-        .large-4.columns= f.text_field :supplier_name
-        .large-4.columns= f.error_message :supplier_name
+        .large-6.columns= f.text_field :supplier_name, autofocus: true
+        .large-2.columns= f.error_message :supplier_name
       = f.row :email
         .large-4.columns= f.label :email
-        .large-4.columns
+        .large-6.columns
           - if @new_supplier.current_employee.present?
             = @new_supplier.current_employee.email
           - else
             = f.email_field :email
-        .large-4.columns= f.error_message :email
+        .large-2.columns= f.error_message :email
       - if not @new_supplier.current_employee.present?
         = f.row :password
           .large-4.columns= f.label :password
-          .large-4.columns= f.text_field :password
+          .large-4.columns= f.password_field :password
           .large-4.columns= f.error_message :password
         = f.row :password_confirmation
           .large-4.columns= f.label :password_confirmation
-          .large-4.columns= f.text_field :password_confirmation
+          .large-4.columns= f.password_field :password_confirmation
           .large-4.columns= f.error_message :password_confirmation
 
       .form-actions

app/views/pages/contact.html.slim

@@ -0,0 +1,22 @@
+.row
+  .large-9.columns
+    .row: .small-12.columns=raw @page.body
+    = form_for Cmtool::ContactForm.new, url: contact_forms_path, html: {class: 'contact'} do |f|
+      .row
+        .large-4.columns: label Uw naam:
+        .large-2.columns= f.select :gender, [['Dhr.', 'male'], ['Mevr.', 'female']]
+        .large-6.columns.end= f.text_field :name
+      .row
+        .small-12.columns.end
+          label Uw vraag of opmerking:*
+          br
+          = f.text_area :body, cols: 32, rows: 8
+      .row
+        .large-4.columns: label Uw e-mail adres:*
+        .large-8.columns.end= f.email_field :email
+      .row
+        .large-12.columns
+          = f.submit 'verstuur', class: 'button'
+          br
+          span * Verplicht veld
+  .large-3.columns== @page.sidebar

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

@@ -6,7 +6,7 @@ h2= t('devise.sign_in.title')
     .form-field= f.email_field :email
   = f.row :email do
     .form-label= f.label :password
-    .form-field= f.password_field :password
+    .form-field= f.password_field :password, autofocus: true
   .form-row
     = f.label :remember_me do
       = f.check_box :remember_me

app/views/theme1/_navigation.html.slim

@@ -1,8 +1,8 @@
 a.menu-secondary-toggle href="#"
   span
 ul.nav
-  li[class=(current_page?(controller: '/pages', action: 'home') ? :active : nil)]= link_to find_page('home').try(:menu_text), locale_root_path
-  li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about')
+  li[class=(current_page?(controller: '/pages', action: 'home') ? ['home', :active] : ['home'])]= link_to find_page('home').try(:menu_text), locale_root_path
+  li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? ['about', :active] : ['about'])]= link_to find_page('about').try(:menu_text), page_path('about')
 ul.nav.secondary
   - Page.menu_roots.each do |page|
-    li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? :active : nil)]= link_to page.menu_text, page_path(page.name)
+    li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? [page.name, :active] : [page.name])]= link_to page.menu_text, page_path(page.name)