diff --git a/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee b/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee index c75171da..a5e1fdd0 100644 --- a/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee +++ b/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee @@ -54,6 +54,9 @@ DragNDrop.Draggable = Ember.Mixin.create if Math.abs(@touchStartEvent.pageX - touch.pageX) < 2 and Math.abs(@touchStartEvent.pageY - touch.pageY) < 2 # The preventDefaults are preventing the click action to fire, therefore we trigger it ourselves # But do not trigger when a handle insed the element is clicked + #NOTE: I think that $(ev.target).click() will work for all cases, makes the code simpler, + # but no time to test that now. Tested mostly on section elements, since they are draggable, clickable + # and have subclickable buttons unless $(ev.target).parents('.handles-inside-draggable') or $(ev.target).hasClass('handles-inside-draggable') @click() if @click else diff --git a/app/assets/stylesheets/theme1/elements/_footer.sass b/app/assets/stylesheets/theme1/elements/_footer.sass index 494e85a6..357b7ef2 100644 --- a/app/assets/stylesheets/theme1/elements/_footer.sass +++ b/app/assets/stylesheets/theme1/elements/_footer.sass @@ -4,16 +4,19 @@ background-position: center overflow: visible position: relative + padding-bottom: 22px .footer-shadow height: 1px //+box-shadow(0px 4px 10px #000) + .signup-button + +button .footer-content-container max-width: 838px margin: 0 auto .footer-content background-color: #420F03 text-align: right - padding: 72px 30px 20px 10px + padding: 32px 30px 10px 10px overflow: visible margin: 0 auto a @@ -25,6 +28,5 @@ padding-left: 30px padding-right: 30px max-width: 838px - position: relative overflow: visible margin: 0 auto diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 55c07e84..e718cc20 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -24,7 +24,7 @@ private #START CMTOOL def authorize_cmtool - redirect_to main_app.new_administrator_session_path, alert: t('general.unauthorized') unless current_administrator.present? + redirect_to main_app.new_administrator_session_path, alert: t('devise.failure.unauthenticated') unless current_administrator.present? end def cmtool_user diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index a7af0181..d6ffa82e 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -14,7 +14,7 @@ html lang="en" body .header-nav-banner = render 'theme1/header' - #home-splash + #home-splash.show-for-large-up #home-splash-content #home-splash-content-inner #home-splash-content-inner-bar diff --git a/app/views/layouts/theme1.html.slim b/app/views/layouts/theme1.html.slim index 24d1a5e9..65b51507 100644 --- a/app/views/layouts/theme1.html.slim +++ b/app/views/layouts/theme1.html.slim @@ -14,7 +14,7 @@ html lang=I18n.locale body .header-nav-banner = render 'theme1/header' - #content-header + #content-header.show-for-large-up .left .right .container diff --git a/app/views/theme1/_footer.html.slim b/app/views/theme1/_footer.html.slim index 9bd964d2..d7df0e37 100644 --- a/app/views/theme1/_footer.html.slim +++ b/app/views/theme1/_footer.html.slim @@ -3,10 +3,12 @@ .footer-content-container .footer-content .fb-like data-href="http://mozo.bar/" data-layout="button" data-action="like" data-show-faces="true" data-share="true" + = link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button' = yield :footer /= link_to 'disclaimer', go_to_path('disclaimer', locale: 'en') /' = link_to 'privacy', main_app.go_to_path('privacy', locale: 'en') ' = link_to 'contact', main_app.go_to_path('contact', locale: 'en') + .clearfix .footer-bottom © mozo.bar 2015 diff --git a/app/views/theme1/_header.html.slim b/app/views/theme1/_header.html.slim index a3c1b83c..b1b777ac 100644 --- a/app/views/theme1/_header.html.slim +++ b/app/views/theme1/_header.html.slim @@ -8,9 +8,9 @@ .light3 .container #header - #header-right= render 'theme1/social' + #header-right.show-for-medium-up= render 'theme1/social' #logo= link_to image_tag('icons/logo-text.png', alt: application_title), main_app.root_path - = link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button' + = link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button show-for-medium-up' #nav-wrap .navbar .navbar-inner= render 'theme1/navigation'