From 4efa3f77523b2f51555a6c4338673b04edb33cc1 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Feb 2014 11:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=9D=A1=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E7=AB=99=E5=9F=9F=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=20forge=20=3D=3D=3D>=20course?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/contest.html.erb | 2 +- app/views/bids/index.html.erb | 2 +- app/views/forums/index.html.erb | 2 +- app/views/layouts/base_bids.html.erb | 2 +- app/views/layouts/base_contest.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_forums.html.erb | 2 +- app/views/layouts/base_homework.html.erb | 2 +- app/views/layouts/base_memos.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- app/views/layouts/base_users.html.erb | 2 +- app/views/memos/new.html.erb | 2 +- app/views/projects/course.html.erb | 2 +- app/views/projects/index.html.erb | 2 +- app/views/projects/search.html.erb | 2 +- app/views/test/index.html.erb | 2 ++ app/views/users/index.html.erb | 4 ++-- app/views/users/search.html.erb | 4 ++-- 18 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index f43936f2f..dd10f7b1b 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -20,7 +20,7 @@ - <%= link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'index' %> + <%= link_to request.host()+"/contest", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index d8e80992c..d939ca6ac 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -21,7 +21,7 @@ - <%= link_to "forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> + <%= link_to request.host()+"/calls", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %> diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index e476ab5e4..15f4e2c36 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -19,7 +19,7 @@ - <%= link_to "forge.trustie.net/forums", forums_path %> + <%= link_to request.host()+"/forums", forums_path %> <%= link_to l(:field_homepage), home_path %> > <%= link_to "公共贴吧", forums_path %> diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index a8e4963ca..f82a5bd2d 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -48,7 +48,7 @@ - <%= link_to "http://forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> + <%= link_to request.host()+"/calls", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %> > <%=link_to @bid.name ,bid_path %> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 409d1e0a6..1acbd9f44 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -40,7 +40,7 @@ - <%=link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'contest' %> + <%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > <%= link_to @bid.name, bid_path %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 8eacd707d..c07aa1e51 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -42,7 +42,7 @@ - <%=link_to "forge.trustie.net/course", :controller => 'projects', :action => 'course' %> + <%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %>

<%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %>

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 035c71ad6..0bf299900 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -38,7 +38,7 @@ - <%= link_to "forge.trustie.net/forums", forums_path %> + <%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %>

diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index e9b583ee6..5759b4332 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -32,7 +32,7 @@ - <%= link_to "forge.trustie.net/courses", :controller => 'projects', :action => 'course'%> + <%= link_to request.host()+"/courses", :controller => 'projects', :action => 'course'%>

<%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%= link_to(@bid.courses.first.name, homework_project_path(@bid.courses.first)) %> > <%=link_to(@bid.name, respond_path(@bid)) %>

diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index 5fe199e85..015df3c67 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -42,7 +42,7 @@ - <%= link_to "forge.trustie.net/forums", forums_path %> + <%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %> > <%=link_to @memo.subject, forum_memo_path(@forum, @memo) %>

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 15b52b1e7..1a4ed1b47 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -39,7 +39,7 @@ - <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> + <%= link_to request.host()+"/projects", :controller => 'projects', :action => 'index', :project_type => 0 %>

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

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 513aba827..90b0cd727 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -39,7 +39,7 @@ - <%=link_to "forge.trustie.net/users" ,:controller => 'users', :action => 'index' %> + <%=link_to request.host()+"/users" ,:controller => 'users', :action => 'index' %> <%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <%=link_to @user.show_name, user_path %> diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb index ec836d32b..0ac0bebea 100644 --- a/app/views/memos/new.html.erb +++ b/app/views/memos/new.html.erb @@ -11,7 +11,7 @@ - <%= link_to "forge.trustie.net/forums", forums_path %> + <%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name %>

diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index 1ef0197d6..13672a6f1 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -24,7 +24,7 @@ - <%= link_to "forge.trustie.net/course", :controller => 'projects', :action => 'course', :project_type => 1 %> + <%= link_to request.host()+"/course", :controller => 'projects', :action => 'course', :project_type => 1 %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %> diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index b99b4436d..9d2aaccdd 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -22,7 +22,7 @@ - <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> + <%= 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 %> diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index 2915c032f..79d21dcb0 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -47,7 +47,7 @@ - <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> + <%= 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 %> diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb index d7491db84..31cfdb9eb 100644 --- a/app/views/test/index.html.erb +++ b/app/views/test/index.html.erb @@ -1,4 +1,6 @@

test

<%= debug request %>
+<%= request.host().class %> +
\ No newline at end of file diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9fe144b8b..a9f3e0b02 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -71,7 +71,7 @@ <%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %> - + @@ -83,7 +83,7 @@ - +
<%= l(:label_software_user ) %><%= l(:label_software_user ) %> <%= l(:label_user_location) %> :
<%= link_to "forge.trustie.net/users", :controller => 'users', :action => 'index' %> <%= link_to request.host()+"/users", :controller => 'users', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_software_user), :controller => 'users', :action => 'index' %>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 611bf938f..b2143ec6e 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -71,7 +71,7 @@ <%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %> - + @@ -83,7 +83,7 @@ - +
<%= l(:label_software_user ) %><%= l(:label_software_user ) %> <%= l(:label_user_location) %> :
<%= link_to "forge.trustie.net/users", :controller => 'users', :action => 'index' %> <%= link_to request.host()+"/users", :controller => 'users', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_software_user), :controller => 'users', :action => 'index' %>