kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' into develop

This commit is contained in:
caishi 2017-08-11 21:00:16 +08:00
parent 403d8f0811 d29910ee9a
commit a8378ebc2f
7 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/account/authentication.html.erb
View File

@ -48,7 +48,7 @@
</tr>
</tbody>
</table>
<p class="mt10">若您想重新认证，请先<a href="javascript:void(0);" class="color-blue" onclick="s_op_confirm_box('<%= cancel_pro_apply_account_path(:auth_type => 1) %>', '是否确定撤销提交的实名认证申请')">撤销本次认证申请</a></p>
<p class="mt10 color-dark-grey">若您想重新认证，请先<a href="javascript:void(0);" class="color-blue" onclick="s_op_confirm_box('<%= cancel_pro_apply_account_path(:auth_type => 1) %>', '是否确定撤销提交的实名认证申请')">撤销本次认证申请</a></p>
</div>
</div>
<% elsif !@user.authentication && @apply_user_auth && @apply_user_auth.status == 2 %>
@ -89,7 +89,7 @@
</tr>
</tbody>
</table>
<p class="mt10">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="real_certification();">点击这里</a></p>
<p class="mt10 color-dark-grey">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="real_certification();">点击这里</a></p>
</div>
</div>
<% elsif @user.authentication %>

4
app/views/account/professional_certification.html.erb
View File

@ -97,7 +97,7 @@
</tr>
</tbody>
</table>
<p class="mt10">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="pro_certification();">点击这里</a></p>
<p class="mt10 color-dark-grey">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="pro_certification();">点击这里</a></p>
</div>
</div>
<% elsif @user.professional_certification %>
@ -142,7 +142,7 @@
</tr>
</tbody>
</table>
<p class="mt10">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="pro_certification();">点击这里</a></p>
<p class="mt10 color-dark-grey">若您想重新认证，请<a href="javascript:void(0);" class="color-blue" onclick="pro_certification();">点击这里</a></p>
</div>
</div>
<% end %>

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

@ -66,7 +66,7 @@
<div class="-layout-h -padding-h-16 -horizontal -footer-left">
<ul class="-task-ml80">
<%= render :partial => "games/shixun_comment_block" %>
<li class="fl mt10 ml15"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
<li class="fl mt10 ml20"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
<li class="fl ml20 mt15">
<span title="<%= @praise.nil? ? "点赞" : "取消点赞" %>" onclick="game_praise()" id="game_praise_tread" class="pt5 color-grey mr20">
<i class="fa fa-thumbs-up font-20 mr3 <%= @praise.nil? ? "" : "color-light-green" %>" alt="赞" ></i><span class="font-12 font-bd" id="game_praise_count"><%= @praise_count %></span>

10
app/views/shixuns/_shixun_top.html.erb
View File

@ -10,30 +10,30 @@
<% if allow_shixun_exec(@shixun) %>
<% if @shixun.status == 0 %>
<% if User.current.manager_of_shixun?(@shixun) %>
<%= link_to "模拟实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :onclick => "forshixun()", :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation",:remote => true %>
<%= link_to "模拟实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation",:remote => true %>
<%#= link_to_shixun_exec myshixun, @shixun, '模拟实战' %>
<a href="javascript:void(0);" data-option="1" onclick="apply_publish_shixun('<%= publish_shixun_path(@shixun) %>')" id="apply_publish_shixun" class="fr shixun-task-btn task-btn-green mr15">申请发布</a>
<%#= link_to "申请发布", publish_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-green mr15", :id => "challenge_begin", :remote => true %>
<% end %>
<% elsif @shixun.status == 1 %>
<%= link_to "模拟实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :onclick => "forshixun()", :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%= link_to "模拟实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%#= link_to_shixun_exec myshixun, @shixun, '模拟实战' %>
<% if User.current.manager_of_shixun?(@shixun) %>
<%= link_to "撤销发布", cancel_publish_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-grey-white mr15", :id => "challenge_begin" %>
<% end %>
<% elsif @shixun.status == 2 %>
<% if myshixun.blank? %>
<%= link_to "开始实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :onclick => "forshixun()", :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%= link_to "开始实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%#= link_to_shixun_exec myshixun, @shixun, '开始实战' %>
<% else %>
<%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :onclick => "forshixun()", :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<% end %>
<% if User.current.manager_of_shixun?(@shixun) %>
<a href="javascript:void(0);" class="fr shixun-task-btn task-btn-grey-white mr15" id="challenge_begin" onclick="s_op_confirm_box('<%= close_shixun_path(@shixun) %>', '关闭后，用户不能再开始挑战了<br/>是否确认关闭')">永久关闭</a>
<% end %>
<% elsif @shixun.status == 3 %>
<% unless myshixun.blank? %>
<%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :onclick => "forshixun()", :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15", :id => "shixun_operation", :remote => true %>
<% end %>
<a href="javascript:void(0);" class="fr shixun-task-ban-btn mr15">已关闭</a>
<% end %>

3
app/views/shixuns/operation.js.erb
View File

@ -3,9 +3,10 @@
<% else %>
<% if @is_modify.blank? %>
//为了防止浏览器阻挡
$(".loading_all").show();
window.location.href="<%= shixun_exec_shixun_path(@shixun) %>";
$("#ajax-indicator").hide();
//var tempwindow = window.open();
//var tempwindow = window.open();
//tempwindow.location = '<%#= shixun_exec_shixun_path(@shixun) %>';
//window.open("<%#= shixun_exec_shixun_path(@shixun) %>");
<% else %>

13
public/javascripts/edu/shixun.js
View File

@ -2,21 +2,8 @@ $(function() {
$("#search_not_collaborators").live('input', function (e) {
throttle(search_not_teacher_f, window, e);
});
// $("#shixun_operation").live("click",function(){
// $(".loading_all").show();
// })
});
//模拟实训，显示加载等待效果
function forshixun(){
$(".loading_all").show();
// $.ajax({
// url : url
// });
// return false;
}
var lastteSearchCondition = '';
function search_not_teacher_f(e){
console.log($(e.target).val().trim());

6
public/stylesheets/css/edu-user.css
View File

@ -236,6 +236,6 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset; ou
.edu-table{width: 100%;border: 1px solid #cccccc;background: #ffffff;border-collapse: collapse;}
.panel-cer-content .edu-table thead{background: #f5f5f5}
.panel-cer-content .edu-table tr td{padding: 0px;border: none;border: 1px solid #ccc;}
.panel-cer-content .edu-table tr td:nth-child(1){text-align:right;width: 25%}
.panel-cer-content .edu-table tr td:nth-child(2){text-align:left;color: #333333;padding-left: 10px}
.panel-cer-content .edu-table tr td{padding: 0px;border: none;border: 1px solid #ccc;padding: 6px 10px;}
.panel-cer-content .edu-table tr td:nth-child(1){text-align:right;width: 25%;color: #666666}
.panel-cer-content .edu-table tr td:nth-child(2){text-align:left;color: #333333;}