diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8f187c27..31176e18 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -53,8 +53,6 @@ <%=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) %> - <%= l(:label_member) %> <%= l(:label_project_defects) %> @@ -82,17 +80,6 @@
- - - -
- -
-
- <%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%> -
-
-
@@ -145,7 +132,6 @@ - <%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 922a6f82..22bab5e3 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -1,42 +1,41 @@
- <% 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'} %> + <% 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'} %> <% end %> - -
- <%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %> -
- + +
+ <%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %> +
+
<% else %> - <%= image_tag("/images/sidebar/tags.png") %> - <%= l(:label_tag) %>: - - +<%= 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} %>
@@ -44,7 +43,7 @@ <%= form_for "tag_for_save",:remote=>true,:url=>tag_path, :update => "tags_show", :complete => '$("#put-tag-form").hide();' do |f| %> - <%= f.text_field :name ,:id => "name",:size=>"28"%> + <%= f.text_field :name ,:id => "name",:size=>"28",:require=>true%> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit "add"%> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 4646f021..2025b5d1 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -11,15 +11,7 @@ h4 {border-bottom: 1px dotted #bbb;} /*new by huang*/ /**/ - -.tag_left{ - float: left; - width: 30%; -} -.tag_right{ - float: right; - width: 68%; -} + .welcome_logo{ float: left; padding-left: 5px; @@ -1890,7 +1882,7 @@ h2 img { vertical-align:middle; } /*added by william*/ #tag { - background: url(/images/issue_tag.png) no-repeat right -19px; + background: url(../images/issue_tag.png) no-repeat right -19px; border-radius: 5px 5px 5px 5px; color: #3a587d !important; padding: 0px 4px;