From 6c7925a7b48c391ac5caedd61508474a3d909317 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 22 Jul 2016 18:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 1 + app/helpers/application_helper.rb | 2 +- app/views/courses/private_or_public.js.erb | 2 +- app/views/homework_common/edit.html.erb | 2 +- app/views/layouts/_course_base_info.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_syllabus.html.erb | 5 ++--- app/views/syllabuses/edit.html.erb | 2 +- public/stylesheets/css/courses.css | 2 +- public/stylesheets/sy_public.css | 7 ++++++- 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index fae350a6a..3e41e2c91 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -56,6 +56,7 @@ class MessagesController < ApplicationController all @replies = paginateHelper messages_replies,10 @reply = Message.new(:subject => "RE: #{@message.subject}") + @left_nav_type = 2 render :action => "show", :layout => "base_courses"#by young elsif @project @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 089333160..7aae73e94 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -54,7 +54,7 @@ module ApplicationHelper # 获取用户单位 # 优先获取高校信息，如果改信息不存在则获取occupation def get_occupation_from_user user - School.where("id=?",user.user_extensions.school_id).first.try(:name).nil? ? user.user_extensions.occupation : School.where("id=?",user.user_extensions.school_id).first.try(:name) + School.where("id=?",user.user_extensions.school_id).first.try(:name).nil? ? user.user_extensions.try(:occupation) : School.where("id=?",user.user_extensions.school_id).first.try(:name) end def update_visiti_count container diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb index 82180c452..835728626 100644 --- a/app/views/courses/private_or_public.js.erb +++ b/app/views/courses/private_or_public.js.erb @@ -1,5 +1,5 @@ <% if params[:user_page].nil? %> - $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>'); + $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/course_base_info') %>'); if(document.getElementById("course_is_public")) { <% if @course.is_public == 0%> $("#course_is_public").attr("checked",false); diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index 0c120b7c2..d4d9d7c16 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -36,7 +36,7 @@
-
+
<%= form_for @homework do |f| %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index bd152ac6e..04162fc9c 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -45,7 +45,7 @@ 主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> 学时：<%= @course.class_period %>学时 学期：<%= current_time_and_term @course %> - 单位：<%= @course.school ? @course.school : '无' %> + 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %>

<% unless is_teacher %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 9332ade4f..7a9f5ac5e 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -49,7 +49,7 @@
-
+
<%=render :partial => 'layouts/course_base_info' %>
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb index ddbb53200..b29c24fe6 100644 --- a/app/views/layouts/base_syllabus.html.erb +++ b/app/views/layouts/base_syllabus.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all'%> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%> @@ -15,8 +15,7 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> -