qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

各个列表添加当前位置

This commit is contained in:
huangjingquan 2013-11-08 10:29:29 +08:00
parent a52944811b
commit 165c392f31
5 changed files with 83 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/views/bids/contest.html.erb
View File

@ -1,37 +1,37 @@
<!-- huang--> <!-- huang-->
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> <!-- modified by huang -->
<div class="project-search-block"> <div class="top-content">
<table width="100%" valign="center"> <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
<table width="940px">
<tr> <tr>
<td width="16%"><span style="margin-left:0px"> <td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_contest_innovate) %></td>
<%= l(:label_contest_list) %> <td class="location-list"><strong>当前位置 : </strong></td>
</span></td> <td rowspan="2">
<td valign="center"><% if User.current.logged? %> <% if User.current.logged? %>
<% unless User.current.user_extensions.identity == 1 %>
<!-- <div class='icon icon-add'> -->
<% if User.current.user_extensions.identity == 0 %>
<%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %> <%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %>
<% end %> <% end %>
<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> --> <% end %>
<!-- </div> --> </td>
<% end %></td> <td rowspan="2" >
<div class="project-search" style="float: right">
<td align="right"> <div class="project-search">
<div class="project-search"> <%= text_field_tag 'name', params[:name], :size => 30 %>
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= hidden_field_tag 'project_type', params[:project_type] %>
<%= hidden_field_tag 'project_type', params[:project_type] %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
</div></td> </div>
</tr></table> </div>
</div> </td>
<%end%> </tr>
<tr>
<% if User.current.logged? %> <td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'index' %> </a></td>
<div id="put-bid-form" style="display: none"> <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %></td>
<%= render :partial => 'new_bid' %> </tr>
</div> </table>
<% end %> <% end %>
</div>
<!-- end -->
<%= sort_contest(@s_state)%> <%= sort_contest(@s_state)%>

96
app/views/bids/index.html.erb
View File

@ -1,61 +1,53 @@
<!-- fq --> <!-- fq -->
<%= form_tag(calls_path, :method => :get) do %> <!-- modified by huang -->
<div class="project-search-block"> <div class="top-content">
<table width="100%" valign="center"> <%= form_tag(calls_path, :method => :get) do %>
<table width="940px">
<tr> <tr>
<td width="16%"><span style="margin-left:0px"> <td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_requirement_enterprise ) %></td>
<% if @project_type == '1' %> <td class="location-list"><strong>当前位置 : </strong></td>
<%= l(:label_bids_task_list) %> <td rowspan="2">
<% else %> <% if User.current.logged? %>
<%= l(:label_call_list)%>
<% end %></span></td>
<td valign="center"><% if User.current.logged? %>
<!-- <div class='icon icon-add'> -->
<% unless @project_type == '1' %>
<%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %> <%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %>
<% end %> <% end %>
<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> --> </td>
<!-- </div> --> <td rowspan="2" >
<% end %></td> <div class="project-search" style="float: right">
<%= text_field_tag 'name', params[:name], :size => 28 %>
<td align="right"> <%= hidden_field_tag 'reward_type', params[:reward_type] %>
<div class="project-search"> <%= hidden_field_tag 'project_type', params[:project_type] %>
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
</div>
</td>
</tr>
<tr>
<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> </a></td>
<td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %></td>
</tr>
</table>
<% end %>
</div>
<!-- end -->
<%= hidden_field_tag 'reward_type', params[:reward_type] %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
</div></td>
</tr></table>
</div>
<%end%>
<% if User.current.logged? %> <%= sort_bid(@s_state, @project_type)%>
<div id="put-bid-form" style="display: none">
<%= render :partial => 'new_bid' %>
</div>
<% end %>
<%= sort_bid(@s_state, @project_type)%> <!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 15px" >
<ul style="margin-right:0px">
<li>
<%= link_to l(:label_sort_by_time), calls_path(:bid_sort_type => '0') %></li>
<!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 15px" > <li>
<ul style="margin-right:0px"> <%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %>
<li> </li>
<%= link_to l(:label_sort_by_time), calls_path(:bid_sort_type => '0') %> <!-- <li>
</li> <%= link_to l(:label_sort_by_influence), calls_path(:bid_sort_type => '2') %>
<li> </li> -->
<%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %> <!-- </ul>
</li> </div> -->
<!-- <li>
<%= link_to l(:label_sort_by_influence), calls_path(:bid_sort_type => '2') %>
</li> -->
<!-- </ul>
</div> -->
<div id="bid-show"> <div id="bid-show">
<%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
</div> </div>

2
app/views/layouts/base_bids.html.erb
View File

@ -28,7 +28,7 @@
<%=render :partial => 'layouts/base_header'%> <%=render :partial => 'layouts/base_header'%>
<% end %> <% end %>
<div id="main" class=""> <div id="main">
<!-- added by bai --> <!-- added by bai -->
<div class="top-content"> <div class="top-content">
<table> <table>

2
app/views/layouts/base_courses.html.erb
View File

@ -46,7 +46,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<!--end--> <!-- end -->
<!--project page--> <!--project page-->
<div id="sidebar"> <div id="sidebar">
<div class="spaceleft"> <div class="spaceleft">

9
public/stylesheets/application.css
View File

@ -11,12 +11,17 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*new by huang*/
/**/ /**/
.location-list{
width: 180px;
color: #15bccf;
}
.top-content{ .top-content{
background-color: #f7f7f7; background-color: #f7f7f7;
height: 50px; height: 52px;
width: 940px; width: 940px;
line-height: 1.2em; line-height: 1.2em;
padding-top: 5px; padding-top: 6px;
margin-bottom: 10px; margin-bottom: 10px;
} }