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

Merge branch 'dev_cs' into dev_cxt 

Conflicts:
	app/views/exercise/_new_question.html.erb
This commit is contained in:
cxt 2017-10-12 15:29:11 +08:00
parent b0b47b5443 9df7340f13
commit b8a958ddbb
33 changed files with 500 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/shixuns_controller.rb
View File

@ -725,6 +725,16 @@ class ShixunsController < ApplicationController
end
end
def fork_list
@shixuns = Shixun.where(:fork_from => @shixun.id)
@shixuns_count = @shixuns.count
@limit = 16
@is_remote = true
@shixun_pages = Paginator.new @shixuns_count, @limit, params['page'] || 1
@offset ||= @shixun_pages.offset
@shixuns = paginateHelper @shixuns, @limit
end
def show
respond_to do |format|
format.html{redirect_to shixun_challenges_path(@shixun)}

6
app/views/attachments/_activity_attach.html.erb
View File

@ -1,15 +1,15 @@
<% if activity.attachments.any? %>
<% activity.attachments.each do |attachment| %>
<li class="color-grey">
<a href="javascript:void(0)" class="link-color-grey">
<a href="javascript:void(0)" class="color-grey">
<i class="fa fa-folder" aria-hidden="true"></i>
<%= link_to_short_attachment attachment,:length=> 58, :class => 'link-color-grey', :download => true %>
<%= link_to_short_attachment attachment,:length=> 58, :class => 'color-grey', :download => true %>
<span class="color-grey">(
<%= number_to_human_size attachment.filesize %>)
</span>
<% user_name = attachment.author.show_real_name.empty? ? attachment.author : attachment.author.show_real_name %>
<span title="<%= user_name %>">
<%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "link-color-grey" %>,
<%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "color-grey" %>,
<%= format_time(attachment.created_on) %>
</span>
</a>

2
app/views/courses/_course_activity_content.html.erb
View File

@ -22,7 +22,7 @@
<% end %>
</li>
<% end %>
<div class="ml10 edu-dropdown">
<div class="ml10 edu-dropdown mr10">
<span class="mr8 color-orange03">新建</span><i class="fa fa-sort-down fl fr mt3 color-orange03"></i>
<ul class="edu-dropdown-menu" id="all_status_list" style="top:29px;left: -12px;width: 90px;text-align: center">
<li style="text-align:center;">

4
app/views/exercise/_exercise_student.html.erb
View File

@ -82,7 +82,7 @@
<div class="clearfix ml15 mt10 mb15">
<% question_list.each_with_index do |eq, index| %>
<span id="ex_commit_status_<%= eq.id %>" class="checkstatus_box_big <%= User.current.exercise_answer.where(:exercise_question_id => eq.id).count > 0 ? 'post_btn_white' : 'post_btn_grey' %>"><%= index + 1 %></span>
<a href="#mao<%= index + 1 %>" style="cursor:pointer" id="ex_commit_status_<%= eq.id %>" class="checkstatus_box_big <%= User.current.exercise_answer.where(:exercise_question_id => eq.id).count > 0 ? 'post_btn_white' : 'post_btn_grey' %>"><%= index + 1 %></a>
<% end %>
</div>
</div>
@ -90,7 +90,7 @@
<% question_list.each_with_index do |exercise_question, i| %>
<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
<div class="clearfix pl15 pr15">
<p class="fl font-15">第<%= i + 1 %>题:<span class="color-orange03 ml10">[<%= exercise_question.question_type_name %>]</span><span class="ml10"><%= exercise_question.question_score %></span>分</p>
<p class="fl font-15" id="mao<%=i+1 %>">第<%= i + 1 %>题:<span class="color-orange03 ml10">[<%= exercise_question.question_type_name %>]</span><span class="ml10"><%= exercise_question.question_score %></span>分</p>
</div>
<div class="pl15 pr15 justify"><%= exercise_question.question_title.html_safe %></div>
<% case exercise_question.question_type %>

6
app/views/exercise/_exercise_student_result.html.erb
View File

@ -46,7 +46,7 @@
<div class="clearfix ml80 mt10 mb5">
<% @exercise.exercise_questions.where(:question_type => [1, 2, 3]).each_with_index do |eq, index| %>
<% is_correct = answer_is_correct(eq, user) %>
<span class="checkstatus_box_big <%= is_correct ? 'post_btn_green' : 'post_btn_red' %>"><%= eq.question_number %></span>
<a href="#mao<%= eq.question_number%>" style="cursor:pointer" class="checkstatus_box_big color_white <%= is_correct ? 'post_btn_green' : 'post_btn_red' %>"><%= eq.question_number %></a>
<% end %>
</div>
<div class="clearfix">
@ -57,7 +57,7 @@
<div class="clearfix ml80 mt10 mb15">
<% @exercise.exercise_questions.where(:question_type => 4).each_with_index do |eq, index| %>
<% ea = User.current.exercise_answer.where(:exercise_question_id => eq.id).first %>
<span id="ex_comment_status_<%= eq.id %>" class="checkstatus_box_big <%= (ea && ea.score != -1) ? 'post_btn_white' : 'post_btn_grey' %>"><%= eq.question_number %></span>
<a href="#mao<%= eq.question_number%>" style="cursor:pointer" id="ex_comment_status_<%= eq.id %>" class="checkstatus_box_big <%= (ea && ea.score != -1) ? 'post_btn_white' : 'post_btn_grey' %>"><%= eq.question_number %></a>
<% end %>
</div>
@ -66,7 +66,7 @@
<% @exercise.exercise_questions.each_with_index do |exercise_question, i| %>
<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
<div class="clearfix pl15 pr15">
<p class="fl font-15">第<%= exercise_question.question_number %>题:<span class="color-orange03 ml10">[<%= exercise_question.question_type_name %>]</span><span class="ml10"><%= exercise_question.question_score %>分</span><span class="ml10 color-red"><%= question_commit_status exercise_question, @exercise_user.user %></span></p>
<p class="fl font-15" id="mao<%= exercise_question.question_number %>">第<%= exercise_question.question_number %>题:<span class="color-orange03 ml10">[<%= exercise_question.question_type_name %>]</span><span class="ml10"><%= exercise_question.question_score %>分</span><span class="ml10 color-red"><%= question_commit_status exercise_question, @exercise_user.user %></span></p>
<% if exercise_question.question_type != 4 %>
<% is_correct = answer_is_correct(exercise_question, user) %>
<p class="fr"><span class="<%= is_correct ? 'color-light-green' : 'color-red' %> mr3"><i class="mr5 fa <%= is_correct ? 'fa-check' : 'fa-close' %> font-14"></i><%= is_correct ? exercise_question.question_score : 0 %></span>分</p>

9
app/views/exercise/_new_question.html.erb
View File

@ -2,10 +2,11 @@
<%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
<% end %>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_MC();"><i class="fa fa-plus-circle color-light-green mr5"></i>单选题</a>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_MCQ();"><i class="fa fa-plus-circle color-light-green mr5"></i>多选题</a>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_single();"><i class="fa fa-plus-circle color-light-green mr5"></i>填空题</a>
<a href="javascript:void(0);" class="fl add_item_part" onclick="add_multi();"><i class="fa fa-plus-circle color-light-green mr5"></i>简答题</a>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_MC();">+&nbsp;单选题</a>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_MCQ();">+&nbsp;多选题</a>
<a href="javascript:void(0);" class="fl mr20 add_item_part" onclick="add_single();">+&nbsp;填空题</a>
<a href="javascript:void(0);" class="fl add_item_part" onclick="add_multi();">+&nbsp;简答题</a>
<div id="hidden_div_block" class="undis">
<textarea style="display: none" id="hidden_textarea"></textarea>
</div>

90
app/views/exercise/student_exercise_list.html.erb
View File

@ -31,17 +31,46 @@
</div>
<div class="edu-tab clearfix mb20">
<ul id="edu-tab-nav" class="border-bottom-orange">
<li id="edu-tab-nav-2" class="new-tab-nav background-orange">
<li id="edu-tab-nav-1" class="new-tab-nav background-orange">
<a href="javascript:void(0);" class="tab_type">答题统计</a>
</li>
<% if @is_teacher %>
<% if false%>
<li id="edu-tab-nav-2" class="new-tab-nav">
<a href="javascript:void(0);" class="tab_type">试卷预览</a>
</li>
<li id="edu-tab-nav-3" class="new-tab-nav">
<a href="javascript:void(0);" class="tab_type">设置</a>
</li>
<% end %>
<%= link_to "导出成绩", student_exercise_list_exercise_path(@exercise, :course_id => @course.id, :format => 'xls'), :id => "export_exercise_work", :class => "fr white-btn orange-btn ml10 mt10 mr15" %>
<% else %>
<% if false%>
<li id="edu-tab-nav-3" class="new-tab-nav">
<a href="javascript:void(0);" class="tab_type">查看设置</a>
</li>
<% end %>
<p class="fr">
<% ex_user = @exercise.exercise_users.where(:user_id => User.current).first %>
<% if ex_user %>
<% if ex_user.commit_status > 0 %>
<%= link_to '查看答题', ex_user.commit_status == 1 ? exercise_path(@exercise,:user_id => User.current.id) : show_student_result_exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr mt10 mr15" %>
<% else %>
<% if @exercise.exercise_status == 2 %>
<%= link_to (ex_user.start_at.nil? ? "开始答题" : "继续答题"), exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr mt10 mr15" %>
<% end %>
<% end %>
<% end %>
</p>
<% end %>
</ul>
<div id="list_count" class="user_bg_shadow bor-grey-e padding15">
<!--老师显示部分-->
<% if @is_teacher %>
<form id="exercise_user_search_form">
<li class="clearfix mb5">
<%= link_to "导出成绩", student_exercise_list_exercise_path(@exercise, :course_id => @course.id, :format => 'xls'), :id => "export_exercise_work", :class => "fr white-btn orange-btn ml10 mt8" %>
<div class="edu-find fr mr40 with20 pr">
<div class="edu-find fr mr20 with20 pr">
<div class="edu-find-input">
<input type="text" class="with100 panel-box-sizing" maxlength="20" placeholder="姓名、学号关键字检索" value="<%= @name %>" id="student_user_name">
<!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
@ -86,29 +115,32 @@
</form>
<% elsif User.current.member_of_course?(@exercise.course) %>
<!--学生显示部分-->
<p class="clearfix">
<% ex_user = @exercise.exercise_users.where(:user_id => User.current).first %>
<% if ex_user %>
<% if ex_user.commit_status > 0 %>
<span class="edu-filter-btn edu-filter-btn-orange mb15">你已提交</span>
<%= link_to '查看答题', ex_user.commit_status == 1 ? exercise_path(@exercise,:user_id => User.current.id) : show_student_result_exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr" %>
<% else %>
<span class="edu-filter-btn edu-filter-btn-orange mb15">你未提交</span>
<% if @exercise.exercise_status == 2 %>
<%= link_to (ex_user.start_at.nil? ? "开始答题" : "继续答题"), exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr" %>
<div class="clearfix mb10">
<p class="fl">
<% ex_user = @exercise.exercise_users.where(:user_id => User.current).first %>
<% if ex_user %>
<% if ex_user.commit_status > 0 %>
<span class="edu-filter-btn edu-filter-btn-orange">你已提交</span>
<%#= link_to '查看答题', ex_user.commit_status == 1 ? exercise_path(@exercise,:user_id => User.current.id) : show_student_result_exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr" %>
<% else %>
<span class="edu-filter-btn edu-filter-btn-orange">你未提交</span>
<%# if @exercise.exercise_status == 2 %>
<%#= link_to (ex_user.start_at.nil? ? "开始答题" : "继续答题"), exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr" %>
<%# end %>
<% end %>
<% end %>
<% end %>
</p>
<p class="clearfix font-12">
<span class="fr color-grey ml10">（<%= @has_commit_count %>人已交）</span>
<% if @exercise.exercise_status == 2 && @exercise.end_time > Time.now %>
<% end_time = @exercise.end_time.to_time.to_i %>
<span class="fr color-grey">答题剩余时间：<span class="color-orange03"><%= (end_time - Time.now.to_i) / (24*60*60) %></span>天<span class="color-orange03"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span>小时<span class="color-orange03"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span>分</span>
<% elsif @exercise.exercise_status == 3 %>
<span class="color-orange ml30">提交已截止</span>
<% end %>
</p>
</p>
<p class="fr font-12 mt8">
<span class="fr color-grey ml10">（<%= @has_commit_count %>人已交）</span>
<% if @exercise.exercise_status == 2 && @exercise.end_time > Time.now %>
<% end_time = @exercise.end_time.to_time.to_i %>
<span class="fr color-grey">答题剩余时间：<span class="color-orange03"><%= (end_time - Time.now.to_i) / (24*60*60) %></span>天<span class="color-orange03"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span>小时<span class="color-orange03"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span>分</span>
<% elsif @exercise.exercise_status == 3 %>
<span class="color-orange ml30">提交已截止</span>
<% end %>
</p>
</div>
<% end %>
<div id="exercise_student_work_list">
@ -116,4 +148,12 @@
</div>
</div>
</div>
</div>
</div>
<script>
$(function(){
$("#edu-tab-nav li").live("click",function(){
$("#edu-tab-nav li").removeClass("background-orange");
$(this).addClass("background-orange");
})
})
</script>

4
app/views/exercise/update_question_num.js.erb
View File

@ -29,4 +29,6 @@
$("#show_poll_questions_<%= @exercise_question.id %>").html("<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_question}) %>");
<% elsif @exercise_question.question_type == 4%>
$("#show_poll_questions_<%= @exercise_question.id %>").html("<%= escape_javascript(render :partial => 'show_multi', :locals => {:exercise_question => @exercise_question}) %>");
<% end%>
<% end%>
$(".data-tip-down").html("");
$(".data-tip-down").hide();

28
app/views/forums/index.html.erb
View File

@ -1,7 +1,7 @@
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="<%= user_path(@user) %>"><%= @user.show_name %></a> &gt; 论坛
<a href="<%= user_path(@user) %>"><%= @user.show_name %></a> &gt; 讨论区
</p>
<div class="edu-class-top clearfix mb30 pr user_bg_shadow bor-grey-e">
<div class="clearfix">
@ -11,19 +11,19 @@
</a>
<div class="fl ml15">
<li class="font-16"><a href="<%= user_path(@user.show_name) %>" class="color-grey3"><%= @user.show_name %></a></li>
<li class="mt5 color-grey"><%= @user.login %></li>
<li class="mt5 color-grey font-12"><%= @user.login %></li><!--三分钟前登录-->
</div>
</div>
<ul class="fr" style="padding: 10px 0px;text-align:right">
<li class="fl" style="text-align:center"><span class="color-orange font-bd" id="all_syllabuses"><%= @memos_praise_count %></span><br><span>被赞</span></li>
<li class="fl" style="text-align:center;margin-left: 60px;"><span class="color-orange font-bd" id="all_syllabuses"><%= @my_memos_count %></span><br><span>回复/评论</span></li>
<li class="fl" style="text-align:center;margin-left: 60px;"><span class="color-orange font-bd" id="all_syllabuses"><%= @my_forums_count %></span><br><span>主题</span></li>
<li class="fl" style="text-align:center"><span class="color-orange03 font-bd" id="all_syllabuses"><%= @memos_praise_count %></span><br><span>被赞</span></li>
<li class="fl" style="text-align:center;margin-left: 60px;"><span class="color-orange03 font-bd" id="all_syllabuses"><%= @my_memos_count %></span><br><span>回复/评论</span></li>
<li class="fl" style="text-align:center;margin-left: 60px;"><span class="color-orange03 font-bd" id="all_syllabuses"><%= @my_forums_count %></span><br><span>主题</span></li>
</ul>
</div>
</div>
<div class="clearfix user_bg_shadow bor-grey-e">
<div class="clearfix pt10 pb10 pl15 pr15 bor-bottom-greyE">
<p class="color-grey3 fl font-16">问吧</p>
<p class="color-grey3 fl font-16">帖子</p>
<a href="<%= new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true) %>" class="mt3 white-btn orange-btn fr">+&nbsp;新话题</a>
</div>
<div id="forum_list" class="forum_table mh650">
@ -38,7 +38,7 @@
<%= memo.subject %>
</a>
<% if memo.sticky %>
<span class="btn-top btn-cir-red mt7 ml5 fl">顶</span>
<span class="btn-top btn-cir-orange mt7 ml5 fl">顶</span>
<% end %>
</p>
<div style="width: 1091px; height: 30px;" class="overellipsis color-dark-grey mb10"><%= memo.content.html_safe %></div>
@ -47,10 +47,16 @@
<span class="fl ml30"><%= time_from_now memo.updated_at %></span>
<!--<span class="fl ml50">最后回复：</span>-->
<p class="font-12 mt5 fr">
<span class="mr20 fl" style="cursor: default;" data-tip-down="浏览数"><i class="fa fa-eye mr5"></i><%= memo.viewed_count %></span>
<span class="mr20 fl" style="cursor: default;" data-tip-down="点赞数"><i class="fa fa-thumbs-o-up mr5"></i><%= get_praise_num(memo) %></span>
<span class="mr10 fl" style="cursor: default;" data-tip-down="回复数"><i class="fa fa-comments-o mr5"></i><%= Memo.where(:root_id => memo.id).count %></span>
<!--<span class="fl">类别：分享</span>-->
<% if memo.viewed_count > 0%>
<span class="mr10 fl" style="cursor: default;" data-tip-down="浏览数"><i class="fa fa-eye mr5"></i><%= memo.viewed_count %></span>
<% end %>
<% if get_praise_num(memo) > 0%>
<span class="mr10 ml10 fl" style="cursor: default;" data-tip-down="点赞数"><i class="fa fa-thumbs-o-up mr5"></i><%= get_praise_num(memo) %></span>
<% end %>
<% if Memo.where(:root_id => memo.id).count > 0%>
<span class="mr10 ml10 fl" style="cursor: default;" data-tip-down="回复数"><i class="fa fa-comments-o mr5"></i><%= Memo.where(:root_id => memo.id).count %></span>
<% end %>
<!--<span class="fl">类别：分享</span>-->
</p>
</div>

5
app/views/homework_common/_homework_index_list.html.erb
View File

@ -21,6 +21,11 @@
<% allow_late = homework_common.allow_late ? '已开启补交' : '未开启补交' %>
<span class="edu-filter-btn <%= homework_status_color allow_late %> ml10 fl mt3"><%= allow_late %></span>
<% end %>
<% if false %>
<span class="btn-top btn-cir-orange ml10 fl mt5">未提交</span>
<% end %>
<div class="cl"></div>
<p class="color-grey font-12 mt20">

4
app/views/layouts/_course_base_info.html.erb
View File

@ -82,8 +82,8 @@
<% end %>
<% unless (is_teacher || is_TA || is_TE || is_ST) %>
<div id="join_in_course_header" class="join">
<p class="joinclass"><%= link_to "加入课堂", join_private_courses_courses_path, :remote => true, :method => "post", :class => 'color_white' %></p>
<div id="join_in_course_header" class="fr">
<p><%= link_to "加入课堂", join_private_courses_courses_path, :remote => true, :method => "post", :class => 'white-btn orange-btn' %></p>
</div>
<% end %>
</li>

2
app/views/layouts/_logined_header.html.erb
View File

@ -18,7 +18,7 @@
<li><%= link_to "全部实训", shixuns_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "实训路径", subjects_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "在线课堂", courses_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "论坛", forums_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "讨论区", forums_path, :class => "new-nav-a font-16" %></li>
<!-- <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>-->
<!-- <li><%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>-->

2
app/views/memos/_common_reply_box.html.erb
View File

@ -69,8 +69,8 @@
<p class="fr mr10 orig_reply">
<% if comment.creator_user == User.current %>
<a href="javascript:void(0);" class="color-grey" id="delete_reply_<%= memo.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= forum_memo_path(comment.forum, comment, :user_activity_id => memo.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
<span class="ml5 mr5 color-grey">|</span>
<% end %>
<span class="ml5 mr5 color-grey">|</span>
<%= link_to(
'<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
{:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => memo.class.to_s, :user_activity_id => memo.id},

4
app/views/memos/show.html.erb
View File

@ -5,11 +5,11 @@
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="<%= user_path(@user.show_name)%>"><%= @user.show_name %></a> &gt; <a href="<%= forums_path %>">讨论 </a>
<a href="<%= user_path(@user.show_name)%>"><%= @user.show_name %></a> &gt; <a href="<%= forums_path %>">讨论区 </a>
</p>
<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
<p class="ml15 color-grey3 fl">
讨论详情
帖子详情
</p>
<!-- <p class="color-grey fr font-12 mr15 mt5"><a href="javascript:void(0)">返回</a></p>-->
</div>

48
app/views/messages/_common_reply_box.html.erb
View File

@ -38,29 +38,8 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 50, :height => 50, :alt => "用户头像"), user_url_in_org(comment.creator_user), :target => '_blank' %>
</div>
<div class="t_content fl">
<div class="J_Comment_Info clearfix">
<div class="t_info fl">
<%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %>
<span class="t_area fl"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
</div>
<p class="fr mr10 orig_reply">
<% if is_teacher || comment.creator_user == User.current%>
<a href="javascript:void(0);" class="color-grey" id="delete_reply_<%=activity.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= delete_board_message_path(:id => comment, :user_activity_id => activity.id, :activity_id => activity.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
<% end %>
<span class="ml5 mr5 color-grey">|</span>
<%= link_to(
'<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
{:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
:remote => true,
:method => 'get',
:title => l(:button_reply),:class => "color-grey") %>
<span class="ml5 mr5 color-grey">|</span>
<span class="reply_praise_count_<%= comment.id %>">
<%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
</span>
</p>
</div>
<div class="J_Comment_Reply">
<div class="J_Comment_Reply">
<div class="comment_orig_content" style="margin:0px">
<% if !comment.parent.nil? && !comment.parent.parent.nil? %>
<% parents_rely = [] %>
@ -95,6 +74,29 @@
<!--onmouseover="$('#delete_reply_<%#=activity.id %>_<%#=comment.id %>').show();" onmouseout="$('#delete_reply_<%#=activity.id %>_<%#=comment.id %>').hide();"-->
<div class="comment_content clearfix" >
<div class="color-grey3"><%= comment.content_detail.html_safe %></div>
<div class="J_Comment_Info clearfix">
<div class="t_info fl">
<%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %>
<span class="t_area fl"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
</div>
<p class="fr mr10 orig_reply">
<% if is_teacher || comment.creator_user == User.current%>
<a href="javascript:void(0);" class="color-grey" id="delete_reply_<%=activity.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= delete_board_message_path(:id => comment, :user_activity_id => activity.id, :activity_id => activity.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
<% end %>
<span class="ml5 mr5 color-grey">|</span>
<%= link_to(
'<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
{:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
:remote => true,
:method => 'get',
:title => l(:button_reply),:class => "color-grey") %>
<span class="ml5 mr5 color-grey">|</span>
<span class="reply_praise_count_<%= comment.id %>">
<%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
</span>
</p>
</div>
<div class="">
<div class="cl"></div>
<div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>

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

@ -1,10 +1,24 @@
<% update_visiti_count @shixun %>
<div class="task-header">
<div class="task-header-info">
<h2 class="fl font-24">
<a href="<%= user_path(@shixun.owner) %>" class="task-header-name fl"><%= @shixun.owner.try(:show_name) %></a>
<span class="ml5 mr5 fl">/ </span><p class="task-header-title fl"><%= @shixun.name %></p>
</h2>
<div class="fl">
<h2 class="fl font-24">
<a href="<%= user_path(@shixun.owner) %>" class="task-header-name fl"><%= @shixun.owner.try(:show_name) %></a>
<span class="ml5 mr5 fl">/ </span><p class="task-header-title fl"><%= @shixun.name %></p>
</h2>
<% if @shixun.fork_from.present? %>
<% fork_shixun = Shixun.find(@shixun.fork_from) %>
<div class="cl"></div>
<span class="font-16 color-grey">forked from <a href="<%= shixun_path(fork_shixun) %>" class="color-orange05" target="_blank"><%= fork_shixun.owner.try(:show_name) %>/<%= fork_shixun.name %></a></span>
<% end %>
<div class="cl"></div>
<% unless User.current.manager_of_shixun?(@shixun) %>
<span class="font-16 color-grey fl" data-tip-down = "技术平台"><%= @shixun.language %></span>
<span class="font-16 color-grey fl ml20" data-tip-down = "面向学员"><%= @shixun.shixun_trainee %></span>
<span class="font-16 color-grey fl ml20" data-tip-down = "适用课程"><%= @shixun.shixun_major_courses.blank? ? "" : CourseList.where(:id => @shixun.shixun_major_courses.map(&:course_list_id)).map(&:name).join("、") %></span>
<% end %>
</div>
<!-- <div><%#= link_to "测试", shixun_test_shixun_path(@shixun), :class => "fl ml10 mr10" %></div>-->
<% myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first %>
<% if allow_shixun_exec(@shixun) %>
@ -36,21 +50,19 @@
<a href="javascript:void(0);" class="fr shixun-task-ban-btn mr15">已关闭</a>
<% end %>
<% if (@shixun.can_copy && User.current.user_extensions.try(:identity) == 0 && User.current.professional_certification) %>
<div class = "fr shixun-task-btn" data-tip-down = "基于这个实训修改形成新的实训">
<a href="javascript:void(0);" class="fr pro_new_topbtn mr15 fork" title="fork成员列表"><%= Shixun.where(:fork_from => @shixun.id).count %></a>
<a href="javascript:void(0);" onclick="op_confirm_box_loading('<%= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = "pro_new_topbtn_left fr fork">
<span class='vl_fork'></span>Fork
</a>
<div class = "fr shixun-task-btn">
<span class="fr mr15" data-tip-down = "Fork实训列表">
<a href="<%= fork_list_shixun_path(@shixun) %>" class="pro_new_topbtn fl fork"><%= Shixun.where(:fork_from => @shixun.id).count %></a>
</span>
<span class="fr" data-tip-down = "基于这个实训修改形成新的实训">
<a href="javascript:void(0);" onclick="op_confirm_box_loading('<%= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = "pro_new_topbtn_left fl fork">
<span class='vl_fork'></span>Fork
</a>
</span>
</div>
<% end %>
<% end %>
<% end %>
<div class="cl"></div>
<% unless User.current.manager_of_shixun?(@shixun) %>
<span class="font-16 color-grey fl" data-tip-down = "技术平台"><%= @shixun.language %></span>
<span class="font-16 color-grey fl ml20" data-tip-down = "面向学员"><%= @shixun.shixun_trainee %></span>
<span class="font-16 color-grey fl ml20" data-tip-down = "适用课程"><%= @shixun.shixun_major_courses.blank? ? "" : CourseList.where(:id => @shixun.shixun_major_courses.map(&:course_list_id)).map(&:name).join("、") %></span>
<% end %>
</div>
</div>
<div class="loading_all" style="display: none">
@ -64,14 +76,14 @@
$(".task-header-info .shixun-task-btn").css("margin-top",$(".task-header-info").height() / 2 - 15);
$(".shixun-task-ban-btn").css("margin-top",$(".task-header-info").height() / 2 - 15);
function apply_publish_shixun(url){
if($("#apply_publish_shixun").attr("data-option") == '1'){
$("#apply_publish_shixun").attr("data-option", 0);
$("#apply_publish_shixun").addClass("disabled-grey-bg");
$.ajax({
url: url,
type: 'get'
});
}
}
function apply_publish_shixun(url){
if($("#apply_publish_shixun").attr("data-option") == '1'){
$("#apply_publish_shixun").attr("data-option", 0);
$("#apply_publish_shixun").addClass("disabled-grey-bg");
$.ajax({
url: url,
type: 'get'
});
}
}
</script>

52
app/views/shixuns/fork_list.html.erb Normal file
View File

@ -0,0 +1,52 @@
<div class="task-index mt30 mb30 box_bg_shandow task-index-head">
<div class="task-index-head mt30 mb30 box_bg_shandow">
<div class="task-index-list clearfix mb20 mh320">
<% if @shixuns.blank? %>
<div style="background: #fff;padding-bottom: 15px;" class="box_bg_shandow bor-grey-e ">
<%= render :partial => "welcome/no_data" %>
</div>
<% else %>
<% @shixuns.each do |shixun| %>
<div class="task-index-list-box fl pr">
<% if shixun.status == 2%>
<p class="triangle-topright font-12"></p>
<span class="triangle-font">已发布</span>
<% end %>
<% if shixun.status < 2 && !User.current.manager_of_shixun?(shixun) %>
<div class="black-half">
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
<div class="black-half-info font-16">非试用内容，需要授权</div>
</div>
<% end %>
<div class="task-index-list-box-top xy_box" onclick="shixun_link('<%= shixun.identifier %>')" style="cursor: pointer;">
<p class="task-index-list-title two_lines_show">
<a href="javascript:void(0);"><%= shixun.name %></a>
</p>
<div class="clearfix task-index-list-user task_yx_bo">
<a href="javascript:void(0);"><%= image_tag(url_to_avatar(shixun.owner), :width =>"60", :height => "60", :class => "panel-warp-img mr10 fl", :alt=>"头像") %></a>
<span class="task-index-name task-hide fl"><%= shixun.owner.try(:show_name) %></span>
</div>
<div class="cl"></div>
<span class="mt10 mb10"><%= shixun.language %></span>
<p class="xy_level"><%= shixun.shixun_trainee %></p>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-tasks color-light-green mr5 btn" data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
<li><i class="fa fa-users color-light-green mr5 btn" data-tip-down="学习人数"></i><span><%= shixun.myshixuns.count %></span></li>
<li><i class="fa fa-viacoin color-light-green mr5 btn" data-tip-down="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
</ul>
</div>
<% end %>
<div class="cl"></div>
<div style="text-align:center;">
<div class="pages_right_min" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @shixun_pages, @shixuns_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>
<% end %>
</div>
</div>
</div>

7
app/views/student_work/_homework_reply_detail.html.erb
View File

@ -1,3 +1,5 @@
<div class="df">
<div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "32", :height => "32"), user_path(comment.creator_user), :target => "_blank", :alt => "用户头像" %>
</div>
@ -7,7 +9,7 @@
autoUrl('reply_content_<%= comment.id %>');
});
</script>
<div class="with90 fl" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<div class="fl" style="flex:1" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<div class="orig_right" style="width: 96%">
<div class="orig_content clearfix" id="reply_content_<%= comment.id %>">
<%= comment.content_detail.html_safe %>
@ -39,4 +41,5 @@
<div id="reply_message_<%= comment.id%>" class="reply_to_message clearfix"></div>
</div>
<div class="cl"></div>
<div class="cl"></div>
</div>

192
app/views/student_work/index.html.erb
View File

@ -111,97 +111,107 @@
</ul>
<div class="cl"></div>
<div id="edu-tab-con-2" class="user_bg_shadow bor-grey-e undis">
<div class="" style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
<div class="" style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
<div class="cl"></div>
<div class="upload_img list_style">
<%= @homework.description.html_safe %>
</div>
</div>
<div class="cl"></div>
<div class="upload_img list_style">
<%= @homework.description.html_safe %>
</div>
</div>
<ul class="panel-mes-head">
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @homework} %>
</ul>
<% if @homework.homework_type == 3 %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">分组要求</p>
</div>
<div class="edu-line font-14 pl15 pr15 pd15">
<p>分组人数： <%= @homework.homework_detail_group.min_num %> - <%= @homework.homework_detail_group.max_num %> 人</p>
<span class="color-orange">注：任一成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享。</span>
</div>
</div>
<% end %>
<% if @homework.homework_type == 2 %>
<% samples = @homework.homework_samples %>
<% unless samples.empty? %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">输入输出样例：<%= samples.count %> 组</p>
</div>
<div class="edu-line font-14">
<% samples.each_with_index do |sample, index| %>
<div class="clearfix mr15">
<ul>
<li class="clearfix">
<label class="panel-form-label fl">&nbsp;&nbsp;</label>
<span class="color-green font-bd fl">样例<%= index + 1 %></span>
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl color-grey">样例输入&nbsp;&nbsp;&nbsp;</label>
<div class="fl edu-bg-grey">
<pre class="mt10 ml10 mr10 mb10" style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=sample.input.blank? ? " " : sample.input %></pre>
</div>
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl color-grey">样例输出&nbsp;&nbsp;&nbsp;</label>
<div class="fl edu-bg-grey">
<pre class="mt10 ml10 mr10 mb10" style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=sample.output.blank? ? " " : sample.output %></pre>
</div>
</li>
</ul>
</div>
<% end %>
</div>
</div>
<% if false%>
<div class="homework_explain"style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
<p class="clearfix">
<span class="fl font-14 font-bd mt5">作业说明:</span>
<a href="javascript:void(0)" class="fr white-btn orange-btn edit-btn"><i class="fa fa-pencil mr5"></i>编辑</a>
<a href="javascript:void(0)" class="fr white-btn orange-btn save-btn undis"><i class="fa fa-floppy-o mr5"></i>保存</a>
</p>
<p class="break-word" style="text-indent: 25px;">兴趣的信息，利用所学到的有关“协议与编码器”/解码器/转换器/处理器”的思维，为该类信息设计协议</p>
<p></p><!--放置ke编辑器点击，点击编辑显示-->
</div>
<% end %>
<% if @is_teacher %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">测试集：<%=@homework.homework_tests.count %> 组</p>
</div>
<div class="edu-line font-14">
<table class="edu-pop-table table-pa5 table-line mb15 ml15" style="width:97.5%;" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th class="edu-txt-center" width="10%">序号</th>
<th class="edu-txt-left">测试集输入</th>
<th class="edu-txt-left">测试集输出</th>
</tr>
</thead>
<tbody>
<% @homework.homework_tests.each_with_index do |test, i| %>
<ul class="panel-mes-head" style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @homework} %>
</ul>
<% if @homework.homework_type == 3 %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">分组要求</p>
</div>
<div class="edu-line font-14 pl15 pr15 pd15">
<p>分组人数： <%= @homework.homework_detail_group.min_num %> - <%= @homework.homework_detail_group.max_num %> 人</p>
<span class="color-orange">注：任一成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享。</span>
</div>
</div>
<% end %>
<% if @homework.homework_type == 2 %>
<% samples = @homework.homework_samples %>
<% unless samples.empty? %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">输入输出样例：<%= samples.count %> 组</p>
</div>
<div class="edu-line font-14">
<% samples.each_with_index do |sample, index| %>
<div class="clearfix mr15">
<ul>
<li class="clearfix">
<label class="panel-form-label fl">&nbsp;&nbsp;</label>
<span class="color-green font-bd fl">样例<%= index + 1 %></span>
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl color-grey">样例输入&nbsp;&nbsp;&nbsp;</label>
<div class="fl edu-bg-grey">
<pre class="mt10 ml10 mr10 mb10" style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=sample.input.blank? ? " " : sample.input %></pre>
</div>
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl color-grey">样例输出&nbsp;&nbsp;&nbsp;</label>
<div class="fl edu-bg-grey">
<pre class="mt10 ml10 mr10 mb10" style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=sample.output.blank? ? " " : sample.output %></pre>
</div>
</li>
</ul>
</div>
<% end %>
</div>
</div>
<% end %>
<% if @is_teacher %>
<div class="edu-con-bg01">
<div class="edu-con-top clearfix mb15">
<p class="ml15 fl font-14 font-bd">测试集：<%=@homework.homework_tests.count %> 组</p>
</div>
<div class="edu-line font-14">
<table class="edu-pop-table table-pa5 table-line mb15 ml15" style="width:97.5%;" cellspacing="0" cellpadding="0">
<thead>
<tr>
<td class="edu-txt-center"><%=i+1 %></td>
<td style="height:100%; width:48%;">
<div style="height:100%; width:100%;"><pre style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=test.input.blank? ? " " : test.input %></pre></div>
</td>
<td style="height:100%; width:48%;">
<div style=" height:100%; width:100%;"><pre style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=test.output.blank? ? " " : test.output %></pre></div>
</td>
<th class="edu-txt-center" width="10%">序号</th>
<th class="edu-txt-left">测试集输入</th>
<th class="edu-txt-left">测试集输出</th>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</thead>
<tbody>
<% @homework.homework_tests.each_with_index do |test, i| %>
<tr>
<td class="edu-txt-center"><%=i+1 %></td>
<td style="height:100%; width:48%;">
<div style="height:100%; width:100%;"><pre style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=test.input.blank? ? " " : test.input %></pre></div>
</td>
<td style="height:100%; width:48%;">
<div style=" height:100%; width:100%;"><pre style="font-family: '微软雅黑','宋体'; word-wrap:break-word; white-space:pre-wrap;"><%=test.output.blank? ? " " : test.output %></pre></div>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<% end %>
<% end %>
<% end %>
<div class="panel-mesbox" id="student_work_replies_box">
<%= render :partial => 'student_work_replies' %>
</div>
<div class="panel-mesbox" id="student_work_replies_box">
<%= render :partial => 'student_work_replies' %>
</div>
</div>
<div id="edu-tab-con-1" class="user_bg_shadow bor-grey-e">
<div class="padding15">
@ -376,5 +386,17 @@
return false;
}
});
//编辑、保存作业说明
$(".edit-btn").live("click",function(){
$(this).siblings(".save-btn").show();
$(this).hide();
})
$(".save-btn").live("click",function(){
$(this).siblings(".edit-btn").show();
$(this).hide();
})
})
</script>

37
app/views/users/_comment_reply_detail.html.erb
View File

@ -1,3 +1,4 @@
<div class="df">
<div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33",:class => "bor-radius-all"), user_path(comment.creator_user), :alt => "用户头像" %>
</div>
@ -7,9 +8,8 @@
autoUrl('reply_content_<%= comment.id %>');
});
</script>
<div class="<%= type == 'TrainingTask' ? 'new_orig_right fl' : 'orig_right fl' %>" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<%= link_to comment.creator_user.show_real_name, user_path(comment.creator_user), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="<%= type == 'TrainingTask' ? 'new_orig_right fl' : 'orig_right fl' %>" style="flex:1" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<div class="orig_content" id="reply_content_<%= comment.id %>">
<% if comment.class == Journal %>
<% if comment.details.any? %>
@ -22,14 +22,17 @@
<%= comment.content_detail.html_safe %>
<% end %>
</div>
<div class="orig_reply mt-10 pr" style="height: 18px;">
<div class="reply">
<div class="clearfix">
<%= link_to comment.creator_user.show_real_name, user_path(comment.creator_user), :class => "mr15 font-14 color-grey fl" %>
<span class="orig_area fl"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_reply mt-10 pr fr mt3" style="width: 110px;">
<div class="reply">
<div class="reply-right none" style="position: absolute; right: 0px;">
<span class="reply_praise_count_<%=comment.id %>">
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>user_activity_id,:type=>"reply"}%>
</span>
<% if type == 'Message' %>
<% topic = comment.root %>
<% topic = comment.root %>
<% if !topic.locked? && authorize_for('messages', 'reply') %>
<span class="fr mr20">
<%= link_to(l(:button_reply),
@ -39,10 +42,10 @@
:type => type,
:user_activity_id => user_activity_id,
:parent_id => parent_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
</span>
<% end %>
<% else %>
@ -54,16 +57,20 @@
:type => type,
:user_activity_id => user_activity_id,
:parent_id => parent_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
</span>
<% end %>
</div>
<div class="cl"></div>
<div class="cl"></div>
</div>
</div>
</div>
<div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>
</div>
<div class="cl"></div>
<div class="cl"></div>
</div>

5
app/views/users/_message_contents.html.erb
View File

@ -1,7 +1,4 @@
<div class="homepagePostReplyPublisher">
<%= link_to comment.creator_user.show_real_name, user_path(comment.creator_user), :class => "newsBlue mr10 f14" %>
<%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
</div>
<% if !comment.parent.nil? && !comment.parent.parent.nil? %>
<% parents_rely = [] %>
<% parents_rely = get_reply_parents_no_root parents_rely, comment %>

179
app/views/users/_message_replies.html.erb
View File

@ -14,94 +14,103 @@
<%= render :partial => 'users/message_contents', :locals => {:comment => comment, :type => type, :user_activity_id => user_activity_id}%>
<% if !comment.content_detail.blank? %>
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="margin-left: 0px" id="reply_content_<%= comment.id %>">
<%= comment.content_detail.html_safe %>
</div>
<div class="orig_reply mb10 mt-10">
<div class="reply">
<span class="reply-right">
<span class="reply_praise_count_<%=comment.id %>">
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>user_activity_id,:type=>"reply"}%>
</span>
<% if type == 'Message' %>
<% topic = comment.root %>
<% if !topic.locked? && authorize_for('messages', 'reply') %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% end %>
<% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) || comment.contest_destroyable_by?(User.current) %>
<a href="javascript:void(0);" id="delete_reply_<%=activity_id %>_<%=comment.id %>" class="fr mr20 undis" onclick="delete_confirm_box_2('<%= delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id) %>', '确定要删除该条回复吗？')">删除</a>
<% end %>
<% elsif type == 'JournalsForMessage' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.creator_user == User.current || User.current.admin? %>
<%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
:id => "delete_reply_#{activity_id}_#{comment.id}",:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete)) %>
<% end %>
<% elsif type == 'OrgDocumentComment' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.creator_user == User.current %>
<%= link_to(
l(:button_delete),
{:controller => 'org_document_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
:method => :delete,
:remote => true,
:id => "delete_reply_#{activity_id}_#{comment.id}",
:class => 'fr mr20 undis',
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)) %>
<% end %>
<% elsif type == 'BlogComment' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) if !comment.root.locked? %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.author == User.current %>
<%= link_to(
l(:button_delete),
{:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
:method => :delete,
:remote => true,
:id => "delete_reply_#{activity_id}_#{comment.id}",
:class => 'fr mr20 undis',
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)) %>
<% end %>
<% end %>
</span>
<div class="cl"></div>
</div>
</div>
<div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>
<% end %>
<div class="clearfix">
<div class="homepagePostReplyPublisher fl" style="margin-bottom: 0px">
<%= link_to comment.creator_user.show_real_name, user_path(comment.creator_user), :class => "color-grey mr10 f14" %>
<%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
</div>
<% if !comment.content_detail.blank? %>
<div class="orig_reply fr mt3">
<div class="reply">
<span class="reply-right">
<span class="reply_praise_count_<%=comment.id %>">
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>user_activity_id,:type=>"reply"}%>
</span>
<% if type == 'Message' %>
<% topic = comment.root %>
<% if !topic.locked? && authorize_for('messages', 'reply') %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% end %>
<% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) || comment.contest_destroyable_by?(User.current) %>
<a href="javascript:void(0);" id="delete_reply_<%=activity_id %>_<%=comment.id %>" class="fr mr20 undis" onclick="delete_confirm_box_2('<%= delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id) %>', '确定要删除该条回复吗？')">删除</a>
<% end %>
<% elsif type == 'JournalsForMessage' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.creator_user == User.current || User.current.admin? %>
<%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
:id => "delete_reply_#{activity_id}_#{comment.id}",:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete)) %>
<% end %>
<% elsif type == 'OrgDocumentComment' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.creator_user == User.current %>
<%= link_to(
l(:button_delete),
{:controller => 'org_document_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
:method => :delete,
:remote => true,
:id => "delete_reply_#{activity_id}_#{comment.id}",
:class => 'fr mr20 undis',
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)) %>
<% end %>
<% elsif type == 'BlogComment' %>
<span style="position: relative" class="fr mr20">
<%= link_to(
l(:button_reply),
{:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
:remote => true,
:method => 'get',
:title => l(:button_reply)) if !comment.root.locked? %>
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
</span>
<% if comment.author == User.current %>
<%= link_to(
l(:button_delete),
{:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
:method => :delete,
:remote => true,
:id => "delete_reply_#{activity_id}_#{comment.id}",
:class => 'fr mr20 undis',
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)) %>
<% end %>
<% end %>
</span>
<div class="cl"></div>
</div>
</div>
<% end %>
</div>
<div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>
</div>
<div class="cl"></div>
</li>

2
app/views/users/_user_journalsformessage.html.erb
View File

@ -1,7 +1,7 @@
<div class="eduResources box_bg_shandow bor-grey-e" style="margin-bottom:20px;" id="user_activity_<%= user_activity_id%>">
<div class="eduHomepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.user), :alt => "用户头像" %>
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
</div>
<div class="eduHomepagePostDes">

1
config/routes.rb
View File

@ -109,6 +109,7 @@ RedmineApp::Application.routes.draw do
get 'statistics_students'
get 'search_file_list'
get 'achieve_ways'
get 'fork_list'
end
collection do
get 'shixun_courses'

24
public/javascripts/edu/application.js
View File

@ -319,16 +319,18 @@ function delete_confirm_box_4(url, str){
}
//提示框：只有一个按钮，点击关闭弹框
//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function notice_sure_box(str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
'<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">知道啦</a></div></div>';
pop_box_new(htmlvalue, 480, 140);
}
//提示框：只有一个确定按钮，点击关闭弹框
//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function notice_box(str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
'<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 140);
@ -336,48 +338,54 @@ function notice_box(str){
// 长提示框：只有一个确定按钮，点击关闭弹框
//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function long_notice_box(str){
var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
'<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
pop_box_new(htmlvalue, 575, 140);
}
// 长提示框：只有一个“知道啦”按钮，点击关闭弹框
//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function yes_notice_box(str){
var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
'<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">知道啦</a></div></div>';
pop_box_new(htmlvalue, 575, 200);
}
//提示框：只有一个知道啦按钮，点击打开新窗口
//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function sure_box_redirect(url, str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
'<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();" target="_blank">知道啦</a></div></div>';
pop_box_new(htmlvalue, 480, 140);
}
//提示框：只有一个知道啦按钮，点击打开新窗口
//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function sure_box_redirect_without_newtab(url, str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
'<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();" >知道啦</a></div></div>';
pop_box_new(htmlvalue, 480, 140);
}
//提示框：只有一个确定按钮，点击跳转
//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function notice_box_redirect(url, str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
'<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 140);
}
//提示框：只有一个确定按钮，点击跳转（局部刷新）
//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
function notice_box_redirect_remote(url, str){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
'<a href="'+ url +'" class="task-btn task-btn-blue" data-remote="true">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 140);

1
public/stylesheets/css/edu-admin.css
View File

@ -9,7 +9,6 @@ a:hover.link-name-dark{ color:#5faee3;}
.mb50{ margin-bottom: 50px;}
.mr50{ margin-right: 50px;}
.ml35{ margin-left:35px;}
input,textarea,select{ border:1px solid #eee; background: #fff; color:#666;}
.edu-name-dark{ max-width:100px; display: block; }
.edu-info-dark{ max-width:345px; display: block; }
.edu-color-grey{ color:#666;}

1
public/stylesheets/css/edu-class.css
View File

@ -10,7 +10,6 @@ a:hover.link-name-dark{ color:#5faee3;}
.mb50{ margin-bottom: 50px;}
.mr50{ margin-right: 50px;}
.ml35{ margin-left:35px;}
input,textarea,select{ border:1px solid #eee; background: #fff; color:#666;}
.edu-name-dark{ max-width:150px; display: block; }/*添加学生时，列表里面显示姓名的部分宽度过小,由100px改为150px*/
.edu-info-dark{ max-width:345px; display: block; }
.edu-color-grey{ color:#666;}

2
public/stylesheets/css/edu-common.css
View File

@ -13,7 +13,7 @@ table,tr,td{border:0;}
ol,ul,li{ list-style-type:none}
a:link,a:visited{text-decoration:none;color:#898989; }
a:hover {color:#FF7500;}
input,textarea,select{ background: #fff; border:1px solid #eee; color:#666;}
input,textarea,select{ background: #fff; border:1px solid #eee;}
textarea{resize: none;}
/*侧滚动条*/
::-webkit-scrollbar { width:10px; height:10px; background-color: #F5F5F5; }

8
public/stylesheets/css/edu-public.css
View File

@ -301,9 +301,15 @@ input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
/*班级讨论区置顶的样式*/
.btn-cir-red {background: red; color: #fff; font-weight: normal;}
.btn-cir {display: inline-block;padding: 0px 5px;border-radius: 25px;line-height: 20px;font-size: 12px;}
.btn-cir:hover{background:#fff;}
.btn-cir-grey{background: #e1e1e1;color: #333;}
.btn-cir-grey:hover{background: #c3c3c3;}
.btn-cir-red{background:red;color: #fff; font-weight: normal;}
.btn-cir-red:hover{background:red;}
.btn-cir-orange {background: #ff7500; color: #fff; font-weight: normal;}
.btn-top{display: inline-block;padding: 0px 5px;line-height: 20px;font-size: 12px;border-radius: 3px;}
.btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:0px 10px; border-radius:25px; line-height:25px; height: 25px; font-size:12px;}
/*圆形绿色背景---------22*/
.panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
/*圆形绿色背景------------------18*/

6
public/stylesheets/css/project.css
View File

@ -413,9 +413,9 @@ a.pro_new_username { font-size: 20px; color: #3b94d6; line-height: 24px;}
a.pro_new_username_fork { font-size: 12px; color: #3b94d6; line-height: 24px;}
a.pro_new_proname{ overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
a.pro_new_project_name{ width: 250px; overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
a.pro_new_topbtn{ padding: 4px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;}
a.pro_new_topbtn_left { padding: 4px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #333;}
a:hover.pro_new_topbtn_left{background-image: linear-gradient(#ededed, #dddddd);}
a.pro_new_topbtn{ padding: 4.5px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;}
a.pro_new_topbtn_left { padding: 4.5px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #333;}
a:hover.pro_new_topbtn_left,a:hover.pro_new_topbtn{background-image: linear-gradient(#ededed, #dddddd);}
a.pro_new_grey_topbtn_left{padding: 3px 10px; font-size: 12px;line-height: 20px; background: #fff; border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #888888; cursor:default;}
.pro_new_topnav ul{border-bottom: 3px solid #fff; height: 30px; line-height: 30px;}
.pro_new_topnav ul li{ float: left;padding:0 15px; height: 30px; line-height: 30px;text-align: center; }

2
public/stylesheets/css/public.css
View File

@ -848,7 +848,7 @@ a.winbox_btn_close{ color: #3b94d6; font-size: 18px; font-weight: bold;}
.J_Comment_Face img{ width:40px; height:40px; }
.t_content{ width:92%; margin-left:15px;}
a.content-username { color:#3b94d6; font-size:14px; margin-right:15px;}
a.content-username:hover{ color:#297fb8;}
a.content-username:hover{ color:#ff7500;}
.orig_user img{width:32px; height:32px;}
.reply-right{ float:right; position:relative;}
.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}

15
public/stylesheets/css/taskstyle.css
View File

@ -19,14 +19,9 @@ a.leftnav-box-inner{ display: block; width:77px; border-left:3px solid #292b3a;
a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;}
a.leftnav-box-reset-inner{ display: block; width:77px; border-left:3px solid #292b3a; background:#292b3a; text-align: center; color:#575f6c;}
a:hover.leftnav-box-reset-inner{border-left:3px solid #3498db;color: #fff!important;}
.btn-cir{ background:#575f6c; color:#292b3a;display: inline-block; padding:0px 5px; border-radius:25px; border-radius:15px; line-height:20px; height: 20px; font-size:12px;}
.btn-cir:hover{background:#fff;}
.btn-cir-grey{background: #e1e1e1;color: #333;}
.btn-cir-grey:hover{background: #c3c3c3;}
.btn-cir-red{background:red;color: #fff; font-weight: normal;}
.btn-cir-red:hover{background:red;}
.btn-cir-orange{ background: #ee4a1f; color: #fff;}
.btn-cir-orange:hover{ background: #ee4a1f; color: #fff;}
/*右侧头部*/
.rightbar-header{width: 100%; background:#282c37; height:60px; min-width:1000px;}
.rightbar-score{ margin-top: 17px; font-size: 14px; margin-right:20px;}
@ -197,7 +192,6 @@ input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f
.-task-ces-top{ padding:5px 15px; background:#515151; color:#bfbfbf;}
.-task-ces-info-left{ display: inline-block; width:100px; text-align: right; }
.-position-a-r15{ position: absolute; top:5px; right:15px;}
.btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:0px 10px; border-radius:25px; line-height:25px; height: 25px; font-size:12px;}
.-task-ml80{ margin-left: 80px;}
.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:8000; height:100%; color:#fff;}
.-task-list-header{ border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;}
@ -444,7 +438,8 @@ html>body #ajax-indicator-base { position: fixed; }
.question_item_con{font-weight: normal!important;border:1px solid #EEEEEE!important;color: #333!important;background: #FFFFff!important;position: relative}
.exam_operator{cursor: pointer;position: absolute;right: 15px;top: 11px;}
.question_item_con .write_answer{border-top:1px solid #EEEEEE;background:#EFF9FD;padding: 10px 15px;text-align:justify;}
.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #CCCCCC;border-radius: 3px;margin-left: 15px;cursor: pointer;}
.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #ff7500;border-radius: 3px;margin-left: 15px;cursor: pointer;color: #ff7500!important;}
.add_item_part:hover{color:#fff!important;background-color: #ff7500}
/*更新提示*/

2
public/stylesheets/repository.css
View File

@ -215,7 +215,7 @@
.vl_copy {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
.vl_copy2 {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
.vl_zip {background:url(../images/vlicon/graph.png) 0px 2px no-repeat; padding-left:22px;}
.vl_fork {background:url(/images/vlicon/fork_icon.png) 0px -2px no-repeat; padding-left:22px;}
.vl_fork {background:url(/images/vlicon/fork_icon.png) 0px 0px no-repeat; padding-left:22px;}
.vl_commit {background:url(../images/vlicon/commit_icon.png) 0px -2px no-repeat; padding-left:22px;weight:20px;height: 24px;}
.vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px}
.mt1 {margin-top:1px;}