From 2b7c6de55c6fa8ef97a784b42986013afaeb6fd9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 21 Mar 2017 15:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_myshixun_extend_repository.html.erb      | 18 ++++++
 app/views/games/_myshixun_repository.html.erb | 59 +++++++++++++++++++
 app/views/games/_repository.html.erb          | 46 ++-------------
 app/views/games/_tree.html.erb                |  7 +--
 app/views/games/entry.js.erb                  |  8 ++-
 app/views/games/show.js.erb                   |  8 ++-
 6 files changed, 98 insertions(+), 48 deletions(-)
 create mode 100644 app/views/games/_myshixun_extend_repository.html.erb
 create mode 100644 app/views/games/_myshixun_repository.html.erb

diff --git a/app/views/games/_myshixun_extend_repository.html.erb b/app/views/games/_myshixun_extend_repository.html.erb
new file mode 100644
index 000000000..7caf4e3ed
--- /dev/null
+++ b/app/views/games/_myshixun_extend_repository.html.erb
@@ -0,0 +1,18 @@
+<div class="panel-header clearfix" style="border: none">
+  <h3 class="fl"><%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h3>
+  <div class="fr  mt5">
+    <a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
+    <a href="javascript:void(0)" onclick="close_big_repository()"><i class="fa fa-compress font-14  fl color-grey"></i></a>
+  </div>
+</div>
+<div class="content-history-extend">
+  <% if params[:action] == "entry" %>
+      <div id="file_entry_content_inner">
+        <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content, :extend => true} %>
+      </div>
+  <% else %>
+      <% unless @entries.blank? %>
+          <%= render :partial => 'tree', :locals => { :extend => true} %>
+      <% end %>
+  <% end %>
+</div>
diff --git a/app/views/games/_myshixun_repository.html.erb b/app/views/games/_myshixun_repository.html.erb
new file mode 100644
index 000000000..c91b41d47
--- /dev/null
+++ b/app/views/games/_myshixun_repository.html.erb
@@ -0,0 +1,59 @@
+<div class="panel-header-border clearfix">
+  <h3 class="fl">
+    <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
+  </h3>
+  <div class="fr  mt5">
+    <% if params[:action] == "entry" %>
+        <a href="<%= file_edit_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => params[:path]) %>" data-remote="true"><i class="fa fa-edit font-18  fl color-grey mr10"></i></a>
+    <% end %>
+    <a href="javascript:void(0)" onclick="extend_repository();"><i class="fa fa-expand font-18 fl color-grey"></i></a>
+  </div>
+</div>
+<div class="content-editor-inner">
+  <% if params[:action] == "entry" %>
+      <div id="file_entry_content">
+        <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
+      </div>
+  <% else %>
+      <% unless @entries.blank?  %>
+          <%= render :partial => 'tree', :locals => { :extend => false}%>
+      <% end %>
+  <% end %>
+</div>
+<script>
+    var web_h = window.innerHeight;
+    $(document).ready(function(){
+        if($.browser.msie) {
+            $(".content-half-fix02").css("height", web_h - 85 + "px");
+            $(".content-half-fix02").css("width", "86%");
+            $(".autoscroll_new").css("height", web_h * 0.61 + "px");
+        }
+        else if($.browser.safari)
+        {
+            $(".content-half-fix02").css("height", web_h - 85 + "px");
+            $(".content-half-fix02").css("width", "86%");
+            $(".autoscroll_new").css("height", web_h * 0.61 + "px");
+        }
+        else if($.browser.mozilla)
+        {
+            $(".content-half-fix02").css("height", web_h - 85 + "px");
+            $(".content-half-fix02").css("width", "86%");
+            $(".autoscroll_new").css("height", web_h * 0.595 + "px");
+        }
+        else if($.browser.opera) {
+            $(".content-half-fix02").css("height", web_h - 85 + "px");
+            $(".content-half-fix02").css("width", "86%");
+            $(".autoscroll_new").css("height", web_h * 0.61 + "px");
+        }else if($.browser.chrome){
+            if(window.navigator.userAgent.indexOf("MetaSr") == -1){
+                $(".content-half-fix02").css("height", web_h - 85 + "px");
+                $(".content-half-fix02").css("width", "86%");
+                $(".autoscroll_new").css("height", web_h * 0.61 + "px");
+            }else{
+                $(".content-half-fix02").css("height", web_h - 80 + "px");
+                $(".content-half-fix02").css("width", "85.7%");
+                $(".autoscroll_new").css("height", web_h * 0.58 + "px");
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index e10f7b5bf..9a2dfc335 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -1,46 +1,8 @@
-<div class="col-width fl ml15 mt15 content-half-fix02 undis" style="border: none">
-  <div class="panel-header clearfix" style="border: none">
-    <h3 class="fl"><%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h3>
-    <div class="fr  mt5">
-      <a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
-      <a href="javascript:void(0)" onclick="close_big_repository()"><i class="fa fa-compress font-14  fl color-grey"></i></a>
-    </div>
-  </div>
-  <div class="content-history-extend">
-    <% if params[:action] == "entry" %>
-        <div id="file_entry_content_inner">
-          <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
-        </div>
-    <% else %>
-        <% unless @entries.blank? %>
-            <%= render :partial => 'tree' %>
-        <% end %>
-    <% end %>
-  </div>
+<div class="col-width fl ml15 mt15 content-half-fix02 undis" style="border: none" id="myshixun_extend_repository">
+  <%= render :partial => 'myshixun_extend_repository' %>
 </div>
-<div class="content-editor col-width2 fl">
-  <div class="panel-header-border clearfix">
-    <h3 class="fl">
-      <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
-    </h3>
-    <div class="fr  mt5 ">
-      <% if params[:action] == "entry" %>
-          <a href="<%= file_edit_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => params[:path]) %>" data-remote="true"><i class="fa fa-edit font-18  fl color-grey mr10"></i></a>
-      <% end %>
-      <a href="javascript:void(0)" onclick="extend_repository();"><i class="fa fa-expand font-18 fl color-grey"></i></a>
-    </div>
-  </div>
-  <div class="content-editor-inner">
-    <% if params[:action] == "entry" %>
-        <div id="file_entry_content">
-          <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
-        </div>
-    <% else %>
-        <% unless @entries.blank?  %>
-            <%= render :partial => 'tree' %>
-        <% end %>
-    <% end %>
-  </div>
+<div class="content-editor col-width2 fl" id="myshixun_repository">
+  <%= render :partial => 'myshixun_repository' %>
 </div>
 <div class="cl"></div>
 <script>
diff --git a/app/views/games/_tree.html.erb b/app/views/games/_tree.html.erb
index 4c782ae8a..aacb0c2e3 100644
--- a/app/views/games/_tree.html.erb
+++ b/app/views/games/_tree.html.erb
@@ -1,6 +1,6 @@
 <div class="autoscroll_new">
   <table class="list entries" id="browser" style="table-layout: fixed;">
-    <tbody style="line-height: 1.9;" id="sasadas">
+    <tbody style="line-height: 1.9;">
     <% @entries.each do |entry| %>
         <% tr_id = Digest::MD5.hexdigest(entry.path)
           depth = params[:depth].to_i %>
@@ -11,7 +11,7 @@
         <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
           <td class="filename_no_report hidden">
             <%=  link_to h(ent_name),
-                         {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @game, :myshixun_id => @myshixun, :path => to_path_param(ent_path), :rev => @rev},
+                         {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @game, :myshixun_id => @myshixun, :path => to_path_param(ent_path), :rev => @rev, :extend => extend },
                           :remote => true,
                           :class => (entry.is_dir? ? 'old-icon old-icon-folder' : "old-icon old-icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
           </td>
@@ -19,5 +19,4 @@
     <% end %>
     </tbody>
   </table>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/app/views/games/entry.js.erb b/app/views/games/entry.js.erb
index 6895bd13f..b8d1c1d8b 100644
--- a/app/views/games/entry.js.erb
+++ b/app/views/games/entry.js.erb
@@ -1 +1,7 @@
-$("#content_list").html('<%= escape_javascript(render :partial => 'games/game_show') %>');
\ No newline at end of file
+<% if params[:extend] == 'false' %>
+$("#myshixun_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_repository') %>');
+$("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>');
+<% else %>
+$("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>');
+$("#myshixun_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_repository') %>');
+<% end %>
\ No newline at end of file
diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb
index 6895bd13f..1f9ca9526 100644
--- a/app/views/games/show.js.erb
+++ b/app/views/games/show.js.erb
@@ -1 +1,7 @@
-$("#content_list").html('<%= escape_javascript(render :partial => 'games/game_show') %>');
\ No newline at end of file
+<% if params[:extend] == 'false' %>
+    $("#myshixun_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_repository') %>');
+    $("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>');
+<% else %>
+    $("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>');
+    $("#myshixun_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_repository') %>');
+<% end %>