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:
daiao 2017-03-24 12:39:01 +08:00
parent 9e6a146d43 9e5ba45b5c
commit 93e67e5dbc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/myshixuns_controller.rb
View File

@ -11,7 +11,7 @@ class MyshixunsController < ApplicationController
def training_task_status def training_task_status
status = params[:status].to_i status = params[:status].to_i
task_id = params[:taskId] task_id = params[:taskId]
outPut = params[:outPut] outPut = Base64.decode64(params[:outPut]) unless params[:outPut].blank?
message = Base64.decode64(params[:msg]) unless params[:msg].blank? message = Base64.decode64(params[:msg]) unless params[:msg].blank?
game = Game.find(task_id) game = Game.find(task_id)
if status == 0 if status == 0

2
app/views/myshixuns/_myshixun_top.html.erb
View File

@ -2,7 +2,7 @@
<h2 class="rightbar-h2 fl"><%= @myshixun.name %></h2> <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> <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" > <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-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> <li><i class="fa fa-trophy font-14 mr5"></i>积分：<a href="#" class="">123</a></li>
<li><i class="fa fa-clock-o font-14 mr5"></i>耗时：<a href="#" class="">56：00</a></li> <li><i class="fa fa-clock-o font-14 mr5"></i>耗时：<a href="#" class="">56：00</a></li>
</ul> </ul>