commit
052a7325f8
@ -1,3 +1,3 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
|
|
||||||
init_KindEditor_data('<%= @user_activity_id%>');
|
init_KindEditor_data('<%= @user_activity_id%>',"","85%");
|
||||||
|
@ -1,74 +1,74 @@
|
|||||||
<div class="homepageRight">
|
<div class="homepageRight">
|
||||||
<div class="HomeWork">
|
<div class="HomeWork">
|
||||||
<div class="RightBanner">
|
<div class="RightBanner">
|
||||||
<div class="NewsBannerName">发布作业</div>
|
<div class="NewsBannerName">发布作业</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="HomeWorkCon">
|
<div class="HomeWorkCon">
|
||||||
<div class="mt15">
|
<div class="mt15">
|
||||||
<textarea class="InputBox W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
|
<textarea class="InputBox W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<div class=" mt10">
|
<div class=" mt10">
|
||||||
<a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
|
<a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
|
||||||
<input type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
|
<input type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
|
||||||
<div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
|
<div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
|
||||||
<input type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
|
<input type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
|
||||||
<div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
|
<div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<% if edit_mode %>
|
<% if edit_mode %>
|
||||||
<%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
|
<%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
|
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
|
||||||
<%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
|
<%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<textarea class="InputBox W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
|
<textarea class="InputBox W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt5">
|
<div class="mt5">
|
||||||
<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
|
<a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20">上传附件</a>
|
||||||
<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
|
<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
|
<a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
|
||||||
<div class="DropLine"></div>
|
<div class="DropLine"></div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="advanced_option" style="display:none;">
|
<div class="advanced_option" style="display:none;">
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<select class="InputBox W120" required="true">
|
<select class="InputBox W120" required="true">
|
||||||
<option value="语言选择">语言选择</option>
|
<option value="语言选择">语言选择</option>
|
||||||
<option value="C语言">C语言</option>
|
<option value="C语言">C语言</option>
|
||||||
<option value="C++">C++</option>
|
<option value="C++">C++</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required></textarea>
|
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required></textarea>
|
||||||
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
|
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
|
||||||
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
|
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
|
<a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
|
||||||
<span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
|
<span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div><!----HomeWork end-->
|
</div><!----HomeWork end-->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script id="t:test-answer-list" type="text/html">
|
<script id="t:test-answer-list" type="text/html">
|
||||||
<div class="mt10">
|
<div class="mt10">
|
||||||
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required></textarea>
|
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required></textarea>
|
||||||
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
|
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
|
||||||
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
|
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<span class="fr pr_join_span mr10" title="匿评结束">匿评结束</span>');
|
$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<a class="postOptionLink" title="匿评结束" href="javascript:void(0);">匿评结束</a>');
|
||||||
alert('关闭成功');
|
alert('关闭成功');
|
@ -1,3 +1,3 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
|
|
||||||
init_KindEditor_data(<%= @user_activity_id%>);
|
init_KindEditor_data(<%= @user_activity_id%>,"","85%");
|
@ -1,6 +1,6 @@
|
|||||||
<%if @project%>
|
<%if @project%>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
<%elsif @course%>
|
<%elsif @course%>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
<%end%>
|
<%end%>
|
||||||
init_KindEditor_data(<%= @user_activity_id%>);
|
init_KindEditor_data(<%= @user_activity_id%>,"","85%");
|
@ -0,0 +1,3 @@
|
|||||||
|
$("#project_id").replaceWith("<%= escape_javascript(select_tag :project_id, options_for_select(user_projects_option), {:class => "InputBox W680 fl"})%>");
|
||||||
|
hideModal("#popbox02");
|
||||||
|
alert("创建成功");
|
@ -1,4 +1,5 @@
|
|||||||
<%= form_for('', :remote => true, :method => :post,:url => add_score_reply_student_work_index_path(:score_id => score.id)) do |f|%>
|
<%= form_for('', :remote => true, :method => :post,:url => add_score_reply_student_work_index_path(:score_id => score.id)) do |f|%>
|
||||||
<%= f.text_area 'message', :class => 'ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
|
<%= f.text_area 'message', :class => 'ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
|
||||||
|
<input type="hidden" value="<%= is_last%>" name="is_last">
|
||||||
<a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
|
<a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
|
||||||
<% end%>
|
<% end%>
|
@ -1,47 +0,0 @@
|
|||||||
<li class="hwork_num ">
|
|
||||||
<span class="c_dark f14 fb fl">学号</span>
|
|
||||||
</li>
|
|
||||||
<li class=" hwork_name f14 fb c_dark">
|
|
||||||
<%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "name"%>
|
|
||||||
<%= link_to "",student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="hwork_tit">
|
|
||||||
<span class="c_dark f14 fb fl">作品名称</span>
|
|
||||||
</li>
|
|
||||||
<li class=" hwork_time f14 fb c_dark">
|
|
||||||
<%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "created_at"%>
|
|
||||||
<%= link_to "",student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="mr5 w40 ml15">
|
|
||||||
<%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "teacher_score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="mr5 w40 ml20">
|
|
||||||
<%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "teaching_asistant_score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="ml15 w40">
|
|
||||||
<% if @homework.homework_type == 1%>
|
|
||||||
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% elsif @homework.homework_type == 2%>
|
|
||||||
<%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% end %>
|
|
||||||
<% if @show_all && @order == "student_score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="ml20">
|
|
||||||
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
@ -0,0 +1,8 @@
|
|||||||
|
<ul class="hworkUl b_grey">
|
||||||
|
<li class="hworkList380 width625">
|
||||||
|
<span class="c_dark f14 fb fl ml10">作品信息</span>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList80 mr10" >
|
||||||
|
<span class="c_dark f14 fb fl ml10">我的评分</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
@ -0,0 +1,37 @@
|
|||||||
|
<ul class="hworkUl b_grey">
|
||||||
|
<li class="hworkList380 <%= @homework.homework_type == 2 ? '' : 'width455'%>">
|
||||||
|
<span class="c_dark f14 fb fl ml10">作品信息</span>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList80" >
|
||||||
|
<%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
||||||
|
<% if @show_all && @order == "teacher_score"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList80">
|
||||||
|
<%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
||||||
|
<% if @show_all && @order == "teaching_asistant_score"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<% if @homework.homework_type == 2%>
|
||||||
|
<li class="hworkList80">
|
||||||
|
<%= link_to "系统评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
||||||
|
<% if @show_all && @order == "system_score"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
<li class="hworkList50">
|
||||||
|
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
||||||
|
<% if @show_all && @order == "student_score"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList50">
|
||||||
|
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
||||||
|
<% if @show_all && @order == "score"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
</ul>
|
@ -0,0 +1,76 @@
|
|||||||
|
<!-- 匿评作品列表,显示某一个作品的信息 -->
|
||||||
|
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
||||||
|
<li class="hworkList380 <%= @homework.homework_type == 2 ? '' : 'width455'%>">
|
||||||
|
<ul>
|
||||||
|
<li class="hworkName mt12">
|
||||||
|
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
||||||
|
<%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
|
||||||
|
</li>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<li>
|
||||||
|
<ul class="mt12">
|
||||||
|
<li class="hworkDetail mr15">
|
||||||
|
姓名:<%= student_work.user.show_name%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkDetail mr15">
|
||||||
|
学号:
|
||||||
|
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkDate">
|
||||||
|
时间:
|
||||||
|
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
|
||||||
|
<span class="c_red">迟交</span>
|
||||||
|
<% else%>
|
||||||
|
<%= format_time student_work.created_at%>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList80 <%= score_color student_work.teacher_score%>">
|
||||||
|
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkList80 <%= score_color student_work.teaching_asistant_score%>">
|
||||||
|
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<% if @homework.homework_type == 2%>
|
||||||
|
<!-- 系统评分 -->
|
||||||
|
<li class="hworkList80 <%= score_color student_work.system_score%>">
|
||||||
|
<%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
<li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
|
||||||
|
<%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
|
||||||
|
<% unless student_work.student_score.nil?%>
|
||||||
|
<span class="linkBlue">
|
||||||
|
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
|
||||||
|
</span>
|
||||||
|
<div class="infoNi none">
|
||||||
|
现共有
|
||||||
|
<span class="c_red"> <%= student_work.student_works_scores.where(:reviewer_role => 3).count%> </span>
|
||||||
|
名学生进行了匿评,平均分为
|
||||||
|
<span class="c_red"> <%= format("%.1f",student_work.student_score)%> </span>分。
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<!-- 成绩 -->
|
||||||
|
<% score = student_work.respond_to?("score") ? student_work.score : student_work.final_score - student_work.absence_penalty - student_work.late_penalty%>
|
||||||
|
<li class="hworkList50 <%= score_color score%> student_final_scor_info">
|
||||||
|
<%= score.nil? ? "--" : format("%.1f",score)%>
|
||||||
|
<% unless score.nil?%>
|
||||||
|
<div class="infoNi none width180">
|
||||||
|
作品最终评分为
|
||||||
|
<span class="c_red"> <%= student_work.final_score%> </span>分。
|
||||||
|
迟交扣分
|
||||||
|
<span class="c_red"> <%= student_work.late_penalty%> </span>分,
|
||||||
|
缺评扣分
|
||||||
|
<span class="c_red"> <%= student_work.absence_penalty%> </span>分,
|
||||||
|
最终成绩为
|
||||||
|
<span class="c_red"> <%= format("%.1f",score)%> </span>分。
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
</ul>
|
@ -1,29 +1,51 @@
|
|||||||
<!-- 匿评作品列表,显示某一个作品的信息 -->
|
<!-- 匿评作品列表,显示某一个作品的信息 -->
|
||||||
<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
|
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
||||||
<% is_my_work = student_work.user == User.current%>
|
<% is_my_work = student_work.user == User.current%>
|
||||||
<li class="hwork_num">
|
<li class="hworkList380 width620">
|
||||||
<% if is_my_work%>
|
<ul>
|
||||||
<span>
|
<li class="hworkName mt12 m_width620">
|
||||||
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
<% if is_my_work%>
|
||||||
</span>
|
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
||||||
<% else%>
|
<%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
|
||||||
<span class="ml30">--</span>
|
<% else%>
|
||||||
<% end%>
|
<%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
|
||||||
</li>
|
<% end%>
|
||||||
<li class="hwork_name">
|
</li>
|
||||||
<% if is_my_work%>
|
<div class="cl"></div>
|
||||||
<%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02" %>
|
<li>
|
||||||
<% else%>
|
<ul class="mt12">
|
||||||
<%= link_to "匿名","javascript:void(0)", :class => "c_blue02"%>
|
<li class="hworkDetail mr15">
|
||||||
<% end%>
|
姓名:
|
||||||
</li>
|
<% if is_my_work%>
|
||||||
<li class=" hwork_tit_e" style="width: 410px">
|
<%= student_work.user.show_name%>
|
||||||
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? '匿名的作品' : student_work.name%>
|
<% else%>
|
||||||
<%= link_to student_work_name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
|
匿名
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkDetail mr15">
|
||||||
|
学号:
|
||||||
|
<% if is_my_work%>
|
||||||
|
<span>
|
||||||
|
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
||||||
|
</span>
|
||||||
|
<% else%>
|
||||||
|
--
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkDate">
|
||||||
|
时间:
|
||||||
|
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
|
||||||
|
<span class="c_red">迟交</span>
|
||||||
|
<% else%>
|
||||||
|
<%= format_time student_work.created_at%>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<% my_score = student_work_score(student_work,User.current) %>
|
<% my_score = student_work_score(student_work,User.current) %>
|
||||||
<li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">
|
<li class="hworkList80 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
|
||||||
<%= my_score.nil? ? "--" : format("%.2f",my_score.score)%>
|
<%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
|
||||||
</li>
|
</li>
|
||||||
<div class="cl"></div>
|
</ul>
|
||||||
</ul><!---hwork_ul end-->
|
|
@ -1,12 +0,0 @@
|
|||||||
<li class="hwork_num ">
|
|
||||||
<span class="f14 f_b c_dark fl ">学号</span>
|
|
||||||
</li>
|
|
||||||
<li class="hwork_name f14 fb c_dark">
|
|
||||||
<span class="c_dark f14 fb fl ">学生姓名</span>
|
|
||||||
</li>
|
|
||||||
<li class="hwork_tit_e">
|
|
||||||
<span class="c_dark f14 fb fl">作品名称</span>
|
|
||||||
</li>
|
|
||||||
<li class="w70 mr5" >
|
|
||||||
<%= link_to "我的评分","javascript:void(0)",:class => "c_dark f14 fb fl"%>
|
|
||||||
</li>
|
|
@ -0,0 +1,31 @@
|
|||||||
|
<div class="BluePopupBox" id="popbox02">
|
||||||
|
<%= labelled_form_for(Project.new,:remote => "true") do |f| %>
|
||||||
|
<h2 class="BluePopuph2 fl">新建项目</h2>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<div class="">
|
||||||
|
<div class="mt10 mb10">
|
||||||
|
<input type="text" class="none" />
|
||||||
|
<input class="InputBox W700" placeholder="项目名称" name="project[name]" id="project_name" onkeyup="regex_project_name();" />
|
||||||
|
<p id="project_name_error_msg" class="c_red"></p>
|
||||||
|
</div>
|
||||||
|
<div class="mb10">
|
||||||
|
<textarea class="InputBox W700" placeholder="项目描述" id="project_description" name="project[description]" onkeyup="regex_project_desc();"></textarea>
|
||||||
|
<p id="project_desc_error_msg" class="c_red"></p>
|
||||||
|
<script>
|
||||||
|
var text = document.getElementById("project_description");
|
||||||
|
autoTextarea(text);// 调用
|
||||||
|
</script>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fl">
|
||||||
|
<input type="checkbox" name="project[is_public]" class="mt5" checked value="1" /><label class=" ml5 ">公开</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_project();">确定</a>
|
||||||
|
<span class="fr mr10 mt3">或</span>
|
||||||
|
<a href="javascript:void(0);" class=" fr mr10 mt3" onclick="clickCanel();">取消</a>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div><!----BluePopupBox end-->
|
@ -0,0 +1,63 @@
|
|||||||
|
<%= form_for('new_form',:url => {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id},:method => "post") do |f|%>
|
||||||
|
<div class="markPopup" id="popbox02">
|
||||||
|
<span class="uploadText">评分设置</span>
|
||||||
|
<div class="mt15">
|
||||||
|
<span class="f14 fontGrey3 mr10">迟交扣分</span>
|
||||||
|
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="f14 fontGrey3 mr10">缺评扣分</span>
|
||||||
|
<input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<% if homework.homework_type == 2%>
|
||||||
|
<div>
|
||||||
|
<span class="f14 fontGrey3 mr10">系统评分</span>
|
||||||
|
<%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "markPercentage"} %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$("#sy_proportion").change(function(){
|
||||||
|
var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100);
|
||||||
|
$("#ta_proportion").replaceWith(build_selector(ta_proportion));
|
||||||
|
$("#student_proportion").val("0%");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#ta_proportion").live("change",function(){
|
||||||
|
var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100) - parseInt($("#ta_proportion").val() * 100);
|
||||||
|
$("#student_proportion").val(ta_proportion + "%");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<% else%>
|
||||||
|
<script>
|
||||||
|
$("#ta_proportion").change(function(){
|
||||||
|
var ta_proportion = $("#ta_proportion").val();
|
||||||
|
$("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<% end%>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<span class="f14 fontGrey3 mr10">教辅评分</span>
|
||||||
|
<%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"} %>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="f14 fontGrey3 mr10">学生匿评</span>
|
||||||
|
<input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
|
||||||
|
</div>
|
||||||
|
<div class="mb20">
|
||||||
|
<span class="f14 fontGrey3 mr10">教师优先</span>
|
||||||
|
<input type="checkbox" name="teacher_priority" <%= homework.teacher_priority == 1 ? 'checked' : ''%>/>
|
||||||
|
<span class="f12 c_red ml10">教师评分为最终评分</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div class="courseSendSubmit">
|
||||||
|
<a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();">确定</a>
|
||||||
|
</div>
|
||||||
|
<div class="courseSendCancel">
|
||||||
|
<a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
@ -1,72 +1,74 @@
|
|||||||
<div class="show_hwork_arrow"></div>
|
<div class="show_hwork_arrow"></div>
|
||||||
<div class="show_hwork">
|
<div class="showHwork">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="fl">
|
<li class="fl" >
|
||||||
<span class="tit_fb">上交时间:</span>
|
<span class="tit_fb">上交时间:</span>
|
||||||
<%=format_time @work.created_at %>
|
<%=format_time @work.created_at %>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<% if !@is_teacher && @work.user == User.current && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1) %>
|
<% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
|
||||||
<!-- 我的作业 && (非匿评作业 || 为开启匿评),显示编辑和删除按钮 -->
|
<!-- 我的作业 && 匿评作业 && 未开启匿评,显示编辑和删除按钮 -->
|
||||||
<li class="fr" >
|
<li class="fr" >
|
||||||
<%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %>
|
<%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %>
|
||||||
</li>
|
</li>
|
||||||
<li class="fr" >
|
<li class="fr" >
|
||||||
<%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
|
<%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
|
||||||
</li>
|
</li>
|
||||||
<% end%>
|
<% end%>
|
||||||
<% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%>
|
<% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%>
|
||||||
<!-- 普通作业或者编程作业,或者是匿评结束阶段,显示点赞按钮 -->
|
<!-- 匿评结束阶段,显示点赞按钮 -->
|
||||||
<li class="fr" id="student_work_praise_<%= @work.id%>">
|
<li class="fr" id="student_work_praise_<%= @work.id%>">
|
||||||
<%= render :partial => 'student_work_praise' %>
|
<%= render :partial => 'student_work_praise' %>
|
||||||
</li>
|
</li>
|
||||||
<% end%>
|
<% end%>
|
||||||
<div class="cl"></div>
|
|
||||||
|
|
||||||
<!--<li >-->
|
|
||||||
<!--<span class="tit_fb"> 参与人员:</span>-->
|
|
||||||
<!--程梦雯 王强-->
|
|
||||||
<!--</li>-->
|
|
||||||
<% if @work.project%>
|
|
||||||
<li >
|
|
||||||
<span class="tit_fb"> 关联项目:</span>
|
|
||||||
<%= link_to( @work.project.name, project_path(@work.project.id), :class => "c_blue02" )%>
|
|
||||||
</li>
|
|
||||||
<% end%>
|
|
||||||
<li >
|
|
||||||
<span class="tit_fb ">内容:</span>
|
|
||||||
<div class="show_hwork_p break_word">
|
|
||||||
<%= text_format(@work.description) if @work.description%>
|
|
||||||
</div>
|
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</li>
|
|
||||||
<li >
|
<!--<li ><span class="tit_fb"> 参与人员:</span>程梦雯 王强</li>-->
|
||||||
<span class="tit_fb"> 附件:</span>
|
|
||||||
<% if @work.attachments.empty?%>
|
<% if @work.project%>
|
||||||
<span style="color: #999999">尚未提交附件</span>
|
<li >
|
||||||
<% else%>
|
<span class="tit_fb"> 关联项目:</span>
|
||||||
<div class="fl">
|
<%= link_to( @work.project.name, project_path(@work.project.id), :class => "linkBlue" )%>
|
||||||
<%= render :partial => 'work_attachments', :locals => {:attachments => @work.attachments} %>
|
</li>
|
||||||
</div>
|
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
|
||||||
<div class="cl"></div>
|
|
||||||
|
|
||||||
<% if @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
|
<li >
|
||||||
<!-- 老师 || 匿评作业 && 开启匿评状态 && 不是当前用户自己的作品 -->
|
<span class="tit_fb ">内容:</span>
|
||||||
<div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
|
<div class="showHworkP break_word">
|
||||||
<%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
|
<%= text_format(@work.description) if @work.description%>
|
||||||
</div>
|
</div>
|
||||||
<% end%>
|
<div class="cl"></div>
|
||||||
</ul>
|
</li>
|
||||||
|
<li >
|
||||||
|
<span class="tit_fb"> 附件:</span>
|
||||||
|
<% if @work.attachments.empty?%>
|
||||||
|
<span style="color: #999999">尚未提交附件</span>
|
||||||
|
<% else%>
|
||||||
|
<div class="fl" style="width: 90%;">
|
||||||
|
<%= render :partial => 'work_attachments', :locals => {:attachments => @work.attachments} %>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<li >
|
||||||
|
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
|
||||||
|
<!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
|
||||||
|
<div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
|
||||||
|
<%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
<div class="ping_box mt10" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
|
<div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
|
||||||
<%@work.student_works_scores.order("updated_at desc").each do |score|%>
|
<%@student_work_scores.each do |score|%>
|
||||||
<div id="work_score_<%= score.id%>">
|
<div id="work_score_<%= score.id%>">
|
||||||
<%= render :partial => 'student_work_score',:locals => {:score => score}%>
|
<%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
|
||||||
</div>
|
</div>
|
||||||
<% end%>
|
<% end%>
|
||||||
</div><!---ping_box end--->
|
</div>
|
||||||
<a href="javascript:void(0);" class="fr c_blue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
|
<!---ping_box end--->
|
||||||
<div class="cl"></div>
|
<a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
|
||||||
</div><!---show_hwork end--->
|
<div class="cl"></div>
|
||||||
|
</div>
|
@ -1,37 +0,0 @@
|
|||||||
<li class="hwork_num ">
|
|
||||||
<span class="c_dark f14 fb fl">学号</span>
|
|
||||||
</li>
|
|
||||||
<li class=" hwork_name f14 fb c_dark">
|
|
||||||
<%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "name"%>
|
|
||||||
<%= link_to "",student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="hwork_tit_une">
|
|
||||||
<span class="c_dark f14 fb fl">作品名称</span>
|
|
||||||
</li>
|
|
||||||
<li class=" hwork_time f14 fb c_dark">
|
|
||||||
<%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "created_at"%>
|
|
||||||
<%= link_to "",student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="mr5 w40 ml15">
|
|
||||||
<%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "teacher_score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="mr5 w40 ml20">
|
|
||||||
<%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "teaching_asistant_score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<li class="ml20">
|
|
||||||
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
|
|
||||||
<% if @show_all && @order == "score"%>
|
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
|
|
||||||
<% end%>
|
|
||||||
</li>
|
|
@ -1,8 +1,8 @@
|
|||||||
<% attachments.each_with_index do |attachment,i| %>
|
<% attachments.each_with_index do |attachment,i| %>
|
||||||
<div id="attachment_<%= attachment.id%>">
|
<div id="attachment_<%= attachment.id%>">
|
||||||
<%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
|
<%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
|
||||||
<%= link_to(' '.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
|
<%= link_to(' '.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
|
||||||
<span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
|
<span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
if($("#about_hwork_<%= @work.id%>").children().length > 0)
|
if($("#about_hwork_<%= @work.id%>").children().length > 0){
|
||||||
{$("#about_hwork_<%= @work.id%>").html("");}
|
$("#about_hwork_<%= @work.id%>").html("");
|
||||||
else
|
}
|
||||||
{
|
else{
|
||||||
<% if @homework.homework_type == 2%>
|
<% if @homework.homework_type == 2%>
|
||||||
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>");
|
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>");
|
||||||
<% else%>
|
<% else%>
|
||||||
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
|
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
|
||||||
<% end%>
|
<% end%>
|
||||||
$('#score_<%= @work.id%>').peSlider({range: 'min'});
|
$('#score_<%= @work.id%>').peSlider({range: 'min'});
|
||||||
}
|
}
|
@ -0,0 +1,40 @@
|
|||||||
|
//本js使用的新的tag显示方法
|
||||||
|
<% if @obj_flag == '3'%>
|
||||||
|
$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
//$('#put-tag-form-issue').hide();
|
||||||
|
$('#name-issue').val("");
|
||||||
|
<% elsif @obj_flag == '1'%>
|
||||||
|
$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_user_new_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
$('#tags_name3').val("");
|
||||||
|
<% elsif @obj_flag == '2'%>
|
||||||
|
$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project_new_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
$('#tags_name2').val("");
|
||||||
|
<% elsif @obj_flag == '6'%>
|
||||||
|
<%if @course%>
|
||||||
|
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
|
||||||
|
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
|
||||||
|
:locals => {:obj => @obj,:object_flag => @obj_flag,:select_tag_name => @select_tag_name}) %>');
|
||||||
|
$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
|
||||||
|
<%else%>
|
||||||
|
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
|
||||||
|
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
<%end%>
|
||||||
|
|
||||||
|
$("#tags_name_<%=@obj.id%>").val("");
|
||||||
|
$("#add_tag_<%=@obj.id%>").hide();
|
||||||
|
<% elsif @obj_flag == '9'%>
|
||||||
|
$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
$('#tags_name').val("");
|
||||||
|
<% elsif @obj_flag == '10'%>
|
||||||
|
//$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
|
||||||
|
<% else%>
|
||||||
|
$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
|
||||||
|
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
|
||||||
|
$('#tags_name').val("");
|
||||||
|
//$('#put-tag-form').hide();
|
||||||
|
<% end %>
|
@ -1,177 +0,0 @@
|
|||||||
|
|
||||||
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
|
|
||||||
|
|
||||||
<% if @news.commentable? %>
|
|
||||||
<div class="msg_box fl">
|
|
||||||
<h4><%= l(:label_comment_add) %></h4>
|
|
||||||
<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
|
|
||||||
<div class="box" id="news_comment">
|
|
||||||
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
|
|
||||||
<%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
|
|
||||||
</div>
|
|
||||||
<p class="mt10">
|
|
||||||
<a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
|
|
||||||
<%= l(:label_cancel_with_space) %>
|
|
||||||
</a>
|
|
||||||
<a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
|
|
||||||
<%= l(:label_comment_with_space) %>
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<div class="homepagePostReplyInputContainer" id='leave-message' nhname="new_message">
|
|
||||||
|
|
||||||
<%= form_for('new_form', :method => :post,
|
|
||||||
:url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
|
|
||||||
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
|
|
||||||
<textarea class="homepagePostReplyInput" nhname="new_message_textarea" name="new_form[course_message]" placeholder="请输入回复"></textarea>
|
|
||||||
<p nhname="contentmsg"></p>
|
|
||||||
<% end %>
|
|
||||||
<div class="cl"></div>
|
|
||||||
<div>
|
|
||||||
<div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
|
|
||||||
<a href="javascript:void(0)" class="grey_btn fr ml10 mt10" nhname="cancel_btn">取 消</a>
|
|
||||||
<a href="javascript:void(0)" onclick='$("#leave_message_form").submit();' class="blue_btn fr mt10">
|
|
||||||
发送
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="cl"></div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
$(function(){
|
|
||||||
|
|
||||||
function init_editor(params){
|
|
||||||
var editor = params.kindutil.create(params.textarea, {
|
|
||||||
resizeType : 1,minWidth:"1px",width:"100%",height:"45px",
|
|
||||||
items:['emoticons'],
|
|
||||||
afterChange:function(){//按键事件
|
|
||||||
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
|
||||||
},
|
|
||||||
afterCreate:function(){
|
|
||||||
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
|
||||||
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
|
||||||
params.toolbar_container.append(toolbar);
|
|
||||||
}
|
|
||||||
}).loadPlugin('paste');
|
|
||||||
return editor;
|
|
||||||
}
|
|
||||||
|
|
||||||
function nh_check_field(params){
|
|
||||||
var result=true;
|
|
||||||
if(params.content!=undefined){
|
|
||||||
if(params.content.isEmpty()){
|
|
||||||
result=false;
|
|
||||||
}
|
|
||||||
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
|
||||||
params.textarea.html(params.content.html());
|
|
||||||
params.content.sync();
|
|
||||||
if(params.content.isEmpty()){
|
|
||||||
params.contentmsg.html('内容不能为空');
|
|
||||||
params.contentmsg.css({color:'#ff0000'});
|
|
||||||
}else{
|
|
||||||
params.contentmsg.html('填写正确');
|
|
||||||
params.contentmsg.css({color:'#008000'});
|
|
||||||
}
|
|
||||||
params.contentmsg.show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
function init_form(params){
|
|
||||||
params.form.submit(function(){
|
|
||||||
var flag = false;
|
|
||||||
if(params.form.attr('data-remote') != undefined ){
|
|
||||||
flag = true
|
|
||||||
}
|
|
||||||
var is_checked = nh_check_field({
|
|
||||||
issubmit:true,
|
|
||||||
content:params.editor,
|
|
||||||
contentmsg:params.contentmsg,
|
|
||||||
textarea:params.textarea
|
|
||||||
});
|
|
||||||
if(is_checked){
|
|
||||||
if(flag){
|
|
||||||
return true;
|
|
||||||
}else{
|
|
||||||
$(this)[0].submit();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
function nh_reset_form(params){
|
|
||||||
params.form[0].reset();
|
|
||||||
params.textarea.empty();
|
|
||||||
if(params.editor != undefined){
|
|
||||||
params.editor.html(params.textarea.html());
|
|
||||||
}
|
|
||||||
params.contentmsg.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
KindEditor.ready(function(K){
|
|
||||||
$("a[nhname='reply_btn']").live('click',function(){
|
|
||||||
var params = {};
|
|
||||||
params.kindutil = K;
|
|
||||||
params.container = $(this).parent('div').parent('div');
|
|
||||||
params.div_form = $(">.respond-form",params.container);
|
|
||||||
params.form = $("form",params.div_form);
|
|
||||||
params.textarea = $("textarea[name='user_notes']",params.div_form);
|
|
||||||
params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
|
|
||||||
params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
|
|
||||||
params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
|
|
||||||
if(params.textarea.data('init') == undefined){
|
|
||||||
params.editor = init_editor(params);
|
|
||||||
init_form(params);
|
|
||||||
params.cancel_btn.click(function(){
|
|
||||||
nh_reset_form(params);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
params.cancel_btn.click();
|
|
||||||
toggleAndSettingWordsVal(params.div_form, params.textarea);
|
|
||||||
setTimeout(function(){
|
|
||||||
if(!params.div_form.is(':hidden')){
|
|
||||||
params.textarea.show();
|
|
||||||
params.textarea.focus();
|
|
||||||
params.textarea.hide();
|
|
||||||
}
|
|
||||||
},300);
|
|
||||||
params.textarea.data('init',1);
|
|
||||||
});
|
|
||||||
|
|
||||||
$("div[nhname='new_message']").each(function(){
|
|
||||||
var params = {};
|
|
||||||
params.kindutil = K;
|
|
||||||
params.div_form = $(this);
|
|
||||||
params.form = $("form",params.div_form);
|
|
||||||
if(params.form==undefined || params.form.length==0){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
|
|
||||||
params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
|
|
||||||
params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
|
|
||||||
if(params.textarea.data('init') == undefined){
|
|
||||||
params.editor = init_editor(params);
|
|
||||||
init_form(params);
|
|
||||||
$("a[nhname='cancel_btn']",params.div_form).click(function(){
|
|
||||||
nh_reset_form(params);
|
|
||||||
});
|
|
||||||
params.textarea.data('init',1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
|
|
||||||
<div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
|
|
||||||
<div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
|
|
||||||
</div>
|
|
||||||
<div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
|
|
||||||
</div>-->
|
|
@ -1,73 +1,79 @@
|
|||||||
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
|
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
/*回复框*/
|
/*回复框*/
|
||||||
div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
|
div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
|
||||||
span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
|
span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
|
||||||
span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
|
span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
|
||||||
div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
|
div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
|
||||||
span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
|
span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
|
||||||
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
|
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
|
||||||
div.ke-toolbar .ke-outline{border:none;}
|
div.ke-toolbar .ke-outline{border:none;}
|
||||||
.ke-inline-block{display: none;}
|
.ke-inline-block{display: none;}
|
||||||
</style>
|
div.ke-container{float:left;}
|
||||||
<% user_activities.each do |user_activity|
|
</style>
|
||||||
if user_activities %>
|
<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %>
|
||||||
<script>
|
<% user_activities.each do |user_activity|
|
||||||
function expand_reply(container,btnid){
|
if user_activities %>
|
||||||
var target = $(container);
|
<script>
|
||||||
var btn = $(btnid);
|
function expand_reply(container,btnid){
|
||||||
if(btn.data('init')=='0'){
|
var target = $(container);
|
||||||
btn.data('init',1);
|
var btn = $(btnid);
|
||||||
btn.html('收起回复('+btn.data('count')+')');
|
if(btn.data('init')=='0'){
|
||||||
target.show();
|
btn.data('init',1);
|
||||||
}else{
|
btn.html('收起回复('+btn.data('count')+')');
|
||||||
btn.data('init',0);
|
target.show();
|
||||||
btn.html('展开更多('+btn.data('count')+')');
|
}else{
|
||||||
target.hide();
|
btn.data('init',0);
|
||||||
target.eq(0).show();
|
btn.html('展开更多('+btn.data('count')+')');
|
||||||
target.eq(1).show();
|
target.hide();
|
||||||
}
|
target.eq(0).show();
|
||||||
}
|
target.eq(1).show();
|
||||||
|
}
|
||||||
$(function() {
|
}
|
||||||
init_KindEditor_data(<%= user_activity.id%>);
|
|
||||||
});
|
function expand_reply_input(id) {
|
||||||
</script>
|
$(id).toggle();
|
||||||
<% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
|
}
|
||||||
<% case user_activity.container_type.to_s %>
|
|
||||||
<% when 'Course' %>
|
$(function() {
|
||||||
<% if act %>
|
init_KindEditor_data(<%= user_activity.id%>,"","85%");
|
||||||
<% case user_activity.act_type.to_s %>
|
});
|
||||||
<% when 'HomeworkCommon' %>
|
</script>
|
||||||
<%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
|
||||||
<% when 'News' %>
|
<% case user_activity.container_type.to_s %>
|
||||||
<%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<% when 'Course' %>
|
||||||
<% when 'Message'%>
|
<% if act %>
|
||||||
<%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<% case user_activity.act_type.to_s %>
|
||||||
<% when 'Poll' %>
|
<% when 'HomeworkCommon' %>
|
||||||
<%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
|
<%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% end %>
|
<% when 'News' %>
|
||||||
<% end %>
|
<%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% when 'Project' %>
|
<% when 'Message'%>
|
||||||
<% if act %>
|
<%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% case user_activity.act_type.to_s %>
|
<% when 'Poll' %>
|
||||||
<% when 'Issue' %>
|
<%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<% end %>
|
||||||
<% when 'Message' %>
|
<% end %>
|
||||||
<%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<% when 'Project' %>
|
||||||
<% end %>
|
<% if act %>
|
||||||
<% end %>
|
<% case user_activity.act_type.to_s %>
|
||||||
<% end %>
|
<% when 'Issue' %>
|
||||||
<% end %>
|
<%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% end %>
|
<% when 'Message' %>
|
||||||
|
<%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% if user_activities.count == 10%>
|
<% end %>
|
||||||
<div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
|
<% end %>
|
||||||
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
|
<% end %>
|
||||||
<% end%>
|
<% end %>
|
||||||
|
<% end %>
|
||||||
<script type="text/javascript">
|
|
||||||
$("#show_more_activities").mouseover(function(){
|
<% if user_activities.count == 10%>
|
||||||
$("#more_activities_link").click();
|
<div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
|
||||||
});
|
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
|
||||||
|
<% end%>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$("#show_more_activities").mouseover(function(){
|
||||||
|
$("#more_activities_link").click();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
@ -0,0 +1,5 @@
|
|||||||
|
class AddTeacherPriorityToHomework < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :homework_commons,:teacher_priority,:integer,:default => 1
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,16 @@
|
|||||||
|
class UpdateUserActivitiesUpdateAt < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
count = UserActivity.all.count / 30 + 2
|
||||||
|
transaction do
|
||||||
|
for i in 1 ... count do i
|
||||||
|
UserActivity.page(i).per(30).each do |activity|
|
||||||
|
activity.updated_at = activity.created_at
|
||||||
|
activity.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,15 @@
|
|||||||
|
class SystemScoreDefault < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
change_column :student_works,:system_score,:float,:default => 0
|
||||||
|
|
||||||
|
|
||||||
|
# StudentWork.where("system_score is null").each do |student_work|
|
||||||
|
# student_work.system_score = 0
|
||||||
|
# student_work.save
|
||||||
|
# end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
change_column :student_works,:system_score,:float
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,20 @@
|
|||||||
|
class AboutNormalHomework < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
HomeworkCommon.where(:homework_type => 0).each do |homework|
|
||||||
|
unless homework.homework_detail_manual
|
||||||
|
homework_detail_manual = HomeworkDetailManual.new
|
||||||
|
homework_detail_manual.ta_proportion = 0.6
|
||||||
|
homework_detail_manual.comment_status = 1
|
||||||
|
homework_detail_manual.evaluation_start = homework.created_at
|
||||||
|
homework_detail_manual.evaluation_end = homework.created_at
|
||||||
|
homework_detail_manual.evaluation_num = 3
|
||||||
|
homework_detail_manual.absence_penalty = 5
|
||||||
|
homework_detail_manual.homework_common_id = homework.id
|
||||||
|
homework_detail_manual.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
File diff suppressed because it is too large
Load Diff
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
@ -1,122 +1,126 @@
|
|||||||
function init_editor(params){
|
function init_editor(params){
|
||||||
// var minHeight; //最小高度
|
// var minHeight; //最小高度
|
||||||
var paramsHeight = params.height; //设定的高度
|
var paramsHeight = params.height; //设定的高度
|
||||||
|
var paramsWidth = params.width == undefined ? "100%" : params.width;
|
||||||
var editor = params.kindutil.create(params.textarea, {
|
|
||||||
resizeType : 1,minWidth:"1px",width:"100%",
|
var editor = params.kindutil.create(params.textarea, {
|
||||||
height:"30px",// == undefined ? "30px":paramsHeight+"px",
|
resizeType : 1,minWidth:"1px",width:paramsWidth,
|
||||||
minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
|
height:"30px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
items:['emoticons'],
|
minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
afterChange:function(){//按键事件
|
items:['emoticons'],
|
||||||
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
afterChange:function(){//按键事件
|
||||||
var edit = this.edit;
|
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
||||||
var body = edit.doc.body;
|
var edit = this.edit;
|
||||||
edit.iframe.height(paramsHeight);
|
var body = edit.doc.body;
|
||||||
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
|
edit.iframe.height(paramsHeight);
|
||||||
},
|
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
|
||||||
afterCreate:function(){
|
},
|
||||||
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
afterCreate:function(){
|
||||||
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
||||||
params.toolbar_container.append(toolbar);
|
toolbar.css('width',24);
|
||||||
//init
|
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
||||||
var edit = this.edit;
|
params.toolbar_container.append(toolbar);
|
||||||
var body = edit.doc.body;
|
//init
|
||||||
edit.iframe[0].scroll = 'no';
|
var edit = this.edit;
|
||||||
body.style.overflowY = 'hidden';
|
var body = edit.doc.body;
|
||||||
//reset height
|
edit.iframe[0].scroll = 'no';
|
||||||
var edit = this.edit;
|
body.style.overflowY = 'hidden';
|
||||||
var body = edit.doc.body;
|
//reset height
|
||||||
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
var edit = this.edit;
|
||||||
edit.iframe.height(paramsHeight);
|
var body = edit.doc.body;
|
||||||
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
|
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
||||||
|
edit.iframe.height(paramsHeight);
|
||||||
}
|
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
|
||||||
}).loadPlugin('paste');
|
|
||||||
return editor;
|
}
|
||||||
}
|
}).loadPlugin('paste');
|
||||||
|
return editor;
|
||||||
function nh_check_field(params){
|
}
|
||||||
var result=true;
|
|
||||||
if(params.content!=undefined){
|
function nh_check_field(params){
|
||||||
if(params.content.isEmpty()){
|
var result=true;
|
||||||
result=false;
|
if(params.content!=undefined){
|
||||||
}
|
if(params.content.isEmpty()){
|
||||||
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
result=false;
|
||||||
params.textarea.html(params.content.html());
|
}
|
||||||
params.content.sync();
|
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
||||||
if(params.content.isEmpty()){
|
params.textarea.html(params.content.html());
|
||||||
params.contentmsg.html('内容不能为空');
|
params.content.sync();
|
||||||
params.contentmsg.css({color:'#ff0000'});
|
if(params.content.isEmpty()){
|
||||||
}else{
|
params.contentmsg.html('内容不能为空');
|
||||||
params.contentmsg.html('填写正确');
|
params.contentmsg.css({color:'#ff0000'});
|
||||||
params.contentmsg.css({color:'#008000'});
|
}else{
|
||||||
}
|
params.contentmsg.html('填写正确');
|
||||||
params.contentmsg.show();
|
params.contentmsg.css({color:'#008000'});
|
||||||
}
|
}
|
||||||
}
|
params.contentmsg.show();
|
||||||
return result;
|
}
|
||||||
}
|
}
|
||||||
function init_form(params){
|
return result;
|
||||||
params.form.submit(function(){
|
}
|
||||||
var flag = false;
|
function init_form(params){
|
||||||
if(params.form.attr('data-remote') != undefined ){
|
params.form.submit(function(){
|
||||||
flag = true
|
var flag = false;
|
||||||
}
|
if(params.form.attr('data-remote') != undefined ){
|
||||||
var is_checked = nh_check_field({
|
flag = true
|
||||||
issubmit:true,
|
}
|
||||||
content:params.editor,
|
var is_checked = nh_check_field({
|
||||||
contentmsg:params.contentmsg,
|
issubmit:true,
|
||||||
textarea:params.textarea
|
content:params.editor,
|
||||||
});
|
contentmsg:params.contentmsg,
|
||||||
if(is_checked){
|
textarea:params.textarea
|
||||||
if(flag){
|
});
|
||||||
return true;
|
if(is_checked){
|
||||||
}else{
|
if(flag){
|
||||||
$(this)[0].submit();
|
return true;
|
||||||
return false;
|
}else{
|
||||||
}
|
$(this)[0].submit();
|
||||||
}
|
return false;
|
||||||
return false;
|
}
|
||||||
});
|
}
|
||||||
}
|
return false;
|
||||||
function nh_reset_form(params){
|
});
|
||||||
params.form[0].reset();
|
}
|
||||||
params.textarea.empty();
|
function nh_reset_form(params){
|
||||||
if(params.editor != undefined){
|
params.form[0].reset();
|
||||||
params.editor.html(params.textarea.html());
|
params.textarea.empty();
|
||||||
}
|
if(params.editor != undefined){
|
||||||
params.contentmsg.hide();
|
params.editor.html(params.textarea.html());
|
||||||
}
|
}
|
||||||
//第二个参数是高度,可以传,可以不传
|
params.contentmsg.hide();
|
||||||
function init_KindEditor_data(id){
|
}
|
||||||
var height = arguments[1] ? arguments[1] : undefined;
|
//第二个参数是高度,可以传,可以不传
|
||||||
KindEditor.ready(function (K) {
|
function init_KindEditor_data(id){
|
||||||
$("div[nhname='new_message_" + id + "']").each(function () {
|
var height = arguments[1] ? arguments[1] : undefined;
|
||||||
var params = {};
|
var width = arguments[2] ? arguments[2] : undefined;
|
||||||
params.kindutil = K;
|
KindEditor.ready(function (K) {
|
||||||
params.div_form = $(this);
|
$("div[nhname='new_message_" + id + "']").each(function () {
|
||||||
params.form = $("form", params.div_form);
|
var params = {};
|
||||||
if (params.form == undefined || params.form.length == 0) {
|
params.kindutil = K;
|
||||||
return;
|
params.div_form = $(this);
|
||||||
}
|
params.form = $("form", params.div_form);
|
||||||
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
if (params.form == undefined || params.form.length == 0) {
|
||||||
params.contentmsg = $("p[nhname='contentmsg_" + id + "']", params.div_form);
|
return;
|
||||||
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
}
|
||||||
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
||||||
params.submit_btn = $("#new_message_submit_btn_" + id);
|
params.contentmsg = $("p[nhname='contentmsg_" + id + "']", params.div_form);
|
||||||
params.height = height;
|
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
||||||
if (params.textarea.data('init') == undefined) {
|
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
||||||
params.editor = init_editor(params);
|
params.submit_btn = $("#new_message_submit_btn_" + id);
|
||||||
init_form(params);
|
params.height = height;
|
||||||
params.cancel_btn.click(function () {
|
params.width = width;
|
||||||
nh_reset_form(params);
|
if (params.textarea.data('init') == undefined) {
|
||||||
});
|
params.editor = init_editor(params);
|
||||||
params.submit_btn.click(function () {
|
init_form(params);
|
||||||
params.form.submit();
|
params.cancel_btn.click(function () {
|
||||||
});
|
nh_reset_form(params);
|
||||||
params.textarea.data('init', 1);
|
});
|
||||||
$(this).show();
|
params.submit_btn.click(function () {
|
||||||
}
|
params.form.submit();
|
||||||
});
|
});
|
||||||
});
|
params.textarea.data('init', 1);
|
||||||
|
$(this).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
@ -1,117 +1,117 @@
|
|||||||
/*新个人主页框架css*/
|
/*新个人主页框架css*/
|
||||||
.navContainer {width:100%; background-color:#269ac9;}
|
.navContainer {width:100%; background-color:#269ac9;}
|
||||||
.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
|
.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
|
||||||
.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
|
.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
|
||||||
.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
|
.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
|
||||||
.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
|
.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
|
||||||
.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
|
.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
|
||||||
.navHomepageMenu:hover {background-color:#297fb8;}
|
.navHomepageMenu:hover {background-color:#297fb8;}
|
||||||
.navHomepageSearchBoxcontainer {margin-top:11px; }
|
.navHomepageSearchBoxcontainer {margin-top:11px; }
|
||||||
.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;}
|
.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;}
|
||||||
.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
|
.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
|
||||||
.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
|
.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
|
||||||
a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
|
a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
|
||||||
#navSearchAlert {display:none;}
|
#navSearchAlert {display:none;}
|
||||||
.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
|
.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
|
||||||
.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;}
|
.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;}
|
||||||
.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
|
.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
|
||||||
.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
|
.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
|
||||||
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
|
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
|
||||||
.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
|
.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
|
||||||
/*.navHomepageProfile ul li ul {display:none;}
|
/*.navHomepageProfile ul li ul {display:none;}
|
||||||
.navHomepageProfile ul li:hover ul {display:block;}*/
|
.navHomepageProfile ul li:hover ul {display:block;}*/
|
||||||
.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
|
.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
|
||||||
.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
|
.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
|
||||||
.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
|
.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
|
||||||
.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
|
.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
|
||||||
.homepagePortraitImage:hover {border:1px solid #15bccf;}
|
.homepagePortraitImage:hover {border:1px solid #15bccf;}
|
||||||
.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
|
.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
|
||||||
.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
|
.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
|
||||||
.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
|
.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
|
||||||
.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
|
.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
|
||||||
.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;}
|
.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;}
|
||||||
.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
|
.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
|
||||||
.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
|
.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
|
||||||
.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
|
.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
|
||||||
.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
|
.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
|
||||||
.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
|
.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
|
||||||
.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
|
.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
|
||||||
.homepageImageNumber {font-size:12px; color:#484848;}
|
.homepageImageNumber {font-size:12px; color:#484848;}
|
||||||
a.homepageImageNumber:hover {color:#15bccf;}
|
a.homepageImageNumber:hover {color:#15bccf;}
|
||||||
.homepageImageText {font-size:12px; color:#888888;}
|
.homepageImageText {font-size:12px; color:#888888;}
|
||||||
.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
|
.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
|
||||||
.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
|
.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
|
||||||
.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
|
.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
|
||||||
.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
|
.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
|
||||||
.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
|
.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
|
||||||
.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
|
.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
|
||||||
a.coursesLineGrey {color:#808080; display:block;}
|
a.coursesLineGrey {color:#808080; display:block;}
|
||||||
a.coursesLineGrey:hover {color:#ffffff;}
|
a.coursesLineGrey:hover {color:#ffffff;}
|
||||||
.homepageLeftMenuMore {height:18px;}
|
.homepageLeftMenuMore {height:18px;}
|
||||||
.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
|
.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
|
||||||
.homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
|
.homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
|
||||||
.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
|
.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
|
||||||
a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
|
a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
|
||||||
.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
|
.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
|
||||||
.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
|
.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
|
||||||
.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
|
.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
|
||||||
.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
|
.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
|
||||||
.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
|
.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
|
||||||
.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
|
.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
|
||||||
.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
|
.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
|
||||||
.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
|
.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
|
||||||
.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
|
.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
|
||||||
.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
|
.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
|
||||||
.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
|
.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
|
||||||
.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
|
.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
|
||||||
a.homepageWhite {color:#ffffff !important;}
|
a.homepageWhite {color:#ffffff !important;}
|
||||||
a.homepageWhite:hover {color:#a1ebff !important;}
|
a.homepageWhite:hover {color:#a1ebff !important;}
|
||||||
a.newsGrey {color:#4b4b4b;}
|
a.newsGrey {color:#4b4b4b;}
|
||||||
a.newsGrey:hover {color:#000000;}
|
a.newsGrey:hover {color:#000000;}
|
||||||
a.replyGrey {color:#888888; display:inline-block;}
|
a.replyGrey {color:#888888; display:inline-block;}
|
||||||
a.replyGrey:hover {color:#4b4b4b;}
|
a.replyGrey:hover {color:#4b4b4b;}
|
||||||
a.replyGrey1 {color:#888888;}
|
a.replyGrey1 {color:#888888;}
|
||||||
a.replyGrey1:hover {color:#4b4b4b;}
|
a.replyGrey1:hover {color:#4b4b4b;}
|
||||||
a.newsBlue {color:#15bccf;}
|
a.newsBlue {color:#15bccf;}
|
||||||
a.newsBlue:hover {color:#0781b4;}
|
a.newsBlue:hover {color:#0781b4;}
|
||||||
a.menuGrey {color:#808080;}
|
a.menuGrey {color:#808080 !important;}
|
||||||
a.menuGrey:hover {color:#fe7d68;}
|
a.menuGrey:hover {color:#fe7d68 !important;}
|
||||||
.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
|
.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
|
||||||
#navSearchAlert {display:none;}
|
#navSearchAlert {display:none;}
|
||||||
.none{display: none;}
|
.none{display: none;}
|
||||||
.db {display:block !important;}
|
.db {display:block !important;}
|
||||||
|
|
||||||
/*myctrip*/
|
/*myctrip*/
|
||||||
.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
|
.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
|
||||||
a.topnav_login_a{color:#fff; display:inline-block;}
|
a.topnav_login_a{color:#fff; display:inline-block;}
|
||||||
a.topnav_login_a:hover {color:#a1ebff;}
|
a.topnav_login_a:hover {color:#a1ebff;}
|
||||||
a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
|
a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
|
||||||
a.topnav_login_mes:hover {color:#a1ebff;}
|
a.topnav_login_mes:hover {color:#a1ebff;}
|
||||||
a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
|
a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
|
||||||
.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
|
.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
|
||||||
li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
|
li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
|
||||||
a.topnav_login_box:hover {color:#a1ebff;}
|
a.topnav_login_box:hover {color:#a1ebff;}
|
||||||
.navRow1 {margin:0; padding:0;}
|
.navRow1 {margin:0; padding:0;}
|
||||||
.navRow2 {margin:0; padding:0;}
|
.navRow2 {margin:0; padding:0;}
|
||||||
.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
|
.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px; font-size: 12px;}
|
||||||
.topnav_login_list a{color:#269ac9;}
|
.topnav_login_list a{color:#269ac9;}
|
||||||
.topnav_login_list li{ }
|
.topnav_login_list li{ }
|
||||||
.portraitRadius {border-radius: 3px;}
|
.portraitRadius {border-radius: 3px;}
|
||||||
|
|
||||||
/*底部*/
|
/*底部*/
|
||||||
#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
|
#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
|
||||||
.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
|
.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
|
||||||
.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
|
.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
|
||||||
.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
|
.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
|
||||||
.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
|
.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
|
||||||
.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
|
.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
|
||||||
a.f_grey {color:#666666 !important;}
|
a.f_grey {color:#666666 !important;}
|
||||||
a.f_grey:hover {color:#000000 !important;}
|
a.f_grey:hover {color:#000000 !important;}
|
||||||
.mr30 {margin-right: 30px;}
|
.mr30 {margin-right: 30px;}
|
||||||
|
|
||||||
|
|
||||||
/*注册登陆页面*/
|
/*注册登陆页面*/
|
||||||
#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
|
#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
|
||||||
#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
|
#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
|
||||||
#loginSignButton:hover {background-color:#297fb8;}
|
#loginSignButton:hover {background-color:#297fb8;}
|
||||||
#loginInButton:hover {background-color:#297fb8;}
|
#loginInButton:hover {background-color:#297fb8;}
|
||||||
|
Loading…
Reference in new issue