diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/devise/sessions/_new_ldap.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml index 812e22373a7..6ec741e4882 100644 --- a/app/views/devise/sessions/_new_ldap.html.haml +++ b/app/views/devise/sessions/_new_ldap.html.haml @@ -1,4 +1,9 @@ = form_tag(user_omniauth_callback_path(server['provider_name']), id: 'new_ldap_user' ) do = text_field_tag :username, nil, {class: "form-control top", placeholder: "#{server['label']} Login", autofocus: "autofocus"} = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"} + - if devise_mapping.rememberable? + .remember-me.checkbox + %label{for: "remember_me"} + = check_box_tag :remember_me, '1', false, id: 'remember_me' + %span Remember me = button_tag "#{server['label']} Sign in", class: "btn-save btn" diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 4d8c5656a25..dbc68c39bf1 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -20,5 +20,3 @@ = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id') = render 'layouts/bootlint' if Rails.env.development? - - = yield :scripts_head diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ff23913d7d6..173033f7eab 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,6 +2,9 @@ %html{ lang: "en"} = render "layouts/head" %body{class: "#{app_theme}", :'data-page' => body_data_page} + / Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. + = yield :scripts_body_top + - if current_user = render "layouts/header/default", title: header_title - else diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 03c7ba8c73f..44afa33dfe5 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -2,8 +2,8 @@ - header_title project_title(@project) - sidebar "project" unless sidebar -- content_for :scripts_head do - -if current_user +- content_for :scripts_body_top do + - if current_user :javascript window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}"; window.markdown_preview_path = "#{markdown_preview_namespace_project_path(@project.namespace, @project)}"; |