From 265e0f246b4b669ad9dd0621e884af8902f60c7f Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 11 Dec 2013 10:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=85=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 6 +- app/views/layouts/base_courses.html.erb | 506 ++++++++++++------------ 2 files changed, 257 insertions(+), 255 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2753f278b..91e42202e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -25,8 +25,10 @@ class ProjectsController < ApplicationController menu_item l(:label_sort_by_active), :only => :index menu_item l(:label_sort_by_influence), :only => :index - menu_item l(:label_homework), :only => :homework - menu_item l(:label_course_feedback), :only => :feedback + # menu_item l(:label_homework), :only => :homework + # menu_item l(:label_course_feedback), :only => :feedback + menu_item :homework, :only => :homework + menu_item :feedback, :only => :feedback menu_item l(:label_course_file), :only => :index menu_item l(:label_course_news), :only => :index # end diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ef9a4b5f9..00adabffc 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -1,254 +1,254 @@ - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> - <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - -
-
-
- <%= render :partial => 'layouts/base_header'%> -
- -
- <% @project = Project.find_by_id(@project.id)%> - <% @course = Course.find_by_extra(@project.identifier)%> - - - - - - - - - - -
高校课程实践社区<%= l(:label_user_location) %> : -
- <%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> - <%= hidden_field_tag 'project_type', @project.project_type %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <% end %> -
-
<%=link_to "forge.trustie.net/course", :controller => 'projects', :action => 'course' %>

<%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %>

-
- - - -
-
-
    -
  • - <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %> -
    • -
  • - <%= link_to l(:label_homework), homework_project_path(@project), :class => link_class('Task') ,:project_type => 1 %> -
    • -
  • - <%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> -
    • -
  • - <%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%> -
    • -
  • - <%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %> -
    • -
  • - <%= link_to l(:label_course_feedback), project_feedback_path(@project), :class => link_class('Feedback')%> -
    • - - <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 7, 9)).size >0))%> - -
- <% end %> -
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
- -
- <%= render :partial => 'layouts/base_footer'%> - <%= debug(params) if Rails.env.development? %> -
- - - -
-
- <%= call_hook :view_layouts_base_body_bottom %> - + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> + <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + +
+
+
+ <%= render :partial => 'layouts/base_header'%> +
+ +
+ <% @project = Project.find_by_id(@project.id)%> + <% @course = Course.find_by_extra(@project.identifier)%> + + + + + + + + + + +
高校课程实践社区<%= l(:label_user_location) %> : +
+ <%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> + <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= hidden_field_tag 'project_type', @project.project_type %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> +
+
<%=link_to "forge.trustie.net/course", :controller => 'projects', :action => 'course' %>

<%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %>

+
+ + + +
+
+
    +
  • + <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %> +
    • +
  • + <%= link_to l(:label_homework), homework_project_path(@project), :class => link_class(:homework) ,:project_type => 1 %> +
    • +
  • + <%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> +
    • +
  • + <%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%> +
    • +
  • + <%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %> +
    • +
  • + <%= link_to l(:label_course_feedback), project_feedback_path(@project), :class => link_class(:feedback)%> +
    • + + <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 7, 9)).size >0))%> + +
+ <% end %> +
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+ +
+ <%= render :partial => 'layouts/base_footer'%> + <%= debug(params) if Rails.env.development? %> +
+ + + +
+
+ <%= call_hook :view_layouts_base_body_bottom %> + \ No newline at end of file