diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fc3d6cd61..ab45d8e9a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1500,16 +1500,16 @@ module ApplicationHelper end def render_dynamic_nav - home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index',:host => Setting.forge_domain} + 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, :host=>Setting.course_domain} - projects_link = link_to l(:label_project_deposit), {:controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain} + courses_link = link_to l(:label_course_practice), {:controller => '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, :host=>Setting.contest_domain} + contest_link = link_to l(:label_contest_innovate), {:controller => 'bids', :action => 'contest', :project_type => 1 } 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", :host => Setting.forge_domain} - stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index', :host => Setting.forge_domain} + 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'} #@nav_dispaly_project_label nav_list = Array.new diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index e475bbd5f..421e76050 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -21,6 +21,10 @@ @nav_dispaly_course_all_label = 1 @nav_dispaly_teacher_all_label = 1 @nav_dispaly_forum_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 diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 9d2aaccdd..db37af91b 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -25,7 +25,6 @@ <%= link_to request.host()+"/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_project_deposit), :controller => 'projects', :action => 'index', :project_type => 0 %> - <% end %> <%= sort_project(@s_type, @project_type) %> diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb new file mode 100644 index 000000000..a082a6dcf --- /dev/null +++ b/app/views/welcome/_search_project.html.erb @@ -0,0 +1,7 @@ +<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> +
+ <%= 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 %> +
+<% end %> \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b3d057c54..fd539b12f 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -94,8 +94,8 @@
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
-
- <%= render :partial => "search_bar"%> +
+ <%= render :partial => "search_project", :locals => {:project_type => 0}%>
@@ -107,60 +107,13 @@ <%= stylesheet_link_tag 'welcome' %> -
- -
- -
- -
- - +

热门项目

<%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %>