From 2e3b0ecfbfd43160a740db4a51f1a36c3ba0de55 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 16 Aug 2017 14:28:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E5=85=89=E6=A0=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_form.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 2e8d32617..5ba904ebc 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -22,7 +22,7 @@
             </li>
             <li class="clearfix mb15">
               <label class="panel-form-label fl">简介&nbsp;&nbsp;&nbsp;</label>
-              <div id="shixun_introduction" class="new_li fl" style="margin-bottom: 0px">
+              <div id="shixun_introduction" class="new_li fl">
                 <textarea name="shixun[description]"><%= @shixun.description %></textarea>
               </div>
               <p id="e_tip_in" style="margin-left: 10%" class="c_grey"></p>
@@ -161,7 +161,7 @@
   /* ------------------------------- 简介md ------------------------------*/
   var shixun_editormd =  editormd("shixun_introduction", {
       width   : "89.7%",
-      height  : 300,
+      height  : 600,
       syncScrolling : "single",
       //你的lib目录的路径，我这边用JSP做测试的
       path    : "/editormd/lib/",
@@ -190,7 +190,7 @@
   /* --------------------------------- 背景知识 -------------------------------------- */
   var shixun_propaedeutics = editormd("shixun_propaedeutics", {
       width   : "89.7%",
-      height  : 300,
+      height  : 600,
       syncScrolling : "single",
       //你的lib目录的路径，我这边用JSP做测试的
       path    : "/editormd/lib/",

From c3f9ad0809a4314b30f4c9ad3f79892b49c525f2 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 16 Aug 2017 14:52:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=91=BD=E4=BB=A4=E8=A1=8C=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E7=82=B9=E5=87=BB=E4=BB=A3=E7=A0=81=E6=97=81=E8=BE=B9?=
 =?UTF-8?q?=E5=8E=BB=E5=87=BA=E7=8E=B0=E5=91=BD=E4=BB=A4=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/games/_repository.html.erb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index 566e46be9..0b393bb9c 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -2,7 +2,7 @@
   <li id="codetab_nav_1" class="blacktab_hover" onclick="HoverLi_new(1);">
     <a href="javascript:void(0);" class="tab_type tab_color" >代码</a>
   </li>
-  <li id="codetab_nav_2">
+  <li id="codetab_nav_2" >
     <% if @myshixun.shixun.try(:webssh) %>
         <a href="javascript:void(0);" class="tab_type tab_color" >命令行</a>
     <% end %>
@@ -81,7 +81,7 @@
         g_l('codetab_con_'+n).className='dis -relative';
         g_l('codetab_nav_'+n).className='blacktab_hover';
     };
-
+    <% if @myshixun.shixun.try(:webssh) %>
     $('#codetab_nav_2').on("click", function(){
         $.ajax({
             url: "<%= open_webssh_myshixun_path(@myshixun) %>",
@@ -94,15 +94,16 @@
                     // 本地版
                     var html_local ="<iframe src='http://127.0.0.1:9527?Host=106.75.96.108&Port=40054&Username=root&Password=123123&Gameid=" +data.game_id + "'" + " style='width:100%;border:0;' scrolling='no' id='game_webssh'></iframe><div class='-brother undis'></div>";
                     $("#codetab_con_2").html(html);
-                     var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
-                     $("#game_webssh").css("min-height", h);
-                     HoverLi_new(2);
-                  // console.log( $("#game_webssh").contentDocument.body.height());
+                    var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
+                    $("#game_webssh").css("min-height", h);
+                    HoverLi_new(2);
+                    // console.log( $("#game_webssh").contentDocument.body.height());
 
 
-                 }
-        }
+                }
+            }
         })
 
     });
+    <% end %>
 </script>
\ No newline at end of file