jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 

Conflicts:
	app/views/contests/index.html.erb

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2014-09-17 16:05:30 +08:00
parent 02470491bd
commit 875249ba58
1 changed files with 53 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
app/views/contests/index.html.erb
View File

@ -1,77 +1,53 @@
<div class="top-content"> <div class="top-content">
<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
<table width="940px"> <table width="940px">
<tr> <tr>
<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td> <td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td> <td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
<td rowspan="2"> <td rowspan="2">
<% if User.current.logged? %> <% if User.current.logged? %>
<% unless User.current.user_extensions.identity == 1 %> <% unless User.current.user_extensions.identity == 1 %>
<<<<<<< HEAD
<!-- <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
modified by longjun <% end %>
<%#link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %> <% end %>
--> </td>
<%= link_to(l(:label_newtype_contest), <td rowspan="2" >
contest_new_contests_path, <div class="project-search" style="float: right">
:class => 'icon icon-add', <%= text_field_tag 'name', params[:name], :size => 30 %>
:target => "_blank") <%= hidden_field_tag 'project_type', params[:project_type] %>
%> <%= submit_tag l(:label_search),
======= :class => "enterprise",
<%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> :name => "contests_search"
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc %>
<!-- end longjun --> </div>
<% end %> </td>
<% end %> </tr>
</td> <tr>
<td rowspan="2" > <td style="padding-left: 8px">
<div class="project-search" style="float: right"> <a>
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= link_to request.host()+"/contests", contests_path %>
<%= hidden_field_tag 'project_type', params[:project_type] %> </a>
<%= submit_tag l(:label_search), </td>
:class => "enterprise", <td >
:name => "contests_search" <%=link_to l(:field_homepage), home_path %> >
%> <%=link_to l(:label_contest_innovate), contests_path %>
</div> <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
</td> </td>
</tr> </tr>
<tr> </table>
<td style="padding-left: 8px"> <% end %>
<a> </div>
<<<<<<< HEAD <% if @contests.size > 0%>
<!--modified by longjun--> <%= sort_contest(@s_state)%>
======= <div id="bid-show">
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc <%= render :partial => 'contest_list',
<%= link_to request.host()+"/contests", contests_path %> :locals => {:contests => @contests, :contest_pages => @contest_pages}
<!-- end longjun --> %>
</a> </div>
</td> <% else %>
<td > <%= render :partial => "layouts/no_content"%>
<%=link_to l(:field_homepage), home_path %> > <% end %>
<<<<<<< HEAD
<!-- <% html_title l(:label_contest_list)%>
modified by longjun s
<%#link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-->
<%=link_to l(:label_contest_innovate), contests_path %>
=======
<%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
<!-- end longjun -->
</td>
</tr>
</table>
<% end %>
</div>
<% if @contests.size > 0%>
<%= sort_contest(@s_state)%>
<div id="bid-show">
<%= render :partial => 'contest_list',
:locals => {:contests => @contests, :contest_pages => @contest_pages}
%>
</div>
<% else %>
<%= render :partial => "layouts/no_content"%>
<% end %>
<% html_title l(:label_contest_list)%>