diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 01acb7bab..8f187c27a 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -53,7 +53,8 @@ <%=link_to "#{@project.members.count}", project_member_path(@project) %> <%=link_to "#{@project.issues.count}", project_issues_path(@project) %> - <%=link_to "#{@project.attachments.count}", project_files_path(@project) %> + <%=link_to "#{@project.attachments.count}", project_files_path(@project) %> + <%= l(:label_member) %> <%= l(:label_project_defects) %> @@ -89,7 +90,8 @@
<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%> -
+ + @@ -143,6 +145,7 @@ + <%= 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 c6d68c475..c8367477f 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -77,7 +77,8 @@
<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%> -
+ + @@ -136,7 +137,7 @@ - + <%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 7abed830d..a7545a45b 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,16 +1,3 @@ - - <% if @events_by_day.size >0 %>

<%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %>

@@ -54,54 +41,3 @@ <% else %> <%= l(:label_project_no_activity) %> <% end %> - - - - - - - diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 9ce6ea86b..922a6f823 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -1,22 +1,16 @@
- - <% if User.current.logged? %> -
- <%= image_tag("/images/sidebar/tags.png") %> - <%= l(:label_tag) %>: - - - - <% if object_flag == '3' %> + <%= image_tag("/images/sidebar/tags.png") %> + <%= l(:label_tag) %>: + + <% if User.current.logged? %> - <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %> + <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %> <% end %> -
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
@@ -35,12 +29,14 @@ <% else %> + <%= image_tag("/images/sidebar/tags.png") %> + <%= l(:label_tag) %>: + + <% if User.current.logged? %> - <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %> + <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %> <% end %> -
-
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
@@ -57,4 +53,3 @@
<% end %> -<% end %> \ No newline at end of file