diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 833711e3e..627e1945b 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -37,6 +37,7 @@ class ContestsController < ApplicationController def index + render_404 # @contests = Contest.visible # @contests ||= [] @offset, @limit = api_offset_and_limit(:limit => 10) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 5381e8757..dc7e97054 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -427,6 +427,7 @@ class CoursesController < ApplicationController end def index + render_404 @course_type = params[:course_type] @school_id = params[:school_id] per_page_option = 10 @@ -474,7 +475,7 @@ class CoursesController < ApplicationController respond_to do |format| format.html { - render :layout => 'base' + # render :layout => 'base' } format.atom { courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 47c8107ce..d73b8de3a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -105,6 +105,7 @@ class ProjectsController < ApplicationController end def index + render_404 #调用存储过程更新提交次数 #ActiveRecord::Base.connection.execute("CALL sp_project_status_cursor();") #Modified by nie @@ -156,8 +157,8 @@ class ProjectsController < ApplicationController respond_to do |format| - format.html { - render :layout => 'base' + format.html { + # render :layout => 'base' # scope = Project # unless params[:closed] # scope = scope.active diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b466e4721..0db7facbc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -295,6 +295,7 @@ class UsersController < ApplicationController #end def index + @status = params[:status] || 1 sort_init 'login', 'asc' sort_update %w(login firstname lastname mail admin created_on last_login_on) @@ -352,7 +353,8 @@ class UsersController < ApplicationController respond_to do |format| format.html { @groups = Group.all.sort - render :layout => @user_base_tag + # render :layout => @user_base_tag + render_404 } format.api end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1d528c183..9c5d8c9b5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1830,12 +1830,11 @@ module ApplicationHelper main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain} main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.contest_domain} - course_all_course_link = link_to l(:label_course_all), {:controller => 'courses', :action => 'index'} + # course_all_course_link = link_to l(:label_course_all), {:controller => 'courses', :action => 'index'} course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :host => Setting.course_domain} - courses_link = link_to l(:label_course_practice), {:controller => 'courses', :action => 'index'} - projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain} + # courses_link = link_to l(:label_course_practice), {:controller => 'courses', :action => 'index'} users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.user_domain} - contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'} + # contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'} bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'} forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"} stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'} @@ -1844,7 +1843,7 @@ module ApplicationHelper #@nav_dispaly_project_label nav_list = Array.new nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 - nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label && @show_course == 1 + # nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label && @show_course == 1 nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label && @show_course == 1 nav_list.push(main_project_link) if @nav_dispaly_main_project_label @@ -1852,9 +1851,9 @@ module ApplicationHelper nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label && @show_contest == 1 nav_list.push(courses_link) if @nav_dispaly_course_label && @show_course == 1 - nav_list.push(projects_link) if @nav_dispaly_project_label + # nav_list.push(projects_link) if @nav_dispaly_project_label nav_list.push(users_link) if @nav_dispaly_user_label - nav_list.push(contest_link) if @nav_dispaly_contest_label && @show_contest == 1 + # nav_list.push(contest_link) if @nav_dispaly_contest_label && @show_contest == 1 nav_list.push(bids_link) if @nav_dispaly_bid_label nav_list.push(forum_link) if @nav_dispaly_forum_label nav_list.push(stores_link) if @nav_dispaly_store_all_label diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 6cdc19471..6de46d2fe 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -56,7 +56,7 @@

<%= link_to "主页", home_path %> - > <%= link_to l(:label_course_all), :controller => 'courses', :action => 'index' %> + > <%=l(:label_courses_management_platform)%> > <%= link_to @course.name, nil %>

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index f656f5263..14be707f3 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -44,7 +44,7 @@ <%= link_to request.host()+"/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> -

<%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index', :project_type => 0 %> > <%=link_to @project, project_path(@project) %>

+

<%=link_to l(:label_home),home_path %> > <%=link_to @project, project_path(@project) %>

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5aedec245..1e0811039 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -113,8 +113,7 @@ <%=link_to request.host()+"/users" ,:controller => 'users', :action => 'index' %> - <%=link_to "主页", home_path %> > - <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > + <%=link_to "主页", home_path %> > <%=link_to @user.name, user_path %> diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb index 66f15fdf2..8d0f1564c 100644 --- a/app/views/welcome/_more_course.html.erb +++ b/app/views/welcome/_more_course.html.erb @@ -7,5 +7,3 @@ <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>      <% end %> - -<%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %> \ No newline at end of file diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 4b7b0bf54..40be02464 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -160,8 +160,6 @@ <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add') %> <% end %> <% end %> -    - <%= link_to l(:label_more), {:controller => 'contests', :action => 'index'}, :target => "_blank" %>
@@ -258,7 +256,6 @@

<%=l(:label_current_attendingcontest_work)%>

- <%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index'}, :target => "_blank" %>
<% if Softapplication.count > 0%>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 171b2b764..424d4eff0 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,5 +1,4 @@ -<% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> +<% @nav_dispaly_forum_label = 1 %> <%= stylesheet_link_tag 'welcome' %> <%= javascript_include_tag 'welcome' %>