frontend update

app/assets/stylesheets/theme1/_theme_structure.css.sass

@@ -59,20 +59,20 @@ body
       font-size: 14px
       font-family: $font-family-content
       line-height: 1.5
-      color: #848585
+      color: $text-color
       position: relative
       h1
         font-size: 28px
         padding: 0.5em 0 0.2em 0
         line-height: 1.4
         font-family: $font-family-headers
-        color: #AE571F
+        color: $header-color
       h2
         font-size: 24px
         padding: 0.5em 0 0.2em 0
         line-height: 1.2
         font-family: $font-family-headers
-        color: #AE571F
+        color: $header-color
 
       background-image: image-url('theme1/wall-bg.jpg')
       background-position: center top

app/assets/stylesheets/theme1/application.css.sass

@@ -5,6 +5,8 @@ $content-max-width: 962px
 $cth-height: 48px
 $green-original: #99CB23
 $green: #7BB459 //Heineken
+$header-color: #AE571F
+$text-color: #333
 $font-family-content: Georgia, serif
 @import font-awesome
 @import ./mixins

app/controllers/application_controller.rb

@@ -22,6 +22,7 @@ private
     headers['Access-Control-Allow-Methods'] = '*'
   end
 
+  #START CMTOOL
   def authorize_cmtool
     redirect_to new_administrator_session_path, alert: t('general.unauthorized') unless current_administrator.present?
   end
@@ -34,6 +35,16 @@ private
     :en
   end
 
+  def page_path(record, locale: I18n.locale)
+    str = case record
+    when Page then record.name
+    else record
+    end
+    go_to_path(str, locale: locale)
+  end
+  helper_method :page_path
+  #END CMTOOL
+
   def broadcast_user(uid, event, data = {})
     Qwaiter.broadcast_user uid, event, data
   end

app/helpers/application_helper.rb

@@ -162,14 +162,6 @@ module ApplicationHelper
     end
   end
 
-  def page_path(record)
-    str = case record
-    when Page then record.name
-    else record
-    end
-    go_to_path(str, locale: I18n.locale)
-  end
-
   def find_page(name)
     Page.find_by_name_and_locale(name, I18n.locale)
   end

app/views/theme1/_footer.html.slim

@@ -3,9 +3,9 @@
   .footer-content-container
     .footer-content
       = yield :footer
-      = link_to 'disclaimer', page_path('disclaimer')
+      = link_to 'disclaimer', go_to_path('disclaimer', locale: 'en')
       '
-      = link_to 'privacy', page_path('privacy')
+      = link_to 'privacy', go_to_path('privacy', locale: 'en')
       '
-      = link_to 'contact', page_path('contact')
+      = link_to 'contact', go_to_path('contact', locale: 'en')
     .footer-bottom © mozo.bar 2015