修改了一些链接bug

This commit is contained in:
huangjingquan 2013-11-05 10:58:23 +08:00
parent 231d1f2c4b
commit b9b0b06185
8 changed files with 15 additions and 15 deletions

View File

@ -42,9 +42,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td> <td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td>
<td ><%=link_to "主页", home_path %> > <td ><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > <span><%=link_to @project.name, nil %>(<%= @course.time %><%= @course.term %>)</span></td>
<%=link_to "实践课程", :controller => 'projects', :action => 'index' %> >
<span><%=link_to @project.name, project_path %>(<%= @course.time %><%= @course.term %>)</span></td>
</tr> </tr>
</table> </table>
</div> </div>

View File

@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td> <td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td>
<td ><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'index' %> > <td ><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> >
<span><%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></span> > <span><%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></span> >
<%=link_to(@bid.name, respond_path(@bid))%></td> <%=link_to(@bid.name, respond_path(@bid))%></td>
</tr> </tr>
@ -48,7 +48,7 @@
<tr style="font-size:16px"> <tr style="font-size:16px">
<td width="70px">课程名:</td> <td width="70px">课程名:</td>
<td align="center"> <td align="center">
<strong> <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></strong> <strong> <%= link_to @bid.courses.first.name, project_path(@bid.courses.first) %></strong>
</td> </td>
</tr> </tr>
<tr style="font-size:16px"> <tr style="font-size:16px">
@ -57,14 +57,14 @@
<span style="color:#ed8924"><strong><%= h @bid.name %></strong></span> <span style="color:#ed8924"><strong><%= h @bid.name %></strong></span>
</td> </td>
</tr> </tr>
<tr> <!-- <tr>
<td></td> <td></td>
<td align="center"> <td align="center">
<span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %> <span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
<%= watcher_link(@bid, User.current) %> <%= watcher_link(@bid, User.current) %>
<% end %> </span> <% end %> </span>
</td> </td>
</tr> </tr> -->
</table> </table>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>

View File

@ -41,7 +41,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td> <td style="padding-left: 8px"><a>forge.trustie.net/courses</a></td>
<td ><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index' %> > <%=link_to @project,project_path %></td> <td ><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index' %> > <%=link_to @project, project_path(@project) %></td>
</tr> </tr>
</table> </table>
</div> </div>

View File

@ -26,13 +26,13 @@
<div class="top-user-content"> <div class="top-user-content">
<table> <table>
<tr> <tr>
<td class="info_font" style="width: 240px">创客主页</td> <td class="info_font" style="width: 240px"><%= l(:label_user_home) %></td>
<td style="width: 350px"><strong>当前位置 : </strong></td> <td style="width: 350px"><strong><%= l(:label_user_location) %> : </strong></td>
<td rowspan="2" width="350px"> <td rowspan="2" width="350px">
<div class="top-content-search"> <div class="top-content-search">
<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %> <%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= text_field_tag 'name', params[:name], :size => 30 %>
<%= submit_tag l(:label_search), :class => "small", :name => nil %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %> <% end %>
</div> </div>
</td> </td>

View File

@ -518,6 +518,8 @@ zh:
label_college_into: 进入高校 label_college_into: 进入高校
label_investor: 投资人: label_investor: 投资人:
lable_contest_user: 竞赛发布人: #huang lable_contest_user: 竞赛发布人: #huang
label_user_home: 创客空间
label_user_location: 当前位置
label_theme: 主题 label_theme: 主题
label_logged_as_new: 当前用户 label_logged_as_new: 当前用户
button_register: 注册 button_register: 注册

View File

@ -473,7 +473,7 @@ RedmineApp::Application.routes.draw do
match 'new_join', :to => 'projects#new_join', :as => 'try_join' match 'new_join', :to => 'projects#new_join', :as => 'try_join'
match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post] match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]
match 'project/course', :to => 'projects#course', :as => 'course' match 'project/course', :to => 'projects#course', :as => 'course' #nyan
#added by william #added by william
# match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results' # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results'

View File

@ -312,7 +312,7 @@ Redmine::MenuManager.map :project_menu do |menu|
# :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } # :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
# menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, # menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
# :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural # :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id menu.push :files, { :controller => 'files', :action => 'index' }, :param => :project_id, :caption => :label_file_new
menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil }, menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil },
:if => Proc.new { |p| p.repository && !p.repository.new_record? } :if => Proc.new { |p| p.repository && !p.repository.new_record? }
menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true

View File

@ -1742,8 +1742,8 @@ input.enterprise[type="submit"] {
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
padding: 0px; padding: 0px;
background: #ac344f; background: #15bccf;
border: 1px solid #ac344f; border: 1px solid #15bccf;
} }
input[type="submit"] { input[type="submit"] {
width: auto; width: auto;