Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining

app/views/projects/_act_training_tasks.html.erb

@@ -42,17 +42,13 @@
             <div class="cl"></div>
           </div>
           <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => user_activity_id, :content => activity.description} %>
-
-          <a href="#" class="task-display-span bBlue mt10">提交测评。</a>
-          <span class="task-display-span alert-blue mt10">当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>
-          <span class="task-display-span b_dgrey mt10">本任务已通过测评，处于关闭状态。</span>
-
-          <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-          <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
           <div class="cl"></div>
           <div class="mb10" style="font-weight:normal;">
             <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
           </div>
+          <div id="training_project_task_status_<%= activity.id %>">
+            <%= render :partial => "training_tasks/action_status", :locals => {:activity => activity} %>
+          </div>
         </div>
         <div class="cl"></div>
       </div>

app/views/projects/task_execute.js.erb

@@ -1 +1,2 @@
-$("#task_action_status_<%= @training_task.id %>").html('<%= escape_javascript( render :partial => 'training_tasks/action_status', :locals => {:activity => @training_task}) %>');
+$("#training_project_task_status_<%= @training_task.id %>").html('<%= escape_javascript( render :partial => 'training_tasks/action_status', :locals => {:activity => @training_task}) %>');
+$("#training_task_details").html('<%= escape_javascript( render :partial => 'training_tasks/training_task_details', :locals => {:activity => @training_task, :project_id => @project.id}) %>');

app/views/training_tasks/_action_status.html.erb

@@ -1,8 +1,14 @@
-<% activity = activity.nil? ? local_assigns[:activity] : activity  %>
+<%# activity = activity.nil? ? local_assigns[:activity] : activity  %>
-<% if activity.status == 1 %>
+<div class="mb10">
-    <a class="btn btn-grey">评测通过</a>
+  <% if activity.status == 1 %>
-<% elsif activity.status == 2  %>
+      <span class="task-display-span b_dgrey mt10">本任务已通过测评，处于关闭状态。</span>
-    <a class="btn btn-blue">评测中</a>
+  <% elsif activity.status == 2  %>
-<% else %>
+      <span class="task-display-span alert-blue mt10">当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>
-    <%= link_to "提交评测", task_execute_project_path(@project, :training_task_id => activity.id), :class => "btn btn-blue", :remote => true %>
+  <% else %>
-<% end %>
+      <%= link_to "提交评测", task_execute_project_path(@project, :training_task_id => activity.id), :class => "task-display-span bBlue mt10", :remote => true %>
+  <% end %>
+</div>
+
+
+
+

app/views/training_tasks/_detail.html.erb

@@ -10,7 +10,6 @@
     <div class="cl"></div>
     由<%=link_to @training_task.author.show_name, user_path(@training_task.author), :class => "link-blue" %>添加于 <%= format_time(@training_task.created_at).html_safe %>
   </div>
-  <%= link_to "完成", complete_training_task_training_task_path(@training_task), :class => "sy_btn_green fr" %>
 
   <!--talk_txt end-->
   <a href="javascript:void(0)" class="talk_edit fr"> </a>
@@ -32,9 +31,10 @@
   <div id = "div_issue_attachment_<%= @training_task.id %>">
     <%= render :partial => 'task_attachments', :locals => {:training_task => @training_task} %>
   </div>
-  <!--属性-->
-  <%#= render :partial => 'issues/attributes_show' %>
   <div class="cl"></div>
+  <div id="training_project_task_status_<%= @training_task.id %>">
+    <%= render :partial => "training_tasks/action_status", :locals => {:activity => @training_task} %>
+  </div>
 </div>
 
 <script type="text/javascript">

app/views/training_tasks/_training_task_details.html.erb

@@ -1,15 +1,16 @@
-<div class="homepagePostTitle break_word">
+<div class="homepagePostTitle break_word task-title ">
   <% if activity.status == 1 %>
       <div class="issues_ciricons fl"><span class="issues_ciricons_02 "></span></div>
   <% else %>
-      <div class="issues_ciricons fl mt2"><i class="icon-flag fb " style="color:#49a547; font-size:15px;"></i></div>
+      <div class="issues_ciricons fl mt2 "><i class="icon-flag fb " style="color:#49a547; font-size:15px;"></i></div>
   <% end %>
-  <span class="task-step mr5 fl">step<%= activity.position %></span>
+  <span class="task-step mr5 ml5">step<%= activity.position %></span>
 
-  <%= link_to activity.subject.to_s, training_task_url(activity), :class => "postGrey ml5 fl", :target => "_blank" %>
+  <%= link_to activity.subject.to_s, training_task_url(activity), :class => "postGrey ml5 ", :target => "_blank", :style => "" %>
-  <% if activity.status == 1 %>
+  <div class="cl"></div>
-      <span class="task-linebtn-green fl ml5 mt3">已解决</span>
+  <!--<%# if activity.status == 1 %>-->
-  <% else %>
+      <!--<span class="task-linebtn-green fl ml5 mt3">已解决</span>-->
-      <span class="task-linebtn-green fl ml5 mt3">正在解决中</span>
+  <!--<%# else %>-->
-  <% end %>
+      <!--<span class="task-linebtn-green fl ml5 mt3">正在解决中</span>-->
+  <!--<%# end %>-->
 </div>

public/stylesheets/css/project.css

@@ -674,3 +674,4 @@ span.task-linebtn-green{color:#59af48; border: 1px solid #59af48;font-size: 12px
 span.task-step{ color:#ee4a20;font-style: italic; font-weight:bold; font-size:14px;}
 .task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; }
 .task-bgrey{background:#ccc;}
+.task-title{ width: 830px;}