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

实训任务样式调整

This commit is contained in:
daiao 2017-02-24 09:41:15 +08:00
parent 4885ec5afb
commit 9e7ce0fd6a
3 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/training_tasks/_content_list.html.erb
View File

@ -31,13 +31,13 @@
<a href="javascript:void(0);" class="fl mt2"><%= activity.journals.count %></a>
<% end %>
</td>
<% if @project.is_child_training_project? %>
<td>
<% if @project.is_child_training_project? %>
<div id="task_action_status_<%= activity.id %>">
<%= render :partial => 'action_status', :locals => {:activity => activity} %>
</div>
<% end %>
</td>
<% end %>
</tr>
<% end %>

41
app/views/training_tasks/index.html.erb
View File

@ -222,7 +222,9 @@
<tr>
<th><p class="text-left">所有<span class="issues_nav_tag ml5" style=" font-weight: normal;"><%= @training_tasks_count %></span></p></th>
<th class="w50">&nbsp;</th>
<th class="w100">&nbsp;</th>
<% if @project.is_child_training_project? %>
<th class="w100">&nbsp;</th>
<% end %>
</tr>
</thead>
<tbody id="issue_list">
@ -246,39 +248,4 @@
</div>
<% end %>
</div>
<!--实训任务结束-->
<% if false %>
<!--缺陷列表开始-->
<div id="myissues_con" class="myissues_con mb10">
<div class="clear mb5">
<div class="issues_statistics fl clear">
<ul>
<li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @training_tasks.count %></a></li>
</ul>
</div><!--issues_statistics end-->
<a href="<%= new_project_training_task_path(@project)%>" class="sy_btn_green fr">新建</a>
</div>
<% if @training_tasks.empty? %>
<%= render :partial => "projects/no_data" %>
<% else %>
<div id="issue_list">
<%= render :partial => 'all_list', :locals => {:tasks => @training_tasks, :query => @query, :training_tasks_pages=> @training_tasks_pages, :training_tasks_count=> @training_tasks_count, :project=> @project, :subject => @subject} %>
</div>
<% end %>
<%#= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
</div><!--issues_con_list end-->
<div class="cl"></div>
<!--issues_filter end-->
<div id="issues_list_content_1">
</div><!--issues_list_content_1 end-->
<div id="issues_list_content_2" class="undis">
</div><!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis">
</div><!--issues_list_content_3 end-->
<!--issues_con_list end-->
<% end %>
<!--实训任务结束-->

2
public/stylesheets/css/public.css
View File

@ -864,7 +864,7 @@ a.content-username:hover{ color:#297fb8;}
.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; word-wrap:break-word; }
.orig_content img {max-width:100%;}
.orig_right{ width:90%; margin-top:5px;}
.new_orig_right{ width:94%; margin-top:5px; }
.new_orig_right{ width:92%; margin-top:5px; }
a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
a:hover.comment_ding_link{ color:#3b94d6;}
.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}