From 7522ed948d1a9b8a0fa70b919f0a4e7e796d1a10 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 15:47:34 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_content_list.html.erb | 6 +++++- public/images/bigdata/singel.png | Bin 0 -> 991 bytes public/stylesheets/css/taskstyle.css | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 public/images/bigdata/singel.png diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb index 7a36fa413..8390b1ca0 100644 --- a/app/views/challenges/_content_list.html.erb +++ b/app/views/challenges/_content_list.html.erb @@ -13,7 +13,11 @@
<% @challenges.each_with_index do |challenge, index| -%>
-

第<%= challenge.position %>关 +

+ + + + 第<%= challenge.position %>关 <%#= link_to challenge.subject, shixun_challenge_path(@shixun.id, challenge), :target => "_blank" %> <% if User.current.manager_of_shixun?(@shixun) %> <%= link_to challenge.subject, shixun_challenge_path(@shixun, challenge), :target => "_blank" %> diff --git a/public/images/bigdata/singel.png b/public/images/bigdata/singel.png new file mode 100644 index 0000000000000000000000000000000000000000..c62175e8649f697e6eba78c9bdd04b4c342d95e2 GIT binary patch literal 991 zcmaJ=J8aWH7&fgGp-L@9VgZCWx#cP1^COOHt8Sad35|r?Dvi`gEOqQlW3~1f`-}N!86&P{bhuGMCTVd|m;H$_cWf z5|sF?C}}xf%ZZ@(u{2ufG_|Tx?!}@zoox{kXb{G6%*7Ii!%ZltstS1# ziei=`veB+jtR(A4Q+)*kMRw>0#Kk^H6|Dx|Av#MlJu1Nq2C{zCYZGl4OsoJ39G{ld z2b$*pp`JHDN2H35^ZloARND;@tfC0-gf_jn=2RLg(260l2o7r)Z}+>n+QI}!EgXPi zvD-Cpb=~zH97or>9MjY)enc$aMioP6sS4-1jwXm@QJIk>MKEMRC@F=!I#bR|1z9kp z#gZ!Yxdyg(Jmix;*E#0qhH_Iocma)UpwPXGoN|ag&@EeYhvy;;)$4Jc;kk%IxsWCU z)64zqvinEWLFsZ}UAh^VANkbrA+`3a!%GT%7AqB_P)j~GeswyX+nG$p2hEXB@xs@! z7w6mciTw`0F;WJ<-;PYr+<$c8`s))iV?0?9^4~8`|2VyWuPC=ablN|!Om<${pI6$< ZD0AlB Date: Wed, 26 Jul 2017 15:48:09 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E7=BA=BF=E7=9A=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8B=96=E6=8B=BD=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_show.html.erb | 6 ++++-- app/views/games/_repository.html.erb | 9 +++++++-- public/stylesheets/css/taskstyle.css | 6 ++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index 35755bb00..529a766f5 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -86,11 +86,13 @@
-
+
<%= render :partial => 'games/repository' %>
-
+
+
+
<%= render :partial => 'games/game_results' %> diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 8930f2d64..156a7ecd7 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -71,8 +71,13 @@ g_l('codotab_con_'+i).className='undis'; } - n == 2 ? $("#games_repository_contents").removeClass("-bg-black").addClass("-bg-weightblack") - : $("#games_repository_contents").removeClass("-bg-weightblack").addClass("-bg-black"); + if(n==2){ + $("#games_repository_contents").removeClass("-bg-black -flex-basic70").addClass("-bg-weightblack -flex-basic60"); + $("#-bg-change-color").removeClass("-bg-black").addClass("-bg-weightblack"); + }else{ + $("#games_repository_contents").removeClass("-bg-weightblack -flex-basic60").addClass("-bg-black -flex-basic70"); + $("#-bg-change-color").removeClass("-bg-weightblack").addClass("-bg-black"); + } g_l('codotab_con_'+n).className='dis -relative'; g_l('codetab_nav_'+n).className='blacktab_hover'; diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index dcf1f11a7..4b6469426 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -148,11 +148,13 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .-flex-basic40{flex-basis:auto;} .-flex-basic50{flex-basis:auto;} .b-label{width:4px;cursor:ew-resize;background:#2b2b2b;} -.h-center{height:4px;cursor:ns-resize;background:#33485F;z-index:9999;} +.h-center{height:4px;cursor:ns-resize;background:#33485F;} +.-changebg{height:3px;} .-brother{width:100%;height:100%;position:absolute;left:0;top:0;z-index:999;} .-bg-weightblack{background:#000;} +.-flex-basic70{flex:4 9 auto;} /*---------------------------------------------*/ -.-flex-basic60{flex:4 9 auto;} +.-flex-basic60{flex:none;} .-flex-basic100{flex-basis: 100%!important;} .-header-title{ max-width:500px; font-weight: normal;} .-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;} From b4711318d9f43d52e35443b594f80196f0065bf6 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 26 Jul 2017 16:53:47 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb index 4b27c9cf0..a97a70e86 100644 --- a/app/views/shixuns/index.html.erb +++ b/app/views/shixuns/index.html.erb @@ -70,7 +70,7 @@ 筛选条件
  • - 所有状态 + 所有状态
    • <% end %> \ No newline at end of file diff --git a/app/views/subjects/edit.html.erb b/app/views/subjects/edit.html.erb index 484fc7f39..623057ba3 100644 --- a/app/views/subjects/edit.html.erb +++ b/app/views/subjects/edit.html.erb @@ -22,7 +22,7 @@
  • <%= link_to "取消", subject_path(@subject), :class => "task-btn fl mr10 ml20" %> - 保存 + 保存
    • <% end %>
    diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 18d0f3506..ac69439de 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -4,45 +4,44 @@

    简介 <% if User.current.manager_of_subject?(@subject) && @subject.status == 0 %> - + <% end %>

    - +
    + <%= @subject.description.blank? ? "暂未填写" : @subject.description %> +
    <% end %>
    diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index fee400d29..354543d78 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -1002,11 +1002,11 @@ function submit_new_subject(){ } } -function submit_edit_subject(){ +function submit_edit_subject(id){ if($("#new_subject_name").val().trim() == ""){ $("#new_subject_name_notice").show(); } else{ $("#new_subject_name_notice").hide(); - $("#edit_subject").submit(); + $("#edit_subject_"+id).submit(); } } \ No newline at end of file From 433028482728dac5a1dbaea3e4ee548928bb33e0 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 19:34:27 +0800 Subject: [PATCH 09/16] =?UTF-8?q?1.=E6=96=B0=E5=BB=BATPM=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=9A=90=E8=97=8F=E6=98=BE=E7=A4=BA=E2=80=9C=E9=A2=84?= =?UTF-8?q?=E5=A4=87=E7=9F=A5=E8=AF=86=E2=80=9D=E7=BC=96=E8=BE=91=E5=9D=97?= =?UTF-8?q?=202.=E5=AE=9E=E8=AE=AD=E9=A6=96=E9=A1=B5=E9=9A=90=E8=97=8Ftab?= =?UTF-8?q?=E6=95=B4=E9=A1=B5=E2=80=9C=E9=A2=84=E5=A4=87=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/index.html.erb | 2 +- app/views/layouts/base_shixun.html.erb | 2 +- app/views/shixuns/_form.html.erb | 6 +++--- app/views/shixuns/index.html.erb | 2 +- app/views/subjects/index.html.erb | 2 +- public/stylesheets/css/edu-subject.css | 2 +- public/stylesheets/css/taskstyle.css | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 846113e1b..63b19f47a 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -2,7 +2,7 @@

    在线课堂

    - <%= link_to "+ 创建课堂".html_safe, new_course_path, :class => "fr color_white font-20" %> + <%= link_to "+ 新建".html_safe, new_course_path, :class => "task-btn task-btn-green fr mt6" %>
      diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index b584a4ce2..7684a7a95 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -27,7 +27,7 @@
      • " >实训
        • -
      • " >预备知识
        • + <% if User.current.manager_of_shixun?(@shixun) %>
      • <%= link_to l(:project_module_repository), diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index 6607e749c..f3c309809 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -28,15 +28,15 @@

        • -
      • +
      • <%= select_tag :major_id, options_for_select(shixun_major_option, 0), :id => 'shixun_major', :class => "fl task-form-30 task-height-40"%> diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb index 4b27c9cf0..760c04eb7 100644 --- a/app/views/shixuns/index.html.erb +++ b/app/views/shixuns/index.html.erb @@ -2,7 +2,7 @@

        全部实训

        - <%= link_to "+ 创建实训".html_safe, new_shixun_path, :class => "fr color_white font-20" %> + <%= link_to "+ 新建".html_safe, new_shixun_path, :class => "task-btn task-btn-green fr mt6" %>
          diff --git a/app/views/subjects/index.html.erb b/app/views/subjects/index.html.erb index 7efca3b78..355a579f2 100644 --- a/app/views/subjects/index.html.erb +++ b/app/views/subjects/index.html.erb @@ -3,7 +3,7 @@

          实训套件

          - <%= link_to "+ 创建套件".html_safe, new_subject_path(), :class => "fr color_white font-20" %> + <%= link_to "+ 新建".html_safe, new_subject_path(), :class => "task-btn task-btn-green fr mt6" %>
            diff --git a/public/stylesheets/css/edu-subject.css b/public/stylesheets/css/edu-subject.css index 21078c0fa..7a671a79d 100644 --- a/public/stylesheets/css/edu-subject.css +++ b/public/stylesheets/css/edu-subject.css @@ -1,5 +1,5 @@ /*------课程实训首页---------*/ -.header-color{background: linear-gradient(304.95deg, rgb(0, 158, 138) 0%, rgb(22, 212, 190) 100%) rgb(22, 212, 190);padding: 30px} +.header-color{background: linear-gradient(to right, rgb(68, 190, 164) 0%, rgb(62, 158, 207) 100%);padding: 30px} .active-class .content .sub-con{width:23.7%;border:1px solid #eee;background:#fff;margin: 0 1.5% 1.5% 0px;box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);} .active-class .content .sub-con:nth-child(4n+0){margin:0 0 1.5% 0;} .active-class .content .sub-con:hover{box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1;} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index a779ecd60..1ec946ed9 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -218,8 +218,8 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .task-index{ width: 1200px; margin:0 auto;} .task-index-head{ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); } /*.task-index-head-top{background-image: linear-gradient(to right, rgb(106, 177, 216) 0%, rgb(1, 74, 78) 100%);background-color: rgb(1, 70, 74); padding:30px;}*/ -.task-index-head-top{background: #1ECDCE linear-gradient(to top left, #48A7D1 0%, #1ECDCE 100%);background-color: rgb(1, 70, 74); padding:30px;} -.task-index-head-top-course{background: linear-gradient(to right, rgb(162, 171, 234) 0%, rgb(114, 123, 177) 100%);background-color:rgb(160, 175, 247); padding:30px;} +.task-index-head-top{background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);background-color: rgb(1, 70, 74); padding:30px;} +.task-index-head-top-course{background: linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);background-color:rgb(160, 175, 247); padding:30px;} .task-inde-head-title{ color:#fff; } .task-index-head-info{ background:#fff; padding:10px 30px;} .task-index-head-info li{ width:100px; float: left; text-align: center; color:#666;} From 709cfb93d53dd1aefc7b44761f7eb967fb5d5c0d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 19:39:04 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_shixun.html.erb | 2 +- app/views/shixuns/_form.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 7684a7a95..b584a4ce2 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -27,7 +27,7 @@
            • " >实训
              • - +
            • " >预备知识
              • <% if User.current.manager_of_shixun?(@shixun) %>
            • <%= link_to l(:project_module_repository), diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index f3c309809..6607e749c 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -28,15 +28,15 @@

              • - +
            • <%= select_tag :major_id, options_for_select(shixun_major_option, 0), :id => 'shixun_major', :class => "fl task-form-30 task-height-40"%> From 248ab43b10a3aab56dbaa186df089b817b14ab17 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 19:59:46 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/show.html.erb | 4 ++-- public/stylesheets/css/edu-subject.css | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 18d0f3506..f965d315d 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -60,7 +60,7 @@ <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %> <% shixun = stage_shixun.shixun %>
              -
            • +
            • <%= shixun.name %>
              • @@ -70,7 +70,7 @@
            • <%= shixun.shixun_score %>
              • -
            • +
            • <% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %> <%= shixun.shixun_status %> diff --git a/public/stylesheets/css/edu-subject.css b/public/stylesheets/css/edu-subject.css index 7a671a79d..d409e8ff9 100644 --- a/public/stylesheets/css/edu-subject.css +++ b/public/stylesheets/css/edu-subject.css @@ -30,9 +30,10 @@ .lesson-saved-list-item{border:1px solid #EEEEEE} .lesson-saved-list-item:hover .edit{color:#29bd8b!important;} .lesson-saved-list-item:hover .delete{color:#29bd8b!important;} -li.li-width55{width: 55%;text-align: left} +li.li-width63{width: 63%;text-align: left} li.li-width20{width: 20%;text-align: left} -li.li-width15{width: 15%;text-align: right} +li.li-width15{width: 15%;text-align: left} +li.li-width7{width: 7%;text-align: left} .lesson-saved-list-item{background-color: #FFFFFF} /*------课程实训首页---------*/ From 54420bcff9312d6a8eca779c225b3d4785534366 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 26 Jul 2017 20:32:13 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_my_homepage_courses_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_my_homepage_courses_list.html.erb b/app/views/users/_my_homepage_courses_list.html.erb index 1d5724e99..65a440e4f 100644 --- a/app/views/users/_my_homepage_courses_list.html.erb +++ b/app/views/users/_my_homepage_courses_list.html.erb @@ -12,7 +12,7 @@ <%= course.name %> <%= course.syllabus.title %> <%= User.where(:id => course.tea_id).first.show_name %> - <%= format_time course.updated_at %> + <%= time_from_now course.updated_at %>

              <% end %> From 0781f117826dbd85910df7f0f65964513d8aef3c Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 26 Jul 2017 20:41:09 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 ++ app/views/users/_my_homepage_shixuns_list.html.erb | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 29fbf65f0..da97508e9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -225,6 +225,8 @@ module ApplicationHelper myshixun = Myshixun.where(:shixun_id => shixun.id, :user_id => user.id).first if myshixun.nil? 0 + elsif !myshixun.nil? && myshixun.games.select{|game| game.status == 2}.count == 0 + -1 else myshixun.games.select{|game| game.status == 2}.count end diff --git a/app/views/users/_my_homepage_shixuns_list.html.erb b/app/views/users/_my_homepage_shixuns_list.html.erb index 6c9cf6156..26ca81b3f 100644 --- a/app/views/users/_my_homepage_shixuns_list.html.erb +++ b/app/views/users/_my_homepage_shixuns_list.html.erb @@ -10,9 +10,19 @@ <% @shixuns.each do |shixun| %>

              <%= shixun.name.strip %> - 已解锁第<%= had_passed_changllenge_count(shixun, @user) %>关/共<%= shixun.challenges.count %>关 + + + <% if had_passed_changllenge_count(shixun, @user) == 0 %> + 尚未挑战 + <% elsif had_passed_changllenge_count(shixun, @user) == -1 %> + 已开启第1关 / 共<%= shixun.challenges.count %>关 + <% else %> + 已完成第<%= had_passed_changllenge_count(shixun, @user) %>关 / 共<%= shixun.challenges.count %>关 + <% end %> + + <%= User.where(:id => shixun.user_id).first.show_name %> - <%= format_time shixun.created_at %> + <%= time_from_now shixun.updated_at %>更新

              <% end %> From 443266a5c088a9ece4135ff074aeb8b42bdb7b9a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 20:42:15 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=92=8C?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_public_left_info.html.erb | 12 ++++++------ app/views/users/_my_homepage_courses_list.html.erb | 6 +++--- app/views/users/_my_homepage_shixuns_list.html.erb | 4 ++-- public/stylesheets/css/edu-common.css | 2 +- public/stylesheets/css/edu-public.css | 2 +- public/stylesheets/css/edu-user.css | 2 +- public/stylesheets/css/ketang.css | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb index 691ace887..bd46d72b7 100644 --- a/app/views/layouts/_public_left_info.html.erb +++ b/app/views/layouts/_public_left_info.html.erb @@ -5,7 +5,7 @@
            - 教学 + 教学
            -->
            - 题库 + 题库
            • <%= link_to "我的题库", homework_bank_index_path(), :target => "_blank" %>
            • <%= link_to "公共题库", homework_bank_index_path(:type => 2), :target => "_blank" %>
            - 实训 + 实训
            • <%= link_to "我的实训", shixuns_user_path(User.current), :target => "_blank" %>
            • <%= link_to "新建实训", new_shixun_path, :target => "_blank" %>
              • @@ -46,7 +46,7 @@ $(function() { $(".sidebar").hover(function() { $(this).css({ - width:'60px' + width:'50px' }).stop().animate({ width:'120px' }, 400); @@ -60,7 +60,7 @@ $(this).css({ width:'120px' }).stop().animate({ - width:'60px' + width:'50px' }, 400); $(".sidebar-con .list ul li").css({ paddingTop:'15px' @@ -74,7 +74,7 @@ //页面缩放时调整整个页面和左侧导航栏的距离 $(window).resize(function() { if($(window).width()<1300){ - $(".newContainer").css("padding-left","60px"); + $(".newContainer").css("padding-left","50px"); }else{ $(".newContainer").css("padding-left","0px"); } diff --git a/app/views/users/_my_homepage_courses_list.html.erb b/app/views/users/_my_homepage_courses_list.html.erb index 1d5724e99..15e43846b 100644 --- a/app/views/users/_my_homepage_courses_list.html.erb +++ b/app/views/users/_my_homepage_courses_list.html.erb @@ -9,9 +9,9 @@
              <% @courses.each do |course| %>

              - <%= course.name %> - <%= course.syllabus.title %> - <%= User.where(:id => course.tea_id).first.show_name %> + <%= course.name %> + <%= course.syllabus.title %> + <%= User.where(:id => course.tea_id).first.show_name %> <%= format_time course.updated_at %>

              diff --git a/app/views/users/_my_homepage_shixuns_list.html.erb b/app/views/users/_my_homepage_shixuns_list.html.erb index 6c9cf6156..d341c2973 100644 --- a/app/views/users/_my_homepage_shixuns_list.html.erb +++ b/app/views/users/_my_homepage_shixuns_list.html.erb @@ -10,8 +10,8 @@ <% @shixuns.each do |shixun| %>

              <%= shixun.name.strip %> - 已解锁第<%= had_passed_changllenge_count(shixun, @user) %>关/共<%= shixun.challenges.count %>关 - <%= User.where(:id => shixun.user_id).first.show_name %> + 已解锁第<%= had_passed_changllenge_count(shixun, @user) %>关/共<%= shixun.challenges.count %>关 + <%= User.where(:id => shixun.user_id).first.show_name %> <%= format_time shixun.created_at %>

              diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 9c480269f..19d5b6e95 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -3,7 +3,7 @@ html,body{ font-size:14px; line-height:2.0; height:100%;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .newMain{ margin: 0 auto; padding-bottom: 155px; } .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px} -.newHeader{background: #46484c;width:100%; height: 50px; min-width: 1200px} +.newHeader{background: #303133;width:100%; height: 50px; min-width: 1200px} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;} diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index 310185d32..2d04c25cc 100644 --- a/public/stylesheets/css/edu-public.css +++ b/public/stylesheets/css/edu-public.css @@ -15,7 +15,7 @@ input.header-search-input{ width:150px; height:30px; padding:0 5px; border-style .new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;} .inner-nav-mes{ font-size:16px; color:#fff; margin-right:35px; margin-top:18px; } .inner-nav-cir{ background:#ff6530; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size:10px; height:17px; line-height:17px;} -.inner-nav-user{ width: 75px; height: 45px; margin-top:5px; position: relative; padding-left: 20px;} +.inner-nav-user{ width: 75px; height: 45px; margin-top:5px; position: relative; padding-left: 0px;} .inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;} select.header-search-select{ border:none; font-size:14px; padding:5px; background: none;} .edu-unlogin-nav a{ color:#fff!important; font-size:14px; line-height:50px;} diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css index 9e5fea434..688d35556 100644 --- a/public/stylesheets/css/edu-user.css +++ b/public/stylesheets/css/edu-user.css @@ -200,7 +200,7 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset; ou /*头部排版更改*/ -.lector{display: block;width: auto;padding: 0px 8px;background: cornflowerblue;color: #ffffff;font-size: 14px;margin-right: 15px;border-radius: 4px;margin-top: 3px;} +.lector{display: block;width: auto;padding: 0px 8px;background: #5ECFBA;color: #ffffff;font-size: 14px;margin-right: 15px;border-radius: 4px;margin-top: 3px;} .u-color-light-red{color: #FF6666} .u-color-light-grey{color: #CCCCCC} .user-info-span{border-radius: 50%;float:left;background: #F3F5F7;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top: 3px;margin-right: 5px} diff --git a/public/stylesheets/css/ketang.css b/public/stylesheets/css/ketang.css index 3f8c4f446..6f5e0a6e6 100644 --- a/public/stylesheets/css/ketang.css +++ b/public/stylesheets/css/ketang.css @@ -22,8 +22,8 @@ 25% {margin-top:-10px;} 50%, 100% {margin-top: 0;} } -.sidebar{width:60px;height:100%;box-shadow: 0 30px 30px 0 rgba(0, 0, 0, 0.15);position:fixed;left:0;top:0;background:#fff;} -.sidebar-top{height:50px;line-height:50px;background:#46484c;text-align:center;} +.sidebar{width:50px;height:100%;box-shadow: 0 30px 30px 0 rgba(0, 0, 0, 0.15);position:fixed;left:0;top:0;background:#fff;} +.sidebar-top{height:50px;line-height:50px;background:#35373a;text-align:center;} .sidebar-top span{color:#fff;display:none;} .sidebar-con{padding-top:20px;white-space: nowrap;} .sidebar-con .list{min-height:45px;margin-top:15px;} From a211100e34ef93707cea0bb1e7e1d6d6c90bc235 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 20:47:22 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_my_homepage_courses_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_my_homepage_courses_list.html.erb b/app/views/users/_my_homepage_courses_list.html.erb index 15e43846b..a3aa56098 100644 --- a/app/views/users/_my_homepage_courses_list.html.erb +++ b/app/views/users/_my_homepage_courses_list.html.erb @@ -12,7 +12,7 @@ <%= course.name %> <%= course.syllabus.title %> <%= User.where(:id => course.tea_id).first.show_name %> - <%= format_time course.updated_at %> + <%= time_from_now course.updated_at %>更新

              <% end %> From 5188fb70591bba480e8b04ae80ea02763e30d045 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jul 2017 21:16:45 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +++- app/views/users/_my_homepage_shixuns_list.html.erb | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index da97508e9..38aa397e7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -225,8 +225,10 @@ module ApplicationHelper myshixun = Myshixun.where(:shixun_id => shixun.id, :user_id => user.id).first if myshixun.nil? 0 - elsif !myshixun.nil? && myshixun.games.select{|game| game.status == 2}.count == 0 + elsif !myshixun.nil? && myshixun.games.select{|game| game.status == 2}.count == 0 -1 + elsif myshixun.games.select{|game| game.status == 0}.count > 0 + [myshixun.games.select{|game| game.status == 0}.count + 1] else myshixun.games.select{|game| game.status == 2}.count end diff --git a/app/views/users/_my_homepage_shixuns_list.html.erb b/app/views/users/_my_homepage_shixuns_list.html.erb index 7478766a3..f8da3a90b 100644 --- a/app/views/users/_my_homepage_shixuns_list.html.erb +++ b/app/views/users/_my_homepage_shixuns_list.html.erb @@ -16,9 +16,11 @@ <% if had_passed_changllenge_count(shixun, @user) == 0 %> 尚未挑战 <% elsif had_passed_changllenge_count(shixun, @user) == -1 %> - 已开启第1关 / 共<%= shixun.challenges.count %>关 + 已挑战至 第1关 / 共<%= shixun.challenges.count %>关 + <% elsif (had_passed_changllenge_count(shixun, @user).class == Array) %> + 已挑战至 第<%= had_passed_changllenge_count(shixun, @user)[0].to_i %>关 / 共<%= shixun.challenges.count %>关 <% else %> - 已完成第<%= had_passed_changllenge_count(shixun, @user) %>关 / 共<%= shixun.challenges.count %>关 + 已完成至 第<%= had_passed_changllenge_count(shixun, @user) %>关 / 共<%= shixun.challenges.count %>关 <% end %>