修改了课程列表样式，部分国际化
This commit is contained in:
parent
7da2f421e0
commit
534c252bcb
|
|
@ -82,7 +82,7 @@ module ProjectsHelper
|
|||
|
||||
end
|
||||
content = content_tag('ul', content)
|
||||
content_tag('div', content, :class => "tabs_enterprise")
|
||||
content_tag('div', content, :class => "tabs")
|
||||
end
|
||||
# end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<table width="940px">
|
||||
<tr>
|
||||
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_contest_innovate) %></td>
|
||||
<td class="location-list"><strong>当前位置 : </strong></td>
|
||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||
<td rowspan="2">
|
||||
<% if User.current.logged? %>
|
||||
<% unless User.current.user_extensions.identity == 1 %>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<table width="940px">
|
||||
<tr>
|
||||
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_requirement_enterprise ) %></td>
|
||||
<td class="location-list"><strong>当前位置 : </strong></td>
|
||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||
<td rowspan="2">
|
||||
<% if User.current.logged? %>
|
||||
<%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" style="width: 240px; color: #15bccf"">企业众包社区</td>
|
||||
<td style="width: 430px; color: #15bccf""><strong>当前位置 : </strong></td>
|
||||
<td style="width: 430px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
|
||||
<td rowspan="2" width="250px">
|
||||
<div class="project-search">
|
||||
<%= form_tag(calls_path, :method => :get) do %>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" style="width: 240px; color: #15bccf"">创新竞赛社区</td>
|
||||
<td style="width: 430px; color: #15bccf""><strong>当前位置 : </strong></td>
|
||||
<td style="width: 430px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
|
||||
<td rowspan="2" width="250px">
|
||||
<div class="project-search">
|
||||
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" style="width: 240px; color: #15bccf"">高校课程实践社区</td>
|
||||
<td style="color: #15bccf"><strong>当前位置 : <!-- <%= @course.teacher.user_extensions.occupation %> --></strong></td>
|
||||
<td style="color: #15bccf"><strong><%= l(:label_user_location) %> : <!-- <%= @course.teacher.user_extensions.occupation %> --></strong></td>
|
||||
<td rowspan="2" width="250px">
|
||||
<div class="top-content-search">
|
||||
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" style="width: 240px; color: #15bccf"">高校课程实践社区</td>
|
||||
<td style="width: auto; color: #15bccf""><strong>当前位置 : </strong></td>
|
||||
<td style="width: auto; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td class="info_font" style="width: 240px; color: #15bccf"">软件项目托管社区</td>
|
||||
<td style="width: 430px; color: #15bccf""><strong>当前位置: </strong></td>
|
||||
<td style="width: 430px; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
|
||||
<td rowspan="2" width="250px">
|
||||
<div class="top-content-search">
|
||||
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
|
||||
|
|
|
|||
|
|
@ -2,27 +2,36 @@
|
|||
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
|
||||
<% end %>
|
||||
|
||||
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
|
||||
<div class="project-search-block">
|
||||
<table width="100%" valign="center">
|
||||
<!-- modified by huang -->
|
||||
<div class="top-content">
|
||||
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
|
||||
<table width="940px">
|
||||
<tr>
|
||||
<td width="16%"><span style="margin-left:0px"><%= l(:label_new_course)%></span></td>
|
||||
<td valign="center">
|
||||
<% if User.current.logged?%>
|
||||
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_course_practice) %></td>
|
||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||
<td rowspan="2">
|
||||
<% if User.current.logged?%>
|
||||
<% if User.current.user_extensions.identity == 0 %>
|
||||
<%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<td align="right">
|
||||
<div class="project-search">
|
||||
<%= text_field_tag 'name', params[:name], :size => 30 %>
|
||||
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
||||
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
|
||||
</div></td>
|
||||
<% end %>
|
||||
</td>
|
||||
<td rowspan="2" >
|
||||
<div class="project-search" style="float: right">
|
||||
<%= text_field_tag 'name', params[:name], :size => 30 %>
|
||||
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
||||
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> </a></td>
|
||||
<td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<!-- end -->
|
||||
|
||||
<%= sort_course(@s_type, @project_type)%>
|
||||
<!-- <div class="pagination_list">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<table width="940px">
|
||||
<tr>
|
||||
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_project_deposit) %></td>
|
||||
<td class="location-list"><strong>当前位置 : </strong></td>
|
||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||
<td rowspan="2">
|
||||
<% if User.current.logged? %>
|
||||
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
<table width="940px">
|
||||
<tr>
|
||||
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_software_user ) %></td>
|
||||
<td class="location-list"><strong>当前位置 : </strong></td>
|
||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||
<td rowspan="2">
|
||||
</td>
|
||||
<td rowspan="2" >
|
||||
|
|
|
|||
|
|
@ -1554,3 +1554,13 @@ en:
|
|||
label_in_course: in course
|
||||
label_assign_homework: assigned homewok
|
||||
label_noawards: No awards
|
||||
label_user_location: Location
|
||||
label_requirement_enterprise: Requirements
|
||||
label_contest_innovate: Competitions
|
||||
label_software_user: Users
|
||||
label_course_practice: Courses
|
||||
label_user_home: User Space
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ zh:
|
|||
label_project_deposit: 项目托管
|
||||
label_software_user: 软件创客
|
||||
label_contest_innovate: 创新竞赛
|
||||
label_requirement_enterprise: 企业众包
|
||||
label_requirement_enterprise: 软件众包
|
||||
label_new_homework: 作业
|
||||
label_new_contest: 竞赛
|
||||
label_requirement_focus: 关注需求
|
||||
|
|
|
|||
Loading…
Reference in New Issue