diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 516bdaa4e..a2f0cde18 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -8,16 +8,6 @@ <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> - - - - - -
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 5d142c4f4..0ff079978 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,83 +1,71 @@ - -
-
- - -
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
+
+
+

+ <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> +

- - - + + + +
<%= call_hook :view_account_login_top %> -
- <%= form_tag(signin_path) do %> - <%= back_url_hidden_field_tag if is_logout? %> - <% unless User.current.logged? %> - - - - +
+ <%= call_hook :view_account_login_top %> +
+ <%= form_tag(signin_path) do %> + <%= back_url_hidden_field_tag if is_logout? %> + <% unless User.current.logged? %> +
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
+ + + + + + + + + + + - - - - - <% if Setting.openid? %> - - - - - <% end %> - - - - - - - - -
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<% if Setting.autologin? %> <% end %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
<% if Setting.autologin? %> <% end %>
<% if Setting.lost_password? %> - <%= link_to l(:label_password_lost), lost_password_path %> - <% end %> - -
- <% else %> -
- - - - - - - - - - - - - -
<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  - <%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %>
<% unless User.current.memberships.empty? %> - <%= l(:label_x_welcome_participate, :count => User.current.memberships.count) %> <%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %> <%= l(:label_welcome_participate_project)%> - <% end %> -
- -
- <% end %> +
+ <% if Setting.lost_password? %> + <%= link_to l(:label_password_lost), lost_password_path %> + <% end %> + + + +
+ <% else %> +
+ + + + + + + + + + + +
<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  + <%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %>
<% unless User.current.memberships.empty? %> + <%= l(:label_x_welcome_participate, :count => User.current.memberships.count) %> <%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %> <%= l(:label_welcome_participate_project)%> + <% end %> +
+
<% end %> -
<%= call_hook :view_account_login_bottom %> + <% end %> +
+ <%= call_hook :view_account_login_bottom %> - <% if params[:username].present? %> - <%= javascript_tag "$('#password').focus();" %> - <% else %> - <%= javascript_tag "$('#username').focus();" %> - <% end %> - - - + <% if params[:username].present? %> + <%= javascript_tag "$('#password').focus();" %> + <% else %> + <%= javascript_tag "$('#username').focus();" %> + <% end %>
- - - + - + <%= stylesheet_link_tag 'welcome' %>
-
- -
+
+