From 4591cf828baa29b04d34af2e03e2700ea4ee8e3a Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 14:52:47 +0800
Subject: [PATCH 01/12] =?UTF-8?q?logo=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/bigdata/bigdata-logo.png | Bin 5677 -> 23210 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/bigdata/bigdata-logo.png b/public/images/bigdata/bigdata-logo.png
index b7c819b330da9c4fe4868b01a1e608641d03e278..7857b4e4e228b9859348a60fb3d2e195234744ab 100644
GIT binary patch
literal 23210
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
A7XSbN

literal 5677
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
P@&)PX7;0B&JqrI1d~@1n


From 809025f566934a564928f736bc418a183d96c3e2 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 14:58:11 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E5=86=85icon=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=B8=8A=E4=B8=8B=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/_homework_search_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index 7dbcc61bf..d03e45891 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,4 +1,4 @@
 <%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
     <input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" id="homework_name_search" value="<%= @search %>" />
-    <a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
+    <a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt8"><i class="fa fa-search"></i></a>
 <% end %>
\ No newline at end of file

From dae8a808f215bc828453cf72d639407d194a0e94 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 15:06:03 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E4=B8=8D=E8=A6=81=E5=9B=BE=E7=89=87=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/syllabuses/show.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index 191583203..10dad18d8 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -28,7 +28,7 @@
       <% end %>
       <span class="mr15 <%= @syllabus.syllabus_type_str ? '' : 'none' %>"><%= @syllabus.syllabus_type_str %></span></li>
   </ul>
-
+<!--
   <div class="edu-class-top-img fr edu-position" >
     <img src="../images/bigdata/edu-class/edu-class-img.jpg" width="260" height="140">
     <% if @is_syllabus_member %>
@@ -37,10 +37,12 @@
       </a>
     <% end %>
   </div>
+  -->
   <% if @is_syllabus_member %>
-      <%= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-blue fr mr20 ml20', :style => 'margin-top:110px;', :remote => true %>
+      <%= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-blue fr  ml20', :style => '', :remote => true %>
   <% end %>
 </div>
+
 <div class="edu-class-inner mb20">
 <div class="with75 fl">
 <div class="edu-tab clearfix mb20">

From 91c32e16aad26d0ae36648fb6e36e5523e742452 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 15:34:24 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=BA=95=E9=83=A8LOGO?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/bigdata/bigdata-logo.png    | Bin 23210 -> 20523 bytes
 public/images/bigdata/edu-footer-logo.png | Bin 21556 -> 23468 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/bigdata/bigdata-logo.png b/public/images/bigdata/bigdata-logo.png
index 7857b4e4e228b9859348a60fb3d2e195234744ab..38431c4014b4d22277f0e95e74b4e8d7b534caf6 100644
GIT binary patch
delta 6066
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

delta 9116
zcmb7qc_5Ts`@fOBBs@uWX(J-WzGgzy6fs1Wgbdlkgt&!xN>qf9Wym^N2iZNPC=<q>
zZ6wLQWX&=&-*eaV{(jH*{k?y@zdzL6=iKKy*SXfub)B1#i72c@h(9pCWWdQGz`?-4
zz-f5?+!Y1}#5DMuXJY{)hu>%kJQY90sB*kaO=%A&Qbu0c?2MusQeI77H9mNcCM!}+
zQBDo16#r(A_W$|K%5(#v5bw&Qc2wb}qP?<%f|87qy^4d3iW1UZMiuF(BBN@rDt}W^
zPFYSt?ne9vCRyn_?p~)IT^!Z^s|9D6wU7TdFKWofUuHfWU&8$Ezhgv%P37NCIKuLr
zc$(c5!Kk7VAI_n|s47ov;P8}X;*p6Fjh9n94T;kX&z&{9Gc-TiaN*W)E$f$^JhyX4
znb^-?VdCcd)7rzkwA<YLR@q;tuiiwZ{2@7iI^Ohi`^|$#-ckg`W5nvvuQ^WL3aayt
zCgv%VCJnT{Z{B^Fr#?UN@FwlMI^_)Ihn;u?ospsKeG~%&qX5GJGJ{wqf&sz#uLmeI
znC%}!Ck=GyKc?)8#+S0=;XgVp1ER_@APwX0LAzTPgg+3})(og}|Nh5WP{?0E-<v$2
z?=!DiSI!?|WGD&SCJlHd)v#80v4nP_0_i`$jny!(i9)nKo(_i6tLICIBMrUupBd>y
zE@1|~eKVi-SV8Oi7`8B7q>c38&kUszpZ5G(rG;g<+VN)G<e7`kH401U?lu|l&V*!O
z!~S2+GnwIMaH9Xeso)RradmX|!b=&%pufrJ=<Ep%-8c*WVPQbXz%PKGeE%-3f7|mH
zp*^rDnJVCQK&n>oI+owOGW<=XuS-yW{LAtOXT+=BeLqy$u=3;wx%PA4&)nVGhT5kP
z((^!U_;soQwpAe`D)jhX>YJmx8#p#WTqh;s-hIONn7XOu;W2UF*0RoXI`Q|Z6Y=12
zTyJiNs}H%nxO!t}g_h^sLYb-Q)YpkmXdlkYX!HV$@!HRSx`k$#562Y-q-#nurtE77
zk+|e$M~R|N@Mdr$KLZIv)8~4WGq{TgtQk*3kI#j4U$bi*qwTj}-T27EhwP=yY{{N-
zTlGI(9DIo}<rU7Mag+I?Z&pE$G}gFpM7T9W>rj3DUM$Bns_DJAG`3~$PJjDEUT1hr
zowMu$V@iDo3fj1TQN<k5ehb&|eU}(|d}@^(?IW~zR@v7v**WwO<cC0?ox&fouV(MP
zHT^+;ErS`UYV~sIn+jhq4m`_FZFe%J2rXD!m#jG{jxf!h0qc@{GO__Bg~x;td*RkF
zS1w`8$RuwB8evEAqZCd>rGD07=@U>Z-zOsj2F(`?8(x!46*>F()ykLI_fKdtBPX?4
zYuK96nY$3mK&XU=%vhV-S|rpOw%z2WZhI_K@?L)*>bTu}|E6f5h4EXw1gYL_=MgiK
z*@$R2slxXR0-WU`?{+YzgpK`0+z#u^$ga4z@1dyLjeu)9d#4{7201*a%f-Jy8C>Mz
zB{L4mZ$>3G?tDd^K^aJU?!_Y9lZU;fPmYthNzgDbnc?<^1FdCZO<<pj>{mYQSOKrt
zZkrzCSa<-xyPpYpZ1`|W>v!JPvdkB<BzD<Pj43>A6Vs7(x#D!Z#7&r_O?dlBJuM-j
z*0<!RH=2Od*{}j3$A@fso-C2Moims#Li_1J?nX+!@4m|c3%})Ck$sVi6T+b#rq655
z(+`l%{_1$|HzOhv>tH{9zDf{D4PinakFL2TfHE*@X}O4qk+AqRHE5nERK!Eh&*D_Z
zyR=y=p78I~53yhrz*J0J<yX5>)gT;V2S1G;2T$@!wj5ZqE_mUeX~S&T?&2)M6;6JS
zFuX*eGhhR9_m$jYk#8--u8_G+n}HvBkWu-cTF+?>F-)lNp#{~-KcsUOi6IukiwB$Y
zUAd05mVKDLU-_tKLx=$D?M-3zGvy|6{XU)1sMyc^$1|CI!*K=X-iDpt(ka!4CW`uw
z%80_}b=!0^n~5?jKdY~Z9*vB>t4}Zhs)AVZedz7p(z9y5--r)_LNb6llpW(Q3QIk7
ztbQ;ii4j#>86@Q&lmH|+<qD4C(5CBn3DNa5syh(+D4Eq#SmZ`zs_`UVV!H#ZH60GA
zsLL&wC3E+@1&8_GT$nA~>AHS>xH`yRh(vyBbgNY%7(Vz`C#u+^FAA#5<rFSh34oy2
z@M;p;p+wYQX^>y-hABUzKx)f~VhmnF={`FafmR9^p50!)WuuvYX`is9Ox^)NKevn&
z73*+V?Z%h=j45q|;eacxW&4D^UvMB|p7;+SBV(VJ$$+3WsC9I%v0_>!5ijxfFe1jN
z#ij@8HT|cPI|7o)EE`#XCzK+@Gt27g8b=ftmfB3Dn2;TY>akAK=TWqDxAT9H8B;zj
zq{p~IYfiLc7kHC19()LNPGQFJ`3ejbc-G>Yn(Q5LhE<*y0q#D96PSbyPUW(DpU6+;
zMaI-sG_K_A#TJ(ORtM}nyG5^%G;k1V^)V}f9;Lq74mVsJ3t&Q?GAFOv#|?DPgGe^}
zXUl$J$*i##Ot)9)3-3*IOz*i)`WaUhi@aSNJefqhVd_7r2D4`(^JJ80g0<1yU7?o@
z$Yd5Q8$YcNt2Lam;!MYGke_Ni{?>5l(?`<1CQSrdFY%!Euw}}6H?BvdJJvyQ?gg~F
zyQDdXdG<I=b^O`A&|F<U_STmMX?^9^JxZ(r=V=6!ode~?DLdgG-;O!#h%+G-iyY&G
zGcAKZj$Z1m=X|&!@``pP^~F1{ACVwkC{kV$-A;OpXgd2_p5rZ?X&*kJP-&A}zOtFE
z9-Cx)?{jrfzZEwbSs+^Ny(y&Dg^Y)!@QZ!E@i@PM04&-Zvzk;grh6i#ctpT!!&0Xw
zQ);`?U*kf<>p-tNX2af((ZSan{pv6G?b4k4L@)Mh#pQ2GXBJcg0l1Q0H`qU$^|2B*
z(5{+DZc;!QP||qG!mR~GVg>2UNX6wr?idVV7D=JZDUCQzEY>{505^z(UMfm@(0?9X
zi!_-XdsCEZ&_@hySsd!jJCVcP?^hdA`at4P&;HCKcBTDP>M{Har^}S9mw_{yk4tM-
z;MHR-LhkfVa*%S-e8bvW1?Zp~34Czk{;aOarG99jram7@RmlL7QF@eP{GejOayoW`
zEP9b|ak9^Tk7ds`8KS;<X(EdW%A3L~KhnhsO;OUlUm1by%+-C7Fuy?B0Y{MS+qiZR
zmylGS+8<TCvbFKLm}^v9iyf@7-*j7B!41Va=kVLya(E8*=_uqA@mjcJJ~O$far&5K
zv=lwP%0uMT?U1^4YLqklhTqa5B^O&ClN9-oGRX-@leFCJ>H?xR_QL2(lLc$d=jKs4
z?!ZA^%*RTlQpi!obLXn%y$6V3slQ(~R|9e(ZeF>}a)=KEpL-jZIyITr@#`54-^4Q|
zvyWSI=W`X&=b5<>F<M7rW>7nIXXaTDF(DPljHpxk>uEN?$(WJa>%5v?GN!ZIhaiZe
z+J5RZH(5m#-MmfS?i`%vI-afv+{mHlxmE>@c#V93%zq;b5Pc*Jr;2RdmE}H2Npc?o
z?T+)G^4_WkZ{6;BY&!VM(RHmvhh~jF+KxoP{Ia<OW2w#w3XCagk-nJIl><@zP_b^O
zr3wgL=t6OK7gJHliXNbuhLw5&62$S;C;m)?!C<Vci@C`G^0T{NpKCd;Zj)J~3__Mp
z#V+}}zXU|T4MmUC2COl7kYAppP93xo9D^bNp6J{MWLEZVf#WQ7N?yigP8r?<4^l%h
z!P={U*v92XoqF#!su9`HbGwrTyeoNGvEjBiw1A*KkkYPR&(MYtbDR<w!0gI~B&Sk=
zov0OkYn9j@*v^KP>M1ev?#lyG*sTISrCz~JHp2~GGqz{~LvE^q2sGz{XvXISn;%*g
z=uo=oCx2&&%mOE9=;G4sI)3x<<%m^n2etKNZgTGsWhMX{OviKC;6Hk!#~_A{$vNdQ
z8zyACn)c{B;W5k{O1V-~{5dz7ZI);<(GqE1z%>dKaa~^r6@F@#BG(P^eF8W%CiAod
z|Fm|J^J)^9GEEgfnuZksku0~N7r3Lla=iP9ro~sB&D4(~%cV9g6%7vRn{ShKUk70W
zsM#lGxE%)|S~3*14j7VQbuz=d5{8ZRePUG!*DvV?(3UFw*1y!iFTals8L1B1Kb*9g
ze19Fp2iJqWPD?0JA(1|*=XDb*@z*K985-=@7RPc;GT|h0^&r(Gqf+_Nm6AW^<da|V
zqAxTZ%G^&ZC-Q&Xnw)!07Szw!PchMi6*L2heo1|O8PAJ0<(vn&(x`KrQXkw66`z+o
zaj!l&ps9B(wcQyeYW>*fJ=)rZWrOy^5IC_Bi(j&Vfq5Cd-f#7JTjVRuo*JW5M*-%L
zvr~_`4)eQkhp$R@3564iqFv_!ev-sd8s41U#_VT_+cYntkJJWUtsU5b07Ip?K#{=a
zlfJFq*j8fiB~CYrR`M{Mw%*UhPFRcl1t`@{{5(<ToDJTj^@LX$ktiUz<fJ9p=6GGA
ziNqbM+iHq>2ha;xZ+$#l)%+M(oKsMhqGGCE<mEDZAxRtwREEBEVN|4pAUW~=a51w@
z1I7WkJ+v2VW}|3Qb-Nr`dBW)7B{y|O0ZKqAp}ue|s`v_hu*RPW`BLSt2%k-SQN*id
z^<7%_72I8kOz*Xa%sYurfz<=vivj&8lL%nAZKW4$Uo`ZrcJD6MTgz<vI9c(7!GJkk
zPD;OUtN(<B+zZm$jr*aIEuU_8n5w4-6cj@I&F2r0RYG!rAzPP^C3pc_5~RL)*WADe
z`z~n+h_u%GBEvJ>hx@eEsk%ycHk6L(oW#`*!=&4hL`>}C&O*WQ2cfwe8;>u)?QhR!
zr3;es^k}wfUA;@=X@^csy#V>f_3Lv^!zL*o_P(~3;np#j*A@?vo}|-_5LW|q_v<Ru
z=UH`lA0no4ZNPIe{&Y3$R)&HIPSO1zv4M&W0XvSFk5+*rBG86}nI&xj;Xm}|`8>8c
zS~eydYygkO=%iZ_-`<QrwIwbIF$yFOSNFb4qoiR|=BDa{l*&<pOvqP!VrVtS-r7Ji
z)baBM5AT};<R@R{Avc_m^36f@&bDGn>J;$p)W5*^WI2xaxGlgNYZ;~^X`_Pri9~Ml
zlL3z<e+`0r{=BvI)Qak2TKa(63*71Ag%04FCe#_V(_K}K^beD(ggKj05Ym7Pi{%q7
z6WbjOt2_t?!VV)i!_;nDW^`(*XcWHBtphd6n@3P+q||yop)vWDdMt=Rg9+}dhZqH<
z>gVdzV^0Ods?9|!1UBcFPdyh-($zt=CpM{fRmhWSVb={2!K8Fo`K|H?Hh+*;f_-EY
ze*&a49{aS(cZ72K@HGoAkRj1jU65Q-MoJbrvrB^m>}tugoY|jf?M@n2RUrNegAlph
z1{b!Ii=>-=-ujT7<Y=TU{t*bZ%i}A!WTj{B6fLKfCF$Y)o3G3{bacX{)D$e;9!U*f
z_;dC!2&8x)jPH=aL!f`NPO;3h2W_gN6#&sf=L6)-hnFU*O;YGpY0<a(6o8ua^2FPv
zh|<J1Oeef$LJ5?G>(noxrvAOOT+7#TyR*<4K+DKVoJNv;?N#;koRy`SSO<80ew4gh
z;ZSwZrJS#BtqOlrbXi)vyFj~rm?r#tofW2Q)VsdF$$n|AUg;D<Ec0HsS=ZbKo<xQ&
z1x<6XVKbMd0w)#&iZY;`6{vAJLp!?W>o3Od9HfG9kO0xLApbrEAW@V%VH%@+HF#?q
zy}pl8VAe+O&|zN?2or>=vjX*jSU*@lZ5YAqkoD-FesBKiV1sqNk!bA)8u7PqxG`(x
z!P7_VPMZBXaZEv$dY5lOMy2-i{PeRr;gFQtW6OTh?u#^RVIT{Fvv68Nn)j~Ws7ui=
z`dI6OqoNm$AnA+iutLbyQh{Bw75TK)!l}x$VE=sIgQK;9C)d9b{q*C)z#C5<g6J<U
zUj3mm2GrEBgs{a&!n^=Z8SnJ<y7Th)9_8!!=%2~3%pv>_%$hS`5SBWuFxpG5w9UQY
zvxk|G`C0TbT%c_Ve3V~LUBaz7KUIILN;6Nm)2ItF*9;Gh>?Yj~9B3I`O%0ybu;YQ}
z@jReK<I|A&)lXDy>GygweNX;_{ZSo6dj0eVklq;u1T6HLpheWwAVhOZISkuFOi`BI
zCVq8Rn*hs3D)5b#Z#vcax1MD`M|BYBuYMok*fu#}Jp=R0-Wtw{sy+U_M{n*!N_9|2
zP9X-c#gh1>wfnYudI6xdhxA!n>tp@Hj_iS=-xT6Z;8!q^FFQORE>-KO<e5RKSKJE=
z;k2<Q{}%Ngn6Cgw2fdYF|09>j=&L25cLGa_QK0QRXq)`~6T7ow3oOJ65VC?T1?c7X
zK3JG}pw?giXNLWzV_XglaOnU@DtZtk2LnlM6B{5$D-{)uK=#*1e*$C<uqwzV<ZW8^
z(139WoqOnqv~Si7sY!Ngb5S(ory$%xI_dEsaA{3rEwbzKc%9$s)tN8oO8KUskO1+)
zn(7etAF_5$TY|9nU+n}*9w0jq4w$`$FhBcHFm2&hyfXAiI!6Lzt9s#ghKeJx&Y<yP
z_$S{<ORdXc!(%5IhoUZ`67zyUa?El8H4fW54$O!yh|7u`6CkUCwhT%=oxN5ds*0in
zqL#6+rya#&mgdww{JbhSK(>^dY+M1dIzZf@sF)R$fCs*9eRce3B}R0;zRAiv1yzE;
zs-G|-s2}*jQQj*@`B8)-h~Jz}b+0~>`r93*V;wGxvtjSt3b()s39{%)dTb8WRP*(-
zVa?ifljSY?6W_r3#mC}A3I~JKvBB#%k4iG8SecXj?M$Oaza;*}P0mjg{7iRiC7Q7o
z9er)spae00*Jz5G%uQZr<sAe4A5gP(1UU7rK-)>bF@v41H}Dr9+={{GiOon*+LXIA
zV2{N`>(x%EfbLZjQ&4=~YY-IgQ{>8bVVn?FBR!sKmIvBqeLJyS`yXG~5{kYW`Hvcb
z=Nq7GH3lJXZVl(k!{8Gwhimm-kjjU)W|eF7Bs*C>aY9L1fgOeGPnmvhOa{v|*YTp)
z3jiw4t&XwtWBdNi{N<ubhh~KK&fS46Hv<2D!}U?&*2<du0AFExf#qf2pt)_Gu}my(
zW99(pq>_+sA?#>6NkAztrUMi-X9D9be}E930zVZIqDpUj3xfy9DM`ShC@ZzJ!s<Qw
zl2Uv?A~08UAy>1!HdB1+!#Jl|HH;L=yvvV}p0wb8BDK4%@gs;P-v*C>bI-{*m(+er
z8E`-6SHhQ6l;wVLTeTDz3lLIL`7vT}K#4Xio<6${0O~l>utOibqoW&-Ru+rwE`;!W
zcB;F47n)ccEae3fv8;EcG}g<aMQhkGK313tr=H0nr3QPm6baix7cjrIhR68&jkDnU
zfG@2E%I1Jfw_H~7Ywn|?TuUt;v;(*EGU_!7(pOXe8~{<VBE|pc1z`Pe0b~@fvmNEA
zsNb~WDx8|PefV(J(sNW}+k*`PO_VjXLV)&Npq^?A<w@YbFB(7$T?|rCT1=;U01bG|
zo?g%pMc(9fHq|4fuiAM73+!0`oH%}*afo$P%*DoeTA=YO0ejHgyI~e6$(^~77ajbV
z38@sGtZAJ9C|aire+gi!Y<FN37?*y2>Ixu3dM%%@-u)VS!bk2kPIT6=G0SKIh#&*?
zAgPhK&s7{0faE99emJM$UChPG@3&8G-Yl2K1>>>`IxTe^P|phtEX}Wh$k8;-nGHO7
zX{fQDYvE2++$Jp*VDayr<+#8_X18|#bLLbRK&;?rvv_n))g@%*3##GzvxsXvp&uLG
zFWiC5+fow}Ezh`sc<>-smR|L3Y}WHD^-!7LwTmz?7w&x9@qV2|de(VO$8`M3`JMLB
zFA?;8xEZeFO=d)=8ehD0ToU(L+G=Thr)>u)b?wa6fLSdpDjx!UN5P$Oli3ONRAk^X
zh?TN^o>#UKXCA&)yMKr03xL!5yTQ=0h8fW7{M=X%vEOiK0*ZF$Al_Pw5%KcmzkdnY
zJ{cCV6|#KSPu0%;``~6UfvYh{X*<VY^g(XZ8j%?2l3a2G0Ek2%P+8sX?yaqzs5ZBM
zA$=k5@M&P<Njd=ygN5wl@}esrSzcEJErJut9?YYiVoWi*oa`E?vLp&+MEnk91I3Sk
zqd<js;whO=t~NsSTE9}i)oODrF3V+_Q{uuqHf&oHdrrZ4J#=@a+^oUKPowFAe@M;X
z7$)SD_Q&q+jY+D}n=~eWNbbi<L};#c_blFg^6n%Eyq{~TZMW?ywSjjE>La|i!qo>A
zo90_ui&9%lZ$sWN0Q1)c<zmRX^>?pJh2KEa;r>p_Dk<}AwJjc$s13b8suoB=eTs}J
zuI8QK2suG_j^XR4!>j$)4}cJ?`KKWNP=kGiSHftlGw5RM#)xHp)Oy#QpH7mmRj7IE
z`IOW1n(|}WR&Qws`7s(Op6=UP-v`t_y*%Ry)qynr!+7Cb&*h|&*Ro5R#+KXnJ)bre
z0ZWk(LZAb?p9`4xq9g<EgqY2M!f0?FRk))FcGVtPXad-CJN!YDG81x+d89U6>|uU7
zsC7XX1^W49{#;K>C++wSWgXa0-IzEoO(N6M5|Xp53+!0+7zbH_D@owm7z9O7<gU~h
ze=zDWAeaDX6()da|5`h7XF<|3AYvS}asa=|;Q=5_987%X+B0cDP?vILLhiNPOdkZ2
z`V?NH{D`veJGgWJULfNCtf~;;T;*^8@KnKlMS=(ua_Jgw!#^?H5Y&KUcdJ3%9t=fI
zS{W`;Wro*f;QN>4`7a$ezHhu4?@CRewu};K@(E*zMSYoHy9~XnQ2rADz=fm?$wBs0
z&k?{xnSBumYJX%UXwN4yzyqny$s|U~@Y9r*xQ%NK%Ti+}IK?t0eGlR0b{<zYZ~2Li
zv>XNrd%EQsZvQ3#N>)>Pc8{msY&54K#XTT)$G2#b31)Sm1Z<Knc|DQr#R5Rb@j=A~
z51kVESB_I(x0C3RzXop>$JyXcY<fabIUT-@#Y4)T84(I%;1C%YqUGZE5UOq|NM0y@
zc*s)bwyZ!!iE_?l054x?Xl~#X-fkh+_C2^FiMr5NLU6t?90~!<=y-R;^(jfgc1+X#
z06V;J?+e3_Iipr&E7Z8?S0@eMaiuT=XcW{JvIgJC(5YMA>2v#35MW~HDd7*)wjX`a
zc|XV;?O{O5rtH(_Ai01oPY_~hNX1W6obU_}rPfj^CVg!evS5a#<JJ6mSBw`*eFrY9
zZUqJ(mEtVf8Lo4d$WVk?&`XO6d8~zmf1a8>*K-kNb?_IJhXy482@yk;7I|T=6m<h>
zf0_+}NR8>1du`Y=1uwXuiInG@X+nWE%lNFJ09AMxpdr<>UBElkW1ANT&tpL<Y@bT-
z6?kn6$@q*%vhtv}ZT(t*<QWLQ_7FjxNQtD#tsFT8NO@{s>=tocNe7mu>>P-)k@~I|
zww2va1{oUIC1?kD$VLGP?w)u_q>O5o_^mJZd@#;02f)i|gX&_V8Icw}2hh(eUC=-u
zbu2j%?&Q9@A-NX$)aag3WA6rQJOmJ)#K6)ggH0j`0X4MiaobnP1F5Z)pykh7=!1om
zTQPP4flIca3&0t~mV-I$_R1KuWNkf+L=^;*K+AQeAgZ&Gw~-52(JJXu?-7ynt98~v
z&F7b5-s-B7@LJIxuX-85MMaA8LRvcAM^c~L>Q`Ba;px?S7B38qCRTtHcN5QQVQWy9
zXvs3BDOhm&YF%27aBIz{Jy(A^^@hUN7nc2tgZY2-tzC0A;0(InmDCQRrdn6UlNj6R
z7p}`e@CFG%J%FF#W_Q$e;?4U2(Sfecg-st-&#A9Nu1|oJURpf(raIy{$}#Mld$V2x
z6wnq&peHiUFfhr9b)2kucCvy%532_4nBPdt;>aUAI%i7m380CZ^}HSmmS|#(T}qEJ
zQ#=;LKB6gje^CYWdCY4mWitVwQ6bo?7r70r`+^sMmPx^mcVEgDJOmZ`DbbcNO8^9n
zc1mTM1G=R}s{tGX7#nnaAdo(R8jDwKuUpn?Kd+ZY4@gGHI00Q)8z;@|^GgTT_PcF-
z2qdf|qq5Vy-Em*gg=1jnH0<`ulIPbYN{l;@zG;Ehjl-SkiA6^)A0^F}w6oqdkK<5&
zDy@8?4cVLRrq*R9cn<JT7#v%hAI;iUeKsa=EvX%PWT2B>n473%MuLIYR^cq|`jwj1
z-u%R~Iz9P?wd%1KnwTyTbq9qf0Sc~Eua+L5TWWbEf=>BB>XA(QuF^%W<1w1$_tjgu
zfezZ%UJ-o687CXh>s<!@hQk|0zv0+0cSl~cgSFnnP?mdW_QWC}lu@h5&`5cR)n7f`
zlBZ-V&QIP7BPNlFe@o0J1SZL8M|neXT_}B>aB^<G9HpjuKlRNyIzNKbKU$RPqnQ<b
zq`XPak+yw_)C(BrJcStnu)}9KzA&f^A-1}S1sYg=1y~YTDXNcW@NA=gFl5$%FgI6J
z^CRG4smi*$G?DMn08YE9F{(zmQ(jvs(X4tk&J`CjW4Rpm|K5ZD>(2Z?T#^5`Qwym7
zbxRKH8iH@yf8C%X|JS`dusHa3|JM!r-`DBCum0g`5WZ>ub@k8iA9(r4#|?iIfs4ie
z^!0$5Smq}5_%aP}6*?&-B%+thvbMb0^?*x&AyHvB*!M^#BGcvf2M=p_#Pu55D*P!!
z8!~gM5G&5fus340uy3^+;ZEddaI8~xn+&B*bT(OmB=XcqfPqr{0#qVdn4~I;{aDf{
z!;|)Me<?(oSx@tr!HL`UoD4Cmpw~gV3V&tcNBG_gSo{#lg@F0|$7cn9KkOWUCGk%&
h{p-P4imuGCFQK5>py%Es_}qrUQ18;YV%_Uu{{u+VNiP5Z

diff --git a/public/images/bigdata/edu-footer-logo.png b/public/images/bigdata/edu-footer-logo.png
index f393a538b4c1868e1da87ac2e26ddd0720335627..b7c5499dfca0e07395968c1371dd47f08591b7ba 100644
GIT binary patch
delta 9381
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

delta 7113
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
Wl5#ug00IH;b+$+cM3v>GJO2eEmpKvu


From a258ce4e763f747f4f01b2966aa80667282993f3 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 15:42:02 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=87=E7=AD=BE=E5=92=8C=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95icon=E6=B2=A1=E6=9C=89=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/_homework_index_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index f2ffdbe22..efbf903b8 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -21,7 +21,7 @@
             </p>
           </div>
           <% if @is_teacher %>
-              <div class="fr edu-position edu-position-hidebox mr20 mt25">
+              <div class="fr edu-position edu-position-hidebox mr20 mt20">
                 <a href="javascript:void(0);"><i class="fa fa-ellipsis-v font-16"></i></a>
                 <ul class="edu-position-hide undis">
                   <li>

From 1532def22be7f0293f0af1e9d6d9498748f825e8 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 15:45:57 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E8=AF=B7=E5=BE=AE=E8=B0=83=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=8F=90=E7=A4=BA=E5=BC=B9=E6=A1=86=E7=9A=84=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/edu-popup.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/css/edu-popup.css b/public/stylesheets/css/edu-popup.css
index 60c0a9c4f..b561bad57 100644
--- a/public/stylesheets/css/edu-popup.css
+++ b/public/stylesheets/css/edu-popup.css
@@ -3,7 +3,7 @@
 .task-popup-text-center{ text-align: center; color: #666;}
 .task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
 .task-popup-content{ padding:15px;}
-.task-popup-submit{ margin:15px auto; width: 120px;}
+.task-popup-submit{ margin:0px auto 15px; width: 120px;}
 .task-popup-sure{ margin:15px auto; width: 54px;}
 .task-popup-OK{ margin:15px auto; width: 70px;}
 .task-popup-bggrey{ background:#ccc; color:#333;}

From 37cfa528ee78d2560a3b58d644e8aba319028600 Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 15:51:00 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E8=BE=B9=E6=A1=86=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/public.css    | 2 +-
 public/stylesheets/css/structure.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index a829d0fc6..f924ff46d 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -8,7 +8,7 @@
 .courseRSide{ width:983px; background:#fff; padding:10px; margin-left: 15px; margin-bottom:10px;}
 .wrap-big {width:980px; background:#fff; padding:10px; margin-bottom:10px;}
 /*资源库*/
-.resources {width:973px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right;}
+.resources {width:973px; background-color:#ffffff; padding:15px; float: right;}
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#3b94d6; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
 .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 08063c4a8..afd2ea71b 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -323,7 +323,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 a.homepageMenuControl {float:left; width:180px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
-.homepageRightBanner {width:975px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
+.homepageRightBanner {width:975px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; }
 .homepagetopBanner {width:750px; height: 100px; margin:0px auto; float:right; background-color: #90C5EC; border:1px solid #dddddd;}
 .homepageRightBannerImg{width:1000px; margin:0px auto;  height: 60px; margin-top: 10px; background:url(/images/TeachersDay.jpg)}
 a.homepageWhite {color:#ffffff;}

From 3cb91f17478a38fe6c0a6b01e828e62313370ec6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 27 May 2017 16:47:22 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=88=92=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/user_join.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb
index bde24f690..d62310d51 100644
--- a/app/views/account/user_join.html.erb
+++ b/app/views/account/user_join.html.erb
@@ -59,7 +59,7 @@
               </li>
               <li class="pr">
                 <input type="checkbox" checked="checked" id="read_and_confirm_1" class=" magic-checkbox">
-                <label for="read_and_confirm_1">我已阅读并同意<a href="<%= agreement_path %>" target="_blank">服务协议条款</a></label>
+                <label for="read_and_confirm_1">我已阅读并同意<a href="<%= agreement_path %>" target="_blank" style="text-decoration: underline;">服务协议条款</a></label>
                 <div class="new-login-error" style="display: none;">
                   <p id="user_aggre_1_notice"></p>
                 </div>

From 596a021980425ee78f2845d22fafe8920e16ccbd Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Sat, 27 May 2017 16:49:25 +0800
Subject: [PATCH 09/12] noting

---
 public/stylesheets/css/edu-user.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css
index 7317cacce..2c8b0c768 100644
--- a/public/stylesheets/css/edu-user.css
+++ b/public/stylesheets/css/edu-user.css
@@ -97,7 +97,8 @@
 .-task-con-int .passageway .hascon .train p .last:hover{color:#5faee3;}
 .-task-con-int .passageway .hascon .train p .last:hover .blue{color:#5faee3;}
 
-.-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;background:#aaa;color:#fff;}
+.-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;color:#5faee3;}
+.-task-con-int .passageway .hascon .expand:hover{ color:#5faee3;}
 /*--------------------------------------箭头动画效果-----------------------------------*/
 .-task-con-int  .passageway .hint .zhuan{
 

From 0d29448be75ddafedf7c0e11fc525160b98a3582 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 27 May 2017 16:49:45 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/syllabuses_controller.rb      |   9 +-
 app/models/course.rb                          |   4 +-
 app/views/layouts/_footer.html.erb            |  10 +-
 app/views/layouts/_public_left_info.html.erb  |   2 +-
 app/views/syllabuses/_courses_list.html.erb   |  16 +--
 .../syllabuses/_join_syllabuses.html.erb      |   8 +-
 app/views/syllabuses/_my_syllabuses.html.erb  |   8 +-
 app/views/syllabuses/index.html.erb           | 111 +++++++++---------
 app/views/syllabuses/index.js.erb             |  36 ++++++
 9 files changed, 128 insertions(+), 76 deletions(-)
 create mode 100644 app/views/syllabuses/index.js.erb

diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 8d27ba45a..7451a893c 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -12,12 +12,12 @@ class SyllabusesController < ApplicationController
                                           :send_homeworks_to_course, :choose_user_course, :send_resources_to_course, :send_r_and_h_to_course]
 
   def index
-    type = params[:type].nil? ? 1 : params[:type].to_i
+    @status = params[:type].nil? ? 1 : params[:type].to_i # 1表示正在进行，2表示已结束
 
     user = User.current
     @my_syllabuses = user.syllabuses
 
-    archive_ids = Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").blank? ? "(-1)" : "(" + Course.where("tea_id = #{user.id} and is_delete = #{type} and syllabus_id is NOT NULL").map{|course| course.syllabus_id}.join(",") + ")"
+    archive_ids = Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").blank? ? "(-1)" : "(" + Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").map{|course| course.syllabus_id}.join(",") + ")"
     @archive_syllabuses = Syllabus.where("id in #{archive_ids}")
 
     sy_courses = user.courses.visible.not_deleted
@@ -32,7 +32,10 @@ class SyllabusesController < ApplicationController
     @join_syllabuses = @join_syllabuses.sort{|x,y| y[:last_update] <=> x[:last_update]}
     @is_course = 1
 
-    render :layout => 'base_edu'
+    respond_to do |format|
+      format.html{ render :layout => 'base_edu'}
+      format.js
+    end
   end
 
   def show
diff --git a/app/models/course.rb b/app/models/course.rb
index 6c546f591..f2172f419 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -24,7 +24,7 @@ class Course < ActiveRecord::Base
     end
   end
   
-  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id, :end_time, :end_term, :choose_group_allow
+  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id, :end_time, :end_term, :choose_group_allow, :is_end
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
@@ -109,6 +109,8 @@ class Course < ActiveRecord::Base
   acts_as_customizable
 
   scope :not_deleted, lambda{where(is_delete: 0)}
+  scope :not_deleted_not_end, lambda{where(is_delete: 0, is_end: 1)}
+  scope :not_deleted_but_is_end, lambda{where(is_end: 1, is_delete: 0)}
   scope :all_course
   scope :active, lambda { where(:status => STATUS_ACTIVE) }
   scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 93d221abf..6bece554e 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -7,11 +7,11 @@
       <li><a href="<%= forums_path %>" class="fl" target="_blank">社区</a></li>
     </ul>
     <div class="cl"></div>
-    <div class="fl" style="width:440px;">
-      <p class="footer_con-p">Email:zhiqingcs@163.com</p>
-      <p class="footer_con-p">Copyright 2007~2017, 智擎信息 All Rights Reserved</p>
+    <div class="fl mt20 center" style="width:440px;height: 50px">
+<!--      <p class="footer_con-p">Email:zhiqingcs@163.com</p>-->
+      <p class="footer_con-p">Copyright 2007~2017, All Rights Reserved</p>
     </div>
-    <div class="fr mt20"  >
+    <div class="fr mt20">
       <ul class="saoma-box fl mr30">
         <li>
           <img src="/images/inner/img-back-weixin.png" width="50" height="50"  alt="高校智能化教学与实训平台" class="img-show" >
@@ -27,7 +27,7 @@
         </li>
       </ul>
       <%= link_to image_tag("/images/bigdata/edu-footer-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
-      <p class="inner-footer-p-big fr ml30">高校智能化教学与实训平台</p>
+<!--      <p class="inner-footer-p-big fr ml30">高校智能化教学与实训平台</p>-->
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb
index 3a0618040..7717156ae 100644
--- a/app/views/layouts/_public_left_info.html.erb
+++ b/app/views/layouts/_public_left_info.html.erb
@@ -1,6 +1,6 @@
 <div class="sidebar">
   <div class="sidebar-top">
-    <i class="fa fa-graduation-cap font-20" style="color:#fff;" aria-hidden="true"></i>
+    <i class="fa fa-graduation-cap font-20" style="color:#fff;line-height: 50px;" aria-hidden="true"></i>
     <span>智能教学</span>
   </div>
   <div class="sidebar-con">
diff --git a/app/views/syllabuses/_courses_list.html.erb b/app/views/syllabuses/_courses_list.html.erb
index 9c21a3db5..64341b888 100644
--- a/app/views/syllabuses/_courses_list.html.erb
+++ b/app/views/syllabuses/_courses_list.html.erb
@@ -1,13 +1,15 @@
-<% courses.each_with_index do |course, i| %>
-    <% allow_visit = course.is_delete == 0 && (User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1) %>
-    <li class="clearfix">
+<% if !courses.blank? %>
+    <% courses.each_with_index do |course, i| %>
+        <% allow_visit = course.is_delete == 0 && (User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1) %>
+        <li class="clearfix">
     <span class="span4 fl ">
 	    <a href="<%= allow_visit ? course_path(course.id) : "javascript:void(0)" %>" class="fl mr5" target="<%= allow_visit ? '_blank' : "" %>"><%= course.name %></a>
       <% if course.is_public == 0 %>
 	    <a href="javascript:void(0);" class="fa fa-lock fl"  style="padding-top:18px;color:#ccc;" aria-hidden="true"></a>
       <% end %>
     </span>
-      <span class="span5 fl font-12"><a href="<%= user_path(course.teacher) %>" class="color-grey"><%= course.teacher.show_name %></a></span>
-      <span class="fl font-12"><i><%= format_date Time.at(course.updatetime) %></i>更新</span>
-    </li>
-<% end %>
\ No newline at end of file
+          <span class="span5 fl font-12"><a href="<%= user_path(course.teacher) %>" class="color-grey"><%= course.teacher.show_name %></a></span>
+          <span class="fl font-12"><i><%= format_date Time.at(course.updatetime) %></i>更新</span>
+        </li>
+    <% end %>
+<% end %>
diff --git a/app/views/syllabuses/_join_syllabuses.html.erb b/app/views/syllabuses/_join_syllabuses.html.erb
index d5f7ff50a..c296f829e 100644
--- a/app/views/syllabuses/_join_syllabuses.html.erb
+++ b/app/views/syllabuses/_join_syllabuses.html.erb
@@ -1,5 +1,5 @@
 <% @join_syllabuses.each_with_index do |syllabus, index|%>
-    <% course_count = syllabus.courses.not_deleted.count %>
+    <% course_count = @status == 1 ? syllabus.courses.where("is_delete = 0 and is_end = 0").count : syllabus.courses.where("is_delete = 0 and is_end = 1").count %>
     <div class="sub-con color-grey">
       <div class="head-top">
 		    <span class="count">
@@ -26,7 +26,11 @@
         </ul>
       </div>
       <ul class="mr20 ml30">
-        <% courses = syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+        <% if @status == 1 %>
+            <% courses = syllabus.courses.where("is_delete = 0 and is_end = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+        <% else %>
+            <% courses = syllabus.courses.where("is_delete = 0 and is_end = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+      <% end %>
         <%= render :partial => 'syllabuses/courses_list', :locals => { :courses => courses, :syllabus => syllabus} %>
       </ul>
     </div>
diff --git a/app/views/syllabuses/_my_syllabuses.html.erb b/app/views/syllabuses/_my_syllabuses.html.erb
index 865de5d88..4a2873376 100644
--- a/app/views/syllabuses/_my_syllabuses.html.erb
+++ b/app/views/syllabuses/_my_syllabuses.html.erb
@@ -1,5 +1,5 @@
 <% @my_syllabuses.each_with_index do |syllabus, index|%>
-    <% course_count = syllabus.courses.not_deleted.count %>
+    <% course_count = @status == 1 ? syllabus.courses.where("is_delete = 0 and is_end = 0").count : syllabus.courses.where("is_delete = 0 and is_end = 1").count %>
     <div class="sub-con color-grey">
       <div class="head-top">
 		        <span class="count">
@@ -26,7 +26,11 @@
         </ul>
       </div>
       <ul class="mr20 ml30">
-        <% courses = syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+        <% if @status == 1 %>
+            <% courses = syllabus.courses.where("is_delete = 0 and is_end = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+        <% else %>
+            <% courses = syllabus.courses.where("is_delete = 0 and is_end = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %>
+        <% end %>
         <%= render :partial => 'syllabuses/courses_list', :locals => { :courses => courses, :syllabus => syllabus} %>
       </ul>
     </div>
diff --git a/app/views/syllabuses/index.html.erb b/app/views/syllabuses/index.html.erb
index 7868f6fab..e858d719e 100644
--- a/app/views/syllabuses/index.html.erb
+++ b/app/views/syllabuses/index.html.erb
@@ -23,16 +23,15 @@
         <i class="fa fa-caret-down font-12" style="display:none;" aria-hidden="true"></i>
       </p>
     </div>
-<!--   <p class="state mt20">
-      <a href="javascript:void(0)" class="edu-filter-cir-grey mr5 active" id="syllabuses_processing">正在进行</a>
-      <a href="javascript:void(0)" class="edu-filter-cir-grey mr5" id="syllabuses_end">已结束</a>
-    </p>-->
+    <p class="state mt20">
+      <a href="<%= syllabuses_path(:type => 1) %>" class="edu-filter-cir-grey mr5 active" data-remote="true" id="syllabuses_processing">正在进行</a>
+      <a href="<%= syllabuses_path(:type => 2) %>" class="edu-filter-cir-grey mr5" data-remote="true" id="syllabuses_end">已结束</a>
+    </p>
     <div class="con" style="min-height:740px;">
-      <div class="release">
+      <div class="release" id="my_syllabuses">
         <%= render :partial => "syllabuses/my_syllabuses" %>
       </div>
-
-      <div class="partic" style="display:none;">
+      <div class="partic undis" id="join_syllabuses" >
         <%= render :partial => "syllabuses/join_syllabuses" %>
       </div>
     </div>
@@ -40,58 +39,60 @@
 </div>
 <script>
     $(function() {
-        console.log($(".con .handle"));
-        $(".play .nav p").click(function() {
-            var $a = $(this).attr("data-option");
-            $(".play .nav p i").hide();
-            $(".play .nav p").removeClass("bold");
-            $(this).addClass("bold");
-            $(this).find("i").show();
-            $(".con").children().hide();
-            $(".con").find("." + $a + "").show();
-        });
-        $(".con .count").click(function() {
-            if($(this).find(".cut").css("display") == "none") {
-                $(this).find(".cut").show();
-                $(this).find(".add").hide();
-                $(this).parent().next().show();
-            } else {
-                $(this).find(".cut").hide();
-                $(this).find(".add").show();
-                $(this).parent().next().hide();
-            }
-        });
-        $(".con .operate").click(function() {
-            if($(this).parent().next().css("display") == "none") {
-                $(".con .handle").hide();
-                $(this).parent().next().show();
-            } else {
-                $(this).parent().next().hide();
-            }
-        });
-        $(document).bind("click", function(e) {
-            var target = $(e.target);
-            if(target.closest(".con .handle").length == 0 && target.closest(".con .operate").length == 0) {
-                $(".con .handle").hide();
-            }
-        });
+            console.log($(".con .handle"));
+            $(".play .nav p").click(function () {
+                var $a = $(this).attr("data-option");
+                $(".play .nav p i").hide();
+                $(".play .nav p").removeClass("bold");
+                $(this).addClass("bold");
+                $(this).find("i").show();
+                $(".con").children().hide();
+                $(".con").find("." + $a + "").show();
+            });
+            $(".con .count").click(function () {
+                if ($(this).find(".cut").css("display") == "none") {
+                    $(this).find(".cut").show();
+                    $(this).find(".add").hide();
+                    $(this).parent().next().show();
+                } else {
+                    $(this).find(".cut").hide();
+                    $(this).find(".add").show();
+                    $(this).parent().next().hide();
+                }
+            });
+            $(".con .operate").click(function () {
+                if ($(this).parent().next().css("display") == "none") {
+                    $(".con .handle").hide();
+                    $(this).parent().next().show();
+                } else {
+                    $(this).parent().next().hide();
+                }
+            });
+            $(document).bind("click", function (e) {
+                var target = $(e.target);
+                if (target.closest(".con .handle").length == 0 && target.closest(".con .operate").length == 0) {
+                    $(".con .handle").hide();
+                }
+            });
 
-/*        // type: 1表示正在进行 2表示一结束
+        // type: 1表示正在进行 2表示一结束
         $("#syllabuses_processing").live("click", function(){
-            if($(".bold").attr("id") == "my_publish"){
-                var type = 1;
-            }else if($(".bold").attr("id") == "my_join"){
-                var type = 2;
-            }
-            console.log(type);
             $(this).addClass("active");
             $(this).next().removeClass("active");
-            $.ajax({
-                url: "<%#= syllabuses_path() %>",
+          /*  $.ajax({
                 dateType: "script",
-                data: { type: type }
-
-            })
-        });*/
+                url: "<%#= syllabuses_path() %>",
+                data: { type: 1 }
+            })*/
+        });
+        $("#syllabuses_end").live("click", function(){
+            $(this).addClass("active");
+            $(this).prev().removeClass("active");
+           /* $.ajax({
+                dateType: "script",
+                url: "<%#= syllabuses_path() %>",
+                data: { type: 2 }
+            })*/
+        });
     });
 </script>
diff --git a/app/views/syllabuses/index.js.erb b/app/views/syllabuses/index.js.erb
new file mode 100644
index 000000000..a07fc7369
--- /dev/null
+++ b/app/views/syllabuses/index.js.erb
@@ -0,0 +1,36 @@
+$("#my_syllabuses").html("<%= j( render :partial => "syllabuses/my_syllabuses") %>");
+$("#join_syllabuses").html("<%= j( render :partial => "syllabuses/join_syllabuses") %>");
+$(".play .nav p").click(function () {
+    var $a = $(this).attr("data-option");
+    $(".play .nav p i").hide();
+    $(".play .nav p").removeClass("bold");
+    $(this).addClass("bold");
+    $(this).find("i").show();
+    $(".con").children().hide();
+    $(".con").find("." + $a + "").show();
+});
+$(".con .count").click(function () {
+    if ($(this).find(".cut").css("display") == "none") {
+        $(this).find(".cut").show();
+        $(this).find(".add").hide();
+        $(this).parent().next().show();
+    } else {
+        $(this).find(".cut").hide();
+        $(this).find(".add").show();
+        $(this).parent().next().hide();
+    }
+});
+$(".con .operate").click(function () {
+    if ($(this).parent().next().css("display") == "none") {
+        $(".con .handle").hide();
+        $(this).parent().next().show();
+    } else {
+        $(this).parent().next().hide();
+    }
+});
+$(document).bind("click", function (e) {
+    var target = $(e.target);
+    if (target.closest(".con .handle").length == 0 && target.closest(".con .operate").length == 0) {
+        $(".con .handle").hide();
+    }
+});

From f92a604ee787ad7f1002ea0821f64cd1a9a73daa Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 27 May 2017 17:10:36 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb |  2 +-
 app/views/account/agreement.html.erb  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 6d04577ea..f834c56f5 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -83,7 +83,7 @@ class AccountController < ApplicationController
 
   # 服务协议
   def agreement
-    render :layout => 'static_base'
+    render :layout => 'base_edu'
   end
 
   def about_us
diff --git a/app/views/account/agreement.html.erb b/app/views/account/agreement.html.erb
index ac0b9906c..2bb958120 100644
--- a/app/views/account/agreement.html.erb
+++ b/app/views/account/agreement.html.erb
@@ -1,29 +1,29 @@
 <%= stylesheet_link_tag 'css/public'%>
 <!--<div class="homepageContentContainer mb20" >-->
   <div class="homepageContent BgBox mt10">
-  	<h2 class="BgBox_h2">Trustie服务协议</h2>
+  	<h2 class="BgBox_h2">服务协议</h2>
    	<div class="AgreementBox">
     	<p>尊敬的用户，您好！<br />
-欢迎使用Trustie平台，在您使用Trustie平台前，请您认真阅读并遵守《Trustie服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
-当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为Trustie平台的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
-		<h4 class="Agreementh4">一、Trustie平台权利和义务</h4>
-        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是Trustie平台的一项基本政策；<br />
-2、管理平台用户：Trustie平台依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理平台注册用户；<br />
-3、处理用户反馈：Trustie平台的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
+欢迎使用本网站，在您使用本网站前，请您认真阅读并遵守《服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
+当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为网站的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
+		<h4 class="Agreementh4">一、本网站权利和义务</h4>
+        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是网站的一项基本政策；<br />
+2、管理网站用户：网站依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理网站注册用户；<br />
+3、处理用户反馈：网站的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
 		<h4 class="Agreementh4">二、用户权利和义务</h4>
-        <p>用户在使用Trustie平台的过程中，必须遵守如下原则：<br />
+        <p>用户在使用网站的过程中，必须遵守如下原则：<br />
 1、遵守中国的有关法律和法规；<br />
 2、使用网络服务不作非法用途；<br />
 3、不干扰和混乱网络服务；<br />
 4、遵守所有使用网络服务的网络协议、规定、程序和惯例；<br />
 5、不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；<br />
 6、不传输任何教唆他人构成犯罪行为的资料；<br />
-7、用户不得故意或者过失损害Trustie平台合法权利和利益。及时回复。</p>
+7、用户不得故意或者过失损害网站合法权利和利益。及时回复。</p>
 		<h4 class="Agreementh4">三、关于责任</h4>
-        <p>鉴于网络服务的特殊性，用户同意Trustie团队有权在事先通知的情况下，变更、中断、升级部分网络服务。Trustie团队不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
+        <p>鉴于网络服务的特殊性，本网站有权在事先通知的情况下，变更、中断、升级部分网络服务。本网站不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
         <h4 class="Agreementh4">四、服务条款的修改</h4>
-        <p>Trustie团队保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由Trustie团队及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
-        <p class=" mt15 fb">本协议最终解释权归Trustie团队所有。</p>
+        <p>本网站保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由网站项目组及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
+        <p class=" mt15 fb">本协议最终解释权归本网站所有。</p>
     </div>
     
     

From 5a2eccfccf8cfed66fe48a6e9fdc72c9ad8a0193 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 27 May 2017 17:28:43 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 6bece554e..93190e9b9 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -7,7 +7,7 @@
       <li><a href="<%= forums_path %>" class="fl" target="_blank">社区</a></li>
     </ul>
     <div class="cl"></div>
-    <div class="fl mt20 center" style="width:440px;height: 50px">
+    <div class="fl mt20" style="width:440px;height: 50px">
 <!--      <p class="footer_con-p">Email:zhiqingcs@163.com</p>-->
       <p class="footer_con-p">Copyright 2007~2017, All Rights Reserved</p>
     </div>
@@ -26,7 +26,7 @@
           </ul>
         </li>
       </ul>
-      <%= link_to image_tag("/images/bigdata/edu-footer-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
+      <%= link_to image_tag("/images/bigdata/edu-footer-logo.png", width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
 <!--      <p class="inner-footer-p-big fr ml30">高校智能化教学与实训平台</p>-->
     </div>
     <div class="cl"></div>