diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 8f23129b4..099017767 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -5,4 +5,4 @@ <% end %> <% end %> -<%= render :file => "layouts/base" %> +<%= render :file => "layouts/base_admin" %> diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb new file mode 100644 index 000000000..fe31c0816 --- /dev/null +++ b/app/views/layouts/base_admin.html.erb @@ -0,0 +1,80 @@ + + + + +<%=h html_title %> + + +<%= csrf_meta_tag %> +<%= favicon %> +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> +<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> +<%= javascript_heads %> +<%= heads_for_theme %> +<%= call_hook :view_layouts_base_html_head %> + +<%= yield :header_tags -%> + + +
+
+
+
+
+ <%= render_menu :account_menu -%> +
+ <%= 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? -%> +
+ + + + +
+ + + + + +
+
+<%= call_hook :view_layouts_base_body_bottom %> + + diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index a3e1f71ab..0f289b37b 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -55,11 +55,20 @@ - + + <%= image_tag(img_uri, weight:"25px", height:"25px") %>
<%= h @user.lastname<<@user.firstname %> <% unless @user.user_extensions.nil?%> - <% unless @user.user_extensions.identity == 2 %> - <% if @user.user_extensions.gender == 1 %> <%= image_tag("/images/sidebar/female.png", weight:"22px", height:"22px") %> - <% else %> <%= image_tag("/images/sidebar/male.png", weight:"25px", height:"25px") %> <% end %><% end %> - <% else %> <%= image_tag("/images/sidebar/male.png", weight:"25px", height:"25px") %> <% end %> <%= h @user.lastname<<@user.firstname %> + <% img_path = '' %> + <% unless @user.user_extensions.nil?%> + <% unless @user.user_extensions.identity == 2 %> + <% if @user.user_extensions.gender == 1 %> + <% img_uri = '/images/sidebar/female.png' %> + <% else %> + <% img_uri = '/images/sidebar/male.png' %> + <% end %> + <% end %> + <% else %> + <% img_uri = '/images/sidebar/female.png' %> + <% end %>
<% unless User.current == @user %>