jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更改project主页显示bug

This commit is contained in:
william 2013-08-13 21:08:23 +08:00
parent f91cfcdec2
commit 92bc517350
3 changed files with 30 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/layouts/base_projects.html.erb
View File

@ -53,8 +53,6 @@
<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td> <td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td> <td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
<td class="font_index"><%=link_to "#{@project.attachments.count}", project_files_path(@project) %></td>
</tr> <!-- project_issues_path(@project), :class => 'project_infor_tag' -->
<tr class="font_aram"> <tr class="font_aram">
<td align="center" width="80px"> <%= l(:label_member) %></td> <td align="center" width="80px"> <%= l(:label_member) %></td>
<td align="center" width="80px"> <%= l(:label_project_defects) %></td> <td align="center" width="80px"> <%= l(:label_project_defects) %></td>
@ -83,17 +81,6 @@
</div> </div>
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
</div>
</div>
</div>
<!--tool--> <!--tool-->
<div class="user_underline"></div> <div class="user_underline"></div>
<div class="tool"> <div class="tool">
@ -145,7 +132,6 @@
<div id="ajax-modal" style="display:none;"></div> <div id="ajax-modal" style="display:none;"></div>
</div> </div>
</div> </div>
</div>
<%= call_hook :view_layouts_base_body_bottom %> <%= call_hook :view_layouts_base_body_bottom %>
</body> </body>
</html> </html>

51
app/views/tags/_tag.html.erb
View File

@ -1,42 +1,41 @@
<div id="tags"> <div id="tags">
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 --> <!-- 1代表是user类型 2代表是project类型 3代表是issue类型 -->
<!-- 3 代表的是issue 当是issue是 处理方式与前2个对象不同 --> <!-- 3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
<% if object_flag == '3' %> <% if object_flag == '3' %>
<span><%= image_tag("/images/sidebar/tags.png") %></span>
<span class="font_title_tag"><%= l(:label_tag) %>:</span>
<span><%= image_tag("/images/sidebar/tags.png") %></span> <% if User.current.logged? %>
<span class="font_title_tag"><%= l(:label_tag) %>:</span> <span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
<% if User.current.logged? %>
<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
<% end %> <% end %>
<div id="tags_show_issue"> <div id="tags_show_issue">
<%= 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} %>
</div> </div>
<div id="put-tag-form-issue" style="display: none"> <div id="put-tag-form-issue" style="display: none">
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path, <%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
:update => "tags_show", :update => "tags_show",
:complete => '$("#put-tag-form-issue").hide();' do |f| %> :complete => '$("#put-tag-form-issue").hide();' do |f| %>
<%= f.text_field :name ,:id => "name-issue",:size=>"30" %> <%= f.text_field :name ,:id => "name-issue",:size=>"30",:require=>true %>
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
<%= f.submit "add"%> <%= f.submit "add"%>
<%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%> <%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%>
<% end %> <% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
<span><%= image_tag("/images/sidebar/tags.png") %></span> <span><%= image_tag("/images/sidebar/tags.png") %></span>
<span class="font_title_tag"><%= l(:label_tag) %>:</span> <span class="font_title_tag"><%= l(:label_tag) %>:</span>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %> <span><%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %></span>
<% end %> <% end %>
<div id="tags_show"> <div id="tags_show">
<%= 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} %>
</div> </div>
@ -44,7 +43,7 @@
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path, <%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
:update => "tags_show", :update => "tags_show",
:complete => '$("#put-tag-form").hide();' do |f| %> :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_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
<%= f.submit "add"%> <%= f.submit "add"%>

10
public/stylesheets/application.css
View File

@ -12,14 +12,6 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*new by huang*/
/**/ /**/
.tag_left{
float: left;
width: 30%;
}
.tag_right{
float: right;
width: 68%;
}
.welcome_logo{ .welcome_logo{
float: left; float: left;
padding-left: 5px; padding-left: 5px;
@ -1890,7 +1882,7 @@ h2 img { vertical-align:middle; }
/*added by william*/ /*added by william*/
#tag { #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; border-radius: 5px 5px 5px 5px;
color: #3a587d !important; color: #3a587d !important;
padding: 0px 4px; padding: 0px 4px;