From 90cc507bcb6d64d106b9ff2dc7db2dd824643593 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 12 Oct 2017 11:24:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/_course_activity_content.html.erb |  4 ++--
 app/views/repositories/shixun_show.html.erb   | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/views/courses/_course_activity_content.html.erb b/app/views/courses/_course_activity_content.html.erb
index 0efd322d4..cc358ea3c 100644
--- a/app/views/courses/_course_activity_content.html.erb
+++ b/app/views/courses/_course_activity_content.html.erb
@@ -22,9 +22,9 @@
                 <% end %>
               </li>
           <% end %>
-          <div class="ml10 edu-dropdown mr10">
+          <div class="ml10 pr edu-position-hidebox mr10">
             <span class="mr8 color-orange03">新建</span><i class="fa fa-sort-down fl fr mt3 color-orange03"></i>
-            <ul class="edu-dropdown-menu" id="all_status_list" style="top:29px;left: -12px;width: 90px;text-align: center">
+            <ul class="edu-position-hide undis" id="all_status_list" style="top:29px;">
               <li style="text-align:center;">
                 <%= link_to '普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-grey" %>
               </li>
diff --git a/app/views/repositories/shixun_show.html.erb b/app/views/repositories/shixun_show.html.erb
index 6c07638a2..547fef0a3 100644
--- a/app/views/repositories/shixun_show.html.erb
+++ b/app/views/repositories/shixun_show.html.erb
@@ -63,4 +63,25 @@
   </div>
 
   <% html_title(l(:label_repository)) -%>
-</div>
\ No newline at end of file
+</div>
+<script>
+    $(window).load(function(){
+        //set_popupbox_position();
+    })
+    $(window).resize(function(){
+        //setposition();
+    })
+    function set_popupbox_position(){
+        var wid1=parseInt($(document).width());
+        var wid2=parseInt($(".newContainer").width());
+        var wid3=parseInt($(".popup_tip_box").width());
+
+        if(wid1>wid2){
+            $(".newContainer").width(wid1);
+        }
+    }
+
+    function setposition(){
+
+    }
+</script>
\ No newline at end of file

From d1b1d6317db49e4f1191171002775bcef348706e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 12 Oct 2017 16:06:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?tip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/new.html.erb        | 14 +++++++++++++-
 app/views/shixuns/fork_list.html.erb  | 15 ++++++++++-----
 public/stylesheets/css/edu-common.css |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 02886a909..b83aaf3f9 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -10,7 +10,7 @@
   <div class="con-content">
     <%= labelled_form_for @course do |f| %>
     <ul>
-      <li class="clearfix pt20">
+      <li class="clearfix pt20 mb110">
         <label class="panel-form-label label fl color-dark-grey"><span class="color-orange mr5">*</span>课程名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
         <div class="pr fl with75">
           <input type="text" name="course[course_list]" autocomplete="off" style="width: 100%;" id="new_course_list" class="task task-height-40 panel-box-sizing fl color-grey" maxlength="100" placeholder="例如：数据结构">
@@ -19,6 +19,18 @@
         </div>
         <div class="cl"></div>
         <span class="color-orange fl none" id="new_course_syllabus_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>请先输入课程</span>
+
+        <div class="tusi" style="left:108% ">
+          <div class="entry">
+            <em></em>
+            <span class="after"></span>
+            <p class="color-grey mt10" style="height: 26px;line-height: 26px;">注意：只需要填写课程的全称即可</p>
+            <p class="color-grey ml50" style="height: 26px;line-height: 26px;margin-left: 35px;"><i class="fa fa-check-circle color-light-green mr5"></i>正确示例：数据结构</p>
+            <p class="color-grey" style="height: 26px;line-height: 26px;margin-left: 35px;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：数据结构2017本部</p>
+            <p class="color-grey" style="height: 26px;line-height: 26px;margin-left: 35px;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：数据结构2017秋季</p>
+            <p class="color-grey" style="height: 26px;line-height: 26px;margin-left: 35px;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：数据结构2017电子商务1班</p>
+          </div>
+        </div>
       </li>
       <li class="pt20 clearfix mb40">
         <label class="panel-form-label label fl color-dark-grey"><span class="color-orange mr5">*</span>课堂名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
diff --git a/app/views/shixuns/fork_list.html.erb b/app/views/shixuns/fork_list.html.erb
index b3066874e..9e2d8e203 100644
--- a/app/views/shixuns/fork_list.html.erb
+++ b/app/views/shixuns/fork_list.html.erb
@@ -1,5 +1,10 @@
-<div class="task-index mt30 mb30 box_bg_shandow task-index-head">
-  <div class="task-index-head mt30 mb30 box_bg_shandow">
+<div class="task-index">
+  <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20 mt30">
+    <p class="ml15 fl color-grey3">
+      <span>Fork实训列表</span>
+    </p>
+  </div>
+  <div class="mt30 mb30">
     <div class="task-index-list clearfix mb20 mh320">
       <% if @shixuns.blank? %>
           <div style="background: #fff;padding-bottom: 15px;" class="box_bg_shandow bor-grey-e ">
@@ -31,9 +36,9 @@
                   <p class="xy_level"><%= shixun.shixun_trainee %></p>
                 </div>
                 <ul class="task-index-list-box-bottom clearfix">
-                  <li><i class="fa fa-tasks  color-light-green mr5 btn"  data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
-                  <li><i class="fa fa-users  color-light-green mr5 btn"  data-tip-down="学习人数"></i><span><%= shixun.myshixuns.count %></span></li>
-                  <li><i class="fa fa-viacoin  color-light-green mr5 btn"  data-tip-down="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
+                  <li><i class="fa fa-tasks color-light-green mr5"  data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
+                  <li><i class="fa fa-users color-light-green mr5"  data-tip-down="学习人数"></i><span><%= shixun.myshixuns.count %></span></li>
+                  <li><i class="fa fa-viacoin color-light-green mr5"  data-tip-down="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
                 </ul>
               </div>
           <% end %>
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index eea10167f..fb481a197 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -100,7 +100,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
 .font-30{ font-size: 30px!important;}
 /*通用内外边距*/
 .mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}
-.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}
+.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}.mb60{ margin-bottom: 60px;}.mb110{ margin-bottom: 110px;}
 .ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
 .mr3{margin-right: 3px}.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr40{margin-right:40px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}
 .pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}.pt40{ padding-top:40px;}

From 6d434de2777e3a6ccda2dbf54575eb1566b04ac7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 12 Oct 2017 17:02:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=90=8E=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_bank/_homework_bank_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/homework_bank/_homework_bank_list.html.erb b/app/views/homework_bank/_homework_bank_list.html.erb
index 6d3f1c55a..264aeb960 100644
--- a/app/views/homework_bank/_homework_bank_list.html.erb
+++ b/app/views/homework_bank/_homework_bank_list.html.erb
@@ -7,9 +7,9 @@
   </div>
   <div class="panel-bg-grey clearfix color-grey font-12">
     <p class="fl ml15">共 <span class="color-orange"><%= @hw_count %></span>个搜索结果</p>
-    <%= link_to '引用次数排序', homework_bank_index_path(:type => @type, :order => "quotes", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr mr15 #{@order == 'quotes' ? 'color-blue' : ''}", :remote => true %>
+    <%= link_to '引用次数排序', homework_bank_index_path(:type => @type, :order => "quotes", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr mr15 #{@order == 'quotes' ? 'color-orange03' : ''}", :remote => true %>
     <span class="mr5 ml5 fr">|</span>
-    <%= link_to '更新时间排序', homework_bank_index_path(:type => @type, :order => "updated_at", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr #{@order == 'updated_at' ? 'color-blue' : ''}", :remote => true %>
+    <%= link_to '更新时间排序', homework_bank_index_path(:type => @type, :order => "updated_at", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr #{@order == 'updated_at' ? 'color-orange03' : ''}", :remote => true %>
   </div>
 <div class="user_bg_shadow">
   <div class="edu-con-top clearfix">