From 1e28ff880d397c55783e17dbc1cc876e4cd8c638 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 22 Jul 2016 10:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E8=AF=BE=E7=A8=8B=E5=A4=A7?= =?UTF-8?q?=E7=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/syllabuses_controller.rb | 7 +- app/views/courses/new.html.erb | 2 +- app/views/layouts/_base_syllabus_old.html.erb | 151 ++++++ .../layouts/_syllabus_base_info.html.erb | 40 +- .../layouts/_syllabus_edit_info.html.erb | 53 +- app/views/layouts/_syllabus_eng_name.html.erb | 9 +- app/views/layouts/_syllabus_info.html.erb | 28 +- .../layouts/_syllabus_teacher_list.html.erb | 21 + app/views/layouts/_syllabus_title.html.erb | 7 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_syllabus.html.erb | 121 ++--- .../syllabuses/_syllabus_course_list.html.erb | 111 +++-- app/views/syllabuses/edit.html.erb | 11 +- .../syllabuses/edit_syllabus_title.js.erb | 2 +- app/views/syllabuses/show.html.erb | 126 +++-- .../syllabuses/syllabus_courselist.html.erb | 13 +- .../syllabuses/syllabus_courselist.js.erb | 2 +- public/images/sy/bg_sy.jpg | Bin 0 -> 34243 bytes public/images/sy/icons_smile.png | Bin 0 -> 24421 bytes public/images/sy/icons_sy.png | Bin 0 -> 26008 bytes public/images/sy/icons_tan.png | Bin 0 -> 24448 bytes public/images/sy/liststyle.png | Bin 0 -> 19868 bytes public/images/sy/logo_class.jpg | Bin 0 -> 22252 bytes public/images/sy/male.jpg | Bin 0 -> 4136 bytes public/images/sy/massage.jpg | Bin 0 -> 29462 bytes public/images/sy/sy_icons_close.png | Bin 0 -> 18046 bytes public/javascripts/syllabus.js | 10 +- public/stylesheets/css/structure.css | 2 + public/stylesheets/sy_public.css | 206 ++++++++ public/stylesheets/syllabus.css | 465 ++++++++++++++++++ 30 files changed, 1117 insertions(+), 272 deletions(-) create mode 100644 app/views/layouts/_base_syllabus_old.html.erb create mode 100644 app/views/layouts/_syllabus_teacher_list.html.erb create mode 100644 public/images/sy/bg_sy.jpg create mode 100644 public/images/sy/icons_smile.png create mode 100644 public/images/sy/icons_sy.png create mode 100644 public/images/sy/icons_tan.png create mode 100644 public/images/sy/liststyle.png create mode 100644 public/images/sy/logo_class.jpg create mode 100644 public/images/sy/male.jpg create mode 100644 public/images/sy/massage.jpg create mode 100644 public/images/sy/sy_icons_close.png create mode 100644 public/stylesheets/sy_public.css diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb index 291e6ca30..9c69f5259 100644 --- a/app/controllers/syllabuses_controller.rb +++ b/app/controllers/syllabuses_controller.rb @@ -13,7 +13,6 @@ class SyllabusesController < ApplicationController end def show - #@courses = @syllabus.courses respond_to do |format| format.js format.html{render :layout => 'base_syllabus'} @@ -109,11 +108,7 @@ class SyllabusesController < ApplicationController sort_name = "updated_on" sort_type = @c_sort == 1 ? "asc" : "desc" - if User.current == @syllabus.user || User.current.admin? - @courses = @syllabus.courses.where("is_delete = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") - else - @courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") - end + @courses = @syllabus.courses.where("is_delete = ?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") #根据 作业+资源数排序 if @order.to_i == 2 diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index d53e89e77..fe6b3e596 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -8,11 +8,11 @@ <% if @syllabus.nil? %> <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"} %> + 如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%> <% else %> <%=@syllabus.title %> <% end %> - 如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>
  • diff --git a/app/views/layouts/_base_syllabus_old.html.erb b/app/views/layouts/_base_syllabus_old.html.erb new file mode 100644 index 000000000..45e77dbad --- /dev/null +++ b/app/views/layouts/_base_syllabus_old.html.erb @@ -0,0 +1,151 @@ + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','css/popup','prettify',:media => 'all' %> + <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> + <%= javascript_heads %> + <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%> + <%= heads_for_theme %> + <%= call_hook :view_layouts_base_html_head %> + <%= yield :header_tags -%> + + + + + + + +<% is_current_user = User.current.logged?%> +
    + <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
    +
    +
    +
    +
    +
    + <%=render :partial => 'layouts/syllabus_info' %> +
    + <% update_visiti_count @syllabus %> + +
    + <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %> +
    + +
    +
    + <%=link_to '班级', {:controller => "syllabuses", :action => "syllabus_courselist", :id => @syllabus.id}, :class => 'homepageMenuText' %> + <% if is_current_user%> + <% if User.current == @syllabus.user && User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> +
    +
      +
    • +
        +
      • + <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey", :target => '_blank'%> +
        • +
      • + <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%> +
        • +
      +
      • +
    +
    + <% else%> + <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入班级"%> + <% end%> + <% end%> +
    + <% if User.current == @syllabus.user || User.current.admin? + all_courses = @syllabus.courses.where("is_delete = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc") + else + all_courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc") + end %> + <% courses = all_courses.limit(5) %> + <% all_count = all_courses.count%> +
    +
    +
      + <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current,:all_count => all_count,:type =>'Syllabus',:page => 0} %> +
    +
    + <% if !courses.empty? %> +
    + +
    + <% end %> +
    +
    + +
    +

    标签:

    +
    + <%= render :partial => 'tags/syllabus_tag', :locals => {:obj => @syllabus,:object_flag => "11"}%> +
    +
    +
    +
    访问计数 <%=@syllabus.visits %> （自2016年7月）
    + +
    +
    + <%= yield %> +
    +
    + <%= render :partial => 'layouts/new_feedback' %> +
    +
    +<%= render :partial => 'layouts/footer' %> +
    + + + + + + diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb index 387ac58f7..446473db5 100644 --- a/app/views/layouts/_syllabus_base_info.html.erb +++ b/app/views/layouts/_syllabus_base_info.html.erb @@ -1,55 +1,59 @@ -