From 34fd8a933a624de98533e43b48cfbc1f762ff9cb Mon Sep 17 00:00:00 2001 From: xianbo Date: Fri, 21 Mar 2014 20:25:41 +0800 Subject: [PATCH 01/48] fix the show of domain and project page --- app/helpers/application_helper.rb | 4 ++-- app/helpers/welcome_helper.rb | 2 +- app/views/layouts/_base_header.html.erb | 4 ++-- app/views/layouts/base.html.erb | 6 +++++- app/views/welcome/course.html.erb | 2 +- app/views/welcome/index.html.erb | 8 ++++---- config/settings.yml | 8 ++++---- lib/redmine.rb | 24 ++++++++++++------------ 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ab45d8e9a..f8acafc1f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -65,7 +65,7 @@ module ApplicationHelper if user.is_a?(User) name = h(user.name(options[:format])) if user.active? || (User.current.admin? && user.logged?) - link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.forge_domain}, :class => user.css_classes + link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes else name end @@ -1513,7 +1513,7 @@ module ApplicationHelper #@nav_dispaly_project_label nav_list = Array.new - nav_list.push(home_link) + nav_list.push(home_link) nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index a446631d7..ed90dd24f 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -214,7 +214,7 @@ module WelcomeHelper "show_news" => true, "show_bids" => true } - activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } + activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'}) end diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 2cb5fafa0..7bdd8a728 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -15,11 +15,11 @@
  • <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
    • <% end -%>
  • <%=link_to l(:label_my_projects),{:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
    • -
  • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.forge_domain}%>
    • +
  • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
  • - <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.forge_domain }, {:class => 'my-message'} if User.current.logged?%> + <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged?%>
    • diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 421e76050..fcf7d2195 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -13,7 +13,7 @@ @nav_dispaly_bid_label = 1 elsif (realUrl.match(/forums/)) @nav_dispaly_forum_label = 1 - elsif (realUrl.match(/[^projects]\/course[^\.]/)) + elsif (realUrl.match(/[^forge]\/course[^\.]/)) @nav_dispaly_course_label = 1 @nav_dispaly_project_label = 1 @nav_dispaly_contest_label = 1 @@ -21,6 +21,10 @@ @nav_dispaly_course_all_label = 1 @nav_dispaly_teacher_all_label = 1 @nav_dispaly_forum_label = 1 + elsif (realUrl.match(/user\.trustie\.net/)) + @nav_dispaly_project_label = 1 + @nav_dispaly_user_label = 1 + @nav_dispaly_forum_label = 1 elsif (realUrl.match(/forge\.trustie\.net/)) @nav_dispaly_project_label = 1 @nav_dispaly_user_label = 1 diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 517e81f30..734568c7d 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -95,7 +95,7 @@ <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
    - <%= render :partial => "search_bar"%> + <%= render :partial => "search_project", :locals => {:project_type => 1}%>
    diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index fd539b12f..c9fad6757 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -140,8 +140,8 @@
    -
    +
      -
      +

      贴吧动态

      <%= link_to "更多>>", forums_path %>
      diff --git a/config/settings.yml b/config/settings.yml index 2a50e6cb4..d43d3699b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -236,11 +236,11 @@ tags_max_length: tags_show_search_results: format: int default: 5 -forge_domain: - default: forge.trustie.net +user_domain: + default: user.trustie.net project_domain: default: forge.trustie.net contest_domain: - default: forge.trustie.net + default: contest.trustie.net course_domain: - default: forge.trustie.net + default: course.trustie.net diff --git a/lib/redmine.rb b/lib/redmine.rb index e5fb39446..3990d10d3 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -203,7 +203,7 @@ Redmine::AccessControl.map do |map| end #by young Redmine::MenuManager.map :top_menu do |menu| - menu.push :home, {:host => Setting.forge_domain} + menu.push :home, {:host => Setting.user_domain} menu.push :course_practice, {:controller => 'projects', :action => 'course', :project_type => 1} menu.push :project_deposit, { :controller => 'projects', :action => 'index', :project_type => 0}, :caption => :label_project_deposit menu.push :software_user, {:controller => 'users', :action => 'index'} @@ -264,7 +264,7 @@ end # end Redmine::MenuManager.map :account_menu do |menu| - menu.push :login, {:controller => 'account', :action => 'login', :host => Setting.forge_domain}, :if => Proc.new { !User.current.logged? } + menu.push :login, {:controller => 'account', :action => 'login', :host => Setting.project_domain}, :if => Proc.new { !User.current.logged? } menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? } # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } @@ -341,29 +341,29 @@ Redmine::MenuManager.map :course_menu do |menu| end Redmine::MenuManager.map :user_menu do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.forge_domain } + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } menu.push :user_course, {:controller => 'users', :action => 'user_courses', :host => Setting.course_domain} #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.forge_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} end Redmine::MenuManager.map :user_enterprise_menu do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.forge_domain } + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} - menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.forge_domain} - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.forge_domain} + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} end Redmine::MenuManager.map :user_menu_self do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.forge_domain } - menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.forge_domain} - menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.forge_domain} - menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.forge_domain} - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.forge_domain} + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.project_domain } + menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.user_domain} + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} end #end From 404568be894ad2c825a3e9a19269a34b83838a2b Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 22 Mar 2014 09:24:59 +0800 Subject: [PATCH 02/48] =?UTF-8?q?=E7=95=99=E8=A8=80url=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=95=99=E8=A8=80=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E7=9A=84url=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 9 ++++++++- app/models/journals_for_message.rb | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 9492bfbad..db47319ef 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -296,10 +296,17 @@ class ProjectsController < ApplicationController #Ended by young def feedback + page = params[:page] + # Find the page of the requested reply @jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC') @limit = 10 + if params[:r] && page.nil? + offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i]) + page = 1 + offset / @limit + end + @feedback_count = @jours.count - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] + @feedback_pages = Paginator.new @feedback_count, @limit, page @offset ||= @feedback_pages.offset @jour = @jours[@offset, @limit] @state = false diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 426d1b56b..2c4f10886 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -27,8 +27,10 @@ class JournalsForMessage < ActiveRecord::Base :datetime => Proc.new {|o| o.updated_on }, :author => Proc.new {|o| o.user }, :description => Proc.new{|o| o.notes }, - :type => Proc.new {|o| o.jour_type }#, - #:url => Proc.new {|o| ''}#{:controller => 'documents', :action => 'show', :id => o.id}} + :type => Proc.new {|o| o.jour_type }, + :url => Proc.new {|o| + (o.jour.kind_of? Project) ? {:controller => 'projects', :action => 'feedback', :id => o.jour, :r => o.id, :anchor => "word_li_#{o.id}"} : {} + }#{:controller => 'documents', :action => 'show', :id => o.id}} acts_as_activity_provider :author_key => :user_id, :timestamp => "#{self.table_name}.updated_on", :find_options => {:include => :project } From 3b13183dbbf257c4703f98a2cbc62a48b17492f6 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 24 Mar 2014 08:31:59 +0800 Subject: [PATCH 03/48] resort --- app/models/issue.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/issue.rb b/app/models/issue.rb index cc321aad0..b7e1cfff8 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -212,9 +212,14 @@ class Issue < ActiveRecord::Base @workflow_rule_by_attribute = nil @assignable_versions = nil @relations = nil + @to_param = nil base_reload(*args) end + # def to_param + # @to_param ||= + # end + # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields def available_custom_fields (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : [] From 2e3b44c830d2d0b68a5027cbb50085a245ac4e07 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 24 Mar 2014 11:11:13 +0800 Subject: [PATCH 04/48] id-name(position|count) --- app/helpers/journals_helper.rb | 2 +- app/models/issue.rb | 6 +++--- app/views/issues/show.html.erb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 788bd0765..480524457 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -25,7 +25,7 @@ module JournalsHelper links = [] if !journal.notes.blank? links << link_to(l(:button_quote), - {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal}, + {:controller => 'journals', :action => 'new', :id => issue.id, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote)) if options[:reply_links] diff --git a/app/models/issue.rb b/app/models/issue.rb index b7e1cfff8..f4eb4aa23 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -216,9 +216,9 @@ class Issue < ActiveRecord::Base base_reload(*args) end - # def to_param - # @to_param ||= - # end + def to_param + @to_param ||= "#{id}_#{self.project.name}(#{self.project.issues.index(self)}|#{self.project.issues.count})"#.parameterize + end # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields def available_custom_fields diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 7166f306f..6678e2f02 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -87,7 +87,7 @@ end %> <% if @issue.description? %>
      - <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> + <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>

      <%=l(:field_description)%>

      From 8db09739a1b2bf6cd124f45c44b2b79811415335 Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 24 Mar 2014 10:18:42 +0800 Subject: [PATCH 05/48] optimize the show of forge --- app/helpers/courses_helper.rb | 7 ++++++- app/helpers/projects_helper.rb | 1 + app/helpers/welcome_helper.rb | 22 +++++++++++++++++++- app/views/welcome/index.html.erb | 35 +++++++++++++++++++++++++++++--- 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 78e20c2a7..d474b5587 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -9,8 +9,13 @@ module CoursesHelper =end TeacherRoles = [3, 4, 7, 9] StudentRoles = [5, 10] - + AllPeople = StudentRoles+TeacherRoles ## return people count + + # 返回x项目成员数量，即roles表中定义的所有成员 + def projectCount project + searchCountByRoles project, AllPeople + end # 返回教师数量，即roles表中定义的Manager def teacherCount project diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 35314efcc..b9d8ef932 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -285,6 +285,7 @@ module ProjectsHelper SELECT project_id,grade FROM project_statuses WHERE project_type = 0 ORDER BY grade DESC LIMIT #{limit} ) AS t ON p.id = t.project_id ") end + # 判断课程是否结束,快别用，这个定日子的方法有问题 def course_timeout? project diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index ed90dd24f..fd00c83e2 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -39,6 +39,13 @@ module WelcomeHelper end end + def get_project_avatar project + if get_avatar?(project) + url_to_avatar(project) + else + '../images/avatars/Project/project.jpg' + end + end # 前略·天国の首页君/Earth has been unable stop to welcomePage's. # sum - 要搜索的项目数量 # max_rate - 新项目所占所有项目的比重，10分制 @@ -56,10 +63,23 @@ module WelcomeHelper c2 = c2 - c1 (c1.take(max)+c2).take(sum) end - + + def find_miracle_project(sum=10, max_rate=7) + max = sum*(max_rate.to_f/10) + c1 = find_new_project(sum).to_a.dup + c2 = find_all_hot_project(sum).to_a.dup + c2 = c2 - c1 + (c1.take(max)+c2).take(sum) + end + def find_new_course limit=15 Project.visible.joins(:course_extra).where("#{Project.table_name}.project_type = ? ", 1).order("courses.time DESC, #{Project.table_name}.created_on DESC").limit(limit).all end + + def find_new_project limit=15 + Project.visible.joins(:course_extra).where("#{Project.table_name}.project_type = ? ", 0).order("courses.time DESC, #{Project.table_name}.created_on DESC").limit(limit).all + end + def find_all_hot_project limit=15 sort_project_by_hot limit diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index c9fad6757..eae4cba2a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -105,10 +105,8 @@ <%= stylesheet_link_tag 'welcome' %> - - -
      + +
      +

      热门项目

      + <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank" %> +
      +
        + <% find_miracle_project(11, 7).map do |project| %> +
      • +
        + <%= image_tag(get_project_avatar(project), :class => "avatar-4") %> +
        + +
        + <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> + (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) +
        +
        + ><%=project.description.truncate(35, omission: '...')%> +
        +
        + <%= content_tag "span", show_grade(project), + :style => "cursor: pointer; display: inline-block; float: right; color: #ec6300; ", + :title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度", + :class => "tooltip", + :id => "tooltip-#{project.id}" %> +

        +
        +
        • + <% end; reset_cycle %> +
      +
      From 8bb4d44cbed67d630f16ad905d3be91b1b5280ec Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 24 Mar 2014 13:48:43 +0800 Subject: [PATCH 06/48] fix link --- app/views/welcome/_search_project.html.erb | 9 ++++- app/views/welcome/index.html.erb | 38 +++------------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index a082a6dcf..df5ce7ad3 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -3,5 +3,12 @@ <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', :size => 30 %> <%= hidden_field_tag 'project_type', project_type %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> -
      +
      +
      + <%= if project_type == 0 + "全站项目搜索。不会搜索私有项目" + else + "全站课程搜索。" + end %> +
      <% end %> \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index eae4cba2a..c88f7e0e2 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -87,7 +87,7 @@
      @@ -106,41 +106,13 @@ <%= stylesheet_link_tag 'welcome' %> -

      热门项目

      - <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank" %> + <%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %>
        - <% find_miracle_project(11, 7).map do |project| %> -
      • + <% find_miracle_project(10, 7).map do |project| %> +
      • <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
        @@ -150,7 +122,7 @@ (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
      - ><%=project.description.truncate(35, omission: '...')%> + ><%=project.description.truncate(50, omission: '...')%>
      <%= content_tag "span", show_grade(project), From 1fabad8c2fc2f6cb588f934effae183272440625 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 24 Mar 2014 16:27:18 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=89=98=E7=AE=A1=E4=B8=BB=E9=A1=B5=E5=92=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E4=B8=BB=E9=A1=B5=E4=B8=BB=E9=A2=98=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 +- app/views/welcome/index.html.erb | 2 +- config/locales/zh.yml | 6 ++++-- public/stylesheets/application.css | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 517e81f30..a5b5a351c 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,7 +92,7 @@
      - <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> + <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %>
      <%= render :partial => "search_bar"%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b3d057c54..3f9ddea3c 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -92,7 +92,7 @@
      - <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> + <%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %>
      <%= render :partial => "search_bar"%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 4aac82bf2..a305a7240 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1544,8 +1544,10 @@ zh: label_sort_by_influence: 按影响力排序 label_bids_published: 发布于 label_bids_published_ago: 之前 - label_welcome_trustie: Trustie - label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。 + label_welcome_trustie_project: Trustie在线项目托管平台 + label_welcome_trustie_course: Trustie在线课程实践平台 + label_welcome_trustie_project_description: 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。 + label_welcome_trustie_course_description: 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。 label_user_project: 项目 label_user_course: 课程 label_user_homework: 作业 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 0661235d0..7bd31f469 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -608,7 +608,7 @@ ul.tool li{list-style-type:none; .font_welcome_trustie{ font-family:Impact; font-weight: regular; - font-size: 24px; + font-size: 18px; color:#15bccf; } From 163cdc8cf7e1eae7b6ea4c9399a3369f060b3787 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 24 Mar 2014 16:42:43 +0800 Subject: [PATCH 08/48] issues to_param --- app/models/issue.rb | 4 ++-- app/views/issues/show.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index f4eb4aa23..c69343c6b 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -57,7 +57,7 @@ class Issue < ActiveRecord::Base # sort by id so that limited eager loading doesn't break with postgresql :order_column => "#{table_name}.id" acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"}, - :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}, + :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o}}, :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') } acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]}, @@ -217,7 +217,7 @@ class Issue < ActiveRecord::Base end def to_param - @to_param ||= "#{id}_#{self.project.name}(#{self.project.issues.index(self)}|#{self.project.issues.count})"#.parameterize + @to_param ||= "#{id}_#{self.project.name}(#{self.project.issues.index(self)+1}-#{self.project.issues.count})"#.parameterize end # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 6678e2f02..f8159fc7a 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -9,14 +9,14 @@
      <%= link_to_if @prev_issue_id, "\xc2\xab #{l(:label_previous)}", - (@prev_issue_id ? issue_path(@prev_issue_id) : nil), + (@prev_issue_id ? issue_path(Issue.find_by_id(@prev_issue_id)) : nil), :title => "##{@prev_issue_id}" %> | <% if @issue_position && @issue_count %> <%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %> | <% end %> <%= link_to_if @next_issue_id, "#{l(:label_next)} \xc2\xbb", - (@next_issue_id ? issue_path(@next_issue_id) : nil), + (@next_issue_id ? issue_path(Issue.find_by_id(@next_issue_id)) : nil), :title => "##{@next_issue_id}" %>
      <% end %> From 321f2df0b91ab1ab32dbb997a044eb9d08b572ec Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 24 Mar 2014 17:12:28 +0800 Subject: [PATCH 09/48] add chance to new preoject --- app/helpers/welcome_helper.rb | 7 +++---- app/views/welcome/_search_project.html.erb | 7 ------- app/views/welcome/course.html.erb | 1 + app/views/welcome/index.html.erb | 3 ++- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fd00c83e2..9fc768d9c 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -64,12 +64,11 @@ module WelcomeHelper (c1.take(max)+c2).take(sum) end - def find_miracle_project(sum=10, max_rate=7) + def find_miracle_project(sum, max_rate) max = sum*(max_rate.to_f/10) c1 = find_new_project(sum).to_a.dup c2 = find_all_hot_project(sum).to_a.dup - c2 = c2 - c1 - (c1.take(max)+c2).take(sum) + (c2.take(sum-max)+c1.take(max)).take(sum) end def find_new_course limit=15 @@ -77,7 +76,7 @@ module WelcomeHelper end def find_new_project limit=15 - Project.visible.joins(:course_extra).where("#{Project.table_name}.project_type = ? ", 0).order("courses.time DESC, #{Project.table_name}.created_on DESC").limit(limit).all + Project.visible.where("#{Project.table_name}.project_type = ? ", 0).order("#{Project.table_name}.updated_on DESC, #{Project.table_name}.created_on DESC").limit(limit).all end diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index df5ce7ad3..61770cace 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -4,11 +4,4 @@ <%= hidden_field_tag 'project_type', project_type %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
      -
      - <%= if project_type == 0 - "全站项目搜索。不会搜索私有项目" - else - "全站课程搜索。" - end %> -
      <% end %> \ No newline at end of file diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 734568c7d..363aa8130 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -96,6 +96,7 @@
      <%= render :partial => "search_project", :locals => {:project_type => 1}%> +
      全站课程搜索。
      diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index c88f7e0e2..af2741a5b 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -96,6 +96,7 @@
      <%= render :partial => "search_project", :locals => {:project_type => 0}%> +
      全站项目搜索。不会搜索私有项目
      @@ -111,7 +112,7 @@ <%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %>
        - <% find_miracle_project(10, 7).map do |project| %> + <% find_miracle_project(10, 3).map do |project| %>
      • <%= image_tag(get_project_avatar(project), :class => "avatar-4") %> From 83b97ef71d167e0fd23785a11313c2b0475aaa41 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 24 Mar 2014 21:23:51 +0800 Subject: [PATCH 10/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=AD=E4=B8=BB=E4=BD=93=E9=83=A8=E5=88=86=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E4=B8=BA=E7=B2=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7bd31f469..2ac667946 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -607,7 +607,7 @@ ul.tool li{list-style-type:none; .font_welcome_trustie{ font-family:Impact; - font-weight: regular; + font-weight: bold; font-size: 18px; color:#15bccf; } From 8d2bbfe320bd46207e4191cd965e6409bf82938f Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 24 Mar 2014 21:36:10 +0800 Subject: [PATCH 11/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=83=A8=E5=88=86=E5=AD=97=E4=BD=93=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 +- app/views/welcome/index.html.erb | 2 +- config/locales/zh.yml | 5 +++-- public/stylesheets/application.css | 7 +++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index e1890a7e6..d7fafb49a 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,7 +92,7 @@
        - <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %> + <%= l(:label_welcome_trustie) %> <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %>
        <%= render :partial => "search_project", :locals => {:project_type => 1}%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 0af0dea21..ad23a3b6b 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -92,7 +92,7 @@
        - <%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %> + <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %>
        <%= render :partial => "search_project", :locals => {:project_type => 0}%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a305a7240..e57fce2f2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1544,8 +1544,9 @@ zh: label_sort_by_influence: 按影响力排序 label_bids_published: 发布于 label_bids_published_ago: 之前 - label_welcome_trustie_project: Trustie在线项目托管平台 - label_welcome_trustie_course: Trustie在线课程实践平台 + label_welcome_trustie: Trustie + label_welcome_trustie_project: 在线项目托管平台 + label_welcome_trustie_course: 在线课程实践平台 label_welcome_trustie_project_description: 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。 label_welcome_trustie_course_description: 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。 label_user_project: 项目 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 2ac667946..38aa5e6a9 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -612,6 +612,13 @@ ul.tool li{list-style-type:none; color:#15bccf; } +.font_welcome_Mdescription{ + font-family:微软雅黑; + font-weight: bold; + font-size: 17px; + color:#15bccf; +} + .font_welcome_Cdescription{ font-family: 微软雅黑; font-size: 16px; From 6ba25556b70e02aa9f18c05aad9c98b2cf3d0594 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 09:09:46 +0800 Subject: [PATCH 12/48] issues id new world --- app/helpers/issues_helper.rb | 3 ++- app/models/issue.rb | 8 +++++++- app/views/issues/_list.html.erb | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index f5847abbc..8da5d7c35 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -58,7 +58,8 @@ module IssuesHelper end def issue_heading(issue) - h("#{issue.tracker} ##{issue.id}") + #h("#{issue.tracker} ##{issue.id}") + h("#{issue.tracker} #{issue.source_from}") end def render_issue_subject_with_tree(issue) diff --git a/app/models/issue.rb b/app/models/issue.rb index c69343c6b..1ea358a37 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -217,7 +217,7 @@ class Issue < ActiveRecord::Base end def to_param - @to_param ||= "#{id}_#{self.project.name}(#{self.project.issues.index(self)+1}-#{self.project.issues.count})"#.parameterize + @to_param ||= "#{id}_#{self.project.name}(#{self.project.issues.index(self).to_i+1}-#{self.project.issues.count})"#.parameterize end # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields @@ -1144,6 +1144,12 @@ class Issue < ActiveRecord::Base Project.all(:conditions => Project.allowed_to_condition(user, :move_issues)) end + # back string obj which is belong to project. + def source_from + "" << self.project.name.to_s << + "#" << (self.project.issues.index(self).to_i + 1).to_s + end + private def after_project_change diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index ed4407fa9..2b17b4fb1 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -30,7 +30,8 @@
          <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %><%= l(:label_post_on)%> <% a = [] %> <% a << column_content[1] %> - <% a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %> + <%# a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %> + <% a << "#{issue.source_from}" << "(#{raw column_content[2]}):" << column_content[4] %> <%= link_to a.join(' '), issue_path(issue), :class => "issue-link" %>
        <% end -%> From ce4f49b635a33aca60e5d85d2c01db51b574f157 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 09:27:43 +0800 Subject: [PATCH 13/48] counter cache for issue --- app/models/issue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 1ea358a37..d28fe6edc 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -19,7 +19,7 @@ class Issue < ActiveRecord::Base include Redmine::SafeAttributes include Redmine::Utils::DateCalculation - belongs_to :project + belongs_to :project, :counter_cache => true belongs_to :tracker belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' From 3bf0a8f1383cdb53a727eee0048c8c96c9df8419 Mon Sep 17 00:00:00 2001 From: xianbo Date: Tue, 25 Mar 2014 09:34:43 +0800 Subject: [PATCH 14/48] fix default show --- app/helpers/welcome_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 9fc768d9c..89b1ec42c 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -43,7 +43,7 @@ module WelcomeHelper if get_avatar?(project) url_to_avatar(project) else - '../images/avatars/Project/project.jpg' + '../images/avatars/Project/0' end end # 前略·天国の首页君/Earth has been unable stop to welcomePage's. From a8d160860321abc5b7227b4c56ea6bad67ed7437 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 14:40:21 +0800 Subject: [PATCH 15/48] nil --- app/models/issue.rb | 2 +- public/stylesheets/nyan.css | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index d28fe6edc..1ea358a37 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -19,7 +19,7 @@ class Issue < ActiveRecord::Base include Redmine::SafeAttributes include Redmine::Utils::DateCalculation - belongs_to :project, :counter_cache => true + belongs_to :project belongs_to :tracker belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index f89783318..6e62c1fee 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -571,3 +571,18 @@ input.blueinputbar:focus { .courses_history a { color: #666; } + +/* issue div.issues +*******************************************************************************/ +div.issue{ + background: none repeat scroll 0 0 #FFFFEC; + /*border: none;*/ + margin-bottom: 6px; + padding: 10; + border-radius: 3px; +/* -moz-box-shadow: 3px 3px 10px rgba(100,150,205,0.1); + -webkit-box-shadow: 3px 3px 10px rgba(100,150,205,0.1); + box-shadow: 3px 3px 10px rgba(100,150,205,0.1);*/ +} + + From 6bef7029bcdf50702c1d8ababf29f911a705c4b4 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 15:21:38 +0800 Subject: [PATCH 16/48] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=86=E4=B8=8D=E6=B8=85=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A7=A3?= =?UTF-8?q?=E9=87=8A=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/new.html.erb | 2 ++ config/locales/zh.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index a85ee280b..3e81482ef 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -3,12 +3,14 @@ <% if @course_tag == '1' %>

        <%=l(:label_course_new)%>

        +

        <%=raw l(:label_course_news_description)%>

        <%= render :partial => 'course_form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> <% else %>

        <%=l(:label_project_new)%>

        +

        <%=l(:label_project_new_description)%>

        <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e57fce2f2..3c9218683 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -463,6 +463,7 @@ zh: label_project: 项目 label_activity_project: '项目: ' #added by bai label_project_new: 新建项目 + label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。' label_project_plural: 项目列表 label_x_projects: zero: 无项目 @@ -637,6 +638,7 @@ zh: label_homework_commit: 提交作业 #huang label_homework_info: 提交情况 #huang label_course_news: 课程通知 + label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；
        如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！' label_course_board: 讨论区 label_version: 版本 label_version_new: 新建版本 From 575fc48ff05ec0770aa13f56cb637f5a88dfc260 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 16:53:11 +0800 Subject: [PATCH 17/48] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 26 ++++++++++++++++++++++ app/views/welcome/_search_project.html.erb | 17 ++++++++++---- app/views/welcome/course.html.erb | 3 +-- app/views/welcome/index.html.erb | 1 - config/routes.rb | 6 +++-- 5 files changed, 44 insertions(+), 9 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 7ca9b9669..a0e79f0f6 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -80,6 +80,32 @@ class WelcomeController < ApplicationController @student = User.student end + def search + search_condition = params[:q] + search_type = params[:search_type].to_sym unless search_condition.blank? + + respond_to do |format| + format.html{ + case search_type + when :projects + redirect_to projects_search_path(:name => search_condition, + :project_type => Project::ProjectType_project) + when :courses + redirect_to projects_search_path(:name => search_condition, + :project_type => Project::ProjectType_course) + when :users + redirect_to users_search_path(:name => search_condition) + when :users_teacher + redirect_to users_search_path(:name => search_condition, :role => :teacher) + when :users_student + redirect_to users_search_path(:name => search_condition, :role => :student) + else + redirect_to home_path, :alert => l(:label_sumbit_empty) + end + } + end + end + private # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法 diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index 61770cace..ca7d151e8 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -1,7 +1,16 @@ -<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> +<% + select_option = [] + (select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project + (select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course + select_option << ['用户', 'users'] + #select_option << ['教师', 'users_teacher'], + #select_option << ['学生', 'users_student'] +%> +<%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
        - <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', :size => 30 %> - <%= hidden_field_tag 'project_type', project_type %> + <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27 %> + <%= select_tag(:search_type, options_for_select(select_option) ) %> + <%#= hidden_field_tag 'project_type', project_type %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
        -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index d7fafb49a..d0ad1fbcd 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -95,8 +95,7 @@ <%= l(:label_welcome_trustie) %> <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %>
        - <%= render :partial => "search_project", :locals => {:project_type => 1}%> -
        全站课程搜索。
        + <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%>
        diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ad23a3b6b..490833a2b 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -96,7 +96,6 @@
        <%= render :partial => "search_project", :locals => {:project_type => 0}%> -
        全站项目搜索。不会搜索私有项目
        diff --git a/config/routes.rb b/config/routes.rb index 41106c0a7..336d8dc51 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -56,8 +56,8 @@ RedmineApp::Application.routes.draw do match 'git_usage/ch_usage', :controller => 'git_usage', :action => 'ch_usage', :via => :get, :as => 'ch_usage' match 'git_usage/en_usage', :controller => 'git_usage', :action => 'en_usage', :via => :get, :as => 'en_usage' #added by nie - match '/projects/search', :controller => 'projects', :action => 'search', :via => [:get, :post], :as => 'search' - match '/users/search', :controller => 'users', :action => 'search', :via => [:get, :post], :as => 'search' + match '/projects/search', :controller => 'projects', :action => 'search', :via => [:get, :post] + match '/users/search', :controller => 'users', :action => 'search', :via => [:get, :post] #end match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post] match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post] @@ -553,4 +553,6 @@ RedmineApp::Application.routes.draw do match 'tags/remove_tag',:to=>'tags#remove_tag',:as=>"remove_tag" match 'words/add_brief_introdution', :controller => 'words', :action => 'add_brief_introdution' + + get ':controller(/:action(/:id))' end From 937d594c416ca97022983a2f34655ae81c2e6f39 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 21:12:04 +0800 Subject: [PATCH 18/48] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 +- app/views/welcome/index.html.erb | 2 +- public/stylesheets/application.css | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index d0ad1fbcd..7cdc8cfa1 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,7 +92,7 @@
        - <%= l(:label_welcome_trustie) %> <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %> + <%= l(:label_welcome_trustie) %> <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %>
        <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 490833a2b..44c791420 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -92,7 +92,7 @@
        - <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %> + <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %>
        <%= render :partial => "search_project", :locals => {:project_type => 0}%> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 38aa5e6a9..8306155d2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -606,19 +606,12 @@ ul.tool li{list-style-type:none; } .font_welcome_trustie{ - font-family:Impact; + font-family:Impact, '微软雅黑'; font-weight: bold; font-size: 18px; color:#15bccf; } -.font_welcome_Mdescription{ - font-family:微软雅黑; - font-weight: bold; - font-size: 17px; - color:#15bccf; -} - .font_welcome_Cdescription{ font-family: 微软雅黑; font-size: 16px; From d64615e60400ebb679fd72abc800263c4fdce79f Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Mar 2014 21:24:17 +0800 Subject: [PATCH 19/48] issue created alert --- app/controllers/issues_controller.rb | 3 ++- app/views/welcome/course.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 581b9bb27..200810c4b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -160,7 +160,8 @@ class IssuesController < ApplicationController respond_to do |format| format.html { render_attachment_warning_if_needed(@issue) - flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) + flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.source_from}", issue_path(@issue), :title => @issue.subject)) + #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) if params[:continue] attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} redirect_to new_project_issue_path(@issue.project, :issue => attrs) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 7cdc8cfa1..865f2d108 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,7 +92,7 @@
        - <%= l(:label_welcome_trustie) %> <%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %> + <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> , <%= l(:label_welcome_trustie_course_description) %>
        <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%> From dba674dfece922da2c3166207314b995515eb76e Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 26 Mar 2014 08:24:12 +0800 Subject: [PATCH 20/48] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 +- app/views/welcome/index.html.erb | 4 +--- public/stylesheets/welcome.css | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 865f2d108..a4bdd6228 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -1,3 +1,4 @@ +<%= stylesheet_link_tag 'welcome' %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index de6f3e119..0af3f5134 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -17,6 +17,11 @@ $('#' + id).val(content); } } + // 给主页用户弹新页面 + $(document).ready(function($) { + $("#loggedas").find("a").attr("target", "_blank"); + //$("#content .tabs_new~ .pagination").find("a").removeAttr("target"); + }); From ad23ba646e23a748f9ba8a40e620fe130bc53fd7 Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 28 Mar 2014 17:08:34 +0800 Subject: [PATCH 25/48] =?UTF-8?q?=E7=90=86=E7=90=86css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 4 +- app/views/welcome/course.html.erb | 15 +++--- public/stylesheets/welcome.css | 87 +++++++++---------------------- 3 files changed, 36 insertions(+), 70 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index f8159fc7a..169f1a107 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,3 +1,6 @@ +<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> +<% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %> + <%= render :partial => 'action_menu' %>

        <%= issue_heading(@issue) %>

        @@ -152,7 +155,6 @@ end %> <%= f.link_to 'PDF' %> <% end %> -<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <% content_for :sidebar do %> <%= render :partial => 'issues/sidebar' %> diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 71acc78aa..ca8e29b88 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -111,22 +111,23 @@
        -

        新开课程

        - <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank" %> +

        新开课程

        + <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1} %>
          <% find_miracle_course(10, 7).map do |project| %> -
        • > -
          +
        • > +
          <%= image_tag(get_course_avatar(project), :class => "avatar-4") %>
          -
          +
          [<%= get_course_term project %>] <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>) + (<%=(project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s%>份资料)
          -
          +
          <% course = Course.find_by_extra(project.identifier) %> <%= course.teacher.user_extensions.occupation.try(:gsub, /(.+)$/, '\1:') %> @@ -139,7 +140,7 @@ -
          +
          <% if !course_endTime_timeout?(project)%>
          <%= join_in_course(project, User.current)%> diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index b616fd593..8e44135b8 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -1,63 +1,3 @@ -/*.body_resize { width:950px; margin:0 auto; padding:0;} -.left { width:371px; float:left; margin:20px 5px 10px 5px; padding:5px;} - -.right { width:527px; float:left; margin:20px 5px 10px 5px; padding:5px;} -.right ul { list-style:none; margin:5px 20px; padding:0;} -.right li { font: bold 12px Arial, Helvetica, sans-serif; color:#6f6f6f; padding:5px 20px; margin:0; background:url(images/about_ul_li.gif) left no-repeat;} - - -.body { background:#ebebeb; border-bottom:1px solid #fff; } - -.home { - font:bold 16px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif; - color:#2c2c2c; - border-bottom:1px solid #cccccc; - padding:10px 5px; - margin:0 0 10px 0; -} - -p { - font:normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif; - color:#6f6f6f; - line-height:1.8em; - padding:5px 5px; - margin:0; -} - -div.project { - font:normal 15px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif; - color:#6f6f6f; - line-height:1.8em; - padding:5px 5px; - margin:0; - border-bottom:1px solid #eeeeee; - width: 95%; - float: right; -} -div.project a{ - color: #5B5B5B; -} - -div.project { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} -div.project>.nowrap { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} - -span.grey { - float: right; - font: normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif; - color:#afaeae; - line-height:1.8em; - padding:5px 5px; - margin:0; -}*/ .top_bar{ height: auto; } @@ -120,7 +60,6 @@ ul.welcome-message-list{ height: 25px; line-height: 25px; background-color: rgb(252, 252, 252); - color: green; /*text-indent: 8px;*/ margin: 0; padding: 0px; @@ -200,17 +139,41 @@ ul.even{ font-weight: 700; } +/*course welcome，左侧新开课程部分开始*/ ul.d-p-projectlist{ margin-top: 0px; } +#J_Slide h3{ + margin-left: 5px; + color: #e8770d; +} +#J_Slide h3~span{ + margin-top: -20px; + float: right; + display: block; +} +.d-p-projectlist li{ + position: relative; + height:5em; +} +.d-p-projectlist li > .avatar{ + float: left; + height: 100%; +} +.d-p-projectlist li > .join_course_link{ + position:absolute; + bottom:0; + right:0; + margin:5px 10px 5px 5px; +} .d-p-projectlist li .desc_item{ float: left; display: inline-block; - /*margin: 2px;*/ line-height: 2em; margin-left: 10px; width: 380px; } +/*course welcome，左侧新开课程部分结束?*/ /* From c38a8e4f6a6ecc75b53fd7cea74915fafb4ebd7a Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 28 Mar 2014 18:12:12 +0800 Subject: [PATCH 26/48] socialForge#324 --- app/helpers/welcome_helper.rb | 15 ++++++++++----- app/models/project.rb | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 89b1ec42c..9d36f2bdf 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -57,11 +57,16 @@ module WelcomeHelper # # Returns project&courses array def find_miracle_course(sum=10, max_rate=7) - max = sum*(max_rate.to_f/10) - c1 = find_new_course(sum).to_a.dup - c2 = find_all_hot_course(sum).to_a.dup - c2 = c2 - c1 - (c1.take(max)+c2).take(sum) + Project.active.visible.course_entities. + joins(:course_extra). + joins(:memberships). + group('members.project_id'). + reorder("courses.time DESC, COUNT(members.project_id) DESC").take sum + # max = sum*(max_rate.to_f/10) + # c1 = find_new_course(sum).to_a.dup + # c2 = find_all_hot_course(sum).to_a.dup + # c2 = c2 - c1 + # (c1.take(max)+c2).take(sum) end def find_miracle_project(sum, max_rate) diff --git a/app/models/project.rb b/app/models/project.rb index 3f91d8c2f..fd576b637 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -152,8 +152,8 @@ class Project < ActiveRecord::Base where("LOWER(identifier) LIKE :p OR LOWER(name) LIKE :p ", :p => pattern) end } - scope :project_entities, -> { where(project_type: 0) } - scope :course_entities, -> { where(project_type: 1) } + scope :project_entities, -> { where(project_type: ProjectType_project) } + scope :course_entities, -> { where(project_type: ProjectType_course) } def new_course self.where('project_type = ?', 1) From 6e065361b3cd8018d5cb901be581a2c19e94f909 Mon Sep 17 00:00:00 2001 From: xianbo Date: Sat, 29 Mar 2014 11:02:05 +0800 Subject: [PATCH 27/48] fix main page navigation --- app/helpers/application_helper.rb | 16 +++++----- app/views/layouts/_base_header.html.erb | 42 +++++++++++++++++++++++++ app/views/layouts/base.html.erb | 40 ----------------------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f8acafc1f..815ac2236 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1501,19 +1501,19 @@ module ApplicationHelper def render_dynamic_nav home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'} - course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1} - course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher'} - courses_link = link_to l(:label_course_practice), {:controller => 'projects', :action => 'course', :project_type => 1} - projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0} - users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index'} - contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 } + course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1, :subdomain => Setting.course_domain} + course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :subdomain => Setting.course_domain} + courses_link = link_to l(:label_course_practice), {:controller => 'projects', :action => 'course', :project_type => 1, :subdomain => Setting.course_domain} + projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :subdomain => Setting.project_domain} + users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :subdomain => Setting.user_domain} + contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 , :subdomain => Setting.project_domain} 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'} + stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index', :subdomain => Setting.course_domain} #@nav_dispaly_project_label nav_list = Array.new - nav_list.push(home_link) + nav_list.push(home_link) if !@nav_dispaly_home_path_label nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 7bdd8a728..a22602f7b 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -1,3 +1,45 @@ +<% + request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil? + realUrl = request.original_url + if (realUrl.match(/project\/course/)) + @nav_dispaly_course_label = 1 + elsif (realUrl.match(/users/)) + @nav_dispaly_home_path_label = 1 + @nav_dispaly_course_all_label = 1 + @nav_dispaly_project_label = 1 + elsif (realUrl.match(/projects/)) + @nav_dispaly_project_label = 1 + elsif (realUrl.match(/contest/)) + @nav_dispaly_contest_label = 1 + elsif (realUrl.match(/calls/)) + @nav_dispaly_bid_label = 1 + elsif (realUrl.match(/forums/)) + @nav_dispaly_forum_label = 1 + elsif (realUrl.match(/[^forge]\/course[^\.]/)) + @nav_dispaly_course_label = 1 + @nav_dispaly_project_label = 1 + @nav_dispaly_contest_label = 1 + elsif (realUrl.match(/course\.trustie\.net/)) + @nav_dispaly_course_all_label = 1 + # @nav_dispaly_teacher_all_label = 1 + @nav_dispaly_forum_label = 1 + elsif (realUrl.match(/user\.trustie\.net/)) + @nav_dispaly_home_path_label = 1 + @nav_dispaly_course_all_label = 1 + @nav_dispaly_project_label = 1 + elsif (realUrl.match(/forge\.trustie\.net/)) + @nav_dispaly_project_label = 1 + @nav_dispaly_user_label = 1 + @nav_dispaly_forum_label = 1 + else + @nav_dispaly_course_label = 1 + @nav_dispaly_project_label = 1 + @nav_dispaly_user_label = 1 + @nav_dispaly_contest_label = 1 + @nav_dispaly_bid_label = 1 + @nav_dispaly_forum_label = 1 + end +%>
        • - <%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %> + <%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%>
        • - <%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> + <%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %>
        • - <%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%> + <%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %>
        • <%= link_to l(:label_course_feedback), project_feedback_path(@project), :class => link_class(:feedback)%> From 850ff6194f76b8a08f507e1116c8bf7938e1019a Mon Sep 17 00:00:00 2001 From: yanxd Date: Sun, 30 Mar 2014 17:03:15 +0800 Subject: [PATCH 30/48] issue#509,#510 --- app/controllers/projects_controller.rb | 4 ++-- app/helpers/projects_helper.rb | 15 +++++++++++++++ app/views/issues/index.html.erb | 2 +- app/views/projects/_member_list.html.erb | 3 +-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index da5f44807..89bb87987 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -638,7 +638,7 @@ class ProjectsController < ApplicationController ## 有角色参数的才是课程，没有的就是项目 @render_file = 'member_list' # 判断是否课程 - if @project.project_type == 1 + if @project.project_type == Project::ProjectType_course case params[:role] when '1' @subPage_title = l :label_teacher_list @@ -650,7 +650,7 @@ class ProjectsController < ApplicationController @subPage_title = '' @members = @project.member_principals.includes(:roles, :principal).all.sort end - else + else # @project.project_type == Project::ProjectType_project roles = Role.find_all_givable @subPage_title = l :label_member_list @members = @project.member_principals.includes(:roles, :principal).all diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b9d8ef932..9394f642b 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -258,6 +258,21 @@ module ProjectsHelper end end + def rolesToLanguage rolesArray + rolesArray.map{ |roleName| + case roleName + when "Manager" + l :default_role_manager + when "Developer" + l :default_role_developer + when "Reporter" + l :default_role_reporter + else + 'Unkown' + end + } + end + def sort_project_by_hot return sort_project_by_hot_rails @projects_status = ProjectStatus.visible.where("project_statuses.project_type <> ? or project_statuses.project_type is null", 1) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index bd475a3a3..9b05e64d6 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -4,7 +4,7 @@ :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %> <%= link_to l(:label_query), '#', :class => 'icon icon-help', - :onclick => '$("#custom_query").slideToggle(400); ' if User.current.logged? %> + :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
        diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb index 0c3ee6b2b..ce5dfc694 100644 --- a/app/views/projects/_member_list.html.erb +++ b/app/views/projects/_member_list.html.erb @@ -21,8 +21,7 @@

        <% else%> - - <%= content_tag "div", content_tag("p", member.roles.sort.collect(&:to_s).join(', ')), :class => "clear avatar_name" %> + <%= content_tag "div", content_tag("p", rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ')), :class => "clear avatar_name" %>

        <%= l(:label_user_for_project_grade) %>: <%= UserGrade.find_by_user_id_and_project_id(member[:user_id], @project.id).grade %> From d2ebfca314eab1fb3b7bc54d08b8f5424904fbcb Mon Sep 17 00:00:00 2001 From: yanxd Date: Sun, 30 Mar 2014 20:28:16 +0800 Subject: [PATCH 31/48] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 9394f642b..b27a5289a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -258,7 +258,8 @@ module ProjectsHelper end end - def rolesToLanguage rolesArray + def rolesToLanguage rolesArray + rolesArray = ([] << rolesArray) unless rolesArray.is_a?(Array) rolesArray.map{ |roleName| case roleName when "Manager" From 3d2516f53c61a42eca5e041f33af1f5e8219e46f Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 31 Mar 2014 08:41:55 +0800 Subject: [PATCH 32/48] fix navigation --- app/helpers/application_helper.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1525105cc..ad5797173 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1499,15 +1499,15 @@ module ApplicationHelper def render_dynamic_nav home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'} - course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1, :subdomain => Setting.course_domain} - course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :subdomain => Setting.course_domain} - courses_link = link_to l(:label_course_practice), {:controller => 'projects', :action => 'course', :project_type => 1, :subdomain => Setting.course_domain} - projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :subdomain => Setting.project_domain} - users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :subdomain => Setting.user_domain} - contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 , :subdomain => Setting.project_domain} + course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} + 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 => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} + projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain} + 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 => 'bids', :action => 'contest', :project_type => 1 , :host => Setting.project_domain} 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', :subdomain => Setting.course_domain} + stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index', :host => Setting.course_domain} #@nav_dispaly_project_label nav_list = Array.new From 2bba27e7a1408951f319f4e8fe5a0955212b4a80 Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 31 Mar 2014 09:01:27 +0800 Subject: [PATCH 33/48] evils uri --- app/helpers/application_helper.rb | 2 +- app/views/layouts/_base_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ad5797173..60935d6d8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1507,7 +1507,7 @@ module ApplicationHelper contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 , :host => Setting.project_domain} 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', :host => Setting.course_domain} + stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'} #@nav_dispaly_project_label nav_list = Array.new diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a22602f7b..a0cc53329 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -42,7 +42,7 @@ %>

        <%= render_menu :account_menu -%> From 5c63ea237857f0307ccb31562ef457dc1d671278 Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 31 Mar 2014 10:56:29 +0800 Subject: [PATCH 34/48] add contest and fix url --- app/controllers/welcome_controller.rb | 13 ++- app/helpers/application_helper.rb | 12 ++- app/views/layouts/_base_header.html.erb | 6 +- app/views/welcome/contest.html.erb | 9 ++ config/routes.rb | 1 + db/schema.rb | 106 +++++++++++++++--------- lib/redmine.rb | 2 +- 7 files changed, 104 insertions(+), 45 deletions(-) create mode 100644 app/views/welcome/contest.html.erb diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index a0e79f0f6..387595e0b 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -17,7 +17,7 @@ class WelcomeController < ApplicationController caches_action :robots - before_filter :entry_select, :only => [:index] + before_filter :entry_select, :entry_select_contest, :only => [:index] def index # @news = News.latest User.current @@ -79,6 +79,10 @@ class WelcomeController < ApplicationController @teacher = User.teacher @student = User.student end + + def contest + + end def search search_condition = params[:q] @@ -113,4 +117,11 @@ class WelcomeController < ApplicationController (course() and render :course and return 0) if request.original_url.match(/course\.trustie\.net/) end + def entry_select_contest + if request.original_url.match(/contest\.trustie\.net/) + course + render :contest, layout: false + return 0 + end + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 60935d6d8..7f8a8bd2b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1499,12 +1499,15 @@ module ApplicationHelper def render_dynamic_nav home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'} + main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain} + main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain} + course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} 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 => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain} 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 => 'bids', :action => 'contest', :project_type => 1 , :host => Setting.project_domain} + contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 , :host => Setting.contest_domain} 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'} @@ -1514,14 +1517,17 @@ module ApplicationHelper nav_list.push(home_link) if !@nav_dispaly_home_path_label nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label - + + nav_list.push(main_project_link) if @nav_dispaly_main_project_label + nav_list.push(main_course_link) if @nav_dispaly_main_course_label + nav_list.push(courses_link) if @nav_dispaly_course_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 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_course_all_label + nav_list.push(stores_link) if @nav_dispaly_store_all_label content_li = '' nav_list.collect do |nav_item| diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a0cc53329..4973ae885 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -5,8 +5,8 @@ @nav_dispaly_course_label = 1 elsif (realUrl.match(/users/)) @nav_dispaly_home_path_label = 1 - @nav_dispaly_course_all_label = 1 - @nav_dispaly_project_label = 1 + @nav_dispaly_main_course_label = 1 + @nav_dispaly_main_project_label = 1 elsif (realUrl.match(/projects/)) @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @@ -21,8 +21,8 @@ @nav_dispaly_contest_label = 1 elsif (realUrl.match(/course\.trustie\.net/)) @nav_dispaly_course_all_label = 1 - # @nav_dispaly_teacher_all_label = 1 @nav_dispaly_forum_label = 1 + @nav_dispaly_store_all_label = 1 elsif (realUrl.match(/user\.trustie\.net/)) @nav_dispaly_home_path_label = 1 @nav_dispaly_course_all_label = 1 diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb new file mode 100644 index 000000000..6a0a8413f --- /dev/null +++ b/app/views/welcome/contest.html.erb @@ -0,0 +1,9 @@ +
        +
        + 正在升级中。。。。。。。。。。。。 +
        +
        +
        + + + diff --git a/config/routes.rb b/config/routes.rb index 336d8dc51..98061fd08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,6 +17,7 @@ RedmineApp::Application.routes.draw do match 'course', :to => 'welcome#course', :via => :get + match 'contest', :to => 'welcome#contest', :via => :get resources :stores do collection do match 'search', via: [:get, :post] diff --git a/db/schema.rb b/db/schema.rb index effd13d81..24db37967 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,6 +13,14 @@ ActiveRecord::Schema.define(:version => 20140319092720) do + create_table "a_user_watchers", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "member_id" + end + create_table "activities", :force => true do |t| t.integer "act_id", :null => false t.string "act_type", :null => false @@ -294,9 +302,9 @@ ActiveRecord::Schema.define(:version => 20140319092720) do add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id" create_table "issue_relations", :force => true do |t| - t.integer "issue_from_id", :null => false - t.integer "issue_to_id", :null => false - t.string "relation_type", :default => "", :null => false + t.integer "issue_from_id", :null => false + t.integer "issue_to_id", :null => false + t.string "relation_type", :null => false t.integer "delay" end @@ -464,6 +472,22 @@ ActiveRecord::Schema.define(:version => 20140319092720) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" + create_table "messages_for_bids", :force => true do |t| + t.string "message" + t.integer "user_id" + t.integer "bid_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "messages_for_users", :force => true do |t| + t.integer "messager_id" + t.integer "user_id" + t.string "message" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -523,11 +547,23 @@ ActiveRecord::Schema.define(:version => 20140319092720) do t.integer "watchers_count" t.integer "project_id" t.integer "project_type" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 + t.integer "gitlab_group_id", :limit => 8 + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 end + add_index "project_statuses", ["changesets_count"], :name => "index_project_statuses_on_changesets_count" add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + add_index "project_statuses", ["watchers_count"], :name => "index_project_statuses_on_watchers_count" + + create_table "project_tags", :force => true do |t| + t.integer "project_id" + t.integer "tag_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + end create_table "projects", :force => true do |t| t.string "name", :default => "", :null => false @@ -573,17 +609,18 @@ ActiveRecord::Schema.define(:version => 20140319092720) do add_index "queries", ["user_id"], :name => "index_queries_on_user_id" create_table "repositories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "url", :default => "", :null => false - t.string "login", :limit => 60, :default => "" - t.string "password", :default => "" - t.string "root_url", :default => "" + t.integer "project_id", :default => 0, :null => false + t.string "url", :default => "", :null => false + t.string "login", :limit => 60, :default => "" + t.string "password", :default => "" + t.string "root_url", :default => "" t.string "type" - t.string "path_encoding", :limit => 64 - t.string "log_encoding", :limit => 64 + t.string "path_encoding", :limit => 64 + t.string "log_encoding", :limit => 64 t.text "extra_info" t.string "identifier" - t.boolean "is_default", :default => false + t.boolean "is_default", :default => false + t.string "git_project_id" end add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" @@ -602,26 +639,6 @@ ActiveRecord::Schema.define(:version => 20140319092720) do t.string "province" end - create_table "seems_rateable_cached_ratings", :force => true do |t| - t.integer "cacheable_id", :limit => 8 - t.string "cacheable_type" - t.float "avg", :null => false - t.integer "cnt", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "seems_rateable_rates", :force => true do |t| - t.integer "rater_id", :limit => 8 - t.integer "rateable_id" - t.string "rateable_type" - t.float "stars", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -632,9 +649,9 @@ ActiveRecord::Schema.define(:version => 20140319092720) do create_table "shares", :force => true do |t| t.date "created_on" - t.string "url" t.string "title" - t.integer "share_type" + t.string "share_type" + t.string "url" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.integer "project_id" @@ -642,6 +659,12 @@ ActiveRecord::Schema.define(:version => 20140319092720) do t.string "description" end + create_table "students", :force => true do |t| + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "students_for_courses", :force => true do |t| t.integer "student_id" t.integer "course_id" @@ -700,7 +723,7 @@ ActiveRecord::Schema.define(:version => 20140319092720) do create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false - t.string "value", :limit => 40, :default => "", :null => false + t.string "value", :limit => 40 t.datetime "created_on", :null => false end @@ -726,12 +749,13 @@ ActiveRecord::Schema.define(:version => 20140319092720) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "technical_title" t.integer "identity" + t.string "technical_title" t.string "student_id" t.string "teacher_realname" t.string "student_realname" t.string "location_city" + t.string "git_token" end create_table "user_grades", :force => true do |t| @@ -768,6 +792,14 @@ ActiveRecord::Schema.define(:version => 20140319092720) do add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" + create_table "user_tags", :force => true do |t| + t.integer "user_id" + t.integer "tag_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "users", :force => true do |t| t.string "login", :default => "", :null => false t.string "hashed_password", :limit => 40, :default => "", :null => false diff --git a/lib/redmine.rb b/lib/redmine.rb index 3990d10d3..0f8b3acc3 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -264,7 +264,7 @@ end # end Redmine::MenuManager.map :account_menu do |menu| - menu.push :login, {:controller => 'account', :action => 'login', :host => Setting.project_domain}, :if => Proc.new { !User.current.logged? } + menu.push :login, {:controller => 'account', :action => 'login', :host => Setting.user_domain}, :if => Proc.new { !User.current.logged? } menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? } # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } From 84c5032eb2cfb29cdd16fa1a3745ceab2cf2dc8f Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 31 Mar 2014 15:36:51 +0800 Subject: [PATCH 35/48] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=8E=A8=E8=8D=90tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/tags_controller.rb | 3 +++ app/helpers/application_helper.rb | 11 +---------- app/helpers/projects_helper.rb | 8 ++++---- app/views/files/index.html.erb | 1 + app/views/tags/_tag.html.erb | 16 ++++++++++++++++ app/views/users/show.html.erb | 2 +- app/views/welcome/_search_project.html.erb | 4 ++++ public/javascripts/application.js | 10 ++++++++++ 8 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index ac2a5236b..2c4dbecfe 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -20,6 +20,9 @@ class TagsController < ApplicationController # $selected_tags = Array.new # $related_tags = Array.new NUMBERS = Setting.tags_show_search_results + + # 预设几个可以添加的tag + @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设F | # 接收参数解释： # params[:q]这是在其他页面点击tag，跳转到该页面后的结果显示 ;params[:selected_tags]，这是在过滤页面增删tag进行过滤传过来的参数 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1525105cc..cc096e76e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1477,16 +1477,7 @@ module ApplicationHelper user.watcher_users.count end #end - #author : nyan - def stringCut240(str) - (str.length > 240) ? (str[0,240]<<"......") : str - end - #author : xianbo - def objCut12(obj) - for obj1 in obj[0..11] - obj2 = obj1 - end - end + def hadcommittedhomework(cur,curb) @attaches=HomeworkAttach.find_by_sql("select * from homework_attaches where(bid_id = #{curb})") diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b27a5289a..2d2934cc2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -261,12 +261,12 @@ module ProjectsHelper def rolesToLanguage rolesArray rolesArray = ([] << rolesArray) unless rolesArray.is_a?(Array) rolesArray.map{ |roleName| - case roleName - when "Manager" + case roleName.to_sym + when :Manager l :default_role_manager - when "Developer" + when :Developer l :default_role_developer - when "Reporter" + when :Reporter l :default_role_reporter else 'Unkown' diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index a6dcc32c1..e2bad8e91 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -215,6 +215,7 @@ div.pagination{
        + <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %> <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
        diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 7eb360d53..0d9467025 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -48,6 +48,22 @@ <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit l(:button_project_tags_add),:class => "small" %> + <%#= link_to_function l(:button_cancel), "$(\"#put-tag-form-#{obj.class}-#{obj.id}\").hide();"%> <% end %>
        diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2369b25d0..6ce5e2095 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -113,7 +113,7 @@ <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> <% end %> -

        <%= h stringCut240(act.content) %>

        +

        <%= h act.content.truncate(240, omission: '...') %>

        diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index c139be6f1..fda9dae7c 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -17,15 +17,19 @@ form #q, form #search_type{ height: 33px; } form #q{ + font-size: 13px; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-right: none; } form #search_type{ + font-size: 13px; color: #363739; border-top-right-radius: 5px; border-bottom-right-radius: 5px; + border-bottom-left-radius: 0px; + border-top-left-radius: 0px; border-left: 1px outset #83A9A9; margin-left: -4px; -webkit-appearance: none; diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 4ac63b56c..2845c3ce0 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1,6 +1,16 @@ /* Redmine - project management software Copyright (C) 2006-2013 Jean-Philippe Lang */ +function cleanArray (actual){ + var newArray = new Array(); + for (var i = 0; i< actual.length; i++){ + if (actual[i]){ + newArray.push(actual[i]); + } + } + return newArray; +} + function checkAll(id, checked) { if (checked) { $('#'+id).find('input[type=checkbox]').attr('checked', true); From 930bc4083eb8171938baa8a1a722bbaa15959ded Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 31 Mar 2014 17:02:28 +0800 Subject: [PATCH 36/48] =?UTF-8?q?forge=20=E8=BD=AF=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 2 +- app/views/projects/new.html.erb | 4 ++-- config/locales/zh.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a22602f7b..c18d48fcb 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -7,7 +7,7 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_course_all_label = 1 @nav_dispaly_project_label = 1 - elsif (realUrl.match(/projects/)) + elsif (realUrl.match(/[projects|issues]/)) @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 3e81482ef..7044d69dd 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -3,14 +3,14 @@ <% if @course_tag == '1' %>

        <%=l(:label_course_new)%>

        -

        <%=raw l(:label_course_news_description)%>

        +

        <%=raw l(:label_course_news_description)%>

        <%= render :partial => 'course_form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> <% else %>

        <%=l(:label_project_new)%>

        -

        <%=l(:label_project_new_description)%>

        +

        <%=raw l(:label_project_new_description)%>

        <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3c9218683..a006ae53c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -448,7 +448,7 @@ zh: project_module_time_tracking: 时间跟踪 project_module_news: 新闻 project_module_documents: 文档 - project_module_files: 版本下载 + project_module_files: 资料下载 project_module_wiki: Wiki project_module_repository: 版本库 project_module_boards: 讨论区 @@ -515,7 +515,7 @@ zh: label_requirement: 需求 label_new_course: 课程列表 label_course_practice: 课程实践 - label_course_all: 所有课程 + label_course_all: 课程列表 label_teacher_all: 所有教师 label_project_deposit: 项目托管 label_software_user: 软件创客 From 06b2c25f3d263e08df10897d1a22597caa699bfb Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 31 Mar 2014 19:26:07 +0800 Subject: [PATCH 37/48] fix --- app/controllers/welcome_controller.rb | 6 +++--- app/models/setting.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 387595e0b..7f20abd15 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -17,7 +17,7 @@ class WelcomeController < ApplicationController caches_action :robots - before_filter :entry_select, :entry_select_contest, :only => [:index] + before_filter :entry_select_course, :entry_select_contest, :only => [:index] def index # @news = News.latest User.current @@ -113,13 +113,13 @@ class WelcomeController < ApplicationController private # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法 - def entry_select + def entry_select_course (course() and render :course and return 0) if request.original_url.match(/course\.trustie\.net/) end def entry_select_contest if request.original_url.match(/contest\.trustie\.net/) - course + contest render :contest, layout: false return 0 end diff --git a/app/models/setting.rb b/app/models/setting.rb index 583d034df..ef461fb4b 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -163,7 +163,7 @@ class Setting < ActiveRecord::Base end # fixed domain url in development. tantantan's bug - if Rails.env.development? + if Rails.env.production? methods.map do |m| define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/ end From e4939bca2c5bec1fb8ac992c54ad4f37f9217117 Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 31 Mar 2014 19:29:21 +0800 Subject: [PATCH 38/48] fix --- config/routes.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 98061fd08..8ad29472b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,8 +16,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. RedmineApp::Application.routes.draw do - match 'course', :to => 'welcome#course', :via => :get - match 'contest', :to => 'welcome#contest', :via => :get resources :stores do collection do match 'search', via: [:get, :post] From dc62e8981608fa514eb1c8d8daf69008b7379c2a Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 1 Apr 2014 09:52:52 +0800 Subject: [PATCH 39/48] =?UTF-8?q?=E6=B1=89=E5=8C=96=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index b25519d3c..08255e98d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1391,6 +1391,10 @@ en: label_bids_published: published label_bids_published_ago: ago label_welcome_trustie: Trustie forge + label_welcome_trustie_project: Online projects hosting platform + label_welcome_trustie_course: Online Courses practice platform + label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange. + label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research. label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs. label_user_project: Projects label_bid_respond_quote: Respond From 5d77381bb95f8937c33b2a14c4d9927b7a307121 Mon Sep 17 00:00:00 2001 From: xianbo Date: Tue, 1 Apr 2014 16:40:55 +0800 Subject: [PATCH 40/48] fix the user.trustie.net --- app/controllers/welcome_controller.rb | 9 ++++++- app/views/layouts/_base_header.html.erb | 33 +++++++++---------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 7f20abd15..904920c5a 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -17,7 +17,7 @@ class WelcomeController < ApplicationController caches_action :robots - before_filter :entry_select_course, :entry_select_contest, :only => [:index] + before_filter :entry_select_course, :entry_select_contest, :entry_select_user, :only => [:index] def index # @news = News.latest User.current @@ -124,4 +124,11 @@ class WelcomeController < ApplicationController return 0 end end + + def entry_select_user + if request.original_url.match(/user\.trustie\.net/) + redirect_to(:controller => "users", :action => "index") + return 0 + end + end end diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 4973ae885..42aa4ce94 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -1,43 +1,32 @@ <% request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil? realUrl = request.original_url - if (realUrl.match(/project\/course/)) - @nav_dispaly_course_label = 1 - elsif (realUrl.match(/users/)) + if (realUrl.match(/users/)) @nav_dispaly_home_path_label = 1 @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 - elsif (realUrl.match(/projects/)) - @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 elsif (realUrl.match(/calls/)) + @nav_dispaly_home_path_label = 1 @nav_dispaly_bid_label = 1 elsif (realUrl.match(/forums/)) @nav_dispaly_forum_label = 1 - elsif (realUrl.match(/[^forge]\/course[^\.]/)) - @nav_dispaly_course_label = 1 + elsif (realUrl.match(/forge\.trustie\.net\/*/)) @nav_dispaly_project_label = 1 - @nav_dispaly_contest_label = 1 - elsif (realUrl.match(/course\.trustie\.net/)) + @nav_dispaly_forum_label = 1 + elsif (realUrl.match(/course\.trustie\.net\/*/)) @nav_dispaly_course_all_label = 1 @nav_dispaly_forum_label = 1 @nav_dispaly_store_all_label = 1 - elsif (realUrl.match(/user\.trustie\.net/)) + elsif (realUrl.match(/user\.trustie\.net\/*/)) @nav_dispaly_home_path_label = 1 - @nav_dispaly_course_all_label = 1 - @nav_dispaly_project_label = 1 - elsif (realUrl.match(/forge\.trustie\.net/)) - @nav_dispaly_project_label = 1 - @nav_dispaly_user_label = 1 - @nav_dispaly_forum_label = 1 + @nav_dispaly_main_course_label = 1 + @nav_dispaly_main_project_label = 1 else - @nav_dispaly_course_label = 1 - @nav_dispaly_project_label = 1 - @nav_dispaly_user_label = 1 - @nav_dispaly_contest_label = 1 - @nav_dispaly_bid_label = 1 - @nav_dispaly_forum_label = 1 + @nav_dispaly_home_path_label = 1 + @nav_dispaly_main_course_label = 1 + @nav_dispaly_main_project_label = 1 end %>
        From 233901577f79ef7e07933267e8c8a1ed5f18c7e2 Mon Sep 17 00:00:00 2001 From: xianbo Date: Tue, 1 Apr 2014 19:55:35 +0800 Subject: [PATCH 41/48] fix --- app/models/setting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index ef461fb4b..583d034df 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -163,7 +163,7 @@ class Setting < ActiveRecord::Base end # fixed domain url in development. tantantan's bug - if Rails.env.production? + if Rails.env.development? methods.map do |m| define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/ end From 66e655a19eab72c54aa506795006c0075097ad75 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 1 Apr 2014 20:05:14 +0800 Subject: [PATCH 42/48] nothing --- ReadMe接手必读.txt | 11 +++++++++++ app/controllers/memos_controller.rb | 1 + 2 files changed, 12 insertions(+) create mode 100644 ReadMe接手必读.txt diff --git a/ReadMe接手必读.txt b/ReadMe接手必读.txt new file mode 100644 index 000000000..d7c1aa009 --- /dev/null +++ b/ReadMe接手必读.txt @@ -0,0 +1,11 @@ +app\models\setting.rb :165 + # fixed domain url in development. tantantan's bug + if Rails.env.development? + methods.map do |m| + define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/ + end + end + 򲿷ƶsubdomainʹڶת + Ϊ˿㣬ʹ֮developmentģʽʧЧ + # => nyan +================================================================================ diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 49e6c1764..a21086da3 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -87,6 +87,7 @@ class MemosController < ApplicationController respond_to do |format| format.html # show.html.erb format.json { render json: @memo } + format.xml { render xml: @memo } end end From 5c2a037a8f2ab396d0e614a57ab82b12f8522723 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Tue, 1 Apr 2014 21:03:52 +0800 Subject: [PATCH 43/48] user dup --- app/controllers/projects_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 89bb87987..d2312e432 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -662,7 +662,10 @@ class ProjectsController < ApplicationController def sort_project_members project, members #userGrade = UserGrade.where(:project_id => project.id) - users = UserGrade.where(:project_id => project.id).order('grade DESC').joins("LEFT JOIN users ON users.id = user_grades.id") + users = UserGrade.where(:project_id => project.id). + order('grade DESC'). + joins("LEFT JOIN users ON users.id = user_grades.id"). + select("DISTINCT user_grades.user_id") memberlist = [] users.each do |user| members.each do |member| From b06d462b532f9d43e49e348eb14e557d811c8ea2 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Tue, 1 Apr 2014 22:21:05 +0800 Subject: [PATCH 44/48] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=8C=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=20=20=E9=BE=99=E5=86=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 1e1934ecf..35e27a87f 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -26,14 +26,15 @@ class FilesController < ApplicationController include SortHelper def index - sort_init 'filename', 'asc' - sort_update 'filename' => "#{Attachment.table_name}.filename", - 'created_on' => "#{Attachment.table_name}.created_on", - 'size' => "#{Attachment.table_name}.filesize", - 'downloads' => "#{Attachment.table_name}.downloads" - - @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)] - @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse + #sort_init 'filename', 'asc' + sort_init 'created_on', 'desc' + sort_update 'created_on' => "#{Attachment.table_name}.created_on", + 'filename' => "#{Attachment.table_name}.filename", + 'size' => "#{Attachment.table_name}.filesize", + 'downloads' => "#{Attachment.table_name}.downloads" + + @containers = [ Project.includes(:attachments).reorder("attachments.created_on DESC").find(@project.id)] #modify by Long Jun + @containers += @project.versions.includes(:attachments).reorder("created_on DESC").all.sort if @project.project_type == 1 render :layout => 'base_courses' From 5ed40da76f613eb30ef7c55c50b097ffeff53525 Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 2 Apr 2014 08:22:02 +0800 Subject: [PATCH 45/48] =?UTF-8?q?course=E9=A1=B5=E9=9D=A2=EF=BC=8Cxx?= =?UTF-8?q?=E4=BB=BD=E8=B5=84=E6=96=99=E4=B8=8A=E5=8A=A0=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index ca8e29b88..db1c1ea81 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -125,7 +125,8 @@ [<%= get_course_term project %>] <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>) - (<%=(project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s%>份资料) + <% files_count = (project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s %> + (<%=link_to "#{files_count}份", project_files_path(project) %>资料)
        From 02925fbb99741c62e9e31572be5259911a0e7f75 Mon Sep 17 00:00:00 2001 From: xianbo Date: Wed, 2 Apr 2014 08:27:02 +0800 Subject: [PATCH 46/48] fix --- app/views/layouts/_base_header.html.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 42aa4ce94..95edbfa8b 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -5,13 +5,20 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 + elsif (realUrl.match(/project\/course/)) + @nav_dispaly_course_label = 1 + elsif (realUrl.match(/projects/)) + @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 elsif (realUrl.match(/calls/)) - @nav_dispaly_home_path_label = 1 @nav_dispaly_bid_label = 1 elsif (realUrl.match(/forums/)) @nav_dispaly_forum_label = 1 + elsif (realUrl.match(/[^forge]\/course[^\.]/)) + @nav_dispaly_course_label = 1 + @nav_dispaly_project_label = 1 + @nav_dispaly_contest_label = 1 elsif (realUrl.match(/forge\.trustie\.net\/*/)) @nav_dispaly_project_label = 1 @nav_dispaly_forum_label = 1 From 90dcf36257f8c65385b4b8378b22beb88b2ce20e Mon Sep 17 00:00:00 2001 From: xianbo Date: Wed, 2 Apr 2014 10:47:50 +0800 Subject: [PATCH 47/48] left italic in email --- app/views/layouts/mailer.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index b95dc8ac8..dd2de21b7 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -19,8 +19,8 @@ hr { border: 0; } .footer { - font-size: 0.8em; - font-style: italic; + /*font-size: 0.8em;*/ + /*font-style: italic;*/ } From 6888e2bf01ca2acc2fcfd1f27a4e7e5eacb7900a Mon Sep 17 00:00:00 2001 From: xianbo Date: Wed, 2 Apr 2014 10:59:32 +0800 Subject: [PATCH 48/48] fix --- app/views/layouts/_base_header.html.erb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 95edbfa8b..8a066d4f8 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -5,20 +5,13 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 - elsif (realUrl.match(/project\/course/)) - @nav_dispaly_course_label = 1 - elsif (realUrl.match(/projects/)) - @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 elsif (realUrl.match(/calls/)) + @nav_dispaly_home_path_label = 1 @nav_dispaly_bid_label = 1 elsif (realUrl.match(/forums/)) @nav_dispaly_forum_label = 1 - elsif (realUrl.match(/[^forge]\/course[^\.]/)) - @nav_dispaly_course_label = 1 - @nav_dispaly_project_label = 1 - @nav_dispaly_contest_label = 1 elsif (realUrl.match(/forge\.trustie\.net\/*/)) @nav_dispaly_project_label = 1 @nav_dispaly_forum_label = 1 @@ -31,9 +24,11 @@ @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 else - @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 + @nav_dispaly_course_all_label = 1 + @nav_dispaly_forum_label = 1 + @nav_dispaly_bid_label = 1 + @nav_dispaly_contest_label = 1 + @nav_dispaly_store_all_label = 1 end %>