From 9cbaf8e4fc8c7769847351dcf5d3216be0d69ca4 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 13 Oct 2017 19:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7=E9=87=8C=E9=9D=A2=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/edit.html.erb              |  2 +-
 .../subjects/_course_shixun_list.html.erb     | 38 ++++++++++---------
 app/views/users/_course_message.html.erb      | 13 ++++---
 app/views/users/_homework_base_info.html.erb  |  5 ++-
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/app/views/exercise/edit.html.erb b/app/views/exercise/edit.html.erb
index f1477c0e5..e67399309 100644
--- a/app/views/exercise/edit.html.erb
+++ b/app/views/exercise/edit.html.erb
@@ -7,7 +7,7 @@
   <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
     <p class="ml15 color-grey3 fl">编辑试卷</p>
     <%= link_to "返回", student_exercise_list_exercise_path(@exercise), :class => "fr font-12 color-grey mr15 mt5" %>
-    <%= link_to "设置", student_exercise_list_exercise_path(@exercise, :tab => 3), :class => "fr font-12 mr15 mt5 color-grey" %>
+    <%#= link_to "设置", student_exercise_list_exercise_path(@exercise, :tab => 3), :class => "fr font-12 mr15 mt5 color-grey" %>
   </div>
 
   <%= render :partial => "exercise/edu_edit_form", :locals => {:is_edit => true} %>
diff --git a/app/views/subjects/_course_shixun_list.html.erb b/app/views/subjects/_course_shixun_list.html.erb
index 8171c479a..9f3db4d36 100644
--- a/app/views/subjects/_course_shixun_list.html.erb
+++ b/app/views/subjects/_course_shixun_list.html.erb
@@ -1,5 +1,6 @@
-<div class="mh390">
-  <% if @shixuns.count > 0 %>
+
+<% if @shixuns.count > 0 %>
+  <div class="mh390">
     <table class="edu-pop-table edu-txt-center mb10" style="table-layout: fixed; border: none;" cellspacing="0" cellpadding="0">
       <thead>
       <tr>
@@ -23,23 +24,26 @@
       <% end %>
       </tbody>
     </table>
+    <p id="lessong_nonechecked_tip" class="color-red none f12">请至少选择一个实训</p>
+      </div>
+      <div>
+        <div class="pages_user_show fl">
+          <ul id="homework_pository_ref_pages">
+            <%= pagination_links_full @shixuns_pages, @shixuns_count, :per_page_links => false, :flag => true, :remote => true, :is_new => true %>
+          </ul>
+          <div class="cl"></div>
+        </div>
+        <div class="fr">
+          <a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_choose_course_shixun()">选择</a>
+          <a href="javascript:void(0);" class="task-btn fr mr10" onclick="hideModal()">取消</a>
+        </div>
+      </div>
 <% else %>
-    <p>没有实训可选择</p>
+  <div style="text-align: center;padding: 150px 0px;">
+    <p class="font-16 mb20">你没有参与任何实训的创建，没有数据可以选择</p>
+    <p><%= link_to "立即新建".html_safe, new_subject_path(),:target => "true", :class => "white-btn orange-btn" %></p>
+  </div>
 <% end %>
-<p id="lessong_nonechecked_tip" class="color-red none f12">请至少选择一个实训</p>
-</div>
-<div>
-  <div class="pages_user_show fl">
-    <ul id="homework_pository_ref_pages">
-      <%= pagination_links_full @shixuns_pages, @shixuns_count, :per_page_links => false, :flag => true, :remote => true, :is_new => true %>
-    </ul>
-    <div class="cl"></div>
-  </div>
-  <div class="fr">
-    <a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_choose_course_shixun()">选择</a>
-    <a href="javascript:void(0);" class="task-btn fr mr10" onclick="hideModal()">取消</a>
-  </div>
-</div>
 
 <script>
   $(function(){
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 9e798a956..fc43e0db1 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -50,16 +50,17 @@
       <% if User.current.logged? %>
         <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
             <ul>
-              <li class="homepagePostSettingIcon"><i class="fa fa-bars color-grey9"></i>
-                <ul class="homepagePostSettiongText">
-                  <li><a href="javascript:void(0)" onclick="show_send(<%= activity.id %>, <%= User.current.id %>, 'message');" class="postOptionLink">发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送</a></li>
+              <li class="pr edu-position-hidebox">
+                <i class="fa fa-bars color-grey9"></i>
+                <ul class="edu-position-hide undis">
+                  <li><a href="javascript:void(0)" onclick="show_send(<%= activity.id %>, <%= User.current.id %>, 'message');" class="wpostOptionLink">发送</a></li>
                   <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) %>
-                      <li><a href="<%= sticky_topic_board_message_path(activity.board_id, activity, :is_board => false, :user_activity_id => user_activity_id) %>" data-remote="true" class="postOptionLink"><%= activity.sticky == 1 ? '取消置顶' : '置&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;顶'.html_safe %></a></li>
+                      <li><a href="<%= sticky_topic_board_message_path(activity.board_id, activity, :is_board => false, :user_activity_id => user_activity_id) %>" data-remote="true" class="wpostOptionLink"><%= activity.sticky == 1 ? '取消置顶' : '置顶'.html_safe %></a></li>
                   <% end %>
                   <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) || User.current == activity.author %>
-                      <li><a href="<%= edit_board_message_path(activity.board_id, activity) %>" class="postOptionLink">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;辑</a></li>
+                      <li><a href="<%= edit_board_message_path(activity.board_id, activity) %>" class="wpostOptionLink">编辑</a></li>
                       <li>
-                        <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= delete_board_message_path(activity.board_id, activity,:is_course=>is_course,:is_board=>is_board) %>', '确定要删除该帖子吗？')" class="postOptionLink">删&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;除</a>
+                        <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= delete_board_message_path(activity.board_id, activity,:is_course=>is_course,:is_board=>is_board) %>', '确定要删除该帖子吗？')" class="wpostOptionLink">删除</a>
                       </li>
                   <% end %>
                 </ul>
diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb
index b6847b3a8..bb54212ea 100644
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@@ -87,8 +87,9 @@
     <% comment_status = activity.homework_detail_manual.comment_status %>
     <div class="homepagePostSetting">
       <ul>
-        <li class="homepagePostSettingIcon"><i class="fa fa-bars color-grey-b"></i>
-          <ul class="whomepagePostSettiongText">
+        <li class="pr edu-position-hidebox">
+          <i class="fa fa-bars color-grey-b"></i>
+          <ul class="edu-position-hide undis">
             <% if activity.homework_type != 4 %>
             <li>
               <%= link_to "编辑", edit_homework_common_path(activity), :class => "wpostOptionLink" %>