From be2a92dcbabf47dff2e2451aafec42671493590d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 13 Aug 2017 14:41:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=92=8C=E6=88=91=E7=9A=84=E7=B2=89=E4=B8=9D=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B0=91=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_watcher_or_fans_list.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/users/_user_watcher_or_fans_list.html.erb b/app/views/users/_user_watcher_or_fans_list.html.erb index a7060556f..7c1c7f989 100644 --- a/app/views/users/_user_watcher_or_fans_list.html.erb +++ b/app/views/users/_user_watcher_or_fans_list.html.erb @@ -7,9 +7,11 @@ <% end %>

<% else %> +
<% users.each do |user| %> <%= render :partial => "users/user_fans_or_watch", :locals => {:user => user, :action => (params[:action] == "watch" || params[:action] == "unwatch") ? action : params[:action] }%> <% end %> +
<% end %>
<% if user_count > 20 %> From 0d8bd36d8736248019c56f158cf78c394c18bde8 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 13 Aug 2017 17:13:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=88=90=E9=95=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=BF=83=E5=88=97=E8=A1=A8=E2=80=9C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E2=80=9D=E4=B8=80=E5=88=97=E9=9D=A0=E5=B7=A6?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_user_experience_content.html.erb | 10 +++--- app/views/users/_user_grade_content.html.erb | 34 +++++++++---------- app/views/users/_user_tag_content.html.erb | 8 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/users/_user_experience_content.html.erb b/app/views/users/_user_experience_content.html.erb index 46ee75a1c..5acc42ad2 100644 --- a/app/views/users/_user_experience_content.html.erb +++ b/app/views/users/_user_experience_content.html.erb @@ -4,7 +4,7 @@

您还没有获得过经验值哦~

<% else %> - +
@@ -16,11 +16,11 @@ <% @user_experiences.each do |exp| %> - - + + <% game = Game.where(:id => exp.container_id).first %> - - + + <% end %> diff --git a/app/views/users/_user_grade_content.html.erb b/app/views/users/_user_grade_content.html.erb index cc31f7ef9..326fe10e6 100644 --- a/app/views/users/_user_grade_content.html.erb +++ b/app/views/users/_user_grade_content.html.erb @@ -4,7 +4,7 @@

您还没有获得过金币哦~

<% else %> -
操作
闯关+ <%= exp.score %>闯关+ <%= exp.score %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time exp.created_at %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time exp.created_at %>
+
@@ -18,29 +18,29 @@ <% case grade.container_type %> <% when 'Phone' %> - - - + + + <% when 'Mail' %> - - - + + + <% when 'Account' %> - - - + + + <% when 'Answer' %> - - + + <% game = Game.where(:id => grade.container_id).first %> - + <% when 'Game' %> - - + + <% game = Game.where(:id => grade.container_id).first %> - + <% end %> - + <% end %> diff --git a/app/views/users/_user_tag_content.html.erb b/app/views/users/_user_tag_content.html.erb index 16ff00cae..481a1d082 100644 --- a/app/views/users/_user_tag_content.html.erb +++ b/app/views/users/_user_tag_content.html.erb @@ -18,11 +18,11 @@ <% game = Game.where(:id => tag.container_id).first %> <% if game && game.challenge.challenge_tags.count > 0 %> - + <% game = Game.where(:id => tag.container_id).first %> - - - + + + <% end %> <% end %> From 49d5d648c3ce967125e6b61de2ce6308702be4ae Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 15 Aug 2017 09:20:46 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E7=9A=84=E9=A6=96=E9=A1=B5=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=BB=BA=E5=85=A5=E5=8F=A3=E7=9A=84=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E8=B0=83=E6=95=B4=20=E8=AF=BE=E7=A8=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/index.html.erb | 2 +- .../syllabuses/_syllabus_members.html.erb | 18 +++--- app/views/syllabuses/show.html.erb | 61 +++++++++++-------- public/javascripts/edu/application.js | 8 ++- public/stylesheets/css/edu-class.css | 7 ++- public/stylesheets/css/edu-common.css | 2 +- public/stylesheets/css/edu-popup.css | 1 + 7 files changed, 57 insertions(+), 42 deletions(-) diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 58e9369cd..2ea12ceb1 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -8,7 +8,7 @@
  • <%= @syllabuses_num %>
    全部
  • <%= @create_syllabuses_count + @join_syllabuses_count %>
    我的课堂
    • <%= link_to "+ 新建".html_safe, new_course_path, :class => "color-light-green fr font-16" , :style => "line-height:56px"%> - <%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr10 font-16" , :style => "line-height:56px" %> + <%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr30 font-16" , :style => "line-height:56px" %> diff --git a/app/views/syllabuses/_syllabus_members.html.erb b/app/views/syllabuses/_syllabus_members.html.erb index e46a21afa..622022e38 100644 --- a/app/views/syllabuses/_syllabus_members.html.erb +++ b/app/views/syllabuses/_syllabus_members.html.erb @@ -1,33 +1,33 @@ <% @members.each_with_index do |member, index| %> -
    +
    <% user = member.user %> <%= link_to image_tag(url_to_avatar(user), :width => "40", :height => "40", :alt => "头像",:class => "bor-radius-all"), user_path(user), :target => '_blank', :class => "fl ml15 mr15" %> -

    +

    <% if user == @syllabus.user && (User.current == @syllabus.user || User.current.admin?) %> <% if @members.count == 1 %> - 更换管理员 + 更换管理员 <% else %> - <%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 link-color-grey operation', :remote => true %> + <%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 color-grey operation', :remote => true %> <% end %> <% elsif user != @syllabus.user && @is_syllabus_member %> - 删除 + 删除 <% end %>

    - <% if index == 1 %> - + <% if index > 9 %> + 查看全部 diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index c7624dacf..d3998cba0 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -18,20 +18,27 @@ <%# end %>
    -
    操作
    绑定手机+ <%= grade.score %>用户首次绑定手机号码获得的奖励绑定手机+ <%= grade.score %>用户首次绑定手机号码获得的奖励绑定邮箱+ <%= grade.score %>用户首次绑定邮箱获得的奖励绑定邮箱+ <%= grade.score %>用户首次绑定邮箱获得的奖励完善基本资料+ <%= grade.score %>新用户首次填写基本资料获得的奖励完善基本资料+ <%= grade.score %>新用户首次填写基本资料获得的奖励查看参考答案- <%= grade.score.abs %>查看参考答案- <%= grade.score.abs %><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %>闯关+ <%= grade.score %>闯关+ <%= grade.score %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time grade.created_at %><%= format_time grade.created_at %>
    闯关闯关+ 标签：<%= game ? game.challenge.challenge_tags.map(&:name).join("、") : "" %><%= "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的标签" %><%= format_time tag.created_at %>+ 标签：<%= game ? game.challenge.challenge_tags.map(&:name).join("、") : "" %><%= "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的标签" %><%= format_time tag.created_at %>
    +
    + <% if @user_experiences.blank? %> +
    + +

    您还没有获得过经验值哦~

    +
    + <% else %> +
    - - - - + + + + <% @user_experiences.each do |exp| %> - + <% game = Game.where(:id => exp.container_id).first %> - - + + <% end %>
    操作变更详情操作时间操作变更详情操作时间
    闯关+ <%= exp.score %>+ <%= exp.score %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time exp.created_at %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time exp.created_at %>
    - + +
    +
    +
    +
    -
    -
    -
      - <%= pagination_links_full @experiences_pages, @experiences_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> -
    -
    -
    -
    +
    +
    <% end %> \ No newline at end of file diff --git a/app/views/users/_user_grade.html.erb b/app/views/users/_user_grade.html.erb index 18b25b3b5..6e3741ce6 100644 --- a/app/views/users/_user_grade.html.erb +++ b/app/views/users/_user_grade.html.erb @@ -5,6 +5,6 @@

    当前金币：<%= @user.grade %>，您可以通过<%= link_to '完善基本资料', my_account_path(), :class => "color-orange03" %> 、<%= link_to '首次绑定邮箱和手机', security_settings_path(), :class => "color-orange03" %> 以及<%= link_to '实训挑战', shixuns_path(), :class => "color-orange03" %>的方式获得金币

    -
    +
    <%= render :partial => "users/user_grade_content" %>
    diff --git a/app/views/users/_user_grade_content.html.erb b/app/views/users/_user_grade_content.html.erb index 326fe10e6..935f3a485 100644 --- a/app/views/users/_user_grade_content.html.erb +++ b/app/views/users/_user_grade_content.html.erb @@ -1,58 +1,59 @@ +
    <% if @user_grades.blank? %>

    您还没有获得过金币哦~

    <% else %> - - +
    + + + + + + + + + + <% @user_grades.each do |grade| %> - - - - + <% case grade.container_type %> + <% when 'Phone' %> + + + + <% when 'Mail' %> + + + + <% when 'Account' %> + + + + <% when 'Answer' %> + + + <% game = Game.where(:id => grade.container_id).first %> + + <% when 'Game' %> + + + <% game = Game.where(:id => grade.container_id).first %> + + <% end %> + - - - <% @user_grades.each do |grade| %> - - <% case grade.container_type %> - <% when 'Phone' %> - - - - <% when 'Mail' %> - - - - <% when 'Account' %> - - - - <% when 'Answer' %> - - - <% game = Game.where(:id => grade.container_id).first %> - - <% when 'Game' %> - - - <% game = Game.where(:id => grade.container_id).first %> - - <% end %> - - - <% end %> - -
    操作变更详情操作时间
    操作变更详情操作时间绑定手机+ <%= grade.score %>用户首次绑定手机号码获得的奖励绑定邮箱+ <%= grade.score %>用户首次绑定邮箱获得的奖励完善基本资料+ <%= grade.score %>新用户首次填写基本资料获得的奖励查看参考答案- <%= grade.score.abs %><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %>闯关+ <%= grade.score %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time grade.created_at %>
    绑定手机+ <%= grade.score %>用户首次绑定手机号码获得的奖励绑定邮箱+ <%= grade.score %>用户首次绑定邮箱获得的奖励完善基本资料+ <%= grade.score %>新用户首次填写基本资料获得的奖励查看参考答案- <%= grade.score.abs %><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %>闯关+ <%= grade.score %><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %><%= format_time grade.created_at %>
    - + <% end %> + + +
    +
    +
    +
    +
      + <%= pagination_links_full @grades_pages, @grades_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> +
    -
    -
    -
      - <%= pagination_links_full @grades_pages, @grades_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> -
    -
    -
    -
    +
    +
    <% end %> \ No newline at end of file diff --git a/app/views/users/_user_tag.html.erb b/app/views/users/_user_tag.html.erb index 2ac7e8fa0..2072a90ec 100644 --- a/app/views/users/_user_tag.html.erb +++ b/app/views/users/_user_tag.html.erb @@ -1,4 +1,4 @@

    当前技能标签：<%= @user.challenge_tags.count %>，您可以通过<%= link_to '实训挑战', shixuns_path(), :class => "color-orange03" %>的方式获得技能标签

    -
    +
    <%= render :partial => "users/user_tag_content" %>
    \ No newline at end of file diff --git a/app/views/users/_user_tag_content.html.erb b/app/views/users/_user_tag_content.html.erb index 481a1d082..c4ee38067 100644 --- a/app/views/users/_user_tag_content.html.erb +++ b/app/views/users/_user_tag_content.html.erb @@ -1,16 +1,17 @@ -<% if @user_tags.blank? || @user.challenge_tags.count == 0 %> -
    - -

    您还没有获得过技能标签哦~

    -
    -<% else %> - +
    + <% if @user_tags.blank? || @user.challenge_tags.count == 0 %> +
    + +

    您还没有获得过技能标签哦~

    +
    + <% else %> +
    - - - - + + + + @@ -20,15 +21,15 @@ <% game = Game.where(:id => tag.container_id).first %> - - - + + + <% end %> <% end %>
    操作变更详情操作时间操作变更详情操作时间
    闯关+ 标签：<%= game ? game.challenge.challenge_tags.map(&:name).join("、") : "" %><%= "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的标签" %><%= format_time tag.created_at %>+ 标签：<%= game ? game.challenge.challenge_tags.map(&:name).join("、") : "" %><%= "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的标签" %><%= format_time tag.created_at %>
    - +
    diff --git a/public/stylesheets/css/edu-admin.css b/public/stylesheets/css/edu-admin.css index 00279f232..de8a3553e 100644 --- a/public/stylesheets/css/edu-admin.css +++ b/public/stylesheets/css/edu-admin.css @@ -47,6 +47,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-filter-btn-green{background:#e4f3ec; color:#6fbb9d;} .edu-filter-btn-yellow{background:#fdefde; color:#ef9324;} .edu-filter-btn-danger{background:#d72e36; color:#fff;} + .edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;} .edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;} .edu-txt-center{ text-align: center;} @@ -54,6 +55,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-pop-table tr td{border-bottom:1px solid #eee;} .edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;} .edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;} + .edu-line{ border-bottom:1px solid #eee;} table.table-th-grey th{ background:#f5f5f5;} table.table-pa5 th,table.table-pa5 td{ padding:0 5px;} diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css index 678f3692f..a21d1b3bf 100644 --- a/public/stylesheets/css/edu-class.css +++ b/public/stylesheets/css/edu-class.css @@ -51,13 +51,14 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;} .edu-pop-table tr{ height:40px; } -.edu-pop-table tr:hover{ background: #dbdbdb; } +/*.edu-pop-table tr:hover{ background: #dbdbdb; }*/ .edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;} .edu-txt-center{ text-align: center;} .edu-pop-table tr th{ color:#333;border-bottom:1px solid #eee; } .edu-pop-table tr td{border-bottom:1px solid #eee;} .edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;} .edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;} + .edu-line{ border-bottom:1px solid #eee;} table.table-th-grey th{ background:#f5f5f5;} table.table-pa5 th,table.table-pa5 td{ padding:0 5px;} diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 03d4568fb..09c2f8dfd 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -85,7 +85,7 @@ a:hover.link-color-grey03{color:#3498db!important;} .font-28{ font-size: 28px!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;} +.mt-10{ margin-top:-10px;}.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;} .mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb50{ margin-bottom: 50px;} .ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.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;}.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;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;} @@ -243,7 +243,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-filter-btn-no-late{background: rgba(186, 205, 215, 0.35); color: #8c8c8c;} .eud-pointer{ cursor:pointer;} .edu-bg-grey{ background:#f6f6f6; width:90%; min-width:700px; color:#666;} -/* table */ +/* table-1底部边框 */ .edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;} .edu-pop-table tr{ height:40px; } .edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;} @@ -252,6 +252,14 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-pop-table tr td{border-bottom:1px solid #eee;} .edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;} .edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;} +/* table-2全边框 */ +.edu-pop-table-all{ width: 100%; border:1px solid #eee; background:#fff; color:#888;border-collapse: collapse;} +.edu-pop-table-all tr{ height:30px; } +.edu-pop-table-all tr.edu-bg-grey{ background:#f5f5f5;} +.edu-pop-table-all tr th{ color:#333;border:1px solid #eee; text-align: left;padding: 5px} +.edu-pop-table-all tr td{border:1px solid #eee;padding: 5px} + + .edu-line{ border-bottom:1px solid #eee;} table.table-th-grey th{ background:#f5f5f5;} table.table-pa5 th,table.table-pa5 td{ padding:0 5px;} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 38d778202..5f8521fa9 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -95,11 +95,11 @@ a.task-header-name{ max-width:200px;} .panel-box-sizing{-moz-box-sizing: border-box; /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; } input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;} input.panel-form-width-200{ padding:5px; height:40px; width:200px;} -input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;} +/*input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;} textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;} textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;} textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;} -textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;} +textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}*/ .panel-form-width-670{ width: 670px; padding:5px;} .panel-form-height-150{ height: 150px;} .panel-form-height-30{height: 30px;} @@ -304,7 +304,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh .lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;} .lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;} .lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;} -.lesson_content{height: 98%;border:none !important;width:100%;outline: none;padding-left: 0;} +.lesson_content{height: 39px;border:none !important;width:100%;outline: none;padding-left: 0;} /* 实训首页的搜索 */ .xy_box{padding:16px;height:180px} @@ -366,7 +366,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh .loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;display: none;} .loading_main img{border-radius: 4px;} .loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;} -.load{width: auto;top:50%;margin-top:-50px;position: relative;} +.load{width: auto;top:50%;margin-top:-100px;position: relative;} .loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;} From 7cc1b2426fc2f811e4065dd134835e8722978031 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 17 Aug 2017 10:29:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?Issues=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../managements/_shixun_mirror_list.html | 213 ++++++++++++++++++ public/stylesheets/css/edu-common.css | 4 +- public/stylesheets/css/edu-public.css | 2 +- public/stylesheets/css/taskstyle.css | 6 +- 4 files changed, 219 insertions(+), 6 deletions(-) create mode 100644 app/views/managements/_shixun_mirror_list.html diff --git a/app/views/managements/_shixun_mirror_list.html b/app/views/managements/_shixun_mirror_list.html new file mode 100644 index 000000000..808053cc7 --- /dev/null +++ b/app/views/managements/_shixun_mirror_list.html @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + +
    + +

    + 创新使者 > + 镜像管理 +

    + + + +
    + +
    + + +添加 +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号镜像ID镜像名称镜像主类别镜像小类别镜像描述状态修改时间操作
    1drfhuko4java1.8-jfinal5.0 +

    java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;

    + + + +     		+

    docert1.5;centos2.5;

    + +     		镜像是。。。。未发布2017-08-15 10:34 + 删除 + 修改 + 保存 +
    2edftg3grpython3.6-mysql1.5 +

    java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;

    + + + +     		+

    docert1.5;centos2.5;

    + + +     		镜像是。。。。已发布2017-08-15 10:34 + 修改 + 保存 +
    +
    + +
    +
    +

    镜像修改

    + +
    +
    +
    + + +
    +
    + +
    + +
      +
    • + + +
      • +
    +
    +
    +
    + +
    + +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    + + +
    +
    + + + + + + + + + +
    +
    +
    + 取消 + 确定 +
    +
    + +
    + + + diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 09c2f8dfd..ca55cc56d 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -253,10 +253,10 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498 .edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;} .edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;} /* table-2全边框 */ -.edu-pop-table-all{ width: 100%; border:1px solid #eee; background:#fff; color:#888;border-collapse: collapse;} +.edu-pop-table-all{ width: 100%; border:1px solid #eee; background:#fff; color:#888;border-collapse: collapse} .edu-pop-table-all tr{ height:30px; } .edu-pop-table-all tr.edu-bg-grey{ background:#f5f5f5;} -.edu-pop-table-all tr th{ color:#333;border:1px solid #eee; text-align: left;padding: 5px} +.edu-pop-table-all tr th{ color:#333;border:1px solid #eee; } .edu-pop-table-all tr td{border:1px solid #eee;padding: 5px} diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index c616c4400..7f36e8d9e 100644 --- a/public/stylesheets/css/edu-public.css +++ b/public/stylesheets/css/edu-public.css @@ -222,7 +222,7 @@ input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{p input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;} input.task-height-220,textarea.task-height-220,.task-height-220{height:220px;} input.task-height-150,textarea.task-height-150,.task-height-150{height:150px;} -input.task-height-150,textarea.task-height-150,.task-height-100{height:100px;} +input.task-height-100,textarea.task-height-100,.task-height-100{height:100px;} /*头像下拉弹框*/ .my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:46px; left:-97px;display: none; z-index:999;} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 5f8521fa9..061cd3a4a 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -95,11 +95,11 @@ a.task-header-name{ max-width:200px;} .panel-box-sizing{-moz-box-sizing: border-box; /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; } input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;} input.panel-form-width-200{ padding:5px; height:40px; width:200px;} -/*input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;} +input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;} textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;} textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;} textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;} -textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}*/ +textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;} .panel-form-width-670{ width: 670px; padding:5px;} .panel-form-height-150{ height: 150px;} .panel-form-height-30{height: 30px;} @@ -301,7 +301,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh .task-form-28{width: 28%;padding:0px 10px} .lesson{border:1px solid #EEEEEE;line-height:40px;} .lesson_img{position: absolute;right: 10px;top:10px;} -.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;} +.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;z-index: 10} .lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;} .lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;} .lesson_content{height: 39px;border:none !important;width:100%;outline: none;padding-left: 0;} From 4b94933540c0225267da4732d4ae7ae11ed0c096 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 17 Aug 2017 14:07:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9Issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/_subject_list.html.erb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb index f882bec81..5adb597dc 100644 --- a/app/views/subjects/_subject_list.html.erb +++ b/app/views/subjects/_subject_list.html.erb @@ -14,9 +14,6 @@
    <% else %> <% @subjects.each do |subject| %> -
    -
    -
    <% if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
    @@ -62,7 +59,6 @@
    -
    <% end %> <% end %> From 5922513e278bb3878e206f1134f1d4979f1244ad Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 18 Aug 2017 10:45:12 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=A5=97=E4=BB=B6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E7=89=88=EF=BC=88=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=B7=B2=E6=B3=A8=E9=87=8A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/_subject_list.html.erb | 35 ++++++++++++++++++++++- app/views/subjects/new.html.erb | 12 ++++++-- public/stylesheets/css/edu-common.css | 6 +++- public/stylesheets/css/edu-subject.css | 9 ++++++ public/stylesheets/css/taskstyle.css | 1 + 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb index 5adb597dc..61f53afdf 100644 --- a/app/views/subjects/_subject_list.html.erb +++ b/app/views/subjects/_subject_list.html.erb @@ -63,7 +63,40 @@ <% end %> <% end %>
    - + + <% if @subjects_count > 16 %>
    diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index 495504139..9ad122938 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -11,14 +11,22 @@ <%= labelled_form_for @subject do |f| %>
  • - +
    请输入名称
    • +
  • - +
    • +
  • <%= link_to "取消", subjects_path(), :class => "task-btn fl mr10 ml20" %> diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index ca55cc56d..cd3d1d2fd 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -386,6 +386,7 @@ input::-ms-clear{display:none;} /*---------------tab公用下边框-----------------*/ .border-bottom-orange{border-bottom: 2px solid #FC7033!important;} .bor-bottom-orange{border-bottom: 1px solid #FF9e6a!important;} +.bor-bottom-greyE{border-bottom: 1px solid #EEEEEE!important;} /*---------------边框-----------------*/ .bor-gray-c{border:1px solid #ccc;} .bor-grey-e{border:1px solid #eee;} @@ -402,4 +403,7 @@ input::-ms-clear{display:none;} /*-------------------------圆角-------------------------*/ .bor-radius-upper{border-radius: 4px 4px 0px 0px;} -.bor-radius-all{border-radius: 50%;} \ No newline at end of file +.bor-radius-all{border-radius: 50%;} + +/*-------------------------旋转-------------------------*/ +.transform90{transform: rotate(90deg);} \ No newline at end of file diff --git a/public/stylesheets/css/edu-subject.css b/public/stylesheets/css/edu-subject.css index b609c6a48..9ddbf2545 100644 --- a/public/stylesheets/css/edu-subject.css +++ b/public/stylesheets/css/edu-subject.css @@ -1,6 +1,15 @@ /*------课程实训首页---------*/ /*background: linear-gradient(to right, rgb(68, 190, 164) 0%, rgb(62, 158, 207) 100%);*/ .header-color{padding: 30px;background-image: url("../images/subject.jpg");background-size: 100%;} + +.box_bg_shandow{box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);} +.active-class .content .pre_sub-con{width:23.69%;margin: 0 1.5% 2% 0px;height: 264px;box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);} +.active-class .content .pre_sub-con:nth-child(4n+0){margin:0 0 2% 0;} +.active-class .content .pre_sub-con:hover{cursor: pointer;-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1;} +.pre-book{height: 100%;position:absolute;} +.subject-box{padding: 20px;background: #fff;text-align: center;position: relative;} +.unit-name{line-height: 15px;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 30px; word-wrap: break-word;} + .active-class .content .sub-con{width:23.69%;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 061cd3a4a..2ee46028c 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -289,6 +289,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh .g_frame{border: 1px solid #21b524;color: #21b524;padding: 5px;border-radius: 3px;} .loading-center{text-align: center; align-items: center;justify-content: center;} .two_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 60px; word-wrap: break-word;} +.three_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;height: 66px;line-height: 22px; word-wrap: break-word;} .center{vertical-align: middle;text-align: center; } .itoblock_w150{ display: block; float:left; width:150px } From bc71a63eb6864f7d19c4be48c3d8aaab869a3d06 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 18 Aug 2017 10:59:10 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BE=B9=E6=A1=86=E9=98=B4=E5=BD=B1?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8A=A0=E8=BD=BD=E6=A1=86=E9=87=8C=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/_form.html.erb | 2 +- app/views/shixuns/new.html.erb | 2 +- public/stylesheets/css/edu-common.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index 5ba904ebc..571e4f9e1 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/editormd.min.js' %> -
    +
      diff --git a/app/views/shixuns/new.html.erb b/app/views/shixuns/new.html.erb index 7c490a727..649c1ebf8 100644 --- a/app/views/shixuns/new.html.erb +++ b/app/views/shixuns/new.html.erb @@ -2,7 +2,7 @@

      <%= User.current.show_name %> > 全部实训 > 新建实训

      -
      +

      新建实训

      <%= render :partial => 'form' %> diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index cd3d1d2fd..4bdd9bf43 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -283,6 +283,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;} html>body #ajax-indicator { position: fixed; } #ajax-indicator span { + color: #333333; background-position: 0% 40%; background-repeat: no-repeat; background-image: url(/images/loading.gif);