Translations, design and content

app/assets/javascripts/application.js

@@ -12,7 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
 //= require bootstrap-sprockets
 //= require typeahead.bundle
 //= require markerclusterer_compiled

app/assets/stylesheets/application.sass

@@ -29,10 +29,16 @@ $font-size-h3: floor($font-size-base * 1.2)
 @import "bootstrap"
 @import "typeaheadjs"
 
+.alert-alert
+  @extend .alert-danger
+
+.alert-notice
+  @extend .alert-info
+
 body
   > .container
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
-    padding-top: 20px
+    padding: 20px
   
   header
     h1

app/controllers/application_controller.rb

@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   before_action :set_locale
+  before_action :configure_permitted_parameters, if: :devise_controller?
 
   INPUT_TIMEOUT = 2.seconds # We estimate that a user needs more then x seconds to enter some informations
 
@@ -27,4 +28,10 @@ class ApplicationController < ActionController::Base
   def default_url_options(options = {})
     options.merge locale: I18n.locale
   end
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:account_update, keys: [:first_name, :last_name, :street, :city, :zip, :support, :language, :age_category, :unsubscribed])
+  end
 end

app/models/supporter.rb

@@ -6,8 +6,8 @@ class Supporter
          :recoverable, :rememberable, :trackable, :validatable
 
   ## Database authenticatable
-  field :email,              type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email,              type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token,   type: String
@@ -47,7 +47,6 @@ class Supporter
   field :street,        type: String
   field :zip,           type: Integer
   field :city,          type: String
-  field :email,         type: String
   field :support,       type: String # Indicates the type of support
   field :li_membership, type: Boolean, default: false
   field :age_category,  type: String

app/views/layouts/application.html.slim

@@ -4,8 +4,8 @@ html lang="#{I18n.locale}"
       - flash.each do |type, message|
         = message
       |  #CH420 - #{content_for(:title)}
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
     = csrf_meta_tags
     link href="/apple-icon-57x57.png" rel="apple-touch-icon" sizes="57x57" /
     link href="/apple-icon-60x60.png" rel="apple-touch-icon" sizes="60x60" /
@@ -37,7 +37,7 @@ html lang="#{I18n.locale}"
 
     / = console if Rails.env.development?
     .container
+      = render 'shared/flashes'
       = render 'shared/header'
       = render 'shared/topnavigation'
-      = render 'shared/flashes'
       = yield

app/views/shared/_topnavigation.slim

@@ -4,4 +4,5 @@
     = navbar_group  id: 'topnav' do
       = navbar_item "Home", "/#{I18n.locale}"
       = navbar_item t('.donation'), spenden_path
-      = navbar_item t('.sign_in'), new_supporter_session_path if current_supporter.blank?
+      = navbar_item t('.sign_in'), new_supporter_session_path unless supporter_signed_in?
+      = navbar_item t('.sign_out'), destroy_supporter_session_path, nil, 'data-method' => :delete  if supporter_signed_in?

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

@@ -0,0 +1,10 @@
+h2
+  = t(".resend_confirmation_instructions")
+= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  = f.full_error :confirmation_token
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t(".resend_confirmation_instructions")
+= render "supporters/shared/links"

app/views/supporters/mailer/confirmation_instructions.html.slim

@@ -0,0 +1,7 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.instruction')
+p
+  = link_to t('.action'), confirmation_url(@resource, confirmation_token: (Devise::VERSION.start_with?('3.') ? @token : @resource.confirmation_token))

app/views/supporters/mailer/email_changed.html.slim

@@ -0,0 +1,14 @@
+p
+  | Hello 
+  = @email
+  | !
+- if @resource.try(:unconfirmed_email?)
+  p
+    | We're contacting you to notify you that your email is being changed to 
+    = @resource.unconfirmed_email
+    | .
+- else
+  p
+    | We're contacting you to notify you that your email has been changed to 
+    = @resource.email
+    | .

app/views/supporters/mailer/password_change.html.slim

@@ -0,0 +1,5 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.message')

app/views/supporters/mailer/reset_password_instructions.html.slim

@@ -0,0 +1,11 @@
+- require 'devise/version'
+p
+  = t('devise.mailer.reset_password_instructions.greeting', recipient: "#{@resource.first_name} #{@resource.last_name}")
+p
+  = t('devise.mailer.reset_password_instructions.instruction')
+p
+  = link_to t('devise.mailer.reset_password_instructions..action'), edit_password_url(@resource, reset_password_token: (Devise::VERSION.start_with?('3.', '4.') ? @token : @resource.reset_password_token), locale: I18n.locale)
+p
+  = t('devise.mailer.reset_password_instructions.instruction_2')
+p
+  = t('devise.mailer.reset_password_instructions.instruction_3')

app/views/supporters/mailer/unlock_instructions.html.slim

@@ -0,0 +1,9 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.message')
+p
+  = t('.instruction')
+p
+  = link_to t('.action'), unlock_url(@resource, unlock_token: (Devise::VERSION.start_with?('3.') ? @token :@resource.unlock_token))

app/views/supporters/new.slim

@@ -1,2 +1,38 @@
-= render 'form'
+- if supporter_signed_in?
+  h1.sr-only = title t('.title', name: current_supporter.first_name)
+  .row
+    .col-xs-12.col-md-7
+      .panel.panel-default
+        .panel-heading
+          h2.panel-title = t '.my_data'
+        .panel-body 
+          dl.dl-horizontal
+            dt = Supporter.human_attribute_name(:email)
+            dd = current_supporter.email
+            dt = Supporter.human_attribute_name(:first_name)
+            dd = current_supporter.first_name
+            dt = Supporter.human_attribute_name(:last_name)
+            dd = current_supporter.last_name
+            dt = Supporter.human_attribute_name(:street)
+            dd = current_supporter.street
+            dt = Supporter.human_attribute_name(:city)
+            dd = "#{current_supporter.zip} #{current_supporter.city}"
+            dt = Supporter.human_attribute_name(:support)
+            dd == t("support_type.#{current_supporter.support}")
+            dt = Supporter.human_attribute_name(:age_category)
+            dd == t("age_category.#{current_supporter.age_category}")
+            dt = Supporter.human_attribute_name(:language)
+            dd = t("languages.#{current_supporter.language}")
+            dt = Supporter.human_attribute_name(:unsubscribed)
+            dd = current_supporter.unsubscribed? ?  t('shared.yes') : t('shared.no')
+      
+          p
+            = link_to t('.edit'), edit_supporter_registration_path(), class: 'pull-right'
+  
+    
+    aside.col-md-5.col-xs-12
+      = render 'right_side'
+
+- else
+ = render 'form' 
   

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

@@ -0,0 +1,11 @@
+h2
+  = t("devise.passwords.edit.change_your_password")
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+  = f.input :reset_password_token, as: :hidden
+  = f.full_error :reset_password_token
+  .form-inputs
+    = f.input :password, label: t("devise.passwords.edit.new_password"), required: true, autofocus: true
+    = f.input :password_confirmation, label: t("devise.passwords.edit.confirm_new_password"), required: true
+  .form-actions
+    = f.button :submit, t("devise.passwords.edit.change_my_password")
+= render "supporters/shared/links"

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

@@ -0,0 +1,8 @@
+h1= title t("devise.passwords.new.forgot_your_password")
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t("devise.passwords.new.send_me_reset_password_instructions")
+= render "supporters/shared/links"

app/views/supporters/registrations/edit.html.slim

@@ -0,0 +1,28 @@
+.panel.panel-default
+  .panel-heading
+      h1.panel-title = title t("devise.registrations.edit.title", resource: resource_class.model_name.human)
+  .panel-body
+    = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+      .form-inputs
+        = f.input :current_password, hint: t("devise.registrations.edit.we_need_your_current_password_to_confirm_your_changes"), required: true
+        = f.input :email, required: true, autofocus: true
+        - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+          p
+            = t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email)
+        = f.input :password, autocomplete: "off", hint: t("devise.registrations.edit.leave_blank_if_you_don_t_want_to_change_it"), required: false
+        = f.input :password_confirmation, required: false
+        = f.input :first_name
+        = f.input :last_name
+        = f.input :street
+        = f.input :city
+        = f.input :zip
+        = f.input :support, as: :radio_buttons, collection: t('support_type').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
+        = f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first
+        = f.input :language, as: :radio_buttons, collection: t('languages').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
+        = f.input :unsubscribed, as: :boolean 
+      .form-actions
+        = f.button :submit, t("devise.registrations.edit.update"), class: 'btn btn-primary'
+    p = link_to t("devise.shared.links.back"), :back
+hr
+p = link_to t("devise.registrations.edit.cancel_my_account"), registration_path(resource_name), data: { confirm: t("devise.registrations.edit.are_you_sure") }, method: :delete, class: 'btn btn-danger btn-sm pull-right'
+

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

@@ -0,0 +1,11 @@
+h2
+  = t(".sign_up")
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = f.error_notification
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+    = f.input :password, required: true
+    = f.input :password_confirmation, required: true
+  .form-actions
+    = f.button :submit, t(".sign_up")
+= render "supporters/shared/links"

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

@@ -0,0 +1,9 @@
+h1= title t(".sign_in")
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  .form-inputs
+    = f.input :email, required: false, autofocus: true
+    = f.input :password, required: false
+    = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+  .form-actions
+    = f.button :submit, t("devise.sessions.new.sign_in")
+= render "supporters/shared/links"

app/views/supporters/shared/_links.html.slim

@@ -0,0 +1,20 @@
+- if controller_name != 'sessions'
+  = link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
+  br
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  /= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name)
+  = link_to t("devise.shared.links.sign_up"), new_supporter_path
+  br
+- if devise_mapping.recoverable? && controller_name != 'passwords'
+  = link_to t("devise.shared.links.forgot_your_password"), new_password_path(resource_name)
+  br
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+  = link_to t('devise.shared.links.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name)
+  br
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+  = link_to t('devise.shared.links.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name)
+  br
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to t('devise.shared.links.sign_in_with_provider', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)
+    br

app/views/supporters/unlocks/new.html.slim

@@ -0,0 +1,10 @@
+h2
+  = t(".resend_unlock_instructions")
+= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  = f.full_error :unlock_token
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t(".resend_unlock_instructions")
+= render "supporters/shared/links"