jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
huang 2017-03-22 13:45:27 +08:00
parent 4d23032937 20bbfe7d4e
commit 0dbe68e6ee
8 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/games/_desc_full_show.html.erb
View File

@ -1,8 +1,7 @@
<div class="col-width fl content-all-fix undis" style="margin-top:50px">
<div class="panel-header clearfix">
<h3 class="fl">第1关：Python的初始化</h3>
<div class="fr mt5">
<a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
<div class="fr mt5">
<a href="javascript:void(0);" onclick="close_game_descpition()"><i class="fa fa-compress font-14 fl color-grey"></i></a>
</div>
</div>

4
app/views/games/_exec_results.html.erb
View File

@ -7,8 +7,7 @@
<div class="col-width fl mt15 content-half-fix undis" style="margin-top:125px;">
<div class="panel-header clearfix">
<h3 class="fl">测评历史</h3>
<div class="fr mt5">
<a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
<div class="fr mt5">
<a href="javascript:void(0)" onclick="hide_windows();"><i class="fa fa-compress font-14 fl color-grey"></i></a>
</div>
</div>
@ -29,7 +28,6 @@
<div class="panel-header clearfix">
<h3 class="fl">测评历史</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="extend_window()"><i class="fa fa-expand font-14 fl color-grey"></i></a>
</div>
</div>

2
app/views/games/_file_edit_form.html.erb
View File

@ -30,7 +30,7 @@
var web_h = window.innerHeight;
$(document).ready(function(){
$(".CodeMirror-line").children('span:first').children().css("margin-left", "-60px");
$(".CodeMirror-line").children('span').eq(1).css("margin-left", "-65px");
$(".CodeMirror-line").children('span').eq(1).css("margin-left", "-57px");
if($.browser.msie) {
$(".CodeMirror").css("height", web_h * 0.61 + "px");
}

3
app/views/games/_game_show.html.erb
View File

@ -8,8 +8,7 @@
<div class="content-info col-width fl">
<div class="panel-header clearfix">
<h3 class="fl">第<%= @game.stage %>关：<%= @game.subject %></h3>
<div class="fr mt5">
<a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
<div class="fr mt5">
<a href="javascript:void(0);" onclick="extend_game_description();"><i class="fa fa-expand font-14 fl color-grey"></i></a>
</div>
</div>

29
app/views/games/_myshixun_extend_repository.html.erb
View File

@ -1,8 +1,8 @@
<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">
<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>
<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">
@ -16,3 +16,28 @@
<% end %>
<% end %>
</div>
<script>
var web_h = window.innerHeight;
$(document).ready(function(){
if($.browser.msie) {
$(".content-history-extend").css("height", web_h * 0.825 + "px");
}
else if($.browser.safari)
{
$(".content-history-extend").css("height", web_h * 0.825 + "px");
}
else if($.browser.mozilla)
{
$(".content-history-extend").css("height", web_h * 0.825 + "px");
}
else if($.browser.opera) {
$(".content-history-extend").css("height", web_h * 0.825 + "px");
}else if($.browser.chrome){
if(window.navigator.userAgent.indexOf("MetaSr") == -1){
$(".content-history-extend").css("height", web_h * 0.835 + "px");
}else{
$(".content-history-extend").css("height", web_h * 0.825 + "px");
}
}
});
</script>

2
app/views/games/_myshixun_repository.html.erb
View File

@ -2,7 +2,7 @@
<h3 class="fl">
<%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
</h3>
<div class="fr mt5">
<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 %>

3
app/views/games/_repository.html.erb
View File

@ -45,6 +45,7 @@
$(".content-half-fix02").hide()
}
function extend_repository(){
$(".content-half-fix02").show()
$(".content-half-fix").hide();
$(".content-half-fix02").show();
}
</script>

4
app/views/games/_tree.html.erb
View File

@ -1,6 +1,6 @@
<div class="autoscroll_new">
<div class="autoscroll_new" style="line-height: 1.9;">
<table class="list entries" id="browser" style="table-layout: fixed;">
<tbody style="line-height: 1.9;">
<tbody>
<% @entries.each do |entry| %>
<% tr_id = Digest::MD5.hexdigest(entry.path)
depth = params[:depth].to_i %>