From 5c5562822bd6028e0a6eb2bc639f8104bd5e5721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 17 Apr 2019 16:50:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_shixun.html.erb | 91 +++++++++++++------ .../_new_shixun_exercise_list.html.erb | 40 ++------ public/stylesheets/educoder/edu-main.css | 61 ++++++++++++- 3 files changed, 129 insertions(+), 63 deletions(-) diff --git a/app/views/exercise/_edit_shixun.html.erb b/app/views/exercise/_edit_shixun.html.erb index 1e8fb088..3dd10e76 100644 --- a/app/views/exercise/_edit_shixun.html.erb +++ b/app/views/exercise/_edit_shixun.html.erb @@ -39,48 +39,83 @@
-
实训题
+
实训题
-
- 初级题 -
- *分值： 分/题 -
*大于等于0，且不能大于100
-
+
-
- * - 随机出题量： 题 -
*不能为空
-
*必须为正整数
-
*不能大于可用题数
-
+ 初级题 -
- 3 - 题可用 -
+
+ *分值： 分/题 +
*大于等于0，且不能大于100
+
*不能为空
+
*必须大于等于0
+
*不能大于100
+
-
+
+ * + 随机出题量： 题 +
*不能为空
+
*必须为正整数
+
*不能大于可用题数
+
-
+
+ 3 + 题可用 +
- 中级题 +
-
+
-
+
+ 命令加密ZPI压缩文件解压 + + + +
- 高级题 +
+ 命令加密ZPI压缩文件解压 + + + +
-
+
+ 命令加密ZPI压缩文件解压 + + + +
-
+
- 顶级题 -
+ + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/app/views/exercise/_new_shixun_exercise_list.html.erb b/app/views/exercise/_new_shixun_exercise_list.html.erb index 84887695..6ae106b8 100644 --- a/app/views/exercise/_new_shixun_exercise_list.html.erb +++ b/app/views/exercise/_new_shixun_exercise_list.html.erb @@ -1,22 +1,22 @@
- + - - - + + + - + <% @shixuns.each do |shixun| %> - - - + + <% end %> @@ -85,27 +85,3 @@ } - \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 583e4a15..5dea2622 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -230,6 +230,8 @@ input::-ms-clear{display:none;} .color-grey-B4{color: #B4B4B4!important;} .color-grey-74{color: #747A7F!important;} .color-f5f5f5{color: #f5f5f5!important;} +.color-afafaf{color: #afafaf!important;} + a.color-grey-name:hover,a.color-dark:hover,a.color-grey-6:hover,a.color-grey-3:hover{color: #4cacff!important;} a.color-grey-9:hover,a.color-grey-8:hover,a.color-grey-c:hover{color: #111C24!important;} /*蓝色*/ @@ -890,7 +892,7 @@ html>body #ajax-indicator { position: fixed; } .practicalTemp{ width:1200px; - height:950px; + min-height:950px; background:rgba(255,255,255,1); border:1px solid rgba(238,238,238,1); } @@ -901,7 +903,7 @@ html>body #ajax-indicator { position: fixed; } font-weight:400; color:rgba(102,102,102,1); width: 1200px; - height: 60px; + min-height: 60px; line-height: 25px; padding-left: 10px; border-bottom: 1px solid rgba(238,238,238,1); @@ -915,7 +917,7 @@ html>body #ajax-indicator { position: fixed; } .Titlefont{ width: 48px; - height: 30px; + min-height: 30px; font-size: 15px; font-family: MicrosoftYaHei; font-weight: 400; @@ -936,6 +938,59 @@ html>body #ajax-indicator { position: fixed; } margin-left: 117px; } +.colorFF8121sum{ + color: #FF8121; + font-size: 12px; + text-align: left; + width: 160px; + margin-left: 62px; +} + + .borderFF8121{ border:1px solid #FF8121 +} + +.shixunsbox{ + width: 1180px; + padding-left: 20px; + padding-bottom: 20px; + border-bottom: 1px solid rgba(238,238,238,1); +} + +.shixunsboxfont{ + width:1060px; + min-height:12px; + font-size:4px; + font-family:MicrosoftYaHei; + font-weight:400; + color:rgba(122,122,122,1); + display: inline-block; +} + +.shixundelect{ + font-size: 18px; +} + +.shixundelect:hover .color-afafaf{ + color:#5b5b5b !important; +} +.block{ + display: block; +} + +.over300{ + max-height: 300px; + overflow-y: auto; + display: block; +} +.width100p{ + width:100px; +} +.width425p{ + width:425px; +} + +.width420p{ + width:420px; } \ No newline at end of file From 73d4fd9c18be93f30b5b3c03deb238bd1ff52c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 17 Apr 2019 17:07:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_shixun.html.erb | 132 +++++++++++------------ app/views/exercise/_new_shixun.html.erb | 72 ++++++++++++- public/stylesheets/educoder/edu-main.css | 26 +++++ 3 files changed, 157 insertions(+), 73 deletions(-) diff --git a/app/views/exercise/_edit_shixun.html.erb b/app/views/exercise/_edit_shixun.html.erb index 3dd10e76..23396e40 100644 --- a/app/views/exercise/_edit_shixun.html.erb +++ b/app/views/exercise/_edit_shixun.html.erb @@ -39,83 +39,75 @@
-
实训题
- - - -
- - 初级题 - -
- *分值： 分/题 -
*大于等于0，且不能大于100
-
*不能为空
-
*必须大于等于0
-
*不能大于100
-
- -
- * - 随机出题量： 题 -
*不能为空
-
*必须为正整数
-
*不能大于可用题数
-
- -
- 3 - 题可用 -
- -
- -
- -
- 命令加密ZPI压缩文件解压 - +
实训题
+ +
+ + 初级题 + +
+ *分值： 分/题 +
*大于等于0，且不能大于100
+
*不能为空
+
*必须大于等于0
+
*不能大于100
+
+ +
+ * + 随机出题量： 题 +
*不能为空
+
*必须为正整数
+
*不能大于可用题数
+
+ +
+ 3 + 题可用 +
+ +
+ +
+ + +
- - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ +
+
+
新增实训题
+
+
+ +
  • +

    + 保存 + 取消 + + 温馨提示：[实训题]属于客观题将由系统自动评分 + +

    +
    • - -
    \ No newline at end of file + diff --git a/app/views/exercise/_new_shixun.html.erb b/app/views/exercise/_new_shixun.html.erb index 389a4b67..36a7789b 100644 --- a/app/views/exercise/_new_shixun.html.erb +++ b/app/views/exercise/_new_shixun.html.erb @@ -41,12 +41,78 @@
    -

    实训题

    +
    实训题
    -

    -

    +
    + + 初级题 + +
    + *分值： 分/题 +
    *大于等于0，且不能大于100
    +
    *不能为空
    +
    *必须大于等于0
    +
    *不能大于100
    +
    + +
    + * + 随机出题量： 题 +
    *不能为空
    +
    *必须为正整数
    +
    *不能大于可用题数
    +
    + +
    + 3 + 题可用 +
    + +
    + +
    + +
    + 命令加密ZPI压缩文件解压 + + + +
    + +
    + 命令加密ZPI压缩文件解压 + + + +
    + +
    + 命令加密ZPI压缩文件解压 + + + +
    + +
    + +
    +
    +
    新增实训题
    +
    +
    + +
  • +

    + 保存 + 取消 + + 温馨提示：[实训题]属于客观题将由系统自动评分 + +

    +
    • +
    diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 5dea2622..363ee3e8 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -958,6 +958,12 @@ html>body #ajax-indicator { position: fixed; } border-bottom: 1px solid rgba(238,238,238,1); } +.shixunsboxs{ + width: 1180px; + padding-left: 20px; + padding-bottom: 20px; +} + .shixunsboxfont{ width:1060px; min-height:12px; @@ -993,4 +999,24 @@ html>body #ajax-indicator { position: fixed; } .width420p{ width:420px; +} +.newshixunbox{ + width: 303px; + height: 40px; + background: rgba(255,255,255,1); + border: 1px solid rgba(255,104,0,1); + border-radius: 2px; + line-height: 40px; + margin: 0 auto; + margin-top: 20px; +} + +.newshixunboxfont{ + width:71px; + height:12px; + font-size:4px; + font-family:MicrosoftYaHei; + font-weight:400; + color:rgba(255,104,0,1); + margin: 0 auto; } \ No newline at end of file
    实训名称创建者级别实训名称创建者级别
    + <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3 ml20",:style=> "text-align:left", :target => "_blank" %> <%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %><%= shixun.shixun_level %><%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "mt3 task-hide" %><%= shixun.shixun_level %>