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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Browse Source
guange_homework
whimlex 10 years ago
parent a4fd9ef0ee 0935a7eab1
commit fd7ec7b4b2
17 changed files with 135 additions and 173 deletions
Show Stats Download Patch File Download Diff File

28
app/controllers/comments_controller.rb
Unescape View File

@ -34,20 +34,20 @@ class CommentsController < ApplicationController
ids = params[:asset_id].split(',') ids = params[:asset_id].split(',')
update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
end end
# <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start # # <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
if( @comment.id && @news.course ) # if( @comment.id && @news.course )
if(@news.author_id != User.current.id) # if(@news.author_id != User.current.id)
notify = ActivityNotify.new() # notify = ActivityNotify.new()
notify.activity_container_id = @news.course.id # notify.activity_container_id = @news.course.id
notify.activity_container_type = 'Course' # notify.activity_container_type = 'Course'
notify.activity_id = @comment.id # notify.activity_id = @comment.id
notify.activity_type = 'Comment' # notify.activity_type = 'Comment'
notify.notify_to = @news.author_id # notify.notify_to = @news.author_id
notify.is_read = 0 # notify.is_read = 0
notify.save() # notify.save()
end # end
end # end
# <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end # # <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
flash[:notice] = l(:label_comment_added) flash[:notice] = l(:label_comment_added)
end end

4
app/helpers/users_helper.rb
Unescape View File

@ -544,6 +544,10 @@ module UsersHelper
#获取指定用户作为老师的课程 #获取指定用户作为老师的课程
def get_as_teacher_courses user def get_as_teacher_courses user
type = [] type = []
option = []
option << "请选择发布作业的课程"
option << -1
type << option
user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course| user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
option = [] option = []
option << course.name+"（"+course.time.to_s+course.term+"）" option << course.name+"（"+course.time.to_s+course.term+"）"

2
app/views/account/lost_password.html.erb
Unescape View File

@ -9,7 +9,7 @@
<!--<input type="text" class="NomalInput mb20 " value="请输入登录邮箱地址" />--> <!--<input type="text" class="NomalInput mb20 " value="请输入登录邮箱地址" />-->
<%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%> <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%>
<% if flash[:error] %> <% if flash[:error] %>
<p class="c_red mb5"><%= flash[:error]%></p> <p class="c_red mt-20 ml5"><%= flash[:error]%></p>
<!--<div style="color: red" class="mb5" ><%#= flash[:error]%></div>--> <!--<div style="color: red" class="mb5" ><%#= flash[:error]%></div>-->
<% elsif flash[:notice] %> <% elsif flash[:notice] %>
<p class="c_green mb5"><%= flash[:notice]%></p> <p class="c_green mb5"><%= flash[:notice]%></p>

12
app/views/boards/_course_show.html.erb
Unescape View File

@ -37,7 +37,7 @@
<% @topics.each do |topic| %> <% @topics.each do |topic| %>
<div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply"> <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply">
<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %> <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
<div class="talkmain_txt fl mt5 f14"> <div class="talkmain_txt fl mt5 f12">
<% author = topic.author.to_s %> <% author = topic.author.to_s %>
<div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;"> <div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
<%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author), <%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author),
@ -48,7 +48,7 @@
<p class="talkmain_tit fl fb break_word f14" title="<%= h(topic.subject) %>" style="width:auto;float:left;max-width:360px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%= h(topic.subject) %></p> <p class="talkmain_tit fl fb break_word f14" title="<%= h(topic.subject) %>" style="width:auto;float:left;max-width:360px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%= h(topic.subject) %></p>
<% if topic.course_editable_by?(User.current) %> <% if topic.course_editable_by?(User.current) %>
<a href="javascript:void(0)" nhname="showbtn" style="color: #426e9a;float: right; <a href="javascript:void(0)" nhname="showbtn" class="linkBlue" style="float: right;
margin-right: 10px;"><%= l(:button_edit) %></a> margin-right: 10px;"><%= l(:button_edit) %></a>
<% end %> <% end %>
@ -120,7 +120,7 @@
<%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %> <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
</div> </div>
<a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a> <a href="javascript:void(0)" nhname="showbtn_reply" class="linkBlue fr f12" style="margin-right:10px;"><%= l(:button_reply) %></a>
<div class="cl"></div> <div class="cl"></div>
@ -171,7 +171,7 @@
</div> </div>
<input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/> <input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/>
<br/><div class="cl"></div> <br/><div class="cl"></div>
<span class=" c_grey fl f14"><%= format_time(message.created_on) %></span> <span class=" c_grey fl f12"><%= format_time(message.created_on) %></span>
<%= link_to( <%= link_to(
l(:button_delete), l(:button_delete),
@ -179,13 +179,13 @@
:method => :post, :method => :post,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete), :title => l(:button_delete),
:class => ' c_dblue fr f14' :class => ' linkBlue fr f12'
) if message.course_destroyable_by?(User.current) %> ) if message.course_destroyable_by?(User.current) %>
<%= link_to( <%= link_to(
l(:button_reply), l(:button_reply),
'javascript:;', 'javascript:;',
:nhname =>'showbtn_child_reply', :nhname =>'showbtn_child_reply',
:class => ' c_dblue fr f14', :class => ' linkBlue fr f12',
:style => 'margin-right: 10px;', :style => 'margin-right: 10px;',
'data-topic-id' =>message.id, 'data-topic-id' =>message.id,
:title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %> :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>

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

@ -50,16 +50,15 @@
<div class="homepagePostReplyBanner"> <div class="homepagePostReplyBanner">
<% count=0 %> <% count=0 %>
<div class="homepagePostReplyBannerCount">回复( <div class="homepagePostReplyBannerCount">回复(
<% if activity.parent_id.nil? %> <% if activity.parent %>
<% count=activity.replies_count%> <% count=activity.parent.children.count%>
<%=count %> <% else %>
<% else %> <% count=activity.children.count%>
<% count=activity.parent.replies_count%>
<%=count %>
<% end %> <% end %>
<%= count %>
)</div> )</div>
<div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div> <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
<%if count>2 %> <%if count > 2 %>
<div class="homepagePostReplyBannerMore"> <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 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%>) 点击展开更多回复(<%= count.to_s%>)
@ -83,9 +82,9 @@
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% activity= activity.parent_id.nil? ? activity:activity.parent%> <% activity= activity.parent ? activity.parent : activity%>
<% replies_all_i = 0 %> <% replies_all_i = 0 %>
<% unless activity.children.empty? %> <% if count > 0 %>
<div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>"> <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
<ul> <ul>
<% activity.children.reorder("created_on desc").each do |reply|%> <% activity.children.reorder("created_on desc").each do |reply|%>
@ -102,17 +101,10 @@
<%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
<% end %> <% end %>
<%= format_date(reply.created_on) %> <%= format_date(reply.created_on) %>
<%#= link_to(
l(:button_delete),
{:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
:method => :post,
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete),
:class => 'replyGrey fr ml10'
) if reply.course_destroyable_by?(User.current) %>
<!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
</div> </div>
<div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div> <div class="homepagePostReplyContent break_word">
<%= reply.content.html_safe %>
</div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</li> </li>

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

@ -18,29 +18,26 @@
<div class="homepagePostDate"> <div class="homepagePostDate">
发布时间：<%= format_date(activity.created_on) %> 发布时间：<%= format_date(activity.created_on) %>
</div> </div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">通知描述：<%= activity.description.html_safe %></div> <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
通知描述：
<div class="homepagePostSetting none" id="act-<%= user_activity_id %>"> <%= activity.description.html_safe %>
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
</ul>
</li>
</ul>
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="homepagePostReply"> <div class="homepagePostReply">
<div class="homepagePostReplyBanner"> <div class="homepagePostReplyBanner">
<% count=activity.comments_count %> <% count=activity.comments.count %>
<div class="homepagePostReplyBannerCount">回复（<%= count %>）</div> <div class="homepagePostReplyBannerCount">
回复（<%= count %>）
</div>
<div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div> <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
<%if count>2 %> <%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" >
点击展开更多回复(<%= count.to_s%>)
</a>
</div>
<% end %> <% end %>
</div> </div>
@ -59,12 +56,12 @@
</div> </div>
<% replies_all_i = 0 %> <% replies_all_i = 0 %>
<% unless activity.comments.empty? %> <% if count > 0 %>
<div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>"> <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
<ul> <ul>
<% activity.comments.reorder("created_on desc").each do |comment| %> <% activity.comments.reorder("created_on desc").each do |comment| %>
<% replies_all_i=replies_all_i+1 %> <% replies_all_i = replies_all_i + 1 %>
<li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>"> <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
<div class="homepagePostReplyPortrait"> <div class="homepagePostReplyPortrait">
<%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
</div> </div>

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

@ -14,7 +14,9 @@
</div> </div>
<div class="homepagePostTitle break_word"> <div class="homepagePostTitle break_word">
<%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
<span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span> <span class='<%= get_issue_priority(activity.priority_id)[0] %>'>
<%= get_issue_priority(activity.priority_id)[1] %>
</span>
</div> </div>
<div class="homepagePostSubmitContainer"> <div class="homepagePostSubmitContainer">
<div class="homepagePostAssignTo">指派给&nbsp;&nbsp; <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
@ -26,7 +28,10 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div> <div class="homepagePostDeadline">
时间：
<%=format_date(activity.created_on) %>
</div>
</div> </div>
<div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述： <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
<% if activity.description? %> <% if activity.description? %>
@ -55,30 +60,21 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<div class="homepagePostSetting" id="act-<%=user_activity_id %>" style="visibility: hidden">
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
</ul>
</li>
</ul>
</div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="homepagePostReply"> <div class="homepagePostReply">
<div class="homepagePostReplyBanner"> <div class="homepagePostReplyBanner">
<% count=activity.journals.count %> <% count = activity.journals.count %>
<div class="homepagePostReplyBannerCount">回复（<%= count %>）</div> <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
<div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div> <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
<% if count>2 %> <% if count > 2 %>
<div class="homepagePostReplyBannerMore"> <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 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> 点击展开更多回复(<%= count.to_s %>)
</a>
</div>
<% end %> <% end %>
</div> </div>
@ -97,11 +93,11 @@
</div> </div>
<% replies_all_i = 0 %> <% replies_all_i = 0 %>
<% unless activity.journals.empty? %> <% if count > 0 %>
<div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>"> <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
<ul> <ul>
<% activity.journals.reorder("created_on desc").each do |reply| %> <% activity.journals.reorder("created_on desc").each do |reply| %>
<% replies_all_i=replies_all_i+1 %> <% replies_all_i=replies_all_i + 1 %>
<li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>"> <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
<div class="homepagePostReplyPortrait"> <div class="homepagePostReplyPortrait">
<%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
@ -114,15 +110,17 @@
<%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
<% end %> <% end %>
<%= format_date(reply.created_on) %> <%= format_date(reply.created_on) %>
<!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
</div> </div>
<% if reply.details.any? %> <% if reply.details.any? %>
<% details_to_strings(reply.details).each do |string| %> <% details_to_strings(reply.details).each do |string| %>
<div class="homepagePostReplyContent break_word"><%= string %></div> <div class="homepagePostReplyContent break_word">
<%= string %>
</div>
<% end %> <% end %>
<% else %> <% else %>
<div class="homepagePostReplyContent break_word"><%= reply.notes.html_safe %></div> <div class="homepagePostReplyContent break_word">
<%= reply.notes.html_safe %>
</div>
<% end %> <% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>

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

@ -33,30 +33,19 @@
<%= activity.parent.content.to_s.html_safe%> <%= activity.parent.content.to_s.html_safe%>
<% end %> <% end %>
</div> </div>
<div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
<li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
</ul>
</li>
</ul>
</div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="homepagePostReply"> <div class="homepagePostReply">
<div class="homepagePostReplyBanner"><% count=0 %> <div class="homepagePostReplyBanner">
<% count = 0 %>
<div class="homepagePostReplyBannerCount">回复( <div class="homepagePostReplyBannerCount">回复(
<% if activity.parent_id.nil? %> <% if activity.parent %>
<% count=activity.replies_count%> <% count=activity.parent.children.count%>
<%=count %>
<% else %> <% else %>
<% count=activity.parent.replies_count%> <% count=activity.children.count%>
<%=count %>
<% end %> <% end %>
<%=count %>
)</div> )</div>
<div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div> <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
<%if count>2 %> <%if count>2 %>
@ -81,7 +70,7 @@
<% activity= activity.parent_id.nil? ? activity : activity.parent %> <% activity= activity.parent_id.nil? ? activity : activity.parent %>
<% replies_all_i = 0 %> <% replies_all_i = 0 %>
<% unless activity.children.empty? %> <% if count > 0 %>
<div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>"> <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
<ul> <ul>
<% activity.children.reorder("created_on desc").each do |reply| %> <% activity.children.reorder("created_on desc").each do |reply| %>
@ -98,15 +87,6 @@
<%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
<% end %> <% end %>
<%= format_date(reply.created_on) %> <%= format_date(reply.created_on) %>
<%#= link_to(
l(:button_delete),
{:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
:method => :post,
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete),
:class => 'replyGrey fr ml10'
) if reply.course_destroyable_by?(User.current) %>
<!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
</div> </div>
<div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div> <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
</div> </div>

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

@ -61,4 +61,4 @@
<% end %> <% end %>
<% end %> <% end %>
<input type="hidden" value="<%= page%>"/> <input type="hidden" value="<%= page%>"/>
<%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>

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

@ -1,6 +1,6 @@
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%= javascript_include_tag 'homework','baiduTemplate' %> <%= javascript_include_tag 'homework','baiduTemplate' %>
<% end %> <% end %>
<div class="HomeWorkCon"> <div class="HomeWorkCon">
@ -29,6 +29,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="mt10"> <div class="mt10">
<!--<input type="text" class="InputBox W700 SearchIcon" placeholder="发送到课程" />--> <!--<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 => "请选择发布作业的课程"} %> <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %>
@ -39,53 +40,48 @@
<%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %> <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
</div> </div>
<div class="mt5">
<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
<span class="fr mr10 mt3">或</span>
<a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
<div class="cl"></div>
</div>
<div class="mt5">
<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
<span class="fr mr10 mt3">或</span>
<a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
<div class="cl"></div>
</div>
<div class="mt10">
<a href="javascript:void(0);" class=" fl DropBtn">编程选项</a> <div class="mt10">
<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" name="program[language]"> <select class="InputBox W120" name="program[language]">
<option value="1" selected>C语言</option> <option value="1" selected>C语言</option>
<option value="2">C++</option> <option value="2">C++</option>
</select> </select>
</div> </div>
<div class="mt10"> <div class="mt10">
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required name="program[output][]"></textarea> <textarea class="InputBox W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a> <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>
<input type="hidden" name="homework_type" value="1"> <input type="hidden" name="homework_type" value="1">
</div>
</div> </div>
</div>
<div class="cl"></div> <div class="cl"></div>
<script type="text/javascript">
$(function (){
$("#course_id").append("<option value='-1' id='option_select' hidden selected>请选择发布作业的课程</option>");
});
</script>
<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 name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required name="program[output][]"></textarea> <textarea class="InputBox W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required name="program[output][]"></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>

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

@ -39,4 +39,4 @@
</div> </div>
</div> </div>
<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %> <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>

2
app/views/users/show.js.erb
Unescape View File

@ -1,4 +1,4 @@
$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>"); $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
<% if @user_activities.count < 10%> <% if @user_activities.count < 10%>
$("#show_more_activities").hide(); $("#show_more_activities").hide();
<% end%> <% end%>

21
app/views/users/user_homeworks.html.erb
Unescape View File

@ -12,16 +12,15 @@
} }
</script> </script>
<div class="resources mb10">
<div class="homepageRightBanner">
<div class="NewsBannerName">作业</div>
</div>
</div>
<div class="cl"></div>
<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
<!-- 老师身份才可以发布作业 --> <!-- 老师身份才可以发布作业 -->
<div class="resources mb10">
<div class="homepageRightBanner">
<div class="NewsBannerName">发布作业</div>
</div>
</div>
<div class="cl"></div>
<div class="HomeWork mb10"> <div class="HomeWork mb10">
<% homework = HomeworkCommon.new %> <% homework = HomeworkCommon.new %>
<%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %> <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
@ -30,14 +29,6 @@
</div> </div>
<% end%> <% end%>
</div><!----HomeWork end--> </div><!----HomeWork end-->
<%else%>
<div class="resources mb10">
<div class="homepageRightBanner">
<div class="NewsBannerName">作业</div>
</div>
</div>
<div class="cl"></div>
<% end%> <% end%>
<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %> <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>

1
app/views/users/user_select_homework.js.erb
Unescape View File

@ -5,3 +5,4 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
$("#course_id").val("<%= @homework.course_id%>"); $("#course_id").val("<%= @homework.course_id%>");
$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>"); $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>");
homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>"); homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
$("#homework_editor").show();

7
public/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js
View File

File diff suppressed because one or more lines are too long

13
public/stylesheets/courses.css
Unescape View File

@ -1,3 +1,5 @@
a.linkBlue {color:#269ac9;}
a.linkBlue:hover {color:#297fb8;}
/*右侧内容--动态*/ /*右侧内容--动态*/
.project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;} .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
@ -78,8 +80,8 @@ a:hover.talk_btn{ background:#2a9dc1;}
/****讨论区内页***/ /****讨论区内页***/
.mt0{ margin-top:0px;} .mt0{ margin-top:0px;}
.talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;}
a.talk_edit{ color:#426e9a; margin-right:5px;} a.talk_edit{ color:#269ac9; margin-right:5px;}
a:hover.talk_edit{ color:#ff5722;} a:hover.talk_edit{ color:#297fb8;}
.talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
.talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;} .talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;}
/****新建讨论***/ /****新建讨论***/
@ -355,7 +357,7 @@ a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-lef
a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;} blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;}
.respond-form{display: none;margin: auto;clear: both;} .respond-form{display: none;margin: auto;clear: both;}
.reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
@ -494,8 +496,9 @@ blockquote {
margin-right: 0.4em; margin-right: 0.4em;
border-radius: 4px; border-radius: 4px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
background: url('../images/requirements/reference.jpg'); /*background: url('../images/requirements/reference.jpg');*/
background-size: 100% 100%; background-size: 100% 100%;
margin-top:5px;
} }
a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;} a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
.min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;} .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
@ -576,7 +579,7 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
.talkmain_pic{} .talkmain_pic{}
a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;} a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
a:hover.talkmain_pic{border:1px solid #64bdd9;} a:hover.talkmain_pic{border:1px solid #64bdd9;}
.talkmain_txt{ width:610px; margin-left:10px; color:#333;} .talkmain_txt{ width:610px; margin-left:10px; color:#888;}
a.talkmain_name{ color:#ff5722;} a.talkmain_name{ color:#ff5722;}
a:hover.talkmain_name{ color:#d33503;} a:hover.talkmain_name{ color:#d33503;}
.talkmain_tit{ color:#0781b4; width:450px; display:block; } .talkmain_tit{ color:#0781b4; width:450px; display:block; }

9
public/stylesheets/new_user.css
Unescape View File

@ -88,6 +88,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mr30{ margin-right:30px !important;} .mr30{ margin-right:30px !important;}
.mr40{ margin-right:40px !important;} .mr40{ margin-right:40px !important;}
.mw20{ margin: 0 20px;} .mw20{ margin: 0 20px;}
.mt-20 {margin-top:-20px;}
.mt-4 {margin-top: -4px;} .mt-4 {margin-top: -4px;}
.mt3{ margin-top:3px;} .mt3{ margin-top:3px;}
.mt5{ margin-top:5px;} .mt5{ margin-top:5px;}
@ -285,7 +286,7 @@ a:hover.search_btn{ background: #0fa9bb;}
/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/ /*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;} .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;} .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;} .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;} .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;} .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;} .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
@ -580,7 +581,7 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
.homepagePostReplyPortrait {float:left; width:45px;} .homepagePostReplyPortrait {float:left; width:45px;}
.homepagePostReplyDes {float:left; width:595px; margin-left:15px;} .homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@ -948,7 +949,9 @@ blockquote {
margin-right: 0.4em; margin-right: 0.4em;
border-radius: 4px; border-radius: 4px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
background: url('../images/requirements/reference.jpg'); /*background: url('../images/requirements/reference.jpg');*/
background-size: 100% 100%; background-size: 100% 100%;
margin-bottom:5px;
background-color: #e8e8e8;
} }

Write Preview
Loading…
Cancel
Save