upgrade styling

.gitignore

@@ -1,7 +1,8 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3
-test/dummy/log/*.log
+spec/dummy/log/*.log
-test/dummy/tmp/
+spec/dummy/tmp/
-test/dummy/.sass-cache
+spec/dummy/.sass-cache
+spec/dummy/public

app/assets/stylesheets/cmtool/application.css

@@ -9,5 +9,5 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require_directory .
 */

app/assets/stylesheets/cmtool/menu.css.sass

@@ -0,0 +1,26 @@
+@import bourbon
+#menu-container
+  @include linear-gradient(#1e5799, #2989d8)
+  clear: both
+  padding: 10px
+  ul
+    margin: 0
+    padding: 0
+    list-style: none
+    li
+      float: left
+      margin-right: 9px
+      padding: 5px 4px
+      background-color: white
+      &.parent:hover> ul
+        display: block
+      .child-menu
+        display: none
+        position: absolute
+        z-index: 10000
+        margin-left: -5px
+        margin-top: 4px
+        li
+          float: none
+      &.ui-state-active .child-menu li.ui-state-default a
+        color: #1C94C4

app/assets/stylesheets/cmtool/sessions/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_directory . 
+*/

app/assets/stylesheets/cmtool/sessions/structure.css.sass

@@ -0,0 +1,73 @@
+@import jquery-ui
+@import bourbon
+.clear
+  clear: both
+body, html
+  font-size: 16px
+  font-family: $lucida-grande
+
+#page-wrapper
+  @extend .ui-widget
+  margin: 80px auto
+  width: 600px
+  a
+    color: black
+    text-decoration: none
+    &:hover
+      text-decoration: underline
+  ul#devise-links
+    list-style: none
+    margin: 20px 0
+    padding: 0
+    li
+      float: left
+      margin-right: 10px
+    #login-home
+      @extend .ui-icon
+      //@extend .ui-icon-arrowreturnthick-1-w
+      @extend .ui-icon-home
+  .field_with_errors
+    display: inline
+    input
+      border: 1px solid #a00
+    label
+      color: #a00
+  #error_explanation
+    @extend .ui-state-error
+    padding: 18px
+    h2
+      padding: 0
+      margin: 0
+    ul
+      margin: 10px 0 0 0 
+  #new-session-button
+    float: right
+    margin-right: 148px
+    width: 100px
+  #content-container
+    @extend .ui-widget-content
+    +border-radius(15px)
+    +box-shadow(5px 5px 5px #555)
+    .message
+      padding: 10px
+      .text
+        margin-left: 32px
+      &.error .icon
+        @extend .ui-icon
+        @extend .ui-icon-alert
+        background-image: url(/assets/ui/ui-icons_ffd27a_256x240.png)
+        float: left
+    #content
+      h2
+        margin: 10px 0
+      background-image: image-url("sessions/logo.png")
+      background-repeat: no-repeat
+      background-position: right bottom
+      padding: 18px
+      .button
+        +button(shiny, #aaa) 
+      .field
+        padding-top: 6px
+        label
+          float: left
+          width: 152px

app/assets/stylesheets/cmtool/structure.css.sass

@@ -29,36 +29,29 @@ a
       border: 1px solid red
 #page-wrapper
   width: 972px
-  margin: 10px auto
+  margin: 40px auto 10px auto
-  background-color: white
+  #sub-navigation-container
-#menu-container
+    ul
-  @include linear-gradient(#1e5799, #2989d8)
+      list-style: none
-  clear: both
+      margin: 0
-  padding: 10px
+      padding: 0
-  ul
+      li
-    margin: 0
+        @include linear-gradient(#2989d8, #1e5799)
-    padding: 0
+        float: left
-    list-style: none
+        margin-right: 10px
-    li
+        padding: 3px 6px
-      float: left
+        +border-bottom-radius(5px)
-      margin-right: 9px
+  #title-container
-      padding: 5px 4px
+    @include linear-gradient(#aaa, #fff)
-      background-color: white
+    padding: 10px
-      &.parent:hover> ul
+    +border-top-radius(15px)
-        display: block
+    +box-shadow(5px 5px 5px #555)
-      .child-menu
+    h1
-        display: none
+      margin: 0
-        position: absolute
+      padding: 0
-        z-index: 10000
+  #content-container
-        margin-left: -5px
+    background-color: white
-        margin-top: 4px
+    +border-bottom-radius(15px)
-        li
+    +box-shadow(5px 5px 5px #555)
-          float: none
+    #content
-      &.ui-state-active .child-menu li.ui-state-default a
+      padding: 10px
-        color: #1C94C4
-#sub-navigation-container
-  ul
-    list-style: none
-    li
-      float: left
-      margin-right: 10px

app/assets/stylesheets/cmtool/table.css.sass

@@ -0,0 +1,13 @@
+@import bourbon
+
+table
+  td.action
+    //@include radial-gradient(50% 50%, circle cover, #1e5799, #2989d8)
+    a
+      display: block
+      width: 16px
+      height: 16px
+      padding: 4px
+      @include radial-gradient(50% 50%, circle cover, #fff, #aaa)
+      &:hover
+        @include radial-gradient(50% 50%, circle cover, #ffc, #aaa)

app/assets/stylesheets/cmtool/user_info.css.sass

@@ -0,0 +1,17 @@
+@import bourbon
+#user-info
+  float: right
+  width: 400px
+  height: 22px
+  margin-top: -30px
+  @include linear-gradient(#2989d8, #1e5799)
+  color: white
+  font-weight: bold
+  padding: 4px
+  a
+    color: white
+    font-weight: bold
+  #user-info-sign-in-out
+    float: right
+  #user-info-email
+    float: left

app/controllers/cmtool/sessions_controller.rb

@@ -1,5 +1,5 @@
 module Cmtool
   class SessionsController < ::Devise::SessionsController
-    layout 'cmtool/application'
+    layout 'cmtool/sessions'
   end
 end

app/helpers/cmtool/application_helper.rb

@@ -14,6 +14,7 @@ module Cmtool
             t("cmtool.action.#{args.first}.title", model: model.model_name.human)
           end
         else
+          raise 'Imporoper title declaration'
           args.first
         end
       end
@@ -81,5 +82,20 @@ module Cmtool
       end
       format("%.2f",n) + %w(B KB MB GB TB)[count]
     end
+
+    def edit_td(obj)
+      content_tag(
+        :td, 
+        link_to((content_tag(:span, 'edit', class: ['ui-icon', 'ui-icon-pencil'])), cmtool.url_for([:edit, obj]), class: [:edit]), 
+        class: [:action, :edit]
+      )
+    end
+    def destroy_td(obj)
+      content_tag(
+        :td, 
+        link_to(content_tag(:span, 'delete', class: ['ui-icon', 'ui-icon-trash']), cmtool.url_for(obj), method: :delete, confirm: are_you_sure(obj), class: [:destroy]),
+        class: [:action, :destroy]
+      )
+    end
   end
 end

app/views/cmtool/contact_forms/index.html.haml

@@ -16,8 +16,8 @@
           %td= link_to contact_form.name, cmtool.contact_form_path(contact_form)
           %td= contact_form.email
           %td= contact_form.phone
-          %td= link_to link_to_edit_content(contact_form), cmtool.edit_contact_form_path(contact_form)
+          = edit_td contact_form
-          %td= link_to link_to_destroy_content(contact_form), cmtool.contact_form_path(contact_form), :confirm => are_you_sure(contact_form), :method => :delete
+          = destroy_td contact_form
 - else
   = empty_result(Cmtool::ContactForm)
 

app/views/cmtool/customers/_form.html.haml

@@ -1,14 +0,0 @@
-= form_for [:admin, @customer] do |f|
-  = render 'error_messages', :target => @customer
-
-  .field
-    = f.label :email
-    = f.text_field :email
-  .field
-    = f.label :password
-    = f.password_field :password
-  .field
-    = f.label :password_confirmation
-    = f.password_field :password_confirmation
-  .actions
-    = f.submit @submit || update_button_text

app/views/cmtool/customers/edit.html.haml

@@ -1,8 +0,0 @@
-- title t('action.edit.title', :model => Customer.model_name.human)
-= render 'form', :submit => update_button_text
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_show_content(@customer), [:admin, @customer]
-    %li= link_separator
-    %li= link_to link_to_index_content(:customer), admin_customers_path

app/views/cmtool/customers/index.html.haml

@@ -1,20 +0,0 @@
-- title t('action.index.title', :model => Customer.model_name.human.pluralize)
-- if @customers.any?
-  %table.index-table
-    %thead
-      %tr
-        %th= Customer.human_attribute_name(:email)
-        %th
-        %th
-    %tbody
-      - @customers.each do |customer|
-        %tr
-          %td= link_to customer.email, [:admin, customer]
-          %td= link_to link_to_edit_content(customer), [:edit, :admin, customer]
-          %td= link_to link_to_destroy_content(customer), [:admin, customer], :confirm => are_you_sure(customer), :method => :delete
-- else
-  = empty_result(Customer)
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_new_content(:customer), new_admin_customer_path

app/views/cmtool/customers/new.html.haml

@@ -1,7 +0,0 @@
-- title t('action.new.title', :model => Customer.model_name.human)
-
-= render 'form', :submit => create_button_text
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_index_content(:customer), admin_customers_path

app/views/cmtool/customers/show.html.haml

@@ -1,10 +0,0 @@
-- title t('action.show.title', :model => Customer.model_name.human)
-.show_field
-  %strong= Customer.human_attribute_name(:email)
-  = @customer.email
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_edit_content(@customer), [:edit, :admin, @customer]
-    %li= link_separator
-    %li= link_to link_to_index_content(:customer), admin_customers_path

app/views/cmtool/directories/index.html.haml

@@ -10,8 +10,8 @@
       - @directories.each do |directory|
         %tr
           %td= link_to directory.name, cmtool.directory_path(directory)
-          %td= link_to link_to_edit_content(directory), cmtool.edit_directory_path(directory)
+          = edit_td directory
-          %td= link_to link_to_destroy_content(directory), cmtool.directory_path(directory), :confirm => are_you_sure(directory), :method => :delete
+          = destroy_td directory
 - else
   = empty_result(Cmtool::Directory)
 

app/views/cmtool/faqs/index.html.haml

@@ -1,4 +1,4 @@
-- title t('cmtool.action.index.title', :models => Cmtool::Faq.model_name.human.pluralize)
+- title :index, Cmtool::Faq
 - if @faqs.any?
   %table.index-table
     %thead
@@ -12,8 +12,8 @@
         %tr
           %td= link_to raw(truncate(faq.question, :length => 40)), cmtool.faq_path(faq)
           %td= link_to raw(truncate(faq.answer, :length => 40)), cmtool.faq_path(faq)
-          %td= link_to link_to_edit_content(faq), cmtool.edit_faq_path(faq)
+          = edit_td faq
-          %td= link_to link_to_destroy_content(faq), cmtool.faq_path(faq), :confirm => are_you_sure(faq), :method => :delete
+          = destroy_td faq
 - else
   = empty_result(Cmtool::Faq)
 

app/views/cmtool/faqs/show.html.haml

@@ -1,4 +1,4 @@
-- title t('cmtool.action.show.title', :model => Cmtool::Faq.model_name.human)
+- title :show, Cmtool::Faq
 .show_field
   %strong= Cmtool::Faq.human_attribute_name(:question)
   =raw @faq.question

app/views/cmtool/images/index.html.haml

@@ -20,8 +20,8 @@
           %td= image.file_content_type
           %td= human_size image.file_file_size
           %td= l image.file_updated_at #, :format => :short
-          %td= link_to link_to_edit_content(image), cmtool.edit_image_path(image)
+          = edit_td image
-          %td= link_to link_to_destroy_content(image), cmtool.image_path(image), :confirm => are_you_sure(image), :method => :delete
+          = destroy_td image
 - else
   = empty_result(Cmtool::Image)
 

app/views/cmtool/images/show.html.haml

@@ -1,4 +1,4 @@
-- title t('action.show.title', :model => Cmtool::Image.model_name.human)
+- title :show Cmtool::Image
 .show_field
   - if @image.file?
     = image_tag @image.file.url(:page)

app/views/cmtool/keywords/edit.html.haml

@@ -1,4 +1,4 @@
-- title t('cmtool.action.edit.title', :model => Cmtool::Keyword.model_name.human)
+- title :edit, Cmtool::Keyword
 = render 'form', :submit => update_button_text(@keyword)
 
 - content_for :page_links do

app/views/cmtool/keywords/index.html.haml

@@ -1,4 +1,4 @@
-- title t('action.index.title', :model => Cmtool::Keyword.model_name.human.pluralize)
+- title :index, Cmtool::Keyword
 - if @keywords.any?
   %table.index-table
     %thead
@@ -10,8 +10,8 @@
       - @keywords.each do |keyword|
         %tr
           %td= link_to keyword.name, cmtool.keyword_path(keyword)
-          %td= link_to link_to_edit_content(keyword), cmtool.edit_keyword_path(keyword)
+          = edit_td keyword
-          %td= link_to link_to_destroy_content(keyword), cmtool.keyword_path(keyword), :confirm => are_you_sure(keyword), :method => :delete
+          = destroy_td keyword
 - else
   = empty_result(Cmtool::Keyword)
 

app/views/cmtool/keywords/new.html.haml

@@ -1,4 +1,4 @@
-- title t('cmtool.action.new.title', :model => Cmtool::Keyword.model_name.human)
+- title :new, Cmtool::Keyword
 
 = render 'form', :submit => create_button_text(@keyword)
 

app/views/cmtool/keywords/show.html.haml

@@ -1,4 +1,4 @@
-- title t('cmtool.action.show.title', :model => Cmtool::Keyword.model_name.human)
+- title :show, Cmtool::Keyword
 .show_field
   %strong= Cmtool::Keyword.human_attribute_name(:name)
   = @keyword.name

app/views/cmtool/news/edit.html.haml

@@ -1,4 +1,4 @@
-- title t('action.edit.title', :model => Cmtool::News.model_name.human)
+- title :edit, Cmtool::News
 - if @news.image?
   = link_to image_tag(@news.image.url(:thumb)), @news.image.url
 = render 'form', :submit => update_button_text(@news)

app/views/cmtool/news/index.html.haml

@@ -1,4 +1,4 @@
-- title t('action.index.title', :model => Cmtool::News.model_name.human.pluralize)
+- title :index, Cmtool::News
 - if @news.any?
   %table.index-table
     %thead
@@ -14,8 +14,8 @@
           %td= link_to news.title, cmtool.news_path(news)
           %td= boolean_text news.active?
           %td=l news.date
-          %td= link_to link_to_edit_content(news), cmtool.edit_news_path(news)
+          = edit_td news
-          %td= link_to link_to_destroy_content(news), cmtool.news_path(news), :confirm => are_you_sure(news), :method => :delete
+          = destroy_td news
 - else
   = empty_result(Cmtool::News)
 

app/views/cmtool/news/new.html.haml

@@ -1,5 +1,4 @@
-- title t('action.new.title', :model => Cmtool::News.model_name.human)
+- title :new, Cmtool::News
-
 = render 'form', :submit => create_button_text(@news)
 
 - content_for :page_links do

app/views/cmtool/news/show.html.haml

@@ -1,8 +1,8 @@
-- title t('action.show.title', :model => Cmtool::News.model_name.human)
+- title :new, Cmtool::News
 - if @news.image?
   #news-image-container
     = link_to image_tag(@news.image.url(:thumb)), @news.image.url
-    = link_to 'Verwijder', remove_image_admin_news_path(@news), :method => :delete, :confirm => are_you_sure, :remote => true
+    = link_to t('cmtool.news.remove_image'), cmtool.remove_image_news_path(@news), :method => :delete, :confirm => are_you_sure(), :remote => true
 .show_field
   %strong= Cmtool::News.human_attribute_name(:title)
   = @news.title

app/views/cmtool/newsletter_subscriptions/index.html.haml

@@ -14,8 +14,8 @@
           %td= newsletter_subscription.email
           %td= newsletter_subscription.deactivation_token
           %td= boolean_text newsletter_subscription.active
-          %td= link_to link_to_edit_content(newsletter_subscription), cmtool.edit_newsletter_subscription_path(newsletter_subscription)
+          = edit_td newsletter_subscription
-          %td= link_to link_to_destroy_content(newsletter_subscription), cmtool.newsletter_subscription_path(newsletter_subscription), :confirm => are_you_sure(newsletter_subscription), :method => :delete
+          = destroy_td newsletter_subscription
 - else
   = empty_result(Cmtool::NewsletterSubscription)
 

app/views/cmtool/pages/edit.html.haml

@@ -1,4 +1,4 @@
-- title t('action.edit.title', :model => Page.model_name.human)
+- title :edit, Page
 = render 'form', :submit => update_button_text(@page)
 
 - content_for :page_links do

app/views/cmtool/pages/index.html.haml

@@ -1,4 +1,4 @@
-- title t('action.index.title', :model => Page.model_name.human_plural)
+- title :index, Page
 %table.index-table
   %thead
     %tr

app/views/cmtool/pages/new.html.haml

@@ -1,5 +1,4 @@
-- title t('action.new.title', :model => Page.model_name.human)
+- title :new, Page
-
 = render 'form', :submit => create_button_text(@page)
 
 - content_for :page_links do

app/views/cmtool/pages/show.html.haml

@@ -1,4 +1,4 @@
-- title t('action.show.title', :model => Page.model_name.human)
+- title :show, Page
 .show_field
   %strong= Page.human_attribute_name(:name)
   = @page.name

app/views/cmtool/partners/_form.html.haml

@@ -1,14 +0,0 @@
-= form_for [:admin, @partner] do |f|
-  = render 'error_messages', :target => @partner
-
-  .field
-    = f.label :email
-    = f.text_field :email
-  .field
-    = f.label :password
-    = f.password_field :password
-  .field
-    = f.label :password_confirmation
-    = f.password_field :password_confirmation
-  .actions
-    = f.submit @submit || update_button_text

app/views/cmtool/partners/edit.html.haml

@@ -1,8 +0,0 @@
-- title t('action.edit.title', :model => Partner.model_name.human)
-= render 'form', :submit => update_button_text
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_show_content(@partner), [:admin, @partner]
-    %li= link_separator
-    %li= link_to link_to_index_content(:partner), admin_partners_path

app/views/cmtool/partners/index.html.haml

@@ -1,20 +0,0 @@
-- title t('action.index.title', :model => Partner.model_name.human.pluralize)
-- if @partners.any?
-  %table.index-table
-    %thead
-      %tr
-        %th= Partner.human_attribute_name(:email)
-        %th
-        %th
-    %tbody
-      - @partners.each do |partner|
-        %tr
-          %td= link_to partner.email, [:admin, partner]
-          %td= link_to link_to_edit_content(partner), [:edit, :admin, partner]
-          %td= link_to link_to_destroy_content(partner), [:admin, partner], :confirm => are_you_sure(partner), :method => :delete
-- else
-  = empty_result(Partner)
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_new_content(:partner), new_admin_partner_path

app/views/cmtool/partners/new.html.haml

@@ -1,7 +0,0 @@
-- title t('action.new.title', :model => Partner.model_name.human)
-
-= render 'form', :submit => create_button_text
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_index_content(:partner), admin_partners_path

app/views/cmtool/partners/show.html.haml

@@ -1,10 +0,0 @@
-- title t('action.show.title', :model => Partner.model_name.human)
-.show_field
-  %strong= Partner.human_attribute_name(:email)
-  = @partner.email
-
-- content_for :page_links do
-  %ul
-    %li= link_to link_to_edit_content(@partner), [:edit, :admin, @partner]
-    %li= link_separator
-    %li= link_to link_to_index_content(:partner), admin_partners_path

app/views/cmtool/quotes/index.html.haml

@@ -16,8 +16,8 @@
           %td= quote.function
           %td= boolean_text quote.active
           %td= quote.state
-          %td= link_to link_to_edit_content(quote), cmtool.edit_quote_path(quote)
+          = edit_td quote
-          %td= link_to link_to_destroy_content(quote), cmtool.quote_path(quote), :confirm => are_you_sure(quote), :method => :delete
+          = destroy_td quote
 - else
   = empty_result(Cmtool::Quote)
 

app/views/cmtool/sessions/new.html.haml

@@ -1,4 +1,4 @@
-%h2 Inloggen voor toegang tot extra diensten
+%h2= t('cmtool.sessions.new.title')
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
   .field
     = f.label :email
@@ -11,6 +11,6 @@
     .field
       = f.check_box :remember_me
       = f.label :remember_me
-  .field
+  .actions
-    = f.submit "Inloggen"
+    = f.submit t('cmtool.sessions.new.label'), class: :button, id: 'new-session-button'
 = render :partial => "devise/shared/links"

app/views/cmtool/sessions/sessions/new.html.haml

@@ -0,0 +1,18 @@
+%h2 Inloggen voor toegang tot extra diensten
+= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+  .field
+    = f.label :email
+    = f.email_field :email, value: params[:email]
+  .field
+    = f.label :password
+    = f.password_field :password, value: params[:password]
+
+  - if devise_mapping.rememberable?
+    .field
+      = f.check_box :remember_me
+      = f.label :remember_me, t('devise.sessions.remember_me')
+      = button_tag t('devise.sessions.sign_in'), id: 'new-session-button', class: :button
+  - else
+    .field
+      = button_tag t('devise.sessions.sign_in'), id: 'new-session-button', class: :button
+= render :partial => "devise/shared/links"

app/views/cmtool/users/index.html.haml

@@ -10,8 +10,8 @@
       - @users.each do |user|
         %tr
           %td= link_to user.email, cmtool.user_path(user)
-          %td= link_to link_to_edit_content(user), cmtool.edit_user_path(user)
+          = edit_td user
-          %td= link_to link_to_destroy_content(user), cmtool.user_path(user), :confirm => are_you_sure(user), :method => :delete
+          = destroy_td user
 - else
   = empty_result(User)
 

app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

app/views/devise/mailer/reset_password_instructions.html.haml

@@ -0,0 +1,10 @@
+%p= "Hello #{@resource.email}!"
+
+%p Someone has requested a link to change your password, and you can do this through the link below.
+
+%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+
+%p If you didn't request this, please ignore this email.
+%p Your password won't change until you access the link above and create a new one.
+%p With kind regards,
+%p The ATool team

app/views/devise/mailer/reset_password_instructions.nl.html.haml

@@ -0,0 +1,6 @@
+%p= "Hallo #{@resource.email}!"
+%p Er is een nieuw wachtwoord voor je aangevraagt. Dit kan je bevestigen door naar de onderstaande link te gaan.
+%p= link_to 'Wijzig wachtwoord', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+%p Als deze aanvraag niet van jou is kan je deze email negeren. Het wachtwoord wordt niet gewijzigd zonder dat de bovenstaande link gebruikt wordt.
+%p Met vriendelijke groet,
+%p Het ATool team

app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></div>
+
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,25 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password %></div>
+
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></div>
+
+  <div><%= f.submit "Update" %></div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= link_to "Back", :back %>

app/views/devise/registrations/new.html.erb

@@ -0,0 +1,18 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>
+
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Sign up" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/sessions/new.html.erb

@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>
+
+  <% if devise_mapping.rememberable? -%>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+  <% end -%>
+
+  <div><%= f.submit "Sign in" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

app/views/devise/shared/_links.html.haml

@@ -0,0 +1,20 @@
+%ul#devise-links
+  %li= link_to 'Home', root_path, id: 'login-home'
+  - if controller_name != 'sessions'
+    %li= link_to "Inloggen", new_session_path(resource_name)
+
+  - if devise_mapping.registerable? && controller_name != 'registrations'
+    %li= link_to "Registreer", new_registration_path(resource_name)
+
+  - if devise_mapping.recoverable? && controller_name != 'passwords'
+    %li= link_to "Wachtwoord vergeten?", new_password_path(resource_name)
+
+  - if devise_mapping.confirmable? && controller_name != 'confirmations'
+    %li= link_to "Geen bevestigingsemail ontvangen?", new_confirmation_path(resource_name)
+
+  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+    %li= link_to "Geen unlock instructies ontvangen?", new_unlock_path(resource_name)
+
+  - if devise_mapping.omniauthable?
+    - resource_class.omniauth_providers.each do |provider|
+      %li= link_to "Inloggen met #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)

app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit "Resend unlock instructions" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/layouts/cmtool/application.html.haml

@@ -32,10 +32,11 @@
               %li{:class => controller_name == 'images' ? 'ui-state-active' : 'ui-state-default'}=link_to Cmtool::Image.model_name.human_plural, cmtool.images_path
               %li{:class => controller_name == 'directories' ? 'ui-state-active' : 'ui-state-default'}=link_to Cmtool::Directory.model_name.human_plural, cmtool.directories_path
             .clear
-        %h1#title= yield :title
         #sub-navigation-container
           = yield :page_links
           .clear
+      #title-container
+        %h1#title= yield :title
       #content-container
         = render 'alerts'
         #content

app/views/layouts/cmtool/sessions.html.haml

@@ -0,0 +1,14 @@
+!!! Strict
+%html{"xml:lang" => I18n.locale, :lang => I18n.locale}
+  %head
+    %title  Login
+    = csrf_meta_tag
+    = stylesheet_link_tag 'cmtool/sessions/application'
+    = javascript_include_tag 'cmtool/sessions/application'
+  %body
+    #page-wrapper
+      #content-container
+        #content
+          = render 'cmtool/application/alerts'
+          = yield
+          .clear

config/locales/cmtool.en.yml

@@ -28,6 +28,12 @@ en:
       add_file: Add file
       add_image:
         label: Add %{image}
+    news:
+      remove_image: Remove image
+    sessions:
+      new:
+        label: Login
+        title: Acces the administration section
   activemodel:
     models:
       page: Page