修正未登录用户界面显示bug；删除了部分多余注释
This commit is contained in:
parent
ece469bff3
commit
4077a91429
|
|
@ -53,7 +53,8 @@
|
|||
|
||||
<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.attachments.count}", project_files_path(@project) %></td> <!-- project_issues_path(@project), :class => 'project_infor_tag' -->
|
||||
<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">
|
||||
<td align="center" width="80px"> <%= l(:label_member) %></td>
|
||||
<td align="center" width="80px"> <%= l(:label_project_defects) %></td>
|
||||
|
|
@ -89,7 +90,8 @@
|
|||
<div class="user_tags">
|
||||
<div id="tags">
|
||||
<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
|
||||
</div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--tool-->
|
||||
|
|
@ -143,6 +145,7 @@
|
|||
<div id="ajax-modal" style="display:none;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%= call_hook :view_layouts_base_body_bottom %>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,8 @@
|
|||
<div class="user_tags">
|
||||
<div id="tags">
|
||||
<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
|
||||
</div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--watch-->
|
||||
|
|
@ -136,7 +137,7 @@
|
|||
<div id="ajax-modal" style="display:none;"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<%= call_hook :view_layouts_base_body_bottom %>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,3 @@
|
|||
<!--最新反馈
|
||||
<div>
|
||||
<div style="padding:40px 0px 0px 0px">
|
||||
<table><tr><td><h3><strong><%= link_to l(:label_user_newfeedback), home_path %></strong></h3>start a...</td></tr></table></div>
|
||||
<div style="margin:1;padding:1;width:99%;height:1px;background-color:#dbdbdb;overflow:hidden"></div>
|
||||
|
||||
<ul class="context_projects">
|
||||
<li><table width="99%">
|
||||
<tr> <td align="center" valign="middle"><img src="/images/user_images/user2.png" width="40" height="40"/></td><td><div class="firstname_project"><strong><%=link_to "huang",home_path%></strong>对我评价了： </div></td><td><div class="tablecontext_single">新建问题的时候存在一个bug，需要解决卡涵盖的垃圾卡拉格德国的萨嘎...</div></td><td width="200" align="right" valign="middle"> <img src="/images/user_images/share.png"/></td></tr>
|
||||
|
||||
</table></li></ul></div>
|
||||
<div class=more><%= link_to"更多",:contoller=>'project',:action=>'index'%></div>-->
|
||||
<!--activities add bu huang-->
|
||||
<% if @events_by_day.size >0 %>
|
||||
<div style="padding-left: 8px">
|
||||
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
||||
|
|
@ -54,54 +41,3 @@
|
|||
<% else %>
|
||||
<%= l(:label_project_no_activity) %>
|
||||
<% end %>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!--
|
||||
<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
|
||||
|
||||
<div style="float:left;">
|
||||
<%= link_to_content_update("\xc2\xab " + l(:label_previous),
|
||||
params.merge(:from => @date_to - @days - 1),
|
||||
:title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
|
||||
</div>
|
||||
<div style="float:right;">
|
||||
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
|
||||
params.merge(:from => @date_to + @days - 1),
|
||||
:title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
|
||||
</div>
|
||||
<% other_formats_links do |f| %>
|
||||
<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :header_tags do %>
|
||||
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :sidebar do %>
|
||||
<%= form_tag({}, :method => :get) do %>
|
||||
<h3><%= l(:label_activity) %></h3>
|
||||
<p>
|
||||
<% @activity.event_types.each do |t| %>
|
||||
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
|
||||
<label for="show_<%= t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label>
|
||||
<br />
|
||||
<% end %>
|
||||
</p>
|
||||
<% if @project && @project.descendants.active.any? %>
|
||||
<%= hidden_field_tag 'with_subprojects', 0 %>
|
||||
<p>
|
||||
<label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%= l(:label_subproject_plural)%></label>
|
||||
</p>
|
||||
<% end %>
|
||||
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
|
||||
<p>
|
||||
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
|
||||
</p>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% html_title(l(:label_activity), @author) -%> -->
|
||||
|
|
|
|||
|
|
@ -1,22 +1,16 @@
|
|||
<div id="tags">
|
||||
|
||||
<% if User.current.logged? %>
|
||||
<div>
|
||||
<span><%= image_tag("/images/sidebar/tags.png") %></span>
|
||||
<span class="font_title_tag"><%= l(:label_tag) %>:</span>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 -->
|
||||
<!-- 3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
|
||||
<% if object_flag == '3' %>
|
||||
|
||||
<span><%= image_tag("/images/sidebar/tags.png") %></span>
|
||||
<span class="font_title_tag"><%= l(:label_tag) %>:</span>
|
||||
|
||||
|
||||
<% if User.current.logged? %>
|
||||
<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
|
||||
<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
<div id="tags_show_issue">
|
||||
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
||||
</div>
|
||||
|
|
@ -35,11 +29,13 @@
|
|||
|
||||
<% else %>
|
||||
|
||||
<% if User.current.logged? %>
|
||||
<span><%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %></span>
|
||||
<% end %>
|
||||
<span><%= image_tag("/images/sidebar/tags.png") %></span>
|
||||
<span class="font_title_tag"><%= l(:label_tag) %>:</span>
|
||||
|
||||
</div>
|
||||
|
||||
<% if User.current.logged? %>
|
||||
<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %>
|
||||
<% end %>
|
||||
|
||||
<div id="tags_show">
|
||||
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
||||
|
|
@ -57,4 +53,3 @@
|
|||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
Loading…
Reference in New Issue