From 0aec565f5eaec2396529d327ffc8f3dd0cdb5cfd Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 10 Apr 2017 16:33:34 +0800
Subject: [PATCH 01/13] =?UTF-8?q?editorMD=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_form.html.erb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index d06791a90..ec025c3f7 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -21,7 +21,18 @@
                                         //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
                                         saveHTMLToTextarea : true,
                                         // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-                                        placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息"
+                                        placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
+                                        imageUpload : true,
+                                        imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
+                                        imageUploadURL : "" //url
+                                       /*
+                                        上传的后台只需要返回一个 JSON 数据，结构如下：
+                                        {
+                                        success : 0 | 1,           // 0 表示上传失败，1 表示上传成功
+                                        message : "提示的信息，上传成功或上传失败及错误信息等。",
+                                        url     : "图片地址"        // 上传成功时才返回
+                                        }
+                                        */
        });
 
     });

From fa21ceb07b86624c30fce9309b815ceeeebbbb92 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 10 Apr 2017 16:58:24 +0800
Subject: [PATCH 02/13] =?UTF-8?q?Codemirror=E6=A0=B7=E5=BC=8F=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8DeditorMD=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_form.html.erb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index ec025c3f7..26004ac79 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -4,7 +4,17 @@
 
 <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min' %>
 <%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %>
-
+<style>
+    .CodeMirror-scroll{
+        overflow: auto !important;
+        margin-bottom: -30px;
+        margin-right: -30px;
+        padding-bottom: 30px;
+        height: 100%;
+        outline: none;
+        position: relative;
+    }
+</style>
 <script type="text/javascript">
     $(function() {
        challenge_editormd =  editormd("challenge_ready_konewlege", {

From 65a6f2241e0cf3b551a2a84174c1f89ddca6fbfc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 11 Apr 2017 09:24:43 +0800
Subject: [PATCH 03/13] =?UTF-8?q?codemirror=E5=BF=AB=E6=8D=B7=E9=94=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_form.html.erb      | 1 +
 app/views/games/_file_edit_form.html.erb | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index 26004ac79..da036ffd9 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -31,6 +31,7 @@
                                         //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
                                         saveHTMLToTextarea : true,
                                         // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+                                        dialogMaskOpacity : 0.6,
                                         placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
                                         imageUpload : true,
                                         imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb
index b9b7f5f5b..610236f8b 100644
--- a/app/views/games/_file_edit_form.html.erb
+++ b/app/views/games/_file_edit_form.html.erb
@@ -12,11 +12,16 @@
 </form>
 
 <script type="text/javascript">
+  // 自动完成
+   /* CodeMirror.commands.autocomplete = function(cm) {
+        cm.showHint({hint: CodeMirror.hint.anyword});
+    };*/
     var editor_CodeMirror = CodeMirror.fromTextArea(document.getElementById("challenge-answer-edit-small"), {
         mode: {name: 'text/x-ruby',
            // version: 2,
             singleLineStringErrors: false},
         lineNumbers: true,
+        // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
         indentUnit: 4, //代码缩进为一个tab的距离
         matchBrackets: true,
         autoRefresh: true,

From 36f380da9571350cbcf0ccc2261d89c695c8eb34 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 11 Apr 2017 10:13:57 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=BE=E6=98=93?=
 =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20170411013813_add_evaluation_way_to_challenge.rb       | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 db/migrate/20170411013813_add_evaluation_way_to_challenge.rb

diff --git a/db/migrate/20170411013813_add_evaluation_way_to_challenge.rb b/db/migrate/20170411013813_add_evaluation_way_to_challenge.rb
new file mode 100644
index 000000000..acd77a745
--- /dev/null
+++ b/db/migrate/20170411013813_add_evaluation_way_to_challenge.rb
@@ -0,0 +1,6 @@
+class AddEvaluationWayToChallenge < ActiveRecord::Migration
+  def change
+    add_column :challenges, :evaluation_way, :integer, :default => 0
+    add_column :challenges, :difficulty, :integer, :default => 1
+  end
+end

From 5262c32475c19aa3ffbf269bf22a1222b17548cc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 11 Apr 2017 10:45:45 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=AE=9E=E8=AE=ADtpm=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_form.html.erb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index da036ffd9..138a93fd2 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -95,6 +95,11 @@
     <%= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %>
     <span style="display: none" class="c_red ml90" id="new_shixun_pass">过关任务不能为空</span>
   </li>
+  <li class="clearfix">
+    <label class="panel-form-label fl"><span class="c_red mr5">*</span>评测方式：</label>
+    <%= select_tag :evaluation, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation]', :class => "ml5", :style => "height: 28px;" %>
+  </li>
+
   <li class="clearfix">
       <% if params[:action] == "edit" && @challenge.challenge_samples.count > 0 %>
         <label class="panel-form-label fl">样例设置：</label>
@@ -189,8 +194,16 @@
     <label class=" panel-form-label fl"> 参考答案：</label>
     <%= f.text_area :answer, :class => "panel-form-width-690 panel-form-height-150 fl task-textarea-pd", :no_label => true, :style => "line-height:1.9;" %>
   </li>
+
   <li class="clearfix">
-    <label class=" panel-form-label fl"><span class="c_red mr5">*</span>分值设定：</label>
+    <label class="panel-form-label fl"><span class="c_red mr5">*</span>难易度：</label>
+    <label><%= radio_button_tag(:difficulty, 1) %>简单 </label>
+    <label><%= radio_button_tag(:difficulty, 2) %>中等 </label>
+    <label><%= radio_button_tag(:difficulty, 3) %>困难 </label>
+  </li>
+
+  <li class="clearfix">
+    <label class="panel-form-label fl"><span class="c_red mr5">*</span>分值设定：</label>
     <%= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %>
     <span class="fl ml5" style="line-height: 40px;">分</span>
     <div class="clear"></div>

From 9c2783f5e98817985b0f819dabb450a7a556e665 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 11 Apr 2017 10:48:55 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/_dir_list_content.html.erb   |  2 +-
 .../_shixun_dir_list_content.html.erb         | 35 -------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 8b7bf612b..b45305e30 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -49,7 +49,7 @@
     <script>
         $(document).ready(function(){
             $.ajax({
-                url:"<%= rep_tree_changes_shixun_path(@project, :rev => @rev, :ent_path => ent_path, :gpid => @project.gpid) %>",
+                url:"<%= repository_tree_changes_project_path(@project, :rev => @rev, :ent_path => ent_path, :gpid => @project.gpid) %>",
                 type: "GET",
                 data: "text",
                 success:function(data){
diff --git a/app/views/repositories/_shixun_dir_list_content.html.erb b/app/views/repositories/_shixun_dir_list_content.html.erb
index 4227717c4..79a9d1512 100644
--- a/app/views/repositories/_shixun_dir_list_content.html.erb
+++ b/app/views/repositories/_shixun_dir_list_content.html.erb
@@ -24,42 +24,7 @@
                      {:action => (entry.is_dir? ? 'shixun_show' : 'shixun_entry'), :id => @shixun, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
                      :class => (entry.is_dir? ? 'old-icon old-icon-folder' : "old-icon old-icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
       </td>
-      <div id="children_tree">
-        <td class="tree-author c_grey">
-          <div class="hidden"  id="changes_author_<%= tr_id %>">
-            <%#= (latest_changes.author_name) if latest_changes %>
-          </div>
-        </td>
-        <td class="tree-comments c_grey hidden">
-          <div class="hidden" id="changes_message_<%= tr_id %>">
-            <%#= (latest_changes.message) if latest_changes %>
-          </div>
-        </td>
-
-        <td class="tree-age c_grey">
-          <div class="hidden" id="changes_time_<%= tr_id %>">
-            <%# 为了转换UTC时间，时差8小时 %>
-            <%#= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes %>
-            <%#= link_to "", repository_tree_changes_project_path(@project, :rev => @rev, :ent_name => ent_name) %>
-          </div>
-        </td>
-      </div>
     </tr>
-
-    <script>
-        $(document).ready(function(){
-            $.ajax({
-                url:"<%= repository_tree_changes_project_path(@shixun, :rev => @rev, :ent_path => ent_path, :gpid => @shixun.gpid) %>",
-                type: "GET",
-                data: "text",
-                success:function(data){
-                    $('#changes_message_<%=tr_id %>').html(data.message)
-                    $('#changes_author_<%=tr_id %>').html(data.author_name)
-                    $('#changes_time_<%=tr_id %>').html(data.time)
-                }
-            });
-        });
-    </script>
 <% end %>
 
 

From 7a59b013a007e391da1547f5d9ca38fc831480b6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 11 Apr 2017 11:09:06 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb                    | 9 +++++++--
 app/helpers/application_helper.rb                        | 2 +-
 app/views/repositories/_shixun_dir_list_content.html.erb | 1 -
 app/views/shixuns/_shixun_top.html.erb                   | 5 ++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index bd92c6b9e..0511f8375 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -22,11 +22,16 @@ class ShixunsController < ApplicationController
 
   # copy_shixun：复制一个新的实训模块包括版本库
   # copy_myshixun自动创建系列game,game中只包含状态等信息，公共信息从Challeges中读取
-  #
+  # 开启过实训的则直接跳入my实训页面
   def shixun_exec
-    if has_exec_cur_shixun(@shixun) || User.current.id == @shixun.user_id
+    unless allow_shixun_exec(@shixun)
       render_403
     end
+    myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first
+    unless myshixun.blank?
+      redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun.id)
+      return
+    end
     repository = @shixun.repository
     ActiveRecord::Base.transaction do
       begin
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e9de11325..1799122c7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -276,7 +276,7 @@ module ApplicationHelper
   end
 
   def allow_shixun_exec shixun
-    (User.current.logged? && User.current.id != shixun.user_id && shixun.status == 1)
+    (User.current.logged? && User.current.id != shixun.user_id && shixun.challenges.count > 0 && !shixun.repository.blank?)
   end
 
   # 通过系统外部邮箱查找用户，如果用户不存在则用邮箱替换
diff --git a/app/views/repositories/_shixun_dir_list_content.html.erb b/app/views/repositories/_shixun_dir_list_content.html.erb
index 79a9d1512..ab6493cfa 100644
--- a/app/views/repositories/_shixun_dir_list_content.html.erb
+++ b/app/views/repositories/_shixun_dir_list_content.html.erb
@@ -16,7 +16,6 @@
                        :repository_id => @repository.identifier_param,
                        :path   => to_path_param(ent_path),
                        :rev    => @rev,
-
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
         <% end %>
diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb
index c61030f1e..7f95a51b6 100644
--- a/app/views/shixuns/_shixun_top.html.erb
+++ b/app/views/shixuns/_shixun_top.html.erb
@@ -6,10 +6,9 @@
       <span class="ml5 mr5 fl">/ </span><p class="task-header-title fl" title="<%= @shixun.name %>"><%= @shixun.name %></p>
     </h2>
     <% if allow_shixun_exec(@shixun) %>
-        <%= link_to "开始挑战", shixun_monitor_shixun_path(@shixun),
+        <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun),
                     :class => "fr task-btn task-btn-orange",
-                    :id => "challenge_begin",
-                    :remote => true %>
+                    :id => "challenge_begin" %>
     <% end %>
     <div class="cl"></div>
   </div>

From ca2e7a9c6c3e2d481d655f17245f416a661fe2a4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 11 Apr 2017 13:53:01 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPM=E8=BF=87=E5=85=B3?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BD=BF=E7=94=A8MD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_form.html.erb | 46 ++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index 138a93fd2..7c65026c2 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -45,6 +45,34 @@
                                         }
                                         */
        });
+        taskpass_editormd =  editormd("challenge_task_pass", {
+                                        width   : "89.6%",
+                                        height  : 300,
+                                        syncScrolling : "single",
+                                        //你的lib目录的路径，我这边用JSP做测试的
+                                        path    : "/editormd/lib/",
+                                        toolbarIcons : function() {
+                                            // Or return editormd.toolbarModes[name]; // full, simple, mini
+                                            // Using "||" set icons align right.
+                                            return ["bold", "italic", "|", "h1", "h2", "h3", "|", "list-ul", "list-ol", "|", "image", "code", "code-block", "|", "watch", "clear"]
+                                        },
+                                        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+                                        saveHTMLToTextarea : true,
+                                        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+                                        dialogMaskOpacity : 0.6,
+                                        placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
+                                        imageUpload : true,
+                                        imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
+                                        imageUploadURL : "" //url
+                                        /*
+                                         上传的后台只需要返回一个 JSON 数据，结构如下：
+                                         {
+                                         success : 0 | 1,           // 0 表示上传失败，1 表示上传成功
+                                         message : "提示的信息，上传成功或上传失败及错误信息等。",
+                                         url     : "图片地址"        // 上传成功时才返回
+                                         }
+                                         */
+        });
 
     });
 </script>
@@ -92,7 +120,11 @@
   <li class="clearfix">
     <label class="panel-form-label fl"><span class="c_red mr5">*</span>过关任务：</label>
     <%#= f.kindeditor :task_pass, :editor_id => "challenge_task_pass", :width=>'87.5%', :height => 159, :resizeType => 0, :no_label => true %>
-    <%= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %>
+    <%#= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %>
+    <div id="challenge_task_pass">
+      <%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %>
+      <textarea name="challenge[task_pass]" placeholder = "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务"><%= @challenge.ready_knowledge %></textarea>
+    </div>
     <span style="display: none" class="c_red ml90" id="new_shixun_pass">过关任务不能为空</span>
   </li>
   <li class="clearfix">
@@ -211,10 +243,10 @@
   </li>
   <li class="clearfix">
     <% if params[:action] == "edit" %>
-        <a href="javascript:void(0)" class="task-btn task-btn-green fr " onclick="challenge_update()">保存</a>
+        <a href="javascript:void(0)" class="task-btn task-btn-green fr" onclick="challenge_update()">保存</a>
         <a href="<%= shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="task-btn fr mr10">取消</a>
     <% else %>
-        <a href="javascript:void(0)" class="task-btn task-btn-green fr " onclick="challenge_create()">保存</a>
+        <a href="javascript:void(0)" class="task-btn task-btn-green fr" onclick="challenge_create()">保存</a>
         <a href="<%= shixun_challenges_path(@shixun) %>" class="task-btn fr mr10">取消</a>
     <% end %>
 
@@ -300,7 +332,7 @@
     function challenge_create(){
         if($('#challenge_subject').val().trim() == ""){
             $("#new_shixun_name").show();
-        }else if($("#challenge_task_pass").val().trim() == ""){
+        }else if($("#challenge_task_pass textarea").val().trim() == ""){
             $("#new_shixun_pass").show();
         }else if($("#challenge_score").val().trim()==""){
             $("#new_shixun_score").show();
@@ -312,7 +344,7 @@
     function challenge_update(){
         if($('#challenge_subject').val().trim() == ""){
             $("#new_shixun_name").show();
-        }else if($("#challenge_task_pass").val().trim() == ""){
+        }else if($("#challenge_task_pass textarea").val().trim() == ""){
             $("#new_shixun_pass").show();
         }else if($("#challenge_score").val().trim()==""){
             $("#new_shixun_score").show();
@@ -335,7 +367,7 @@
         $('#challenge_answer').val(cMirror.getValue());
     });
 
-    challenge_task_pass_editor = KindEditor.create('#challenge_task_pass',
+   /* challenge_task_pass_editor = KindEditor.create('#challenge_task_pass',
             {"width":"89.7%",
                 "resizeType":0,
                 "no_label":true,
@@ -358,7 +390,7 @@
                 "fileManagerJson":"/kindeditor/filemanager"
             });
 
-
+*/
     function add_tag(){
         var num = $(".task-bd-grey").children('div').length;
         var val = $(".task-tag-input").val().trim();

From 0be0467cb7c0947a2946ee412496898021665c59 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 11 Apr 2017 14:05:50 +0800
Subject: [PATCH 09/13] =?UTF-8?q?challenge=E6=96=B0=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8E=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=BA=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/challenges_helper.rb    | 12 ++++++++++++
 app/views/challenges/_form.html.erb |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/helpers/challenges_helper.rb b/app/helpers/challenges_helper.rb
index 86b0183c9..06d71f9bb 100644
--- a/app/helpers/challenges_helper.rb
+++ b/app/helpers/challenges_helper.rb
@@ -1,2 +1,14 @@
+# encoding: utf-8
 module ChallengesHelper
+
+  def difficulty_type difficulty
+    case difficulty
+      when 1
+        "简单"
+      when 2
+        "中等"
+      when 3
+        "复杂"
+    end
+  end
 end
diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb
index 138a93fd2..b520f705b 100644
--- a/app/views/challenges/_form.html.erb
+++ b/app/views/challenges/_form.html.erb
@@ -97,7 +97,7 @@
   </li>
   <li class="clearfix">
     <label class="panel-form-label fl"><span class="c_red mr5">*</span>评测方式：</label>
-    <%= select_tag :evaluation, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation]', :class => "ml5", :style => "height: 28px;" %>
+    <%= select_tag :evaluation_way, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation_way]', :class => "ml5", :style => "height: 28px;" %>
   </li>
 
   <li class="clearfix">
@@ -197,9 +197,9 @@
 
   <li class="clearfix">
     <label class="panel-form-label fl"><span class="c_red mr5">*</span>难易度：</label>
-    <label><%= radio_button_tag(:difficulty, 1) %>简单 </label>
-    <label><%= radio_button_tag(:difficulty, 2) %>中等 </label>
-    <label><%= radio_button_tag(:difficulty, 3) %>困难 </label>
+    <label><%= radio_button_tag("challenge[difficulty]", 1, checked = (@challenge.difficulty ==1 ? true : false)) %>简单 </label>
+    <label><%= radio_button_tag("challenge[difficulty]", 2, checked = (@challenge.difficulty ==2 ? true : false)) %>中等 </label>
+    <label><%= radio_button_tag("challenge[difficulty]", 3, checked = (@challenge.difficulty ==3 ? true : false)) %>困难 </label>
   </li>
 
   <li class="clearfix">

From 43d11c538881b15fc4a3de43659626931503eeda Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 11 Apr 2017 16:38:17 +0800
Subject: [PATCH 10/13] =?UTF-8?q?tpi=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_myshixun.html.erb  | 348 +++++++-
 public/images/task/coin.png               | Bin 0 -> 26748 bytes
 public/stylesheets/css/bigdata-common.css | 232 +++---
 public/stylesheets/css/bigdata-public.css | 161 +++-
 public/stylesheets/css/font-awesome.css   | 968 +++++++++++-----------
 public/stylesheets/css/taskstyle.css      | 167 ++--
 6 files changed, 1166 insertions(+), 710 deletions(-)
 create mode 100644 public/images/task/coin.png

diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index 86be35ea4..532aef9f1 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -9,7 +9,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build', 'css/bigdata-common','css/bigdata-public' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -18,38 +18,313 @@
 <body onload="prettyPrint();">
 <div class="cl"></div>
 
-<div class="task-container EXTENDER">
-  <div class="COLS">
-    <div class="leftbar CELL" style="width: 120px;">
-      <div class="CELL">
-        <div class="user-info" style="width: 120px;height:120px;padding-top: 10px;">
-          <%= link_to image_tag(url_to_avatar(@myshixun.owner), :width => "100", :height => "100"), user_path(@myshixun.owner), :alt => "用户头像", :class => "user-info-img", :style => "border-radius: 100px;margin-left: 5px;" %>
-          <!--<a href="#" class="user-info-img"><img src="images/user/male.jpg" width="100" height="" alt="100"></a>-->
-          <%#= link_to @myshixun.owner.try(:show_name), user_path(@myshixun.owner), :class => "user-info-name" %>
+<div class="page -layout-v -fit ">
+<div class="page--over undis" >
+  <div class="col-width-3  -scroll" style="height:100%;">
+    <div class="-task-list-header clearfix">
+      <h3 class="fl">全部任务</h3>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">01</span><h4 class=" -task-list-title fl"> 础入门Python基础入门P</h4>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">02</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础</h4>
+        <a href="#" class=" fr" title="开启"><i class="fa fa-toggle-right color-light-green font-18 mt5 " ></i></a>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">03</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础入thon基础入thon基础入thon基础入thon基础入门</h4>
+        <span  class="  fr color-light-green">正在解决</span>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">04</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基</h4>
+        <a href="#" class=" fr"> <i class="fa fa-lock fr font-18 mt5" ></i></a>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="page--header clearfix" >
+  <div class="-layout-h ml10 fl">
+    <h2 class="-header-title task-hide font-20 color-white">Helloworld:Java入门实训项目</h2>
+    <i class="fa fa-angle-right color-white font-20 ml5 mr5 mt10"></i>
+    <span class="font-20 color-white">第一关</span>
+  </div>
+  <div class="-layout-h mr10 fr mt3 -header-right-box">
+    <div class="-header-right clearfix">
+      <img src="/images/task/coin.png" class="fl" width="30" height="30">
+      <span class="ml5 color-white fl">3,000</span>
+    </div>
+    <div class="-header-right-info ">
+      <font></font>
+      <div class="-task-bar-bg"><span class="-task-bar-inner -task-widht-30"></span>3k/8K</div>
+      <span  class="font-12 color-grey">距离下次升级需要 +5000 经验值</span>
+    </div>
+  </div>
+</div>
+<div class="page--leftnav" >
+  <div class="user-info">
+    <a href="#" class="user-info-img"><img src="images/user/male.jpg" width="50" height="50" alt="头像"></a>
+    <a href="#" class="user-info-name">胡莎莎</a>
+  </div>
+  <div class="leftnav">
+    <ul>
+      <li class="leftnav-box"><a href="#" class="leftnav-box-inner leftnav-active">
+        <i class="fa fa-gamepad font-20"></i><br/><span class="font-12">当前任务</span>
+      </a></li>
+      <li class="leftnav-box"><a href="#" class="leftnav-box-inner ">
+        <i class="fa fa-qrcode font-20"></i><br/><span class="font-12">全部任务</span><span class="btn-cir ml5">123</span>
+      </a></li>
+    </ul>
+  </div>
+</div>
+<div class="page--body -margin-t-64 -flex ">
+<div class="-layout -stretch -fit">
+<div class="split-panel--first -layout -vertical -flex -relative -flex-basic50" >
+  <div class="-fit -layout-v">
+    <div class="-layout-v -flex -bg-white -task-ml80">
+      <ul id="tab_nav" class="-tab-nav">
+        <li id="tab_nav_1" class="tab_hover " onclick="HoverLi1(1);">
+          <a href="javascript:void(0);" class="tab_type">过关任务</a>
+        </li>
+        <li id="tab_nav_2"  onclick="HoverLi1(2);">
+          <a href="javascript:void(0);" class="tab_type" >预备知识</a>
+        </li>
+        <li id="tab_nav_3"  onclick="HoverLi1(3);">
+          <a href="javascript:void(0);" class="tab_type" >参考答案</a>
+        </li>
+        <span class="btn-cir-big  fr mt8 mr15" >经验值：300</span>
+      </ul>
+      <div class="cl"></div>
+      <div  class=" -flex -relative greytab-inner" >
+        <div id="tab_con_1" class=" tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div  class="-flex -scroll task-padding16">
+                <h3>第一关标题</h3>
+                <p>
+                  Python3 代码风格建议<br/>
+                  Python3 中使用注释<br/>
+                  认识 Python3 模块<br/>
+                  实验步骤<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                  Python3 中使用注释<br/>
+                  认识 Python3 模块<br/>
+                  实验步骤<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                  Python3 中使用注释<br/>
+                  认识 Python3 模块<br/>
+                  实验步骤<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                  Python3 中使用注释<br/>
+                  认识 Python3 模块<br/>
+                  实验步骤<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                  Python3 中使用注释<br/>
+                  认识 Python3 模块<br/>
+                  实验步骤<br/>
+                  1. 解释器<br/>
+                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
+                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
+                </p>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="leftnav">
-          <ul>
-            <li class="leftnav-box" style="width: 120px">
-              <a href="<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>" class="leftnav-box-inner leftnav-active" style="width: 120px" id="current_task_tab" data-remote="true">
-                <i class="fa fa-gamepad font-28"></i><br/><span class="font-16">当前任务</span>
-              </a>
-            </li>
-            <li class="leftnav-box" style="width: 120px">
-              <a href="<%= myshixun_games_path(@myshixun) %>" class="leftnav-box-inner" style="width: 120px" id="all_task_tab" data-remote="true">
-                <i class="fa fa-qrcode font-28"></i><br/><span class="font-16">全部任务</span><span class="btn-cir ml5"><%= @myshixun.games.count %></span>
-              </a>
-            </li>
-          </ul>
+        <div id="tab_con_2" class="undis tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div class="-flex -scroll task-padding16">
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div id="tab_con_3" class="undis tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div class="-flex -scroll task-padding16">
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+                <p>dafafdasf</p>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
-    <div class="rightbar CELL _FLEX ROWS">
-      <div id="myshixun_top">
-        <%= render :partial => "myshixuns/myshixun_top" %>
-      </div>
-
-      <%= yield %>
+    <div class="-layout-h -center -padding-h-16 -horizontal -footer-left" >
+      <ul class="-layout -task-ml80"  >
+        <li title="点赞"><i class="fa fa-thumbs-up mr15 font-20  " alt="赞" ></i></li>
+        <li title="踩"><i class="fa fa-thumbs-down mr15 font-20 " ></i></li>
+        <li title="纠错"><i class="fa fa-flag mr30 font-20 " ></i></li>
+      </ul>
+      <div class="cl"></div>
     </div>
+  </div>
+</div>
+<div class="split-panel--second -layout -vertical -flex -relative -flex-basic50" >
+  <div class="-layout-v -flex">
+    <div class="-flex -relative">
+      <div class="split-panel -fit -vertical">
+        <div class="-layout -stretch -fit -vertical">
+          <div class="split-panel--first -layout -vertical -flex -relative -bg-black -flex-basic60">
+            <div class="task-source-view -fit">
+              <div class="panel-header clearfix">
+                <h3 class="fl"><a href="#">testrepo</a> / <a href="#">lib</a> / <a href="#">plugins</a> / <a href="#">acts_as_searchable</a> / <span >init.rb</span></h3>
+                <div class="fr  mt5  -horizontal">
+                  <a href="#"><i class="fa fa-arrows-alt font-16  mr5"></i></a>
+                </div>
+              </div>
+              <div class="content-editor-inner">
+              </div>
+            </div>
+          </div>
+          <div class="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic40" >
+            <ul id="blacktab_nav">
+              <li id="blacktab_nav_1" class="blacktab_hover " onclick="HoverLi(1);">
+                <a href="javascript:void(0);" class="tab_type">测试结果</a>
+              </li>
+              <li id="blacktab_nav_2"  onclick="HoverLi(2);">
+                <a href="javascript:void(0);" class="tab_type" >评测信息</a>
+              </li>
+              <i class="fa fa-expand font-16 color-grey fr mt10 mr15" ></i>
+              <div class="cl"></div>
+            </ul>
+            <div class="cl"></div>
+            <div  class=" -flex -relative blacktab-inner" >
+              <div id="blacktab_con_1" class="" >
+                <div class="fit -scroll">
+                  <div class="-layout-v -fit">
+                    <div  class="-flex -scroll task-padding16">
+                      <p class="color-orange  mb10"><i class="fa fa-exclamation-circle font-16 " ></i><span class="ml5 mr5">0/11</span> 编译错误</p>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-down" ></i>
+                          <span>测试集 1</span>
+                        </div>
+                        <div class="-task-ces-info">
+                          <ul>
+                            <li><span class="-task-ces-info-left color-blue">输入：</span><span>param1：1</span></li>
+                            <li><span class="-task-ces-info-left color-blue">实际输出：</span><span>空</span></li>
+                            <li><span class="-task-ces-info-left color-blue">期望输出：</span><span>3</span></li>
+                          </ul>
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 2</span>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 3</span>
+                          <i class="fa fa-lock fr mt8" ></i>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 4</span>
+                          <i class="fa fa-exclamation-circle color-orange fr mt8" ></i>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div id="blacktab_con_2" class="undis " >
+                <div class="fit -scroll">
+                  <div class="-layout-v -fit">
+                    <div  class="-flex -scroll task-padding16 ">
+                      <p class="color-light-green mb10"><i class="fa fa-check-circle font-16 " ></i><span class="ml5 mr5">11/11</span> 全部通过</p>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-info">
+                          <ul>
+                            <li><span class="-task-ces-info-left ">样例测试：</span><span class="color-light-green">9/9</span></li>
+                            <li><span class="-task-ces-info-left">隐藏测试：</span><span class="color-light-green">9/9</span></li>
+                            <li><span class="-task-ces-info-left">经验值：</span><span class="color-light-green">+ 300</span></li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack " style="height:48px; ">
+      <div class="-flex -layout-h" >
+        <span class="mt10 -flex ml15">耗时：1天5小时10分钟</span>
+        <a href="#" class="task-btn task-btn-blue  mr15  mt8">测评</a>
+      </div>
+    </div>
+  </div>
+</div>
+</div>
 </div>
 </div>
 
@@ -69,6 +344,23 @@
       $("#current_task_tab").addClass("leftnav-active");
       $("#all_task_tab").removeClass("leftnav-active");
   });
+  function g(o){return document.getElementById(o);}
+  function HoverLi1(n){
+      for(var i=1;i<=3;i++){
+          g('tab_nav_'+i).className='tab_nomal';
+          g('tab_con_'+i).className='undis';
+      }
+      g('tab_con_'+n).className='dis';
+      g('tab_nav_'+n).className='tab_hover';
+  }
+  function HoverLi(n){
+      for(var i=1;i<=2;i++){
+          g('blacktab_nav_'+i).className='blacktab_nomal';
+          g('blacktab_con_'+i).className='undis';
+      }
+      g('blacktab_con_'+n).className='dis';
+      g('blacktab_nav_'+n).className='blacktab_hover';
+  }
 </script>
 <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %>
 </html>
diff --git a/public/images/task/coin.png b/public/images/task/coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef7ff002e1d07c012f1de5c0e68908545c767261
GIT binary patch
literal 26748
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

literal 0
HcmV?d00001

diff --git a/public/stylesheets/css/bigdata-common.css b/public/stylesheets/css/bigdata-common.css
index 04adff003..3b7811f18 100644
--- a/public/stylesheets/css/bigdata-common.css
+++ b/public/stylesheets/css/bigdata-common.css
@@ -1,114 +1,118 @@
-/* 重置样式 */
-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:12px;line-height:1.9; background:#f5f9fc; color:#333;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{text-decoration:none;color:#898989; }
-a:hover {color:#29bd8b;}
-/*万能清除浮动*/
-.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden;}
-.clearfix{clear:both;zoom:1}
-.cl{ clear: both; overflow: hidden;}
-/*通用浮动*/
-.fl{ float: left;}
-.fr{ float: right;}
-/*通用文字功能样式*/
-.font-bd{ font-weight: bold;}
-.color-red{ color:#d2322d;}
-.color-green{color:#51a74f;}
-.color-light-green{color:#29bd8b;}
-.color-blue{color:#6a8abe;}
-.color-orenge{color:#ee4a1f;}
-.color-yellow{color:#f0ad4e;}
-.color-grey{color:#888;}
-.color_white{ color:#fff;}
-a.link-color-grey{color:#888;}
-a:hover.link-color-grey{color:#29bd8b;}
-a.link-color-green{color:#29bd8b;}
-a.link-color-blue{color:#6a8abe;}
-/*通用文字大小样式*/
-.font-12{ font-size: 12px;}
-.font-14{ font-size: 14px;}
-.font-16{ font-size: 16px;}
-.font-18{ font-size: 18px;}
-.font-20{ font-size: 20px;}
-.font-24{ font-size: 24px;}
-.font-28{ font-size: 28px;}
-.font-30{ font-size: 30px;}
-/*通用内外边距*/
-.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.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;}
-.ml5{ margin-left: 5px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml50{ margin-left: 50px;}.ml230{ margin-left: 230px;}
-.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}
-.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}
-.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}
-.pl5{ padding-left:5px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}
-.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px;}
-/*定位*/
-.pr{ position: relative;}
-/*块*/
-.col-width{ background: #fff; border:1px solid #e8e8e8;}
-.col-width-10{ max-width: 100%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-9{ max-width: 90%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-8{ max-width: 80%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-7{ max-width: 70%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-6{ max-width: 60%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-5{ max-width: 50%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-4{ max-width: 40%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-3{ max-width: 30%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-2{ max-width: 20%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-1{ max-width: 10%; background: #fff; border:1px solid #e8e8e8;}
-/*按钮*/
-a.task-btn{display: inline-block;border:none; padding:0 35px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px;  height: 35px;line-height: 35px; border-radius:3px;}
-a:hover.task-btn {background: #c3c3c3; }
-a.task-btn-grey{background: #e1e1e1; cursor: pointer;}
-a:hover.task-btn-grey {background: #e1e1e1; }
-a.task-btn-green{background: #29bd8b; color: #fff;}
-a:hover.task-btn-green{background: #19b17e;}
-a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px;  height: 30px;border-radius: 3px; line-height: 30px;}
-a.new-btn:hover{background: #c3c3c3; color: #333;}
-a.new-btn-green{background: #29bd8b; color: #fff;}
-a.new-btn-green:hover{background:#19b17e; }
-a.new-btn-blue{background: #6a8abe; color: #fff;}
-a.new-btn-blue:hover{background:#5f7cab; }
-a.new-bigbtn{display: inline-block;border:none; padding:2px 30px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px;  height: 30px;line-height: 30px; border-radius: 3px;}
-a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
-a.new-bigbtn-green{background: #3b94d6; color: #fff;}
-a.new-bigbtn-green:hover{background: #2384cd; color: #fff;}
-a.task-btn-ver{ height:45px; line-height: 45px; background: #6a8abe; color: #fff; border-radius:5px; font-size:12px; padding:0 10px;}
-a.task-btn-ver-line{height:43px; line-height: 43px;  border-radius:5px; font-size:12px; padding:0 10px; border:1px solid #ccc;}
-a:hover.task-btn-ver-line{ border:1px solid #29bd8b;}
-a:hover.task-btn-ver{background:#5f7cab;}
-a.rest-btn-ver{ background: #969696; color: #fff; cursor: not-allowed}
-a:hover.rest-btn-ver{ background: #969696;}
-.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc; color:#fff !important; font-size:14px; border-radius:5px; border:none;  text-align:center;  cursor:pointer; vertical-align: middle;}
-.new_login_submit{ display: inline-block; width:100%; height:45px; line-height: 45px; background:#29bd8b; color:#fff !important; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
-.new_login_submit:hover{background: #19b17e;}
-.new_login_submit a{ color: #fff;}
-/*提示条*/
-.alert{  padding:10px;border: 1px solid transparent; text-align: center;}
-.alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}
-.alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;}
-.alert-green{ background-color: #dff0d8;border-color: #d6e9c6; color:#3c763d;}
-.close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none;  font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;}
-.close:hover{opacity: 0.5;}
-/*tag*/
-.task-tag{  padding:0 10px; text-align: center; display:inline-block; height:30px; line-height: 30px;}
-.tag-blue{ background-color: #d9edf7; color: #3a87ad;}
-.tag-grey{ background-color: #f3f5f7; color: #4d555d;}
-.tag-border-grey{ background-color: #fff;border-color: #e2e2e2; color: #888;}
-/****************************/
-/* 页面结构*/
-.task-pm-content{ width: 1000px; margin: 0 auto; }
-.task-pm-box{ width: 100%;    background: #fff; border: 1px solid #e8e8e8;}
-.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
-.task-text-center{ text-align: center;}
-.flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-/*pre标签换行*/
-.break_word{word-break: break-all;word-wrap: break-word;}
-.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
-
-.none{ display: none; }
-
-
+/* 重置样式 */
+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:12px;line-height:1.9; background:#f5f9fc; color:#333;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{text-decoration:none;color:#898989; }
+a:hover {color:#29bd8b;}
+/*万能清除浮动*/
+.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden;}
+.clearfix{clear:both;zoom:1}
+.cl{ clear: both; overflow: hidden;}
+/*通用浮动*/
+.fl{ float: left;}
+.fr{ float: right;}
+/*pre标签换行*/
+.break-word{word-break: break-all;word-wrap: break-word;}
+.break-word-firefox{white-space: pre-wrap !important;word-break: break-all;}
+/*超过隐藏*/
+.task-hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.hide-text {overflow:hidden; white-space:nowrap;}
+/*通用文字功能样式*/
+.font-bd{ font-weight: bold;}
+.color-red{ color:#d2322d;}
+.color-green{color:#51a74f;}
+.color-light-green{color:#29bd8b;}
+.color-blue{color:#3498db;}
+.color-orange{color:#ee4a1f;}
+.color-yellow{color:#f0ad4e;}
+.color-grey{color:#888;}
+.color_white{ color:#fff;}
+a.link-color-grey{color:#888;}
+a:hover.link-color-grey{color:#29bd8b;}
+a.link-color-green{color:#29bd8b;}
+a.link-color-blue{color:#6a8abe;}
+a.link-color-grey02{color:#888;}
+a:hover.link-color-grey02{ color:red;}
+/*通用文字大小样式*/
+.font-12{ font-size: 12px;}
+.font-14{ font-size: 14px;}
+.font-16{ font-size: 16px;}
+.font-18{ font-size: 18px;}
+.font-20{ font-size: 20px;}
+.font-24{ font-size: 24px;}
+.font-28{ font-size: 28px;}
+.font-30{ font-size: 30px;}
+/*通用内外边距*/
+.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.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;}
+.ml5{ margin-left: 5px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml50{ margin-left: 50px;}.ml230{ margin-left: 230px;}
+.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}
+.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}
+.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}
+.pl5{ padding-left:5px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}
+.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px;}
+/*块*/
+.col-width{ background: #fff; border:1px solid #e8e8e8;}
+.col-width-10{ max-width: 100%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-9{ max-width: 90%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-8{ max-width: 80%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-7{ max-width: 70%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-6{ max-width: 60%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-5{ max-width: 50%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-4{ max-width: 40%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-3{ max-width: 30%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-2{ max-width: 20%; background: #fff; border:1px solid #e8e8e8;}
+.col-width-1{ max-width: 10%; background: #fff; border:1px solid #e8e8e8;}
+/*按钮*/
+a.task-btn{display: inline-block;border:none; padding:0 35px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px;  height: 35px;line-height: 35px; border-radius:3px;}
+a:hover.task-btn {background: #c3c3c3; }
+a.task-btn-green{background: #29bd8b; color: #fff;}
+a:hover.task-btn-green{background: #19b17e;}
+a.task-btn-blue{background: #3498db; color:#fff!important;}
+a:hover.task-btn-blue{background: #5faee3;color:#fff;}
+a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px;  height: 30px;border-radius: 3px; line-height: 30px;}
+a.new-btn:hover{background: #c3c3c3; color: #333;}
+a.new-btn-green{background: #29bd8b; color: #fff;}
+a.new-btn-green:hover{background:#19b17e; }
+a.new-btn-blue{background: #6a8abe; color: #fff;}
+a.new-btn-blue:hover{background:#5f7cab; }
+a.new-bigbtn{display: inline-block;border:none; padding:2px 30px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px;  height: 30px;line-height: 30px; border-radius: 3px;}
+a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
+a.new-bigbtn-green{background: #3b94d6; color: #fff;}
+a.new-bigbtn-green:hover{background: #2384cd; color: #fff;}
+a.task-btn-ver{ height:45px; line-height: 45px; background: #6a8abe; color: #fff; border-radius:5px; font-size:12px; padding:0 10px;}
+a.task-btn-ver-line{height:43px; line-height: 43px;  border-radius:5px; font-size:12px; padding:0 10px; border:1px solid #ccc;}
+a:hover.task-btn-ver-line{ border:1px solid #29bd8b;}
+a:hover.task-btn-ver{background:#5f7cab;}
+.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc;  color:#fff; font-size:14px; border-radius:5px; border:none;  text-align:center;  cursor:pointer; vertical-align: middle;}
+.new_login_submit{ width:100%; height:45px; line-height: 45px; background:#29bd8b; color:#fff; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
+.new_login_submit:hover{background: #19b17e;}
+/*提示条*/
+.alert{  padding:10px;border: 1px solid transparent; text-align: center;}
+.alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}
+.alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;}
+.alert-green{ background-color: #dff0d8;border-color: #d6e9c6; color:#3c763d;}
+.task-close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none;  font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;}
+.taskclose:hover{opacity: 0.5;}
+/*tag*/
+.task-tag{  padding:0 10px; text-align: center; display:inline-block; height:30px; line-height: 30px;}
+.tag-blue{ background-color: #d9edf7; color: #3a87ad;}
+.tag-grey{ background-color: #f3f5f7; color: #4d555d;}
+.tag-border-grey{ background-color: #fff;border-color: #e2e2e2; color: #888;}
+.cir-orange{background: #ff6530;color: #fff; border-radius: 15px; padding: 0 5px; display: inline-block; font-size: 12px;  height: 16px;line-height: 16px; }
+.cir-red{background: red;color: #fff; border-radius: 15px; padding: 0 5px; display: inline-block; font-size: 12px;  height: 16px;line-height: 16px; }
+/****************************/
+/* 页面结构*/
+.task-pm-content{ width: 1000px; margin: 0 auto; }
+.task-pm-box{ width: 100%;    background: #fff; border: 1px solid #e8e8e8;}
+.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
+.task-text-center{ text-align: center;}
+.flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+/*pre标签换行*/
+.break_word{word-break: break-all;word-wrap: break-word;}
+.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
+
+
diff --git a/public/stylesheets/css/bigdata-public.css b/public/stylesheets/css/bigdata-public.css
index b28b04f64..4cfb71813 100644
--- a/public/stylesheets/css/bigdata-public.css
+++ b/public/stylesheets/css/bigdata-public.css
@@ -1,3 +1,158 @@
-
-
-
+/* 头部 */
+.header{ width:100%; height:51px;background:#46484c;  }
+.header_con{ width:1200px; height:50px; margin:0 auto;  }
+.new-logo img{ width: 31px; height: 31px; margin-top:10px;}
+.new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
+a.new-nav-a{ display: block; font-size: 14px; line-height: 50px; color:#fff;}
+a:hover.new-nav-a{ color:#3b94d6; text-decoration: none;}
+.header-search{border-radius:3px; background:#fff;}
+.header-search a:hover,a:link, a:visited{ text-decoration: none; color:#666;}
+input.header-search-input{ width:200px; height:30px; padding:0 5px; border-style: none; border: none;outline:none;}
+.innner-nav li{float:left;}
+.innner-nav li a{margin-right: 25px; display: block; color:#fff; padding:0 10px; }
+.inner-btnbox02{ width:270px; margin: 30px auto 0;}
+.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
+.inner-nav-mes{ font-size:20px; color:#fff; position: relative; margin-right:35px;}
+.inner-nav-cir{ position: absolute; top:0px; left:15px; background:#ff6530; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size:10px; height:16px; line-height:16px;}
+.inner-nav-user{ width: 55px; height: 40px; margin-top:5px; position: relative;}
+.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
+
+.task-user-dropdown{width:120px; background-color:#fff; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:relative; top:10px; right:45px; display: none; z-index:999;}
+.task-user-dropdown font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left:60px; border-style:solid; border-color: transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.task-user-dropdown-nav { padding-top:5px; }
+.task-user-dropdown-nav li { display: inline-block; text-align: center;  width:100%; height: 30px; line-height: 30px;}
+.task-user-dropdown-nav li:hover{ background:#eee;}
+li.task-line{ height: 1px; line-height: 1px; border-bottom:1px solid #eee;}
+.inner-nav-user:hover .task-user-dropdown{ display:block;}
+/* 底部 */
+.footer{width:100%; height:100px; background-color:#fff; }
+.footer_con{ width:1200px; height:100px; margin:0 auto; text-align: center;  padding:20px 0; }
+.footer_con-inner{ width: 300px; margin:0px auto;}
+.footer_con-inner li{  }
+.footer_con-inner li a{ font-size: 16px; color: #888;display: block;padding:0 15px; border-right: solid 1px #888;}
+.footer_con-inner li a:hover{text-decoration: underline;}
+.footer_con-p{ color: #888; margin-top:10px;}
+.inner-footer{ width: 100%; background:#323232; padding-bottom:30px;}
+.inner-footer_con{ width: 1200px; margin: 0 auto;}
+.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
+.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
+.saoma-box{ position: relative;}
+.img-saoma{ }
+.saoma-img-box{  position: absolute; top:-300px; left: -95px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
+.saoma-box  li:hover ul{display:block; }
+.img-show{ width:50px; height:50px; border-radius:50px; }
+.saoma-img-box font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top:289px;left: 110px; border-style:solid; border-color:#fff transparent transparent  transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
+.inner-btnbox02{ width:270px; margin: 30px auto 0;}
+.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
+/************布局 byLB****************/
+.panel-content{ width: 1200px; margin:20px auto; background:#fff;}
+/************讨论区20170321 byLB****************/
+.panel-inner-fourm{ padding:20px; border-bottom:1px solid #eee;}
+.panel-inner-fourm:hover{ background:#EFF2F7;}
+.nobg:hover{ background:#fff;}
+a.panel-list-title,.panel-list-title { display:inline-block; font-size: 16px; color: #333; font-weight:normal; max-width:82%;}
+a:hover.panel-list-title{color:#29bd8b;}
+.panel-list-img{ width: 60px; height: 60px; border-radius:100px;}
+a.panel-name-small{ display: inline-block; max-width:100px; color:#29bd8b; font-size:12px; }
+.panel-list-infobox{ width: 92%; margin-left:8%; margin-top:-70px;}
+.panel-lightgrey,.panel-lightgrey span{  font-size:12px; color:#888;}
+.panel-inner-info{ width: 92%; margin-left:8%; color:#666;}
+.panel-bg-grey{ padding:5px 0;background:#f6f6f6; width: 100%; color:#666;}
+.panel-list-nodata{ width: 420px; margin:100px auto; text-align: center;}
+
+/* 回复评论 */
+.panel-comment_item{ width: 100%; }
+.panel-comment_item .t_area{ color:#888;}
+.panel-comment_item .comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.panel-comment_item .J_Comment_Face img{ width:50px; height:50px; border-radius:100px; }
+.panel-comment_item .t_content{ width:92%; margin-left:15px;}
+.panel-comment_item a.content-username { color:#333;font-size:14px; margin-right:15px; display:inline-block; max-width:100px; font-weight: bold;}
+.panel-comment_item a:hover.content-username{color:#29bd8b;}
+.panel-comment_item .orig_user img{width:40px; height:40px;border-radius:100px; }
+.panel-comment_item .reply-right{ float:right; position:relative;}
+.panel-comment_item .reply_iconup02{ position:absolute; top:22px; left:14px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.panel-comment_item .comment_orig_content{margin:10px 0; color:#999;}
+.panel-comment_item .comment_orig_content .comment_orig_content{margin-top:0; color:#666;}
+.panel-comment_item .orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px; }
+.panel-comment_item .orig_cont_sub{ border-top:0}
+.panel-comment_item .comment_orig_content .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.panel-comment_item .comment_orig_content .orig_user{ margin:10px 15px 10px 5px;}
+.panel-comment_item .comment_orig_content .orig_user span{ color:#999; padding-right:5px;}
+.panel-comment_item .comment_orig_content .orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#666; }
+.panel-comment_item .orig_right{ width:80%; margin-top:5px;}
+.panel-comment_item a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+.panel-comment_item a:hover.comment_ding_link{ color:#269ac9;}
+.panel-comment_item .comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.panel-comment_item .comment_ding_link em{font-style: normal;font-family:arial;}
+.panel-comment_item .comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.panel-comment_item .comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.panel-comment_item .comment_content{ color:#666;}
+.panel-comment_item .t_txt{ margin-top:10px;}
+.panel-comment_item .orig_reply_box{border-top:1px solid #e3e3e3; width:100%;}
+.panel-comment_item .orig_textarea02{ border:1px solid #ccc; background-color:#fff; width:92%;  margin-bottom:10px;}
+.panel-comment_item .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.panel-comment_item .orig_sub:hover{ background:#297fb8;}
+.panel-comment_item .orig_cont_hide{ text-align:center; width:100%; display:block; font-size:14px; color:#666; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.panel-comment_item .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+.orig_reply{ font-size: 12px; }
+.panel-mes-head{ padding:10px; border-bottom:1px solid #eee;}
+/* 表格 */
+.panel-new-table { width:100%; text-align: center; }
+.panel-new-table tr th{ color:#333; height: 50px;line-height:50px; }
+.panel-new-table tr th,.panel-new-table tr td{ border-bottom:1px solid #eee; }
+.panel-new-table tr td{color:#666; height: 40px; line-height:40px;}
+.panel-table-pd15 tr td{ padding:15px 0;}
+.panel-new-table tbody tr:hover{ background:#f9f9f9;}
+a.panel-table-name{display:block; max-width:100px;text-align:center;}
+a.panel-table-title{display:block; max-width:240px;text-align:center;}
+.table-num{ width:5%; text-align: center;}
+/* 滑动条 */
+.panel-slider-bg{ width:240px; height: 15px; border-radius:15px; background:#f1f2f7; }
+.panel-slider-inner01{ display:block;  width:10%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner02{ display:block;  width:20%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner03{ display:block;  width:30%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner04{ display:block;  width:40%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner05{ display:block;  width:50%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner06{ display:block;  width:60%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner07{ display:block;  width:70%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner08{ display:block;  width:80%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner09{ display:block;  width:90%; height: 15px; border-radius:15px; background:#29bd8b;}
+.panel-slider-inner10{ display:block;  width:100%; height: 15px; border-radius:15px; background:#29bd8b;}
+/* 翻页 */
+.panel-pages a{ display: inline-block;  border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:0 10px; margin-right:5px; height: 30px; line-height: 30px; }
+.panel-pages a:hover,.panel-pages .active{  background-color:#29bd8b; border:1px solid #29bd8b;color:#fff; }
+.panel-pages{ width: 350px; margin:20px auto;}
+/* 搜索*/
+.panel-search{ position: relative;}
+input.panel-search-input{ height: 30px; width:300px; color: #666;}
+.panel-search-btn{ position: absolute; top:2px; right:10px;}
+/* 表单*/
+.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; font-weight: normal; }
+.panel-form input,.panel-form textarea,.panel-form select{ border:1px solid #e2e2e2;color:#666;line-height: 1.9; background:#fff;}
+.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; }
+input.panel-form-width-100{ padding:5px;width:100%; height:40px;}
+input.panel-form-width-45{ padding:5px;width:44.5%; height:40px; }
+textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; }
+textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; }
+.panel-form-width-670{ width: 670px; padding:5px;}
+.panel-form-height-150{ height: 150px;}
+.panel-form-height-30{height: 30px;}
+.task-bg-grey{ background:#f3f3f3; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3; color:#888;}
+.panel-form-p{}
+
+input.task-form-10,textarea.task-form-10,select.task-form-10,.task-form-10{padding:5px;width:10%;}
+input.task-form-20,textarea.task-form-20,select.task-form-20,.task-form-20{padding:5px;width:20%;}
+input.task-form-30,textarea.task-form-30,select.task-form-30,.task-form-30{padding:5px;width:30%;}
+input.task-form-35,textarea.task-form-35,select.task-form-35,.task-form-35{padding:5px;width:35%;}
+input.task-form-40,textarea.task-form-40,select.task-form-40,.task-form-40{padding:5px;width:40%;}
+input.task-form-50,textarea.task-form-50,select.task-form-50,.task-form-50{padding:5px;width:50%;}
+input.task-form-60,textarea.task-form-60,select.task-form-60,.task-form-60{padding:5px;width:60%;}
+input.task-form-70,textarea.task-form-70,select.task-form-70,.task-form-70{padding:5px;width:70%;}
+input.task-form-80,textarea.task-form-80,select.task-form-80,.task-form-80{padding:5px;width:80%;}
+input.task-form-90,textarea.task-form-90,select.task-form-90,.task-form-90{padding:5px;width:90%;}
+input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{padding:5px;width:100%;}
+input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;}
+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;}
diff --git a/public/stylesheets/css/font-awesome.css b/public/stylesheets/css/font-awesome.css
index 9388a728c..048cff973 100644
--- a/public/stylesheets/css/font-awesome.css
+++ b/public/stylesheets/css/font-awesome.css
@@ -5,1334 +5,1334 @@
 /* FONT PATH
  * -------------------------- */
 @font-face {
-    font-family: 'FontAwesome';
-    src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
-    src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
-    font-weight: normal;
-    font-style: normal;
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
 }
 .fa {
-    display: inline-block;
-    font-family: FontAwesome;
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  display: inline-block;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
-    font-size: 1.3333333333333333em;
-    line-height: 0.75em;
-    vertical-align: -15%;
+  font-size: 1.3333333333333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
 }
 .fa-2x {
-    font-size: 2em;
+  font-size: 2em;
 }
 .fa-3x {
-    font-size: 3em;
+  font-size: 3em;
 }
 .fa-4x {
-    font-size: 4em;
+  font-size: 4em;
 }
 .fa-5x {
-    font-size: 5em;
+  font-size: 5em;
 }
 .fa-fw {
-    width: 1.2857142857142858em;
-    text-align: center;
+  width: 1.2857142857142858em;
+  text-align: center;
 }
 .fa-ul {
-    padding-left: 0;
-    margin-left: 2.142857142857143em;
-    list-style-type: none;
+  padding-left: 0;
+  margin-left: 2.142857142857143em;
+  list-style-type: none;
 }
 .fa-ul > li {
-    position: relative;
+  position: relative;
 }
 .fa-li {
-    position: absolute;
-    left: -2.142857142857143em;
-    width: 2.142857142857143em;
-    top: 0.14285714285714285em;
-    text-align: center;
+  position: absolute;
+  left: -2.142857142857143em;
+  width: 2.142857142857143em;
+  top: 0.14285714285714285em;
+  text-align: center;
 }
 .fa-li.fa-lg {
-    left: -1.8571428571428572em;
+  left: -1.8571428571428572em;
 }
 .fa-border {
-    padding: .2em .25em .15em;
-    border: solid 0.08em #eeeeee;
-    border-radius: .1em;
+  padding: .2em .25em .15em;
+  border: solid 0.08em #eeeeee;
+  border-radius: .1em;
 }
 .pull-right {
-    float: right;
+  float: right;
 }
 .pull-left {
-    float: left;
+  float: left;
 }
 .fa.pull-left {
-    margin-right: .3em;
+  margin-right: .3em;
 }
 .fa.pull-right {
-    margin-left: .3em;
+  margin-left: .3em;
 }
 .fa-spin {
-    -webkit-animation: spin 2s infinite linear;
-    -moz-animation: spin 2s infinite linear;
-    -o-animation: spin 2s infinite linear;
-    animation: spin 2s infinite linear;
+  -webkit-animation: spin 2s infinite linear;
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
 }
 @-moz-keyframes spin {
-    0% {
-        -moz-transform: rotate(0deg);
-    }
-    100% {
-        -moz-transform: rotate(359deg);
-    }
+  0% {
+    -moz-transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+  }
 }
 @-webkit-keyframes spin {
-    0% {
-        -webkit-transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(359deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
 }
 @-o-keyframes spin {
-    0% {
-        -o-transform: rotate(0deg);
-    }
-    100% {
-        -o-transform: rotate(359deg);
-    }
+  0% {
+    -o-transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+  }
 }
 @-ms-keyframes spin {
-    0% {
-        -ms-transform: rotate(0deg);
-    }
-    100% {
-        -ms-transform: rotate(359deg);
-    }
+  0% {
+    -ms-transform: rotate(0deg);
+  }
+  100% {
+    -ms-transform: rotate(359deg);
+  }
 }
 @keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-    100% {
-        transform: rotate(359deg);
-    }
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(359deg);
+  }
 }
 .fa-rotate-90 {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    -o-transform: rotate(90deg);
-    transform: rotate(90deg);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -webkit-transform: rotate(90deg);
+  -moz-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  -o-transform: rotate(90deg);
+  transform: rotate(90deg);
 }
 .fa-rotate-180 {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-    -webkit-transform: rotate(180deg);
-    -moz-transform: rotate(180deg);
-    -ms-transform: rotate(180deg);
-    -o-transform: rotate(180deg);
-    transform: rotate(180deg);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  -o-transform: rotate(180deg);
+  transform: rotate(180deg);
 }
 .fa-rotate-270 {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-    -webkit-transform: rotate(270deg);
-    -moz-transform: rotate(270deg);
-    -ms-transform: rotate(270deg);
-    -o-transform: rotate(270deg);
-    transform: rotate(270deg);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -webkit-transform: rotate(270deg);
+  -moz-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  -o-transform: rotate(270deg);
+  transform: rotate(270deg);
 }
 .fa-flip-horizontal {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
-    -webkit-transform: scale(-1, 1);
-    -moz-transform: scale(-1, 1);
-    -ms-transform: scale(-1, 1);
-    -o-transform: scale(-1, 1);
-    transform: scale(-1, 1);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -webkit-transform: scale(-1, 1);
+  -moz-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  -o-transform: scale(-1, 1);
+  transform: scale(-1, 1);
 }
 .fa-flip-vertical {
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
-    -webkit-transform: scale(1, -1);
-    -moz-transform: scale(1, -1);
-    -ms-transform: scale(1, -1);
-    -o-transform: scale(1, -1);
-    transform: scale(1, -1);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -webkit-transform: scale(1, -1);
+  -moz-transform: scale(1, -1);
+  -ms-transform: scale(1, -1);
+  -o-transform: scale(1, -1);
+  transform: scale(1, -1);
 }
 .fa-stack {
-    position: relative;
-    display: inline-block;
-    width: 2em;
-    height: 2em;
-    line-height: 2em;
-    vertical-align: middle;
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
 }
 .fa-stack-1x,
 .fa-stack-2x {
-    position: absolute;
-    left: 0;
-    width: 100%;
-    text-align: center;
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
 }
 .fa-stack-1x {
-    line-height: inherit;
+  line-height: inherit;
 }
 .fa-stack-2x {
-    font-size: 2em;
+  font-size: 2em;
 }
 .fa-inverse {
-    color: #ffffff;
+  color: #ffffff;
 }
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 .fa-glass:before {
-    content: "\f000";
+  content: "\f000";
 }
 .fa-music:before {
-    content: "\f001";
+  content: "\f001";
 }
 .fa-search:before {
-    content: "\f002";
+  content: "\f002";
 }
 .fa-envelope-o:before {
-    content: "\f003";
+  content: "\f003";
 }
 .fa-heart:before {
-    content: "\f004";
+  content: "\f004";
 }
 .fa-star:before {
-    content: "\f005";
+  content: "\f005";
 }
 .fa-star-o:before {
-    content: "\f006";
+  content: "\f006";
 }
 .fa-user:before {
-    content: "\f007";
+  content: "\f007";
 }
 .fa-film:before {
-    content: "\f008";
+  content: "\f008";
 }
 .fa-th-large:before {
-    content: "\f009";
+  content: "\f009";
 }
 .fa-th:before {
-    content: "\f00a";
+  content: "\f00a";
 }
 .fa-th-list:before {
-    content: "\f00b";
+  content: "\f00b";
 }
 .fa-check:before {
-    content: "\f00c";
+  content: "\f00c";
 }
 .fa-times:before {
-    content: "\f00d";
+  content: "\f00d";
 }
 .fa-search-plus:before {
-    content: "\f00e";
+  content: "\f00e";
 }
 .fa-search-minus:before {
-    content: "\f010";
+  content: "\f010";
 }
 .fa-power-off:before {
-    content: "\f011";
+  content: "\f011";
 }
 .fa-signal:before {
-    content: "\f012";
+  content: "\f012";
 }
 .fa-gear:before,
 .fa-cog:before {
-    content: "\f013";
+  content: "\f013";
 }
 .fa-trash-o:before {
-    content: "\f014";
+  content: "\f014";
 }
 .fa-home:before {
-    content: "\f015";
+  content: "\f015";
 }
 .fa-file-o:before {
-    content: "\f016";
+  content: "\f016";
 }
 .fa-clock-o:before {
-    content: "\f017";
+  content: "\f017";
 }
 .fa-road:before {
-    content: "\f018";
+  content: "\f018";
 }
 .fa-download:before {
-    content: "\f019";
+  content: "\f019";
 }
 .fa-arrow-circle-o-down:before {
-    content: "\f01a";
+  content: "\f01a";
 }
 .fa-arrow-circle-o-up:before {
-    content: "\f01b";
+  content: "\f01b";
 }
 .fa-inbox:before {
-    content: "\f01c";
+  content: "\f01c";
 }
 .fa-play-circle-o:before {
-    content: "\f01d";
+  content: "\f01d";
 }
 .fa-rotate-right:before,
 .fa-repeat:before {
-    content: "\f01e";
+  content: "\f01e";
 }
 .fa-refresh:before {
-    content: "\f021";
+  content: "\f021";
 }
 .fa-list-alt:before {
-    content: "\f022";
+  content: "\f022";
 }
 .fa-lock:before {
-    content: "\f023";
+  content: "\f023";
 }
 .fa-flag:before {
-    content: "\f024";
+  content: "\f024";
 }
 .fa-headphones:before {
-    content: "\f025";
+  content: "\f025";
 }
 .fa-volume-off:before {
-    content: "\f026";
+  content: "\f026";
 }
 .fa-volume-down:before {
-    content: "\f027";
+  content: "\f027";
 }
 .fa-volume-up:before {
-    content: "\f028";
+  content: "\f028";
 }
 .fa-qrcode:before {
-    content: "\f029";
+  content: "\f029";
 }
 .fa-barcode:before {
-    content: "\f02a";
+  content: "\f02a";
 }
 .fa-tag:before {
-    content: "\f02b";
+  content: "\f02b";
 }
 .fa-tags:before {
-    content: "\f02c";
+  content: "\f02c";
 }
 .fa-book:before {
-    content: "\f02d";
+  content: "\f02d";
 }
 .fa-bookmark:before {
-    content: "\f02e";
+  content: "\f02e";
 }
 .fa-print:before {
-    content: "\f02f";
+  content: "\f02f";
 }
 .fa-camera:before {
-    content: "\f030";
+  content: "\f030";
 }
 .fa-font:before {
-    content: "\f031";
+  content: "\f031";
 }
 .fa-bold:before {
-    content: "\f032";
+  content: "\f032";
 }
 .fa-italic:before {
-    content: "\f033";
+  content: "\f033";
 }
 .fa-text-height:before {
-    content: "\f034";
+  content: "\f034";
 }
 .fa-text-width:before {
-    content: "\f035";
+  content: "\f035";
 }
 .fa-align-left:before {
-    content: "\f036";
+  content: "\f036";
 }
 .fa-align-center:before {
-    content: "\f037";
+  content: "\f037";
 }
 .fa-align-right:before {
-    content: "\f038";
+  content: "\f038";
 }
 .fa-align-justify:before {
-    content: "\f039";
+  content: "\f039";
 }
 .fa-list:before {
-    content: "\f03a";
+  content: "\f03a";
 }
 .fa-dedent:before,
 .fa-outdent:before {
-    content: "\f03b";
+  content: "\f03b";
 }
 .fa-indent:before {
-    content: "\f03c";
+  content: "\f03c";
 }
 .fa-video-camera:before {
-    content: "\f03d";
+  content: "\f03d";
 }
 .fa-picture-o:before {
-    content: "\f03e";
+  content: "\f03e";
 }
 .fa-pencil:before {
-    content: "\f040";
+  content: "\f040";
 }
 .fa-map-marker:before {
-    content: "\f041";
+  content: "\f041";
 }
 .fa-adjust:before {
-    content: "\f042";
+  content: "\f042";
 }
 .fa-tint:before {
-    content: "\f043";
+  content: "\f043";
 }
 .fa-edit:before,
 .fa-pencil-square-o:before {
-    content: "\f044";
+  content: "\f044";
 }
 .fa-share-square-o:before {
-    content: "\f045";
+  content: "\f045";
 }
 .fa-check-square-o:before {
-    content: "\f046";
+  content: "\f046";
 }
 .fa-arrows:before {
-    content: "\f047";
+  content: "\f047";
 }
 .fa-step-backward:before {
-    content: "\f048";
+  content: "\f048";
 }
 .fa-fast-backward:before {
-    content: "\f049";
+  content: "\f049";
 }
 .fa-backward:before {
-    content: "\f04a";
+  content: "\f04a";
 }
 .fa-play:before {
-    content: "\f04b";
+  content: "\f04b";
 }
 .fa-pause:before {
-    content: "\f04c";
+  content: "\f04c";
 }
 .fa-stop:before {
-    content: "\f04d";
+  content: "\f04d";
 }
 .fa-forward:before {
-    content: "\f04e";
+  content: "\f04e";
 }
 .fa-fast-forward:before {
-    content: "\f050";
+  content: "\f050";
 }
 .fa-step-forward:before {
-    content: "\f051";
+  content: "\f051";
 }
 .fa-eject:before {
-    content: "\f052";
+  content: "\f052";
 }
 .fa-chevron-left:before {
-    content: "\f053";
+  content: "\f053";
 }
 .fa-chevron-right:before {
-    content: "\f054";
+  content: "\f054";
 }
 .fa-plus-circle:before {
-    content: "\f055";
+  content: "\f055";
 }
 .fa-minus-circle:before {
-    content: "\f056";
+  content: "\f056";
 }
 .fa-times-circle:before {
-    content: "\f057";
+  content: "\f057";
 }
 .fa-check-circle:before {
-    content: "\f058";
+  content: "\f058";
 }
 .fa-question-circle:before {
-    content: "\f059";
+  content: "\f059";
 }
 .fa-info-circle:before {
-    content: "\f05a";
+  content: "\f05a";
 }
 .fa-crosshairs:before {
-    content: "\f05b";
+  content: "\f05b";
 }
 .fa-times-circle-o:before {
-    content: "\f05c";
+  content: "\f05c";
 }
 .fa-check-circle-o:before {
-    content: "\f05d";
+  content: "\f05d";
 }
 .fa-ban:before {
-    content: "\f05e";
+  content: "\f05e";
 }
 .fa-arrow-left:before {
-    content: "\f060";
+  content: "\f060";
 }
 .fa-arrow-right:before {
-    content: "\f061";
+  content: "\f061";
 }
 .fa-arrow-up:before {
-    content: "\f062";
+  content: "\f062";
 }
 .fa-arrow-down:before {
-    content: "\f063";
+  content: "\f063";
 }
 .fa-mail-forward:before,
 .fa-share:before {
-    content: "\f064";
+  content: "\f064";
 }
 .fa-expand:before {
-    content: "\f065";
+  content: "\f065";
 }
 .fa-compress:before {
-    content: "\f066";
+  content: "\f066";
 }
 .fa-plus:before {
-    content: "\f067";
+  content: "\f067";
 }
 .fa-minus:before {
-    content: "\f068";
+  content: "\f068";
 }
 .fa-asterisk:before {
-    content: "\f069";
+  content: "\f069";
 }
 .fa-exclamation-circle:before {
-    content: "\f06a";
+  content: "\f06a";
 }
 .fa-gift:before {
-    content: "\f06b";
+  content: "\f06b";
 }
 .fa-leaf:before {
-    content: "\f06c";
+  content: "\f06c";
 }
 .fa-fire:before {
-    content: "\f06d";
+  content: "\f06d";
 }
 .fa-eye:before {
-    content: "\f06e";
+  content: "\f06e";
 }
 .fa-eye-slash:before {
-    content: "\f070";
+  content: "\f070";
 }
 .fa-warning:before,
 .fa-exclamation-triangle:before {
-    content: "\f071";
+  content: "\f071";
 }
 .fa-plane:before {
-    content: "\f072";
+  content: "\f072";
 }
 .fa-calendar:before {
-    content: "\f073";
+  content: "\f073";
 }
 .fa-random:before {
-    content: "\f074";
+  content: "\f074";
 }
 .fa-comment:before {
-    content: "\f075";
+  content: "\f075";
 }
 .fa-magnet:before {
-    content: "\f076";
+  content: "\f076";
 }
 .fa-chevron-up:before {
-    content: "\f077";
+  content: "\f077";
 }
 .fa-chevron-down:before {
-    content: "\f078";
+  content: "\f078";
 }
 .fa-retweet:before {
-    content: "\f079";
+  content: "\f079";
 }
 .fa-shopping-cart:before {
-    content: "\f07a";
+  content: "\f07a";
 }
 .fa-folder:before {
-    content: "\f07b";
+  content: "\f07b";
 }
 .fa-folder-open:before {
-    content: "\f07c";
+  content: "\f07c";
 }
 .fa-arrows-v:before {
-    content: "\f07d";
+  content: "\f07d";
 }
 .fa-arrows-h:before {
-    content: "\f07e";
+  content: "\f07e";
 }
 .fa-bar-chart-o:before {
-    content: "\f080";
+  content: "\f080";
 }
 .fa-twitter-square:before {
-    content: "\f081";
+  content: "\f081";
 }
 .fa-facebook-square:before {
-    content: "\f082";
+  content: "\f082";
 }
 .fa-camera-retro:before {
-    content: "\f083";
+  content: "\f083";
 }
 .fa-key:before {
-    content: "\f084";
+  content: "\f084";
 }
 .fa-gears:before,
 .fa-cogs:before {
-    content: "\f085";
+  content: "\f085";
 }
 .fa-comments:before {
-    content: "\f086";
+  content: "\f086";
 }
 .fa-thumbs-o-up:before {
-    content: "\f087";
+  content: "\f087";
 }
 .fa-thumbs-o-down:before {
-    content: "\f088";
+  content: "\f088";
 }
 .fa-star-half:before {
-    content: "\f089";
+  content: "\f089";
 }
 .fa-heart-o:before {
-    content: "\f08a";
+  content: "\f08a";
 }
 .fa-sign-out:before {
-    content: "\f08b";
+  content: "\f08b";
 }
 .fa-linkedin-square:before {
-    content: "\f08c";
+  content: "\f08c";
 }
 .fa-thumb-tack:before {
-    content: "\f08d";
+  content: "\f08d";
 }
 .fa-external-link:before {
-    content: "\f08e";
+  content: "\f08e";
 }
 .fa-sign-in:before {
-    content: "\f090";
+  content: "\f090";
 }
 .fa-trophy:before {
-    content: "\f091";
+  content: "\f091";
 }
 .fa-github-square:before {
-    content: "\f092";
+  content: "\f092";
 }
 .fa-upload:before {
-    content: "\f093";
+  content: "\f093";
 }
 .fa-lemon-o:before {
-    content: "\f094";
+  content: "\f094";
 }
 .fa-phone:before {
-    content: "\f095";
+  content: "\f095";
 }
 .fa-square-o:before {
-    content: "\f096";
+  content: "\f096";
 }
 .fa-bookmark-o:before {
-    content: "\f097";
+  content: "\f097";
 }
 .fa-phone-square:before {
-    content: "\f098";
+  content: "\f098";
 }
 .fa-twitter:before {
-    content: "\f099";
+  content: "\f099";
 }
 .fa-facebook:before {
-    content: "\f09a";
+  content: "\f09a";
 }
 .fa-github:before {
-    content: "\f09b";
+  content: "\f09b";
 }
 .fa-unlock:before {
-    content: "\f09c";
+  content: "\f09c";
 }
 .fa-credit-card:before {
-    content: "\f09d";
+  content: "\f09d";
 }
 .fa-rss:before {
-    content: "\f09e";
+  content: "\f09e";
 }
 .fa-hdd-o:before {
-    content: "\f0a0";
+  content: "\f0a0";
 }
 .fa-bullhorn:before {
-    content: "\f0a1";
+  content: "\f0a1";
 }
 .fa-bell:before {
-    content: "\f0f3";
+  content: "\f0f3";
 }
 .fa-certificate:before {
-    content: "\f0a3";
+  content: "\f0a3";
 }
 .fa-hand-o-right:before {
-    content: "\f0a4";
+  content: "\f0a4";
 }
 .fa-hand-o-left:before {
-    content: "\f0a5";
+  content: "\f0a5";
 }
 .fa-hand-o-up:before {
-    content: "\f0a6";
+  content: "\f0a6";
 }
 .fa-hand-o-down:before {
-    content: "\f0a7";
+  content: "\f0a7";
 }
 .fa-arrow-circle-left:before {
-    content: "\f0a8";
+  content: "\f0a8";
 }
 .fa-arrow-circle-right:before {
-    content: "\f0a9";
+  content: "\f0a9";
 }
 .fa-arrow-circle-up:before {
-    content: "\f0aa";
+  content: "\f0aa";
 }
 .fa-arrow-circle-down:before {
-    content: "\f0ab";
+  content: "\f0ab";
 }
 .fa-globe:before {
-    content: "\f0ac";
+  content: "\f0ac";
 }
 .fa-wrench:before {
-    content: "\f0ad";
+  content: "\f0ad";
 }
 .fa-tasks:before {
-    content: "\f0ae";
+  content: "\f0ae";
 }
 .fa-filter:before {
-    content: "\f0b0";
+  content: "\f0b0";
 }
 .fa-briefcase:before {
-    content: "\f0b1";
+  content: "\f0b1";
 }
 .fa-arrows-alt:before {
-    content: "\f0b2";
+  content: "\f0b2";
 }
 .fa-group:before,
 .fa-users:before {
-    content: "\f0c0";
+  content: "\f0c0";
 }
 .fa-chain:before,
 .fa-link:before {
-    content: "\f0c1";
+  content: "\f0c1";
 }
 .fa-cloud:before {
-    content: "\f0c2";
+  content: "\f0c2";
 }
 .fa-flask:before {
-    content: "\f0c3";
+  content: "\f0c3";
 }
 .fa-cut:before,
 .fa-scissors:before {
-    content: "\f0c4";
+  content: "\f0c4";
 }
 .fa-copy:before,
 .fa-files-o:before {
-    content: "\f0c5";
+  content: "\f0c5";
 }
 .fa-paperclip:before {
-    content: "\f0c6";
+  content: "\f0c6";
 }
 .fa-save:before,
 .fa-floppy-o:before {
-    content: "\f0c7";
+  content: "\f0c7";
 }
 .fa-square:before {
-    content: "\f0c8";
+  content: "\f0c8";
 }
 .fa-bars:before {
-    content: "\f0c9";
+  content: "\f0c9";
 }
 .fa-list-ul:before {
-    content: "\f0ca";
+  content: "\f0ca";
 }
 .fa-list-ol:before {
-    content: "\f0cb";
+  content: "\f0cb";
 }
 .fa-strikethrough:before {
-    content: "\f0cc";
+  content: "\f0cc";
 }
 .fa-underline:before {
-    content: "\f0cd";
+  content: "\f0cd";
 }
 .fa-table:before {
-    content: "\f0ce";
+  content: "\f0ce";
 }
 .fa-magic:before {
-    content: "\f0d0";
+  content: "\f0d0";
 }
 .fa-truck:before {
-    content: "\f0d1";
+  content: "\f0d1";
 }
 .fa-pinterest:before {
-    content: "\f0d2";
+  content: "\f0d2";
 }
 .fa-pinterest-square:before {
-    content: "\f0d3";
+  content: "\f0d3";
 }
 .fa-google-plus-square:before {
-    content: "\f0d4";
+  content: "\f0d4";
 }
 .fa-google-plus:before {
-    content: "\f0d5";
+  content: "\f0d5";
 }
 .fa-money:before {
-    content: "\f0d6";
+  content: "\f0d6";
 }
 .fa-caret-down:before {
-    content: "\f0d7";
+  content: "\f0d7";
 }
 .fa-caret-up:before {
-    content: "\f0d8";
+  content: "\f0d8";
 }
 .fa-caret-left:before {
-    content: "\f0d9";
+  content: "\f0d9";
 }
 .fa-caret-right:before {
-    content: "\f0da";
+  content: "\f0da";
 }
 .fa-columns:before {
-    content: "\f0db";
+  content: "\f0db";
 }
 .fa-unsorted:before,
 .fa-sort:before {
-    content: "\f0dc";
+  content: "\f0dc";
 }
 .fa-sort-down:before,
 .fa-sort-asc:before {
-    content: "\f0dd";
+  content: "\f0dd";
 }
 .fa-sort-up:before,
 .fa-sort-desc:before {
-    content: "\f0de";
+  content: "\f0de";
 }
 .fa-envelope:before {
-    content: "\f0e0";
+  content: "\f0e0";
 }
 .fa-linkedin:before {
-    content: "\f0e1";
+  content: "\f0e1";
 }
 .fa-rotate-left:before,
 .fa-undo:before {
-    content: "\f0e2";
+  content: "\f0e2";
 }
 .fa-legal:before,
 .fa-gavel:before {
-    content: "\f0e3";
+  content: "\f0e3";
 }
 .fa-dashboard:before,
 .fa-tachometer:before {
-    content: "\f0e4";
+  content: "\f0e4";
 }
 .fa-comment-o:before {
-    content: "\f0e5";
+  content: "\f0e5";
 }
 .fa-comments-o:before {
-    content: "\f0e6";
+  content: "\f0e6";
 }
 .fa-flash:before,
 .fa-bolt:before {
-    content: "\f0e7";
+  content: "\f0e7";
 }
 .fa-sitemap:before {
-    content: "\f0e8";
+  content: "\f0e8";
 }
 .fa-umbrella:before {
-    content: "\f0e9";
+  content: "\f0e9";
 }
 .fa-paste:before,
 .fa-clipboard:before {
-    content: "\f0ea";
+  content: "\f0ea";
 }
 .fa-lightbulb-o:before {
-    content: "\f0eb";
+  content: "\f0eb";
 }
 .fa-exchange:before {
-    content: "\f0ec";
+  content: "\f0ec";
 }
 .fa-cloud-download:before {
-    content: "\f0ed";
+  content: "\f0ed";
 }
 .fa-cloud-upload:before {
-    content: "\f0ee";
+  content: "\f0ee";
 }
 .fa-user-md:before {
-    content: "\f0f0";
+  content: "\f0f0";
 }
 .fa-stethoscope:before {
-    content: "\f0f1";
+  content: "\f0f1";
 }
 .fa-suitcase:before {
-    content: "\f0f2";
+  content: "\f0f2";
 }
 .fa-bell-o:before {
-    content: "\f0a2";
+  content: "\f0a2";
 }
 .fa-coffee:before {
-    content: "\f0f4";
+  content: "\f0f4";
 }
 .fa-cutlery:before {
-    content: "\f0f5";
+  content: "\f0f5";
 }
 .fa-file-text-o:before {
-    content: "\f0f6";
+  content: "\f0f6";
 }
 .fa-building-o:before {
-    content: "\f0f7";
+  content: "\f0f7";
 }
 .fa-hospital-o:before {
-    content: "\f0f8";
+  content: "\f0f8";
 }
 .fa-ambulance:before {
-    content: "\f0f9";
+  content: "\f0f9";
 }
 .fa-medkit:before {
-    content: "\f0fa";
+  content: "\f0fa";
 }
 .fa-fighter-jet:before {
-    content: "\f0fb";
+  content: "\f0fb";
 }
 .fa-beer:before {
-    content: "\f0fc";
+  content: "\f0fc";
 }
 .fa-h-square:before {
-    content: "\f0fd";
+  content: "\f0fd";
 }
 .fa-plus-square:before {
-    content: "\f0fe";
+  content: "\f0fe";
 }
 .fa-angle-double-left:before {
-    content: "\f100";
+  content: "\f100";
 }
 .fa-angle-double-right:before {
-    content: "\f101";
+  content: "\f101";
 }
 .fa-angle-double-up:before {
-    content: "\f102";
+  content: "\f102";
 }
 .fa-angle-double-down:before {
-    content: "\f103";
+  content: "\f103";
 }
 .fa-angle-left:before {
-    content: "\f104";
+  content: "\f104";
 }
 .fa-angle-right:before {
-    content: "\f105";
+  content: "\f105";
 }
 .fa-angle-up:before {
-    content: "\f106";
+  content: "\f106";
 }
 .fa-angle-down:before {
-    content: "\f107";
+  content: "\f107";
 }
 .fa-desktop:before {
-    content: "\f108";
+  content: "\f108";
 }
 .fa-laptop:before {
-    content: "\f109";
+  content: "\f109";
 }
 .fa-tablet:before {
-    content: "\f10a";
+  content: "\f10a";
 }
 .fa-mobile-phone:before,
 .fa-mobile:before {
-    content: "\f10b";
+  content: "\f10b";
 }
 .fa-circle-o:before {
-    content: "\f10c";
+  content: "\f10c";
 }
 .fa-quote-left:before {
-    content: "\f10d";
+  content: "\f10d";
 }
 .fa-quote-right:before {
-    content: "\f10e";
+  content: "\f10e";
 }
 .fa-spinner:before {
-    content: "\f110";
+  content: "\f110";
 }
 .fa-circle:before {
-    content: "\f111";
+  content: "\f111";
 }
 .fa-mail-reply:before,
 .fa-reply:before {
-    content: "\f112";
+  content: "\f112";
 }
 .fa-github-alt:before {
-    content: "\f113";
+  content: "\f113";
 }
 .fa-folder-o:before {
-    content: "\f114";
+  content: "\f114";
 }
 .fa-folder-open-o:before {
-    content: "\f115";
+  content: "\f115";
 }
 .fa-smile-o:before {
-    content: "\f118";
+  content: "\f118";
 }
 .fa-frown-o:before {
-    content: "\f119";
+  content: "\f119";
 }
 .fa-meh-o:before {
-    content: "\f11a";
+  content: "\f11a";
 }
 .fa-gamepad:before {
-    content: "\f11b";
+  content: "\f11b";
 }
 .fa-keyboard-o:before {
-    content: "\f11c";
+  content: "\f11c";
 }
 .fa-flag-o:before {
-    content: "\f11d";
+  content: "\f11d";
 }
 .fa-flag-checkered:before {
-    content: "\f11e";
+  content: "\f11e";
 }
 .fa-terminal:before {
-    content: "\f120";
+  content: "\f120";
 }
 .fa-code:before {
-    content: "\f121";
+  content: "\f121";
 }
 .fa-reply-all:before {
-    content: "\f122";
+  content: "\f122";
 }
 .fa-mail-reply-all:before {
-    content: "\f122";
+  content: "\f122";
 }
 .fa-star-half-empty:before,
 .fa-star-half-full:before,
 .fa-star-half-o:before {
-    content: "\f123";
+  content: "\f123";
 }
 .fa-location-arrow:before {
-    content: "\f124";
+  content: "\f124";
 }
 .fa-crop:before {
-    content: "\f125";
+  content: "\f125";
 }
 .fa-code-fork:before {
-    content: "\f126";
+  content: "\f126";
 }
 .fa-unlink:before,
 .fa-chain-broken:before {
-    content: "\f127";
+  content: "\f127";
 }
 .fa-question:before {
-    content: "\f128";
+  content: "\f128";
 }
 .fa-info:before {
-    content: "\f129";
+  content: "\f129";
 }
 .fa-exclamation:before {
-    content: "\f12a";
+  content: "\f12a";
 }
 .fa-superscript:before {
-    content: "\f12b";
+  content: "\f12b";
 }
 .fa-subscript:before {
-    content: "\f12c";
+  content: "\f12c";
 }
 .fa-eraser:before {
-    content: "\f12d";
+  content: "\f12d";
 }
 .fa-puzzle-piece:before {
-    content: "\f12e";
+  content: "\f12e";
 }
 .fa-microphone:before {
-    content: "\f130";
+  content: "\f130";
 }
 .fa-microphone-slash:before {
-    content: "\f131";
+  content: "\f131";
 }
 .fa-shield:before {
-    content: "\f132";
+  content: "\f132";
 }
 .fa-calendar-o:before {
-    content: "\f133";
+  content: "\f133";
 }
 .fa-fire-extinguisher:before {
-    content: "\f134";
+  content: "\f134";
 }
 .fa-rocket:before {
-    content: "\f135";
+  content: "\f135";
 }
 .fa-maxcdn:before {
-    content: "\f136";
+  content: "\f136";
 }
 .fa-chevron-circle-left:before {
-    content: "\f137";
+  content: "\f137";
 }
 .fa-chevron-circle-right:before {
-    content: "\f138";
+  content: "\f138";
 }
 .fa-chevron-circle-up:before {
-    content: "\f139";
+  content: "\f139";
 }
 .fa-chevron-circle-down:before {
-    content: "\f13a";
+  content: "\f13a";
 }
 .fa-html5:before {
-    content: "\f13b";
+  content: "\f13b";
 }
 .fa-css3:before {
-    content: "\f13c";
+  content: "\f13c";
 }
 .fa-anchor:before {
-    content: "\f13d";
+  content: "\f13d";
 }
 .fa-unlock-alt:before {
-    content: "\f13e";
+  content: "\f13e";
 }
 .fa-bullseye:before {
-    content: "\f140";
+  content: "\f140";
 }
 .fa-ellipsis-h:before {
-    content: "\f141";
+  content: "\f141";
 }
 .fa-ellipsis-v:before {
-    content: "\f142";
+  content: "\f142";
 }
 .fa-rss-square:before {
-    content: "\f143";
+  content: "\f143";
 }
 .fa-play-circle:before {
-    content: "\f144";
+  content: "\f144";
 }
 .fa-ticket:before {
-    content: "\f145";
+  content: "\f145";
 }
 .fa-minus-square:before {
-    content: "\f146";
+  content: "\f146";
 }
 .fa-minus-square-o:before {
-    content: "\f147";
+  content: "\f147";
 }
 .fa-level-up:before {
-    content: "\f148";
+  content: "\f148";
 }
 .fa-level-down:before {
-    content: "\f149";
+  content: "\f149";
 }
 .fa-check-square:before {
-    content: "\f14a";
+  content: "\f14a";
 }
 .fa-pencil-square:before {
-    content: "\f14b";
+  content: "\f14b";
 }
 .fa-external-link-square:before {
-    content: "\f14c";
+  content: "\f14c";
 }
 .fa-share-square:before {
-    content: "\f14d";
+  content: "\f14d";
 }
 .fa-compass:before {
-    content: "\f14e";
+  content: "\f14e";
 }
 .fa-toggle-down:before,
 .fa-caret-square-o-down:before {
-    content: "\f150";
+  content: "\f150";
 }
 .fa-toggle-up:before,
 .fa-caret-square-o-up:before {
-    content: "\f151";
+  content: "\f151";
 }
 .fa-toggle-right:before,
 .fa-caret-square-o-right:before {
-    content: "\f152";
+  content: "\f152";
 }
 .fa-euro:before,
 .fa-eur:before {
-    content: "\f153";
+  content: "\f153";
 }
 .fa-gbp:before {
-    content: "\f154";
+  content: "\f154";
 }
 .fa-dollar:before,
 .fa-usd:before {
-    content: "\f155";
+  content: "\f155";
 }
 .fa-rupee:before,
 .fa-inr:before {
-    content: "\f156";
+  content: "\f156";
 }
 .fa-cny:before,
 .fa-rmb:before,
 .fa-yen:before,
 .fa-jpy:before {
-    content: "\f157";
+  content: "\f157";
 }
 .fa-ruble:before,
 .fa-rouble:before,
 .fa-rub:before {
-    content: "\f158";
+  content: "\f158";
 }
 .fa-won:before,
 .fa-krw:before {
-    content: "\f159";
+  content: "\f159";
 }
 .fa-bitcoin:before,
 .fa-btc:before {
-    content: "\f15a";
+  content: "\f15a";
 }
 .fa-file:before {
-    content: "\f15b";
+  content: "\f15b";
 }
 .fa-file-text:before {
-    content: "\f15c";
+  content: "\f15c";
 }
 .fa-sort-alpha-asc:before {
-    content: "\f15d";
+  content: "\f15d";
 }
 .fa-sort-alpha-desc:before {
-    content: "\f15e";
+  content: "\f15e";
 }
 .fa-sort-amount-asc:before {
-    content: "\f160";
+  content: "\f160";
 }
 .fa-sort-amount-desc:before {
-    content: "\f161";
+  content: "\f161";
 }
 .fa-sort-numeric-asc:before {
-    content: "\f162";
+  content: "\f162";
 }
 .fa-sort-numeric-desc:before {
-    content: "\f163";
+  content: "\f163";
 }
 .fa-thumbs-up:before {
-    content: "\f164";
+  content: "\f164";
 }
 .fa-thumbs-down:before {
-    content: "\f165";
+  content: "\f165";
 }
 .fa-youtube-square:before {
-    content: "\f166";
+  content: "\f166";
 }
 .fa-youtube:before {
-    content: "\f167";
+  content: "\f167";
 }
 .fa-xing:before {
-    content: "\f168";
+  content: "\f168";
 }
 .fa-xing-square:before {
-    content: "\f169";
+  content: "\f169";
 }
 .fa-youtube-play:before {
-    content: "\f16a";
+  content: "\f16a";
 }
 .fa-dropbox:before {
-    content: "\f16b";
+  content: "\f16b";
 }
 .fa-stack-overflow:before {
-    content: "\f16c";
+  content: "\f16c";
 }
 .fa-instagram:before {
-    content: "\f16d";
+  content: "\f16d";
 }
 .fa-flickr:before {
-    content: "\f16e";
+  content: "\f16e";
 }
 .fa-adn:before {
-    content: "\f170";
+  content: "\f170";
 }
 .fa-bitbucket:before {
-    content: "\f171";
+  content: "\f171";
 }
 .fa-bitbucket-square:before {
-    content: "\f172";
+  content: "\f172";
 }
 .fa-tumblr:before {
-    content: "\f173";
+  content: "\f173";
 }
 .fa-tumblr-square:before {
-    content: "\f174";
+  content: "\f174";
 }
 .fa-long-arrow-down:before {
-    content: "\f175";
+  content: "\f175";
 }
 .fa-long-arrow-up:before {
-    content: "\f176";
+  content: "\f176";
 }
 .fa-long-arrow-left:before {
-    content: "\f177";
+  content: "\f177";
 }
 .fa-long-arrow-right:before {
-    content: "\f178";
+  content: "\f178";
 }
 .fa-apple:before {
-    content: "\f179";
+  content: "\f179";
 }
 .fa-windows:before {
-    content: "\f17a";
+  content: "\f17a";
 }
 .fa-android:before {
-    content: "\f17b";
+  content: "\f17b";
 }
 .fa-linux:before {
-    content: "\f17c";
+  content: "\f17c";
 }
 .fa-dribbble:before {
-    content: "\f17d";
+  content: "\f17d";
 }
 .fa-skype:before {
-    content: "\f17e";
+  content: "\f17e";
 }
 .fa-foursquare:before {
-    content: "\f180";
+  content: "\f180";
 }
 .fa-trello:before {
-    content: "\f181";
+  content: "\f181";
 }
 .fa-female:before {
-    content: "\f182";
+  content: "\f182";
 }
 .fa-male:before {
-    content: "\f183";
+  content: "\f183";
 }
 .fa-gittip:before {
-    content: "\f184";
+  content: "\f184";
 }
 .fa-sun-o:before {
-    content: "\f185";
+  content: "\f185";
 }
 .fa-moon-o:before {
-    content: "\f186";
+  content: "\f186";
 }
 .fa-archive:before {
-    content: "\f187";
+  content: "\f187";
 }
 .fa-bug:before {
-    content: "\f188";
+  content: "\f188";
 }
 .fa-vk:before {
-    content: "\f189";
+  content: "\f189";
 }
 .fa-weibo:before {
-    content: "\f18a";
+  content: "\f18a";
 }
 .fa-renren:before {
-    content: "\f18b";
+  content: "\f18b";
 }
 .fa-pagelines:before {
-    content: "\f18c";
+  content: "\f18c";
 }
 .fa-stack-exchange:before {
-    content: "\f18d";
+  content: "\f18d";
 }
 .fa-arrow-circle-o-right:before {
-    content: "\f18e";
+  content: "\f18e";
 }
 .fa-arrow-circle-o-left:before {
-    content: "\f190";
+  content: "\f190";
 }
 .fa-toggle-left:before,
 .fa-caret-square-o-left:before {
-    content: "\f191";
+  content: "\f191";
 }
 .fa-dot-circle-o:before {
-    content: "\f192";
+  content: "\f192";
 }
 .fa-wheelchair:before {
-    content: "\f193";
+  content: "\f193";
 }
 .fa-vimeo-square:before {
-    content: "\f194";
+  content: "\f194";
 }
 .fa-turkish-lira:before,
 .fa-try:before {
-    content: "\f195";
+  content: "\f195";
 }
 .fa-plus-square-o:before {
-    content: "\f196";
+  content: "\f196";
 }
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index eda401803..076182302 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -2,92 +2,26 @@
 a:link,a:visited{text-decoration:none;color:#898989;}
 a:hover {color:#29bd8b;}
 body{ font-size:14px; line-height:2.0;}
-/*万能清除浮动*/
-.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
-.clearfix{clear:both;zoom:1}
-.cl{ clear: both; overflow: hidden;}
-/*通用浮动*/
-.fl{ float: left;}
-.fr{ float: right;}
-/*通用文字功能样式*/
-.color-red{ color:#d2322d;}
-.color-green{color:#51a74f;}
-.color-light-green{color:#29bd8b;}
-.color-blue{color:#2788d0;}
-.color-orenge{color:#ee4a1f;}
-.color-yellow{color:#f0ad4e;}
-.color-grey{color:#888;}
-a.link-color-grey{color:#888;}
-a:hover.link-color-grey{color:#29bd8b;}
-a.link-color-green{color:#29bd8b;}
-/*通用文字大小样式*/
-.font-14{ font-size: 14px;}
-.font-16{ font-size: 16px;}
-.font-18{ font-size: 18px;}
-.font-20{ font-size: 20px;}
-.font-24{ font-size: 24px;}
-.font-28{ font-size: 28px;}
-.font-30{ font-size: 30px;}
-/*通用内外边距*/
-.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt7{ margin-top:7px;}.mt10{ margin-top:10px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}
-.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}
-.ml5{ margin-left: 5px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml19{margin-left: 19px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml230{ margin-left: 230px;}
-.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr45{margin-right:45px;}
-.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}
-.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}
-.pl5{ padding-left:5px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}
-.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px;}
-/*块*/
-.col-width{background: #fff; border:1px solid #e8e8e8;}
-.col-width2{background: #fff;}
-.col-width-10{ max-width: 100%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-9{ max-width: 90%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-8{ max-width: 80%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-7{ max-width: 70%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-6{ max-width: 60%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-5{ max-width: 50%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-4{ max-width: 40%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-3{ max-width: 30%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-2{ max-width: 20%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-1{ max-width: 10%; background: #fff; border:1px solid #e8e8e8;}
 
-/*按钮*/
-a.task-btn{display: inline-block;border:none; padding:0 32px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px;  height: 35px;line-height: 35px; border-radius:3px;}
-a:hover.task-btn {background: #c3c3c3; }
-a.task-btn-green{background: #29bd8b; color: #fff;}
-a:hover.task-btn-green{background: #19b17e;}
-a.task-btn-orange{ background:#fc8675; color:#fff;}
-a:hover.task-btn-orange{ background:#e27869;}
-a.task-btn-blue{ background:#6a8abe; color:#fff;}
-a:hover.task-btn-blue{ background:#5f7cab;}
-/*提示条*/
-.alert{  padding:10px;border: 1px solid transparent; text-align: center;}
-.alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}
-.alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;}
-.alert-green{ background-color: #dff0d8;border-color: #d6e9c6; color:#3c763d;}
-.task-close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none;  font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;}
-.task-close:hover{opacity: 0.5;}
-/*tag*/
-.task-tag{  padding:0 10px; text-align: center; display:inline-block; height:30px; line-height: 30px;}
-.tag-blue{ background-color: #d9edf7; color: #3a87ad;}
-.tag-grey{ background-color: #f3f5f7; color: #4d555d;}
-.tag-border-grey{ background-color: #fff;border-color: #e2e2e2; color: #888;}
-/****************************/
 .task-container{ min-width:1300px; margin:0 auto; background: #f5f9fc; position: relative;}
 /*左侧导航*/
-.leftbar{  height: 100%; background: #1f212d; width: 210px;}
-.user-info{ width: 210px; height:180px; background:#29bd8b; padding-top:30px;}
-a.user-info-img{ display: block; width: 100px; height: 100px; margin:0 auto;  }
-a.user-info-img img{border-radius:100px;border:5px solid #3fcf9e;}
-a.user-info-img img:hover{border:5px solid #4cdeac;}
-a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 20px auto; text-align: center;}
-.leftnav-box{ width: 210px; height: 100px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
-a.leftnav-box-inner{ display: block; width: 207px; height:80px; border-left:3px solid #292b3a; background:#292b3a;  text-align: center; padding-top:20px; color:#575f6c;}
-a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #29bd8b;color: #fff;  }
-.btn-cir{ background:#575f6c; color:#292b3a;display: inline-block; padding:0px 5px; border-radius:25px; border-radius:15px;  line-height:20px; font-size:12px;}
+.leftbar{  height: 100%; background: #1f212d; width:80px;}
+.user-info{ width:80px; height:100px;  padding-top:15px;}
+a.user-info-img{ display: block; width: 50px; height: 50px; margin:0 auto;  }
+a.user-info-img img{border-radius:100px;border:2px solid #666;}
+a.user-info-img img:hover{border:2px solid #888;}
+a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;}
+.leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
+a.leftnav-box-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; padding:10px 0; color:#575f6c;}
+a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff;  }
+.btn-cir{ background:#575f6c; color:#292b3a;display: inline-block; padding:0px 5px; border-radius:25px; border-radius:15px;  line-height:20px; height: 20px; font-size:12px;}
 .btn-cir:hover{background:#fff;}
 .btn-cir-grey{background: #e1e1e1;color: #333;}
 .btn-cir-grey:hover{background: #c3c3c3;}
+.btn-cir-red{background:red;color: #fff; font-weight: normal;}
+.btn-cir-red:hover{background:red;}
+.btn-cir-orange{ background: #ee4a1f; color: #fff;}
+.btn-cir-orange:hover{ background: #ee4a1f; color: #fff;}
 /*右侧头部*/
 .rightbar-header{width: 100%; background:#282c37; height:60px; min-width:1000px;}
 .rightbar-score{ margin-top: 17px; font-size: 14px; margin-right:20px;}
@@ -101,7 +35,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
 .content-row{ padding:15px; }
 .content-info{ width:49.5%; min-width:250px;}
 .content-editor{  width:49.3%; min-width:250px; margin-left:15px; }
-.panel-header{  border-bottom:1px solid #eee; padding:10px 15px;}
+.panel-header{  border-bottom:1px solid #515151; padding:5px 15px; color:#898989;}
 .panel-header-border{  border:1px solid #eee; padding:10px 15px; border-bottom:none;}
 /* tab */
 .tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
@@ -181,3 +115,74 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
 .content-half-fix02{margin:0; position: absolute; top:65px; z-index:99; right:45px;}
 .content-history-extend{ height: 98%;overflow:auto;}
 .task-bg-grey .prettyprint{font-size: 9pt;font-family: Courier New,Arial;border: 1px solid #ddd;border-left: 5px solid #6CE26C;background: #f6f6f6;padding: 5px;}
+/* 左右版TPI 20170410byLB */
+.-fit { position: absolute; top: 0;  right: 0;  bottom: 0;  left: 0;}
+.-layout-v { display: flex; flex-direction: column;}
+.page--header { position: fixed;top: 0; left:80px; right: 0; z-index: 9000;background:#33485F; height:44px; padding:10px 0; color:#fff;}
+.page--leftnav{position: fixed;top:0; left:0; right: 0; z-index: 9001;width:80px; height:100%;background:#282c37;}
+.page--body { position: relative;}
+.-margin-t-64 { margin-top: 64px;}
+.-flex { flex: 1;}
+.split-panel.-fit {position: absolute;}
+.split-panel { position: relative;  overflow: hidden;  min-height: 200px; height: 100%;}
+.-stretch { align-items: stretch;}
+.-layout { display: flex;}
+.split-panel--first { overflow: hidden;}
+.-relative { position: relative;}
+.-bg-white { background-color: #eee;}
+.split-panel.-handle .split-panel--second { padding-left: 2px;}
+.split-panel--second { overflow: hidden;}
+.task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
+    flex-direction: column; border-top: 1px solid #515151;}
+.-vertical { flex-direction: column;}
+.-layout-h { display: flex;flex-direction: row;}
+.-horizontal { flex-direction:row-reverse;}
+.-scroll{ overflow:auto;}
+.-flex-basic0{flex-basis: 0%!important;}
+.-flex-basic40{flex-basis: 40%;}
+.-flex-basic50{flex-basis: 50%;}
+.-flex-basic60{flex-basis: 60%;}
+.-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;}
+.-header-right-info{ padding:10px; background:#fff; border-radius:3px; top:50px; right:10px;   position: relative;display:none;color:#666;}
+.-header-right-info font { border: 1px solid #dddddd; display: block;border-width: 8px;  position: absolute;  top: -15px;right:20px;border-style: solid; border-color: transparent transparent #fff transparent;  font-size: 0; line-height: 0;}
+.-header-right-box:hover .-header-right-info{ display: block;}
+.-task-bar-bg{ width: 160px; height:15px; border-radius:15px; background:#ff9932; color:#fff; font-size: 12px; line-height: 15px; text-align: right; position: relative; padding-right:10px;}
+.-task-bar-inner{background:#ffc100; display: block; height: 15px;border-radius:15px; position: absolute; top:0; left:0;}
+.-task-widht-10{ width: 10%;}
+.-task-widht-20{ width: 20%;}
+.-task-widht-30{ width: 30%;}
+.-task-widht-40{ width: 40%;}
+.-task-widht-50{ width: 50%;}
+.-task-widht-60{ width: 60%;}
+.-task-widht-70{ width: 70%;}
+.-task-widht-80{ width: 80%;}
+.-task-widht-90{ width: 90%;}
+.-task-widht-100{ width: 100%;}
+.-footer-left{height:48px;background:#f5f5f5;}
+.-footer-left ul { margin-top:10px;}
+.-footer-left ul li{ cursor: pointer; color:#666;}
+.-footer-left ul li:hover{ color:#888;}
+.-bg-black{ background:#2b2b2b; color:#f4f1ed;}
+.-bg-darkblack{background:#1D1D1D; color: #fff;}
+.task-answer-view{ border-top:1px solid #515151; background:#333;}
+#blacktab_nav {height:40px;background:#292929; }
+#blacktab_nav li {float:left; padding:0px 50px;text-align:center;height: 40px;line-height: 40px;  }
+#blacktab_nav li a{font-size:14px; }
+.blacktab_hover { background: #333;}
+.blacktab_hover a{ color:#fff; }
+.-task-ces-top{ padding:5px 15px; background:#515151; color:#bfbfbf;}
+.-task-ces-info-left{ display: inline-block; width:100px; text-align: right; }
+.-position-a-r15{ position: absolute; top:5px; right:15px;}
+.btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:2px 10px; border-radius:25px; border-radius:15px;  line-height:20px; height: 20px; font-size:12px;}
+.-task-ml80{ margin-left: 80px;}
+.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:10000;background:rgba(0,0,0,0.7); height:100%; color:#fff;}
+.-task-list-header{  border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;}
+.-task-list-header h3{ font-weight: normal; font-size:16px; color:#333;}
+.-task-list-inner{ background:#EFF2F7; margin:10px; padding:5px;}
+.-task-list-title{ font-size: 14px; color: #666;word-wrap: break-word; font-weight: normal; max-width: 80%;}
+.greytab-inner{ background:#fff; }
+.blacktab-inner{ background:#333;}
+.task-padding16{ padding:16px;}
\ No newline at end of file

From bd2cbd6793eec04e1debed0ec29d62de90c32d6b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 11 Apr 2017 17:32:44 +0800
Subject: [PATCH 11/13] =?UTF-8?q?myshixun=E6=96=B0=E7=89=88=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb          |   4 +
 app/views/games/_games_list.html.erb       |  36 +++
 app/views/games/_repository.html.erb       |  32 +-
 app/views/games/show.html.erb              | 207 +++++++++---
 app/views/layouts/base_myshixun.html.erb   | 347 ++-------------------
 app/views/myshixuns/_myshixun_top.html.erb |  31 +-
 6 files changed, 263 insertions(+), 394 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1799122c7..3c5f37db3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -50,6 +50,10 @@ module ApplicationHelper
   end
 
   # 定义实训相关方法
+  def sum_final_score
+    Game.find_by_sql("SELECT sum(final_score) as total_score FROM `games` where user_id=#{User.current.id}").first.try(:total_score)
+  end
+
   # myshixun 最高分
   def top_score shixun, position
     Game.find_by_sql("SELECT max(final_score) as top_score FROM `games` g, `challenges` c where g.challenge_id = c.id and  c.position=#{position} and g.myshixun_id in (SELECT id FROM `myshixuns` ms where ms.shixun_id=#{shixun.id})").first.try(:top_score)
diff --git a/app/views/games/_games_list.html.erb b/app/views/games/_games_list.html.erb
index 75605342a..2d23b5076 100644
--- a/app/views/games/_games_list.html.erb
+++ b/app/views/games/_games_list.html.erb
@@ -1,3 +1,39 @@
+<div class="page--over undis" >
+  <div class="col-width-3  -scroll" style="height:100%;">
+    <div class="-task-list-header clearfix">
+      <h3 class="fl">全部任务</h3>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">01</span><h4 class=" -task-list-title fl"> 础入门Python基础入门P</h4>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">02</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础</h4>
+        <a href="#" class=" fr" title="开启"><i class="fa fa-toggle-right color-light-green font-18 mt5 " ></i></a>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">03</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础入thon基础入thon基础入thon基础入thon基础入门</h4>
+        <span  class="  fr color-light-green">正在解决</span>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="panel-list">
+      <div class=" clearfix -task-list-inner">
+        <span class="icon-success fl mr5">04</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基</h4>
+        <a href="#" class=" fr"> <i class="fa fa-lock fr font-18 mt5" ></i></a>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
 <div class="content clearfix" >
   <div class="col-width-10 ml15 mt15 mr15">
     <div class="panel-header clearfix">
diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index 61de11723..ff9bd58f8 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -1,16 +1,22 @@
-<div class="content-editor col-width2 CELL" id="myshixun_repository">
-  <%= render :partial => 'myshixun_repository' %>
+<div class="panel-header clearfix">
+  <h3 class="fl">
+    <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %>
+  </h3>
+  <div class="fr  mt5  -horizontal">
+    <a href="#"><i class="fa fa-arrows-alt font-16  mr5"></i></a>
+
+  </div>
+</div>
+<div class="content-editor-inner">
+  <% if params[:action] == "entry" || @file_open %>
+      <div id="file_entry_content">
+        <%= render :partial => 'games/file_edit_form', :locals => {:filename => @path, :content => @content} %>
+      </div>
+  <% else %>
+      <% unless @entries.blank?  %>
+          <%= render :partial => 'tree', :locals => { :extend => false}%>
+      <% end %>
+  <% end %>
 </div>
 
-<div class="cl"></div>
-<script>
-    var web_h = window.innerHeight;
-    $(document).ready(function(){
 
-    });
-    function extend_repository(){
-        $("#extend_code_results").hide();
-        $("#myshixun_extend_repository").show();
-        extend_editor.refresh();
-    }
-</script>
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 0b80122f8..9dd632bb0 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -1,51 +1,162 @@
-<%= javascript_include_tag  'baiduTemplate', 'jquery.datetimepicker.js' %>
-<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c"  %>
-<%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
-<div id="content_list" class="CELL _FLEX ROWS">
-  <%= render :partial => "game_show" %>
+<div class="page--body -margin-t-64 -flex ">
+<div class="-layout -stretch -fit">
+<div class="split-panel--first -layout -vertical -flex -relative -flex-basic50" >
+  <div class="-fit -layout-v">
+    <div class="-layout-v -flex -bg-white -task-ml80">
+      <ul id="tab_nav" class="-tab-nav">
+        <li id="tab_nav_1" class="tab_hover " onclick="HoverLi1(1);">
+          <a href="javascript:void(0);" class="tab_type">过关任务</a>
+        </li>
+        <li id="tab_nav_2"  onclick="HoverLi1(2);">
+          <a href="javascript:void(0);" class="tab_type" >预备知识</a>
+        </li>
+        <li id="tab_nav_3"  onclick="HoverLi1(3);">
+          <a href="javascript:void(0);" class="tab_type" >参考答案</a>
+        </li>
+        <span class="btn-cir-big  fr mt8 mr15" >经验值：<%= @game_challenge.score %></span>
+      </ul>
+      <div class="cl"></div>
+      <div  class=" -flex -relative greytab-inner" >
+        <div id="tab_con_1" class=" tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div  class="-flex -scroll task-padding16">
+                <%= h @game_challenge.task_pass.try(:html_safe) %>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div id="tab_con_2" class="undis tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div class="-flex -scroll task-padding16">
+                <%= h @game_challenge.ready_knowledge.try(:html_safe) %>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div id="tab_con_3" class="undis tab-info" >
+          <div class="fit -scroll">
+            <div class="-layout-v -fit">
+              <div class="-flex -scroll task-padding16">
+                <%= @game_challenge.answer %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="-layout-h -center -padding-h-16 -horizontal -footer-left" >
+      <ul class="-layout -task-ml80"  >
+        <li title="点赞"><i class="fa fa-thumbs-up mr15 font-20  " alt="赞" ></i></li>
+        <li title="踩"><i class="fa fa-thumbs-down mr15 font-20 " ></i></li>
+        <li title="纠错"><i class="fa fa-flag mr30 font-20 " ></i></li>
+      </ul>
+      <div class="cl"></div>
+    </div>
+  </div>
 </div>
-<div id="content_attr_1">
-  <%= render :partial => 'desc_full_show'%>
+<div class="split-panel--second -layout -vertical -flex -relative -flex-basic50" >
+  <div class="-layout-v -flex">
+    <div class="-flex -relative">
+      <div class="split-panel -fit -vertical">
+        <div class="-layout -stretch -fit -vertical">
+          <div class="split-panel--first -layout -vertical -flex -relative -bg-black -flex-basic60">
+            <div class="task-source-view -fit">
+              <%= render :partial => 'games/repository' %>
+            </div>
+          </div>
+          <div class="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic40" >
+            <ul id="blacktab_nav">
+              <li id="blacktab_nav_1" class="blacktab_hover " onclick="HoverLi(1);">
+                <a href="javascript:void(0);" class="tab_type">测试结果</a>
+              </li>
+              <li id="blacktab_nav_2"  onclick="HoverLi(2);">
+                <a href="javascript:void(0);" class="tab_type" >评测信息</a>
+              </li>
+              <i class="fa fa-expand font-16 color-grey fr mt10 mr15" ></i>
+              <div class="cl"></div>
+            </ul>
+            <div class="cl"></div>
+            <div  class=" -flex -relative blacktab-inner" >
+              <div id="blacktab_con_1" class="" >
+                <div class="fit -scroll">
+                  <div class="-layout-v -fit">
+                    <div  class="-flex -scroll task-padding16">
+                      <p class="color-orange  mb10"><i class="fa fa-exclamation-circle font-16 " ></i><span class="ml5 mr5">0/11</span> 编译错误</p>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-down" ></i>
+                          <span>测试集 1</span>
+                        </div>
+                        <div class="-task-ces-info">
+                          <ul>
+                            <li><span class="-task-ces-info-left color-blue">输入：</span><span>param1：1</span></li>
+                            <li><span class="-task-ces-info-left color-blue">实际输出：</span><span>空</span></li>
+                            <li><span class="-task-ces-info-left color-blue">期望输出：</span><span>3</span></li>
+                          </ul>
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 2</span>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 3</span>
+                          <i class="fa fa-lock fr mt8" ></i>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-top">
+                          <i class="fa fa-caret-right" ></i>
+                          <span>测试集 4</span>
+                          <i class="fa fa-exclamation-circle color-orange fr mt8" ></i>
+                        </div>
+                        <div class="-task-ces-info">
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div id="blacktab_con_2" class="undis " >
+                <div class="fit -scroll">
+                  <div class="-layout-v -fit">
+                    <div  class="-flex -scroll task-padding16 ">
+                      <p class="color-light-green mb10"><i class="fa fa-check-circle font-16 " ></i><span class="ml5 mr5">11/11</span> 全部通过</p>
+                      <div class="-task-ces-box mb10 clearfix">
+                        <div class="-task-ces-info">
+                          <ul>
+                            <li><span class="-task-ces-info-left ">样例测试：</span><span class="color-light-green">9/9</span></li>
+                            <li><span class="-task-ces-info-left">隐藏测试：</span><span class="color-light-green">9/9</span></li>
+                            <li><span class="-task-ces-info-left">经验值：</span><span class="color-light-green">+ 300</span></li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack " style="height:48px; ">
+      <div class="-flex -layout-h" >
+        <span class="mt10 -flex ml15">耗时：1天5小时10分钟</span>
+        <a href="#" class="task-btn task-btn-blue  mr15  mt8">测评</a>
+      </div>
+    </div>
+  </div>
 </div>
-<div class="col-width content-all-fix undis" style="border: none" id="myshixun_extend_repository">
-  <%= render :partial => 'myshixun_extend_repository' %>
 </div>
-<div id="content_attr_2">
-  <%= render :partial => 'extend_test_output' %>
-</div>
-
-<script type="text/javascript" language="javascript">
-    // contents_h 是中间左侧内容页的高度，不同浏览器的得到高度不一致
-    // contents_top_h 是内容页头部的高度
-    // contents_tab_nav是三个tab的高度
-    // residue_h contents剩余展示内容的高度
-    // 左侧内容
-    var contents_h = $("#tpi_contents_info").height();
-    var contents_top_h = $("#contents_top").height() + 20;
-    var contents_tab_nav = $("#tab_nav").height();
-    var residue_h = contents_h - contents_top_h - contents_tab_nav - 10;
-    $(document).ready(function(){
-        $(".tab-info-inner").css("height", residue_h+"px");
-        $(".content-half-fix").css("height", residue_h + 310 +"px")
-    });
-    //课程大纲tab
-    function g(o){return document.getElementById(o);}
-    function HoverLi(n){
-        for(var i=1;i<=3;i++){
-            g('tab_nav_'+i).className='tab_nomal';
-            g('tab_con_'+i).className='undis';
-        }
-        g('tab_con_'+n).className='dis';
-        g('tab_nav_'+n).className='tab_hover';
-        if(n == 3){
-            // 点击参考答案时，让codemirror展示,如果不refresh的话，第一次展示会隐藏
-            myCodeMirror.refresh();
-        }
-    }
-    $("#close_myshixun_tip").click(function(){
-        $("#myshixun_tip").hide();
-    });
-    function close_big_repository(){
-        $("#myshixun_extend_repository").hide()
-    }
-</script>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index 532aef9f1..0fb164eb8 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -19,59 +19,10 @@
 <div class="cl"></div>
 
 <div class="page -layout-v -fit ">
-<div class="page--over undis" >
-  <div class="col-width-3  -scroll" style="height:100%;">
-    <div class="-task-list-header clearfix">
-      <h3 class="fl">全部任务</h3>
-    </div>
-    <div class="panel-list">
-      <div class=" clearfix -task-list-inner">
-        <span class="icon-success fl mr5">01</span><h4 class=" -task-list-title fl"> 础入门Python基础入门P</h4>
-        <div class="cl"></div>
-      </div>
-    </div>
-    <div class="panel-list">
-      <div class=" clearfix -task-list-inner">
-        <span class="icon-success fl mr5">02</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础</h4>
-        <a href="#" class=" fr" title="开启"><i class="fa fa-toggle-right color-light-green font-18 mt5 " ></i></a>
-        <div class="cl"></div>
-      </div>
-    </div>
-    <div class="panel-list">
-      <div class=" clearfix -task-list-inner">
-        <span class="icon-success fl mr5">03</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基础入thon基础入thon基础入thon基础入thon基础入门</h4>
-        <span  class="  fr color-light-green">正在解决</span>
-        <div class="cl"></div>
-      </div>
-    </div>
-    <div class="panel-list">
-      <div class=" clearfix -task-list-inner">
-        <span class="icon-success fl mr5">04</span><h4 class=" -task-list-title fl"> 础入门Python基础入门Python基</h4>
-        <a href="#" class=" fr"> <i class="fa fa-lock fr font-18 mt5" ></i></a>
-        <div class="cl"></div>
-      </div>
-    </div>
-  </div>
+<div class="page--header clearfix" id="myshixun_top">
+  <%= render :partial => 'myshixuns/myshixun_top' %>
 </div>
-<div class="page--header clearfix" >
-  <div class="-layout-h ml10 fl">
-    <h2 class="-header-title task-hide font-20 color-white">Helloworld:Java入门实训项目</h2>
-    <i class="fa fa-angle-right color-white font-20 ml5 mr5 mt10"></i>
-    <span class="font-20 color-white">第一关</span>
-  </div>
-  <div class="-layout-h mr10 fr mt3 -header-right-box">
-    <div class="-header-right clearfix">
-      <img src="/images/task/coin.png" class="fl" width="30" height="30">
-      <span class="ml5 color-white fl">3,000</span>
-    </div>
-    <div class="-header-right-info ">
-      <font></font>
-      <div class="-task-bar-bg"><span class="-task-bar-inner -task-widht-30"></span>3k/8K</div>
-      <span  class="font-12 color-grey">距离下次升级需要 +5000 经验值</span>
-    </div>
-  </div>
-</div>
-<div class="page--leftnav" >
+<div class="page--leftnav">
   <div class="user-info">
     <a href="#" class="user-info-img"><img src="images/user/male.jpg" width="50" height="50" alt="头像"></a>
     <a href="#" class="user-info-name">胡莎莎</a>
@@ -82,250 +33,12 @@
         <i class="fa fa-gamepad font-20"></i><br/><span class="font-12">当前任务</span>
       </a></li>
       <li class="leftnav-box"><a href="#" class="leftnav-box-inner ">
-        <i class="fa fa-qrcode font-20"></i><br/><span class="font-12">全部任务</span><span class="btn-cir ml5">123</span>
+        <i class="fa fa-qrcode font-20"></i><br/><span class="font-12">全部任务</span><span class="btn-cir ml5"><%= @myshixun.games.count %></span>
       </a></li>
     </ul>
   </div>
 </div>
-<div class="page--body -margin-t-64 -flex ">
-<div class="-layout -stretch -fit">
-<div class="split-panel--first -layout -vertical -flex -relative -flex-basic50" >
-  <div class="-fit -layout-v">
-    <div class="-layout-v -flex -bg-white -task-ml80">
-      <ul id="tab_nav" class="-tab-nav">
-        <li id="tab_nav_1" class="tab_hover " onclick="HoverLi1(1);">
-          <a href="javascript:void(0);" class="tab_type">过关任务</a>
-        </li>
-        <li id="tab_nav_2"  onclick="HoverLi1(2);">
-          <a href="javascript:void(0);" class="tab_type" >预备知识</a>
-        </li>
-        <li id="tab_nav_3"  onclick="HoverLi1(3);">
-          <a href="javascript:void(0);" class="tab_type" >参考答案</a>
-        </li>
-        <span class="btn-cir-big  fr mt8 mr15" >经验值：300</span>
-      </ul>
-      <div class="cl"></div>
-      <div  class=" -flex -relative greytab-inner" >
-        <div id="tab_con_1" class=" tab-info" >
-          <div class="fit -scroll">
-            <div class="-layout-v -fit">
-              <div  class="-flex -scroll task-padding16">
-                <h3>第一关标题</h3>
-                <p>
-                  Python3 代码风格建议<br/>
-                  Python3 中使用注释<br/>
-                  认识 Python3 模块<br/>
-                  实验步骤<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                  Python3 中使用注释<br/>
-                  认识 Python3 模块<br/>
-                  实验步骤<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                  Python3 中使用注释<br/>
-                  认识 Python3 模块<br/>
-                  实验步骤<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                  Python3 中使用注释<br/>
-                  认识 Python3 模块<br/>
-                  实验步骤<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                  Python3 中使用注释<br/>
-                  认识 Python3 模块<br/>
-                  实验步骤<br/>
-                  1. 解释器<br/>
-                  Python 是一个脚本语言，你可以在 Python <br/>解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。<br/>
-                  首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。<br/>
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div id="tab_con_2" class="undis tab-info" >
-          <div class="fit -scroll">
-            <div class="-layout-v -fit">
-              <div class="-flex -scroll task-padding16">
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div id="tab_con_3" class="undis tab-info" >
-          <div class="fit -scroll">
-            <div class="-layout-v -fit">
-              <div class="-flex -scroll task-padding16">
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-                <p>dafafdasf</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="-layout-h -center -padding-h-16 -horizontal -footer-left" >
-      <ul class="-layout -task-ml80"  >
-        <li title="点赞"><i class="fa fa-thumbs-up mr15 font-20  " alt="赞" ></i></li>
-        <li title="踩"><i class="fa fa-thumbs-down mr15 font-20 " ></i></li>
-        <li title="纠错"><i class="fa fa-flag mr30 font-20 " ></i></li>
-      </ul>
-      <div class="cl"></div>
-    </div>
-  </div>
-</div>
-<div class="split-panel--second -layout -vertical -flex -relative -flex-basic50" >
-  <div class="-layout-v -flex">
-    <div class="-flex -relative">
-      <div class="split-panel -fit -vertical">
-        <div class="-layout -stretch -fit -vertical">
-          <div class="split-panel--first -layout -vertical -flex -relative -bg-black -flex-basic60">
-            <div class="task-source-view -fit">
-              <div class="panel-header clearfix">
-                <h3 class="fl"><a href="#">testrepo</a> / <a href="#">lib</a> / <a href="#">plugins</a> / <a href="#">acts_as_searchable</a> / <span >init.rb</span></h3>
-                <div class="fr  mt5  -horizontal">
-                  <a href="#"><i class="fa fa-arrows-alt font-16  mr5"></i></a>
-                </div>
-              </div>
-              <div class="content-editor-inner">
-              </div>
-            </div>
-          </div>
-          <div class="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic40" >
-            <ul id="blacktab_nav">
-              <li id="blacktab_nav_1" class="blacktab_hover " onclick="HoverLi(1);">
-                <a href="javascript:void(0);" class="tab_type">测试结果</a>
-              </li>
-              <li id="blacktab_nav_2"  onclick="HoverLi(2);">
-                <a href="javascript:void(0);" class="tab_type" >评测信息</a>
-              </li>
-              <i class="fa fa-expand font-16 color-grey fr mt10 mr15" ></i>
-              <div class="cl"></div>
-            </ul>
-            <div class="cl"></div>
-            <div  class=" -flex -relative blacktab-inner" >
-              <div id="blacktab_con_1" class="" >
-                <div class="fit -scroll">
-                  <div class="-layout-v -fit">
-                    <div  class="-flex -scroll task-padding16">
-                      <p class="color-orange  mb10"><i class="fa fa-exclamation-circle font-16 " ></i><span class="ml5 mr5">0/11</span> 编译错误</p>
-                      <div class="-task-ces-box mb10 clearfix">
-                        <div class="-task-ces-top">
-                          <i class="fa fa-caret-down" ></i>
-                          <span>测试集 1</span>
-                        </div>
-                        <div class="-task-ces-info">
-                          <ul>
-                            <li><span class="-task-ces-info-left color-blue">输入：</span><span>param1：1</span></li>
-                            <li><span class="-task-ces-info-left color-blue">实际输出：</span><span>空</span></li>
-                            <li><span class="-task-ces-info-left color-blue">期望输出：</span><span>3</span></li>
-                          </ul>
-                        </div>
-                      </div>
-                      <div class="-task-ces-box mb10 clearfix">
-                        <div class="-task-ces-top">
-                          <i class="fa fa-caret-right" ></i>
-                          <span>测试集 2</span>
-                        </div>
-                        <div class="-task-ces-info">
-                        </div>
-                      </div>
-                      <div class="-task-ces-box mb10 clearfix">
-                        <div class="-task-ces-top">
-                          <i class="fa fa-caret-right" ></i>
-                          <span>测试集 3</span>
-                          <i class="fa fa-lock fr mt8" ></i>
-                        </div>
-                        <div class="-task-ces-info">
-                        </div>
-                      </div>
-                      <div class="-task-ces-box mb10 clearfix">
-                        <div class="-task-ces-top">
-                          <i class="fa fa-caret-right" ></i>
-                          <span>测试集 4</span>
-                          <i class="fa fa-exclamation-circle color-orange fr mt8" ></i>
-                        </div>
-                        <div class="-task-ces-info">
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div id="blacktab_con_2" class="undis " >
-                <div class="fit -scroll">
-                  <div class="-layout-v -fit">
-                    <div  class="-flex -scroll task-padding16 ">
-                      <p class="color-light-green mb10"><i class="fa fa-check-circle font-16 " ></i><span class="ml5 mr5">11/11</span> 全部通过</p>
-                      <div class="-task-ces-box mb10 clearfix">
-                        <div class="-task-ces-info">
-                          <ul>
-                            <li><span class="-task-ces-info-left ">样例测试：</span><span class="color-light-green">9/9</span></li>
-                            <li><span class="-task-ces-info-left">隐藏测试：</span><span class="color-light-green">9/9</span></li>
-                            <li><span class="-task-ces-info-left">经验值：</span><span class="color-light-green">+ 300</span></li>
-                          </ul>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack " style="height:48px; ">
-      <div class="-flex -layout-h" >
-        <span class="mt10 -flex ml15">耗时：1天5小时10分钟</span>
-        <a href="#" class="task-btn task-btn-blue  mr15  mt8">测评</a>
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
+<%= yield %>
 </div>
 
 <div id="ajax-indicator" style="display:none;">
@@ -336,31 +49,31 @@
 </body>
 <!-- MathJax的配置 -->
 <script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  $("#all_task_tab").click(function(){
-      $("#all_task_tab").addClass("leftnav-active");
-      $("#current_task_tab").removeClass("leftnav-active");
-  });
-  $("#current_task_tab").click(function(){
-      $("#current_task_tab").addClass("leftnav-active");
-      $("#all_task_tab").removeClass("leftnav-active");
-  });
-  function g(o){return document.getElementById(o);}
-  function HoverLi1(n){
-      for(var i=1;i<=3;i++){
-          g('tab_nav_'+i).className='tab_nomal';
-          g('tab_con_'+i).className='undis';
-      }
-      g('tab_con_'+n).className='dis';
-      g('tab_nav_'+n).className='tab_hover';
-  }
-  function HoverLi(n){
-      for(var i=1;i<=2;i++){
-          g('blacktab_nav_'+i).className='blacktab_nomal';
-          g('blacktab_con_'+i).className='undis';
-      }
-      g('blacktab_con_'+n).className='dis';
-      g('blacktab_nav_'+n).className='blacktab_hover';
-  }
+    $("#all_task_tab").click(function(){
+        $("#all_task_tab").addClass("leftnav-active");
+        $("#current_task_tab").removeClass("leftnav-active");
+    });
+    $("#current_task_tab").click(function(){
+        $("#current_task_tab").addClass("leftnav-active");
+        $("#all_task_tab").removeClass("leftnav-active");
+    });
+    function g(o){return document.getElementById(o);}
+    function HoverLi1(n){
+        for(var i=1;i<=3;i++){
+            g('tab_nav_'+i).className='tab_nomal';
+            g('tab_con_'+i).className='undis';
+        }
+        g('tab_con_'+n).className='dis';
+        g('tab_nav_'+n).className='tab_hover';
+    }
+    function HoverLi(n){
+        for(var i=1;i<=2;i++){
+            g('blacktab_nav_'+i).className='blacktab_nomal';
+            g('blacktab_con_'+i).className='undis';
+        }
+        g('blacktab_con_'+n).className='dis';
+        g('blacktab_nav_'+n).className='blacktab_hover';
+    }
 </script>
 <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %>
 </html>
diff --git a/app/views/myshixuns/_myshixun_top.html.erb b/app/views/myshixuns/_myshixun_top.html.erb
index 8268d7e9c..2e47d51d7 100644
--- a/app/views/myshixuns/_myshixun_top.html.erb
+++ b/app/views/myshixuns/_myshixun_top.html.erb
@@ -1,17 +1,16 @@
-<div class="rightbar-header clearfix CELL">
-  <h2 class="rightbar-h2 fl"><%= @myshixun.name %></h2>
-  <a href="javascript:void(0)" class="fr rightbar-pause" id="leave_shixun_page"><i class="fa fa-power-off font-20 mt5"></i><span class="ml10">暂时离开</span></a>
-  <ul class="rightbar-score fr" >
-    <!--<li><i class="fa fa-signal font-14 mr5"></i>排名：<a href="#" class="">123</a></li>-->
-    <% if params[:action] == "show" && (Time.now - @game.created_at) > 60  %>
-        <li><i class="fa fa-trophy font-14 mr5"></i>积分：<%= shixun_final_score(@myshixun) %></li>
-        <li><i class="fa fa-clock-o font-14 mr5"></i>耗时：<%= @game.status != 2 ? game_spend_time(@game.created_at, Time.now) : game_spend_time(@game.created_at, @game.updated_at) %></li>
-    <% end %>
-  </ul>
+<div class="-layout-h ml10 fl">
+  <h2 class="-header-title task-hide font-20 color-white">Helloworld:Java入门实训项目</h2>
+  <i class="fa fa-angle-right color-white font-20 ml5 mr5 mt10"></i>
+  <span class="font-20 color-white">第<%= @game_challenge.position %>关</span>
 </div>
-<script>
-    $("#leave_shixun_page").click(function(){
-        var htmlvalue = "<%= j (render :partial => 'games/leave_tip') %>";
-        pop_box_new(htmlvalue,460,316);
-    });
-</script>
\ No newline at end of file
+<div class="-layout-h mr10 fr mt3 -header-right-box">
+  <div class="-header-right clearfix">
+    <img src="/images/task/coin.png" class="fl" width="30" height="30">
+    <span class="ml5 color-white fl"><%= sum_final_score %></span>
+  </div>
+  <!--<div class="-header-right-info ">-->
+    <!--<font></font>-->
+    <!--<div class="-task-bar-bg"><span class="-task-bar-inner -task-widht-30"></span>3k/8K</div>-->
+    <!--<span  class="font-12 color-grey">距离下次升级需要 +5000 经验值</span>-->
+  <!--</div>-->
+</div>
\ No newline at end of file

From 4eb4ef442d3793882457762008f28ed1eb24aa94 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 11 Apr 2017 17:34:04 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPI=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_myshixun.html.erb  | 10 +---------
 public/stylesheets/css/bigdata-common.css |  1 +
 public/stylesheets/css/bigdata-popup.css  | 17 +++--------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index 532aef9f1..e78a725b3 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -9,7 +9,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build', 'css/bigdata-common','css/bigdata-public' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build', 'css/bigdata-common','css/bigdata-public', 'css/bigdata-popup' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -336,14 +336,6 @@
 </body>
 <!-- MathJax的配置 -->
 <script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  $("#all_task_tab").click(function(){
-      $("#all_task_tab").addClass("leftnav-active");
-      $("#current_task_tab").removeClass("leftnav-active");
-  });
-  $("#current_task_tab").click(function(){
-      $("#current_task_tab").addClass("leftnav-active");
-      $("#all_task_tab").removeClass("leftnav-active");
-  });
   function g(o){return document.getElementById(o);}
   function HoverLi1(n){
       for(var i=1;i<=3;i++){
diff --git a/public/stylesheets/css/bigdata-common.css b/public/stylesheets/css/bigdata-common.css
index 3b7811f18..22c38d9ed 100644
--- a/public/stylesheets/css/bigdata-common.css
+++ b/public/stylesheets/css/bigdata-common.css
@@ -6,6 +6,7 @@ table,tr,td{border:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{text-decoration:none;color:#898989; }
 a:hover {color:#29bd8b;}
+input,textarea,select{ background: #fff; border:1px solid #ccc; color:#666;}
 /*万能清除浮动*/
 .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden;}
 .clearfix{clear:both;zoom:1}
diff --git a/public/stylesheets/css/bigdata-popup.css b/public/stylesheets/css/bigdata-popup.css
index 9251bbce7..00162d956 100644
--- a/public/stylesheets/css/bigdata-popup.css
+++ b/public/stylesheets/css/bigdata-popup.css
@@ -1,19 +1,8 @@
 /* 修改密码成功弹框 */
-.task-popup{background: #fff; border:1px solid #e8e8e8; border-radius:3px; -webkit-box-shadow:0 0 10px #ccc; -moz-box-shadow:0 0 10px #ccc; box-shadow:0 0 10px #ccc;}
+.task-popup{ width: 30%;background: #fff; border:1px solid #e8e8e8; border-radius:3px; -webkit-box-shadow:0 0 10px #ccc;  -moz-box-shadow:0 0 10px #ccc;  box-shadow:0 0 10px #ccc;   margin: 50px auto;}
 .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: 200px;}
-/************实训弹窗****************/
-.task-popup-warp{ width: 100%; height:100%; background:black; position:fixed;}
-.task-popup-box{  position: relative; margin:150px auto; }
-.task-box1{ width:428px; height:420px;background:url(/images/task/task-success.png) 0px 0px no-repeat;}
-.task-box2{ width:496px; height:373px;background:url(/images/task/task-success02.png) 0px 50px no-repeat;}
-a.task-popup-close{ display: block; background:url(/images/task/task-close.png) 0px 0px no-repeat; width: 31px; height: 31px; position:absolute; right:5px; top:100px;}
-a:hover.task-popup-close{background:url(/images/task/task-close.png) -40px 0px no-repeat; }
-.task-su-con{  text-align: center; padding-top:285px;}
-.task-su-p{ font-size: 20px; color:#ee4a1f; font-weight: bold;}
-a.task-su-btn{display: block;background:url(/images/task/task-su-btn.png) 0px -64px no-repeat; width: 138px; height: 57px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
-a:hover.task-su-btn{background:url(/images/task/task-su-btn.png) 0px 0px no-repeat; }
-a.task-su-btn-white{ display: inline-block; padding:8px 25px; border:1px solid #fff; color:#fff; text-align: center; border-radius:5px; font-size:14px;}
-a:hover.task-su-btn-white{ color: #ee4a1f;  border:1px solid #ee4a1f; }
\ No newline at end of file
+
+.task-popup-bggrey{ background:#ccc; color:#333;}
\ No newline at end of file

From c67cc64751c60bebd5a3018105a1c40927276023 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 12 Apr 2017 09:38:13 +0800
Subject: [PATCH 13/13] TPI

---
 app/views/games/_file_edit_form.html.erb | 10 ++++------
 app/views/games/_repository.html.erb     |  5 ++---
 app/views/games/show.html.erb            |  9 ++++++---
 app/views/layouts/base_myshixun.html.erb | 15 +++++++++------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb
index 610236f8b..3698837a2 100644
--- a/app/views/games/_file_edit_form.html.erb
+++ b/app/views/games/_file_edit_form.html.erb
@@ -4,10 +4,7 @@
 
 <form action="/myshixuns/<%= @myshixun.id %>/games/<%= @game.id %>/file_update?path=<%= @path %>" method="post" id="file_update_id" data-remote="true">
     <li class="clearfix" xmlns="http://www.w3.org/1999/html" id="edit_code_contents">
-      <textarea class = "" id="challenge-answer-edit-small" name="content" style="height: 98%;width: 98%;"><%= Redmine::CodesetUtil.replace_invalid_utf8(@content) %></textarea>
-      <script>
-          var text = document.getElementById("challenge-answer-edit-small");
-      </script>
+      <textarea class = "" id="challenge-answer-edit-small" name="content"><%= Redmine::CodesetUtil.replace_invalid_utf8(@content) %></textarea>
     </li>
 </form>
 
@@ -25,7 +22,7 @@
         indentUnit: 4, //代码缩进为一个tab的距离
         matchBrackets: true,
         autoRefresh: true,
-        smartIndent: true //智能换行
+        smartIndent: true//智能换行
     });
     editor_CodeMirror.on('change',function(cMirror){
         // get value right from instance
@@ -40,7 +37,8 @@
    // $("#challenge-answer-edit-small" ).nextAll(".CodeMirror").css("line-height", 1.2);
     $(document).ready(function(){
         // 设置codemirror的高度/宽度自适应
-        editor_CodeMirror.setSize("auto",residue_h+50+"px");
+        var code_height = $("#new_repository_contents").height() - $("#top_repository").height() - 15;
+        editor_CodeMirror.setSize("auto",code_height+"px");
         editor_CodeMirror.refresh();
     });
 </script>
\ No newline at end of file
diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index ff9bd58f8..fe72cd3ed 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -1,10 +1,9 @@
-<div class="panel-header clearfix">
+<div class="panel-header clearfix" id="top_repository">
   <h3 class="fl">
     <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %>
   </h3>
-  <div class="fr  mt5  -horizontal">
+  <div class="fr mt5 -horizontal">
     <a href="#"><i class="fa fa-arrows-alt font-16  mr5"></i></a>
-
   </div>
 </div>
 <div class="content-editor-inner">
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 9dd632bb0..c89e4cfd3 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -1,10 +1,13 @@
+<%= javascript_include_tag  'baiduTemplate', 'jquery.datetimepicker.js' %>
+<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c"  %>
+<%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
 <div class="page--body -margin-t-64 -flex ">
 <div class="-layout -stretch -fit">
 <div class="split-panel--first -layout -vertical -flex -relative -flex-basic50" >
   <div class="-fit -layout-v">
     <div class="-layout-v -flex -bg-white -task-ml80">
       <ul id="tab_nav" class="-tab-nav">
-        <li id="tab_nav_1" class="tab_hover " onclick="HoverLi1(1);">
+        <li id="tab_nav_1" class="tab_hover" onclick="HoverLi1(1);">
           <a href="javascript:void(0);" class="tab_type">过关任务</a>
         </li>
         <li id="tab_nav_2"  onclick="HoverLi1(2);">
@@ -13,7 +16,7 @@
         <li id="tab_nav_3"  onclick="HoverLi1(3);">
           <a href="javascript:void(0);" class="tab_type" >参考答案</a>
         </li>
-        <span class="btn-cir-big  fr mt8 mr15" >经验值：<%= @game_challenge.score %></span>
+        <span class="btn-cir-big fr mt8 mr15" >经验值：<%= @game_challenge.score %></span>
       </ul>
       <div class="cl"></div>
       <div  class=" -flex -relative greytab-inner" >
@@ -62,7 +65,7 @@
       <div class="split-panel -fit -vertical">
         <div class="-layout -stretch -fit -vertical">
           <div class="split-panel--first -layout -vertical -flex -relative -bg-black -flex-basic60">
-            <div class="task-source-view -fit">
+            <div class="task-source-view -fit" id="new_repository_contents">
               <%= render :partial => 'games/repository' %>
             </div>
           </div>
diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index 8b1637f1e..2669573e7 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -24,17 +24,20 @@
 </div>
 <div class="page--leftnav">
   <div class="user-info">
-    <a href="#" class="user-info-img"><img src="images/user/male.jpg" width="50" height="50" alt="头像"></a>
-    <a href="#" class="user-info-name">胡莎莎</a>
+    <%= link_to image_tag(url_to_avatar(@myshixun.owner), :width => "50", :height => "50"), user_path(@myshixun.owner), :alt => "用户头像", :class => "user-info-img" %>
+    <%= link_to @myshixun.owner.try(:show_name), user_path(@myshixun.owner), :class => "user-info-name" %>
   </div>
   <div class="leftnav">
     <ul>
-      <li class="leftnav-box"><a href="#" class="leftnav-box-inner leftnav-active">
+      <li class="leftnav-box">
+        <a href="<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>" class="leftnav-box-inner leftnav-active" id="current_task_tab" data-remote="true">
         <i class="fa fa-gamepad font-20"></i><br/><span class="font-12">当前任务</span>
       </a></li>
-      <li class="leftnav-box"><a href="#" class="leftnav-box-inner ">
-        <i class="fa fa-qrcode font-20"></i><br/><span class="font-12">全部任务</span><span class="btn-cir ml5"><%= @myshixun.games.count %></span>
-      </a></li>
+      <li class="leftnav-box">
+        <a href="<%= myshixun_games_path(@myshixun) %>" class="leftnav-box-inner" id="all_task_tab" data-remote="true">
+        <i class="fa fa-qrcode font-20"></i><br/><span class="font-12">全部任务</span><br/><span class="btn-cir ml5"><%= @myshixun.games.count %></span>
+        </a>
+      </li>
     </ul>
   </div>
 </div>