Merge remote-tracking branch 'remotes/origin/szzh' into develop

11 years ago · 35ab3a2c7d
parent 2a8929b90f d8d8473811
commit 35ab3a2c7d
10 changed files with 82 additions and 12 deletions
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@ -140,7 +140,11 @@ private
  end

  def find_board_if_available
-    @board = @project.boards.find(params[:id]) if params[:id]
+    if @project
+      @board = @project.boards.find(params[:id]) if params[:id]
+    elsif @course
+      @board = @course.boards.find(params[:id]) if params[:id]
+    end
  rescue ActiveRecord::RecordNotFound
    render_404
  end
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -155,7 +155,7 @@ class CoursesController < ApplicationController

    respond_to do |format|
      format.html {
-        render :layout => 'base'
+        render :layout => 'course_base'
        scope = Course
        unless params[:closed]
          scope = scope.active
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@ -112,10 +112,19 @@ class MessagesController < ApplicationController
    (render_403; return false) unless @message.destroyable_by?(User.current)
    r = @message.to_param
    @message.destroy
-    if @message.parent
-      redirect_to board_message_path(@board, @message.parent, :r => r)
-    else
-      redirect_to project_board_path(@project, @board)
+    # modify by nwb
+    if @project
+      if @message.parent
+        redirect_to board_message_path(@board, @message.parent, :r => r)
+      else
+        redirect_to project_board_path(@project, @board)
+      end
+    elsif @course
+      if @message.parent
+        redirect_to board_message_path(@board, @message.parent, :r => r)
+      else
+        redirect_to course_board_path(@course, @board)
+      end
    end
  end

--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@ -1,5 +1,5 @@
 class SchoolController < ApplicationController
-  
+  layout 'course_base'
  before_filter :require_admin, :only => :upload_logo
  
  def upload
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -26,11 +26,11 @@ module CoursesHelper
  end

  # 返回学生数量，即roles表中定义的Reporter
-  def studentCount project
-    searchStudent(project).count
+  #def studentCount project
+   # searchStudent(project).count
    # or
    # searchStudent(project).count
-  end
+ # end

  # 判断用户是否是课程的管理员
  # add by nwb
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@ -43,7 +43,8 @@
 	</p>
 	<p class="stats">
 		<%= content_tag('span',  "#{garble @course.members.count}", :class => "info") %>
-		<%= content_tag('span',  l(:label_x_member, :count => @course.members.count)) %>
+		<%#= content_tag('span',  l(:label_x_member, :count => @course.members.count)) %>
+         <%= content_tag('span',  l(:label_x_member, :count => studentCount(@course)+teacherCount(@course))) %>
 	</p>
 	
 	<!--gcm-->
--- a/app/views/layouts/base_stores.html.erb
+++ b/app/views/layouts/base_stores.html.erb
@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="<%= current_language %>">
 <head>
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@ -0,0 +1,49 @@
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
+<!DOCTYPE html>
+<html lang="<%= current_language %>">
+<head>
+  <meta charset="utf-8" />
+  <title><%=h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%= yield :header_tags -%>
+</head>
+<body class="<%=h body_css_classes %>">
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <%=render :partial => 'layouts/base_header'%>
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <%= render_flash_messages %>
+          <%= yield %>
+          <%= call_hook :view_layouts_base_content %>
+          <div style="clear:both;"></div>
+          <%=render :partial => 'layouts/base_footer'%>
+        </div>
+
+      </div>
+    </div>
+
+    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+    <div id="ajax-modal" style="display:none;"></div>
+
+
+  </div>
+</div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@ -10,7 +10,7 @@

 <h3><strong><%=h @news.title %></strong></h3>

-<% if authorize_for('news', 'edit') %>
+<% if authorize_for_course('news', 'edit') %>
    <div id="edit-news" style="display:none;">
      <%= labelled_form_for :news, @news, :url => news_path(@news),
                            :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@ -1,3 +1,5 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>