hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/szzh' into guange_homework

Browse Source
Branch_szzh
guange 10 years ago
parent dd4e67ebdb 2e51d0e833
commit 1c8b24822d
16 changed files with 76 additions and 32 deletions
Show Stats Download Patch File Download Diff File

5
app/views/homework_common/index.html.erb
Unescape View File

@ -9,7 +9,7 @@
<span><%= @obj_count%></span>
<%= l(:label_homework_count)%>
</p>
<%= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
<%#= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
<div class="cl"></div>
</div>
<% @homeworks.each do |homework|%>
@ -27,7 +27,8 @@
<% if @is_teacher%>
<%= homework_anonymous_comment(homework)%>
<%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit") %>
<%= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
<%#= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
<%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %>
<% elsif @is_student%>
<%= student_anonymous_comment homework %>
<%= student_new_homework homework %>

19
app/views/homework_common/new.html.erb
Unescape View File

@ -1,16 +1,17 @@
<% content_for :header_tags do %>
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%= javascript_include_tag 'homework','baiduTemplate' %>
<% end %>
<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
<%= error_messages_for 'homework_common' %>
<div class="project_r_h">
<h2 class="project_h2">
<%= l(:label_course_homework_new)%>
</h2>
</div>
<div class="hwork_new">
<%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
<%= hidden_field_tag "course",@course.id%>
<%= render :partial => 'homework_common/new_homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
<%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
<a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
<%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
<%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
<% end%>
</div><!--hwork_new end-->
<div class="cl"></div>

2
app/views/layouts/base_courses.html.erb
Unescape View File

@ -123,7 +123,7 @@
<div class="subNav">
<%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
<%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
<%= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
<%#= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
</div>
<div class="subNav">
<%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>

2
app/views/student_work/index.html.erb
Unescape View File

@ -124,7 +124,7 @@
</h4>
<% if @is_teacher%>
<%= homework_anonymous_comment(@homework)%>
<%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %>
<%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %>
<% else%>
<%= student_anonymous_comment @homework %>
<%= student_new_homework @homework %>

2
app/views/users/_course_homework.html.erb
Unescape View File

@ -19,7 +19,7 @@
<div class="homepagePostSubmit">
<%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
</div>
<div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
<div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
</div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
作业描述：<%= activity.description.html_safe %>

6
app/views/users/_course_message.html.erb
Unescape View File

@ -21,7 +21,7 @@
<% end %>
</div>
<div class="homepagePostDate">
发帖时间：<%= format_date(activity.created_on) %>
发帖时间：<%= format_time(activity.created_on) %>
</div>
@ -61,7 +61,7 @@
<%if count > 2 %>
<div class="homepagePostReplyBannerMore">
<a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
点击展开更多回复(<%= count.to_s%>)
展开更多
</a>
</div>
<% end %>
@ -100,7 +100,7 @@
<% else %>
<%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
<% end %>
<%= format_date(reply.created_on) %>
<%= format_time(reply.created_on) %>
</div>
<div class="homepagePostReplyContent break_word">
<%= reply.content.html_safe %>

6
app/views/users/_course_news.html.erb
Unescape View File

@ -16,7 +16,7 @@
<%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
</div>
<div class="homepagePostDate">
发布时间：<%= format_date(activity.created_on) %>
发布时间：<%= format_time(activity.created_on) %>
</div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
通知描述：
@ -35,7 +35,7 @@
<%if count>2 %>
<div class="homepagePostReplyBannerMore">
<a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
点击展开更多回复(<%= count.to_s%>)
展开更多
</a>
</div>
<% end %>
@ -72,7 +72,7 @@
<% else %>
<%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
<% end %>
<%= format_date(comment.created_on) %>
<%= format_time(comment.created_on) %>
</div>
<div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
</div>

2
app/views/users/_course_poll.html.erb
Unescape View File

@ -26,7 +26,7 @@
<% end %>
</div>
<div class="homepagePostDate">
发布时间：<%= format_date(activity.published_at) %>
发布时间：<%= format_time(activity.published_at) %>
</div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
<div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">

6
app/views/users/_project_issue.html.erb
Unescape View File

@ -30,7 +30,7 @@
</div>
<div class="homepagePostDeadline">
时间：
<%=format_date(activity.created_on) %>
<%=format_time(activity.created_on) %>
</div>
</div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
@ -72,7 +72,7 @@
<% if count > 2 %>
<div class="homepagePostReplyBannerMore">
<a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
点击展开更多回复(<%= count.to_s %>)
展开更多
</a>
</div>
<% end %>
@ -109,7 +109,7 @@
<% else %>
<%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
<% end %>
<%= format_date(reply.created_on) %>
<%= format_time(reply.created_on) %>
</div>
<% if reply.details.any? %>
<% details_to_strings(reply.details).each do |string| %>

6
app/views/users/_project_message.html.erb
Unescape View File

@ -24,7 +24,7 @@
<% end %>
</div>
<div class="homepagePostDate">
时间：<%= format_date(activity.created_on) %>
时间：<%= format_time(activity.created_on) %>
</div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
<% if activity.parent_id.nil? %>
@ -49,7 +49,7 @@
)</div>
<div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
<%if count>2 %>
<div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
<div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
<% end %>
</div>
@ -86,7 +86,7 @@
<% else %>
<%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
<% end %>
<%= format_date(reply.created_on) %>
<%= format_time(reply.created_on) %>
</div>
<div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
</div>

1
app/views/users/_user_activities.html.erb
Unescape View File

@ -9,6 +9,7 @@
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
div.ke-toolbar .ke-outline{border:none;}
.ke-inline-block{display: none;}
.ke-container{height: 40px !important;}
</style>
<% user_activities.each do |user_activity|
if user_activities %>

5
app/views/users/_user_homework_form.html.erb
Unescape View File

@ -15,9 +15,12 @@
<div class="calendar_div fl">
<input type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" >
<%= calendar_for('homework_end_time')%>
</div>
</div>
<div class="cl"></div>
<p id="homework_end_time_span" class="c_red mt5"></p>
<div class="cl"></div>
<div id="homework_editor" style="display: none">
<div class="mt10">
<% if edit_mode %>
@ -31,9 +34,9 @@
<div class="mt10">
<!--<input type="text" class="InputBox W700 SearchIcon" placeholder="发送到课程" />-->
<%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %>
</div>
<p id="homework_course_id_span" class="c_red mt5"></p>
<div class="cl"></div>
<div id="homework_attachments">

4
public/assets/kindeditor/kindeditor.js
Unescape View File

@ -3536,8 +3536,8 @@ function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
'<head><meta charset="utf-8" /><title></title>',
'<style>',
'html {margin:2px;padding:2px;}',
'body {margin:2px;padding:5px;}',
'html {margin:3px 5px;padding:0px;}',
'body {margin:0px;padding:0px;}',
'body, td {font:14px/1.5 "sans serif",tahoma,verdana,helvetica;}',
'body, p, div {word-wrap: break-word;}',
'p {margin:0 0;}',

2
public/javascripts/init_KindEditor.js
Unescape View File

@ -1,6 +1,6 @@
function init_editor(params){
var editor = params.kindutil.create(params.textarea, {
resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
resizeType : 0,minWidth:"1px",width:"100%",minHeight:"40px",
items:['emoticons'],
afterChange:function(){//按键事件
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});

39
public/javascripts/new_user.js
Unescape View File

@ -62,8 +62,15 @@ function submit_homework(id)
{
$("#homework_name").focus();
}
else
else if(!regex_homework_end_time())
{
$("#homework_end_time").focus();
}
else if(!regex_course_id())
{
$("#course_id").focus();
}
else{
homework_description_editor.sync();
$("#"+id).submit();
}
@ -85,6 +92,36 @@ function regex_homework_name()
return true;
}
}
//验证截止时间
function regex_homework_end_time()
{
var name = $.trim($("#homework_end_time").val());
if(name=="")
{
$("#homework_end_time_span").text("截止时间不能为空");
return false;
}
else
{
$("#homework_end_time_span").text("");
return true;
}
}
//验证发送到课程
function regex_course_id(){
var course_id = $("#course_id").val();
if(course_id == -1)
{
$("#homework_course_id_span").text("发布课程不能为空");
return false;
}
else
{
$("#homework_course_id_span").text("");
return true;
}
}
//老师导入作业时查询作业
function search_homework_by_name(url){

1
public/stylesheets/courses.css
Unescape View File

@ -139,6 +139,7 @@ a:hover.tb_all{ background:#ff5d31; color:#fff; text-decoration:none;}
.work_tb_{ background-color: #eaeaea; height:40px; }
a.work_edit{color: #64bdd9; display:block; padding:1px 5px; border:1px solid #64bdd9;}
a:hover.work_edit{color: #fff; background: #64bdd9;}
a.un_work_edit{color: white; display:block; padding:1px 5px; background-color: darkgray;border:1px solid darkgray;}
/* 控制显示与隐藏css类 */
.normaltab { color:#64bdd9 ; }

Write Preview
Loading…
Cancel
Save