diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 1440e32..5e48de8 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -1,6 +1,7 @@ <%= call_hook :view_account_login_top %>
+

<%= l(:label_login) %>

<%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %> <%= back_url_hidden_field_tag %> diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 03aae7b..3b45fee 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -11,13 +11,16 @@ <%= favicon %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'application', 'responsive', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> +<% is_welcome = !User.current.logged? && current_page?(:controller => 'welcome', :action => 'index') %> +<%= stylesheet_link_tag 'frontpage', :media => 'all' if is_welcome %> + <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - + <%= call_hook :view_layouts_base_body_top %>
@@ -62,7 +65,7 @@ +<%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %> +