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

实训tpi页面调整

This commit is contained in:
daiao 2017-03-16 14:46:11 +08:00
parent 471f37b3d4
commit a83f8351b2
5 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/games/_leave_tip.html.erb Normal file
View File

@ -0,0 +1,18 @@
<div style="width:460px;">
<div class="task-popup-title clearfix">
<h3 class="fl color-grey">提示</h3>
<a href="javascript:void(0);" onclick="hideModal()"><i class="fa fa-times-circle font-18 link-color-grey fr"></i></a>
<div class="cl"></div>
</div>
<div class="sy_popup_con" style="width:380px;">
<ul class="sy_popup_add" >
<li class="center mb30" style="line-height:20px">
确定开启后，将开始计算耗时<br/>请问是否确定继续？
</li>
<div class="task-popup-submit clearfix">
<a href="javascript:void(0);" class="task-btn fl" onclick="hideModal()">取消</a>
<a href="javascript:self.close()" class="task-btn task-btn-green fr">确定</a>
</div>
</ul>
</div>
</div>

6
app/views/games/show.html.erb
View File

@ -1,6 +1,6 @@
<div class="rightbar-header clearfix">
<h2 class="rightbar-h2 fl">Helloworld:Java入门实训项目</h2>
<a href="#" class=" fr rightbar-pause "><i class="fa fa-power-off font-20 mt5"></i><span class="ml10">暂时离开</span></a>
<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>
<li><i class="fa fa-trophy font-14 mr5"></i>积分：<a href="#" class="">123</a></li>
@ -106,4 +106,8 @@
g('tab_con_'+n).className='dis';
g('tab_nav_'+n).className='tab_hover';
}
$("#leave_shixun_page").click(function(){
var htmlvalue = "<%= j (render :partial => 'games/leave_tip') %>";
pop_box_new(htmlvalue,460,316);
});
</script>

3
app/views/layouts/base_myshixun.html.erb
View File

@ -37,9 +37,6 @@
<li class="leftnav-box"><a href="#" class="leftnav-box-inner ">
<i class="fa fa-qrcode font-28"></i><br/><span class="font-16">全部任务</span><span class="btn-cir ml5">123</span>
</a></li>
<li class="leftnav-box"><a href="#" class="leftnav-box-inner ">
<i class="fa fa-comments-o font-28"></i><br/><span class="font-16">讨论区</span><span class="btn-cir ml5">456</span>
</a></li>
</ul>
</div>
</div>

2
app/views/shixuns/_monitor_tip.html.erb
View File

@ -12,7 +12,7 @@
<div class="task-popup-submit clearfix">
<a href="javascript:void(0);" class="task-btn fl" onclick="hideModal()">取消</a>
<% if @had_exec == true %>
<%= link_to "确 定", myshixun_path(@tpm), :class => "sy_btn_blue fl ml20", :onclick => "hideModal();", :target => "_blank" %>
<%= link_to "确 定", myshixun_path(@tpm), :class => "task-btn task-btn-green fr", :onclick => "hideModal();", :target => "_blank" %>
<% else %>
<a href="<%= shixun_exec_shixun_path(@shixun) %>" class="task-btn task-btn-green fr" onclick="hideModal();">确定</a>
<% end %>

35
db/schema.rb
View File

@ -1144,8 +1144,8 @@ ActiveRecord::Schema.define(:version => 20170316032420) do
t.string "name"
t.integer "user_id"
t.text "description"
t.date "publish_time"
t.date "end_time"
t.datetime "publish_time"
t.datetime "end_time"
t.integer "homework_type", :default => 1
t.string "late_penalty"
t.integer "course_id"
@ -1242,6 +1242,19 @@ ActiveRecord::Schema.define(:version => 20170316032420) do
t.datetime "updated_at", :null => false
end
create_table "ii", :force => true do |t|
t.integer "project_id"
t.string "author_login"
t.string "rep_identifier"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "sonar_version", :default => 0
t.string "path"
t.string "branch"
t.string "language"
t.string "sonar_name"
end
create_table "innodb_monitor", :id => false, :force => true do |t|
t.integer "a"
end
@ -2119,21 +2132,17 @@ ActiveRecord::Schema.define(:version => 20170316032420) do
t.string "name"
t.text "description"
t.text "script"
t.boolean "is_public", :default => true
t.boolean "is_public", :default => true
t.integer "parent_id"
t.integer "user_id"
t.integer "gpid"
t.integer "forked_count", :default => 0
t.integer "visits", :default => 0
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "forked_count", :default => 0
t.integer "visits", :default => 0
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "changeset_num"
t.integer "forked_form"
t.integer "status", :default => 0
t.text "ready_knowledge"
t.text "task_pass"
t.text "answer"
t.integer "score"
t.integer "status", :default => 0
end
create_table "softapplications", :force => true do |t|
@ -2428,7 +2437,7 @@ ActiveRecord::Schema.define(:version => 20170316032420) do
t.datetime "updated_at", :null => false
t.integer "author_id"
t.integer "status", :limit => 1, :default => 0
t.integer "position", :limit => 1
t.integer "position", :limit => 1, :default => 0
t.integer "result", :default => 0
end