diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8e57fab4d..1c2419305 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1,5 +1,5 @@ class CoursesController < ApplicationController - layout 'base_courses' + # layout 'base_courses' include CoursesHelper include ActivitiesHelper helper :activities @@ -73,6 +73,7 @@ class CoursesController < ApplicationController if @course.errors.full_messages.count <= 0 respond_to do |format| format.html { + # render :layout => 'base_courses' flash[:notice] = l(:notice_successful_update) redirect_to settings_course_url(@course) } @@ -82,7 +83,7 @@ class CoursesController < ApplicationController respond_to do |format| format.html { settings - render :action => 'settings' + redirect_to settings_course_url(@course) } format.api { render_validation_errors(@course) } end @@ -407,6 +408,10 @@ class CoursesController < ApplicationController @roles = Role.givable.all[3..5] @members = @course.member_principals.includes(:roles, :principal).all.sort + respond_to do |format| + format.html { render :layout => 'base_courses' } + format.api { render_validation_errors(@course) } + end else render_403 end @@ -424,6 +429,7 @@ class CoursesController < ApplicationController else respond_to do |format| format.html { + render :layout => 'base_courses' flash[:notice] = l(:notice_successful_create) if params[:continue] redirect_to new_course_url(attrs, :course => '0') @@ -738,7 +744,7 @@ class CoursesController < ApplicationController @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id) end - sorted_events = sort_activity_events_course(events); + sorted_events = sort_activity_events_course(events) events = paginateHelper sorted_events,10 @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)} # documents diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index f4a5ac193..55f216ab9 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -20,7 +20,7 @@ module CoursesHelper # 返回教师数量，即roles表中定义的Manager def teacherCount project - project.members.count - studentCount(project).to_i + project ? project.members.count - studentCount(project).to_i : 0 # or # searchTeacherAndAssistant(project).count end @@ -152,7 +152,7 @@ module CoursesHelper # 学生人数计算 # add by nwb def studentCount course - course.student.count.to_s#course.student.count + course ? course.student.count.to_s : 0#course.student.count end #课程成员数计算 @@ -782,6 +782,7 @@ module CoursesHelper end def visable_attachemnts_incourse course + return[] unless course result = [] course.attachments.each do |attachment| if attachment.is_public? || User.current.member_of_course?(course) || User.current.admin? diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 58935dd11..af2d5abc4 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -278,4 +278,29 @@ module UsersHelper end } end + + #获取用户留言相关的连接 + def user_jour_feed_back_url active + if active.act_type == "JournalsForMessage" + jour = JournalsForMessage.find active.act_id + if jour + case jour.jour_type + when "Principal" + link_to(l(:label_goto), user_newfeedback_user_path(jour.jour_id)) + when "Project" + link_to(l(:label_goto), project_feedback_path(jour.jour_id)) + when "Bid" + link_to(l(:label_goto), course_for_bid_path(jour.jour_id)) + when "Course" + link_to(l(:label_goto), course_feedback_path(jour.jour_id)) + when "Contest" + link_to(l(:label_goto), show_contest_contest_path(jour.jour_id)) + when "Softapplication" + link_to(l(:label_goto), softapplication_path(jour.jour_id)) + when "HomeworkAttach" + link_to(l(:label_goto), course_for_bid_path(jour.jour_id)) + end + end + end + end end diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index a302d0981..7b388adc4 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -15,7 +15,7 @@ <%= format_time(journal.created_on) %>
-

+

<%= journal.notes.html_safe %>

diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb index cbb5d6fc1..f7cf2a360 100644 --- a/app/views/courses/homework.html.erb +++ b/app/views/courses/homework.html.erb @@ -31,7 +31,7 @@ $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
-
+
<%= bid.description.html_safe %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 79cb267b4..1cc117dd6 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -9,12 +9,13 @@ <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %> -
+
<%= link_to_user_header(e.event_author,false,:class => 'problem_name c_orange fl') if e.respond_to?(:event_author) %> <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>   <%= l(:label_new_activity) %>： - <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:class => "problem_tit c_dblue fl fb"%> + <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : + (e.event_type.eql?("bid") ? homework_course_path(@course) : e.event_url),:class => "problem_tit c_dblue fl fb"%>

<%= e.event_description.html_safe %>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index b6f65e9b2..62fdc3082 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -9,7 +9,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before("") + $('#ajax-modal').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("popbox_polls"); } diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 3d692a36b..3946b1da1 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -46,8 +46,8 @@

- <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %> - <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %> + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> + <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index fe2f757c3..59ed1092e 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -16,7 +16,7 @@ - +

<%= textAreailizable forum.description%>

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index d1d055bb8..19892e841 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -173,7 +173,6 @@ function cookieget(n) <% end %>
- <%= l(:label_technical_support) %>黄井泉 <%= l(:label_technical_support) %>白   羽
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 4f7e650eb..32afb4e5c 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -21,10 +21,6 @@ <% end %>
- - <%= l(:label_technical_support) %> - 黄井泉 - <%= l(:label_technical_support) %> 白   羽 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 9fed77faf..dbcf933ff 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -43,7 +43,7 @@ <%=l(:label_courses_management_platform)%> > - <%= link_to @course.name, nil %> + <%= link_to @course.name, course_path(@course) %>

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index f12b3186d..4d79f50f9 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -53,7 +53,7 @@
<%= @forum.name %>
-
<%= @forum.description.html_safe %>
+
<%= @forum.description.html_safe %>
创建人信息
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index dd7db06de..1e6b9bca2 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -36,6 +36,7 @@ } .span_wping a:hover{ background-color:#03a1b3;} .span_wping_background{background: #CCC !important;} + .font_lighter_sidebar img{max-width: 100%} diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index 1f815576f..d955d5d7b 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -84,7 +84,7 @@
<%= @forum.name %>
-
<%= @forum.description.html_safe %>
+
<%= @forum.description.html_safe %>
创建人信息
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index c99c41fb9..50a97d9ba 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -30,7 +30,7 @@ :class => 'talk_edit fr' ) if @message.course_destroyable_by?(User.current) %>
-
<%= @topic.content.html_safe %>
+
<%= @topic.content.html_safe %>
<%= link_to_attachments_course @topic, :author => false %>
@@ -54,7 +54,7 @@
">
<%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
-
+
<%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %> <%= format_time(message.created_on) %>
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb index f4f8126fe..54a62144a 100644 --- a/app/views/messages/_form_course.html.erb +++ b/app/views/messages/_form_course.html.erb @@ -44,7 +44,7 @@ <%= f.kindeditor :content, :editor_id => 'message_content_editor', :owner_id => @message.nil? ? 0: @message.id, :owner_type => OwnerTypeHelper::MESSAGE, - :width => '91%', + :width => '90%', :height => 300, :class => 'talk_text fl', :input_html => { :id => 'message_content', diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb index 750f7e465..a7b9693b2 100644 --- a/app/views/news/_course_news.html.erb +++ b/app/views/news/_course_news.html.erb @@ -26,7 +26,7 @@

<% else %> <% @newss.each do |news| %> -
+
<%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
<%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %> @@ -43,7 +43,7 @@ <%= l(:button_more)%>...
- <%= l(:label_end_time)%>：<%= format_time(news.created_on)%> + <%= l(:label_create_time)%>：<%= format_time(news.created_on)%>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index f7c5145f0..d7bec4a4f 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -31,7 +31,7 @@ :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %> <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-
+
<%= @news.description.html_safe %>
<%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %> @@ -74,7 +74,7 @@ <%= format_time(comment.created_on) %>
-

<%= comment.comments.html_safe %>

+

<%= comment.comments.html_safe %>

<%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, diff --git a/app/views/tags/_tag_add.html.erb b/app/views/tags/_tag_add.html.erb index 610c3edfa..f8cac7c0d 100644 --- a/app/views/tags/_tag_add.html.erb +++ b/app/views/tags/_tag_add.html.erb @@ -2,13 +2,13 @@ :class => "yellowBtn f_l", :onclick=>"$('#add_tag_#{obj.id}').slideToggle();" if User.current.logged? %> - <%= form_for "tag_for_save",:remote=>true,:url => save_tag_path, - :update => "tags_show", - :complete => '$("#put-tag-form").hide();' do |f| %> - - <% end %> +<%= form_for "tag_for_save",:remote=>true,:url => save_tag_path, + :update => "tags_show", + :complete => '$("#put-tag-form").hide();' do |f| %> + +<% end %> diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb index 2bef1a3a3..c7dbec65d 100644 --- a/app/views/tags/tag_save.js.erb +++ b/app/views/tags/tag_save.js.erb @@ -6,20 +6,16 @@ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_n $('#name-issue').val(""); <% elsif @obj_flag == '6'%> $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty(); -$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name', +$("#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}) %>'); -//$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide(); -$("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val(""); +$("#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'%> -$("#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}) %>'); //$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide(); -$("#tags_name_<%=@obj.id%>").val(""); <% else%> $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name', :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>'); diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 673e01d72..2c5126794 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -97,13 +97,14 @@ - +

<%= textAreailizable act.notes %>

- <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> + <% puts 11111111111111%> + <%= user_jour_feed_back_url e %>
@@ -167,7 +168,7 @@ <% end %> - +

<%=textAreailizable act, :description %>

@@ -227,7 +228,7 @@ <% else %> <% desStr= textAreailizable(act, :notes) %> <% end %> - +

<%= desStr %>

@@ -282,7 +283,7 @@ <% end %> - +

<%= textAreailizable act,:long_comments %>

@@ -344,7 +345,7 @@ <% end %> - +

<%= textAreailizable(act,:content) %>

@@ -385,7 +386,7 @@ <% end %> - +

@@ -428,7 +429,7 @@ <% end %> - +

<%= textAreailizable act,:description %>

@@ -559,7 +560,7 @@ <% end %> - +

<%= textAreailizable act, :description %>

@@ -633,7 +634,7 @@ - +

<%= textAreailizable e.notes %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fc2f55086..658f30480 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -8,6 +8,9 @@ h3, .wiki h2 {font-size: 15px; padding-left: 5px} h4, .wiki h3 {font-size: 13px;} h4 {border-bottom: 1px dotted #bbb;} +/*上传图片处理*/ +.upload_img img{max-width: 100%;} + /****翻页***/ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } ul.wlist li{float: left;} diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index cfb27e20b..a3e358b14 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -435,6 +435,9 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;} #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;} +/*上传图片处理*/ +.upload_img img{max-width: 100%;} + /* The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9. diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index ac7142c71..de4dcb65c 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -750,9 +750,9 @@ div.actions input[type="text"] { .memo-content img, .comments img { overflow: hidden; /*width: 100%;*/ - max-width: 500px; + max-width: 100%; height: auto !important; - width: expression(this.width > 500 ? "500px" : this.width+"px"); + /*width: expression(this.width > 500 ? "500px" : this.width+"px");*/ } table.content-text-list tbody tr td.sticky, div.memo-section .sticky { diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 17b193a44..cd4dc337a 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -156,8 +156,8 @@ div#menu ul ul a:hover { color:#ff9900;} div#menu ul ul li.last { margin-left:15px; } div#menu ul ul li {width: 100%;} /* menu::level3 */ -div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:140px; } -div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;} +div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:200px; } +div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;} /*主类容*/ @@ -199,7 +199,7 @@ html{ overflow-x:hidden;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} .msgserver { margin-top:5px;} -.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; } +.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; color:#15bccf;} .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} a:hover.opnionButton{background: #0fa9bb; } @@ -210,8 +210,7 @@ a:hover.opnionButton{background: #0fa9bb; } a.close_btn {background-position:-44px 0;} a:hover.close_btn {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a {color:#15bccf; } -.msgserver a:hover { text-decoration:underline; } +.msgserver a:hover { color: #0fa9bb; } .break_word{word-break: break-all;word-wrap: break-word;} /***** Ajax indicator ******/ #ajax-indicator {