From 875249ba5821074b710e3ec41a6575e065ca3537 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 17 Sep 2014 16:05:30 +0800 Subject: [PATCH 1/3] 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> --- app/views/contests/index.html.erb | 130 ++++++++++++------------------ 1 file changed, 53 insertions(+), 77 deletions(-) diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb index 998eabf80..293715c62 100644 --- a/app/views/contests/index.html.erb +++ b/app/views/contests/index.html.erb @@ -1,77 +1,53 @@ -
- <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> - - - - - - - - - - - -
<%= l(:label_contest_innovate) %><%= l(:label_user_location) %> : - <% if User.current.logged? %> - <% unless User.current.user_extensions.identity == 1 %> -<<<<<<< HEAD - - <%= link_to(l(:label_newtype_contest), - contest_new_contests_path, - :class => 'icon icon-add', - :target => "_blank") - %> -======= - <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - - <% end %> - <% end %> - -
- <%= text_field_tag 'name', params[:name], :size => 30 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), - :class => "enterprise", - :name => "contests_search" - %> -
-
- -<<<<<<< HEAD - -======= ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - <%= link_to request.host()+"/contests", contests_path %> - - - - <%=link_to l(:field_homepage), home_path %> > -<<<<<<< HEAD - - <%=link_to l(:label_contest_innovate), contests_path %> -======= - <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - -
- <% end %> -
-<% if @contests.size > 0%> -<%= sort_contest(@s_state)%> -
- <%= render :partial => 'contest_list', - :locals => {:contests => @contests, :contest_pages => @contest_pages} - %> -
-<% else %> - <%= render :partial => "layouts/no_content"%> -<% end %> - -<% html_title l(:label_contest_list)%> +
+ <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> + + + + + + + + + + + +
<%= l(:label_contest_innovate) %><%= l(:label_user_location) %> : + <% if User.current.logged? %> + <% unless User.current.user_extensions.identity == 1 %> + + <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> + <% end %> + <% end %> + +
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), + :class => "enterprise", + :name => "contests_search" + %> +
+
+ + <%= link_to request.host()+"/contests", contests_path %> + + + <%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), contests_path %> + <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> +
+ <% end %> +
+<% if @contests.size > 0%> +<%= sort_contest(@s_state)%> +
+ <%= render :partial => 'contest_list', + :locals => {:contests => @contests, :contest_pages => @contest_pages} + %> +
+<% else %> + <%= render :partial => "layouts/no_content"%> +<% end %> + +<% html_title l(:label_contest_list)%> +s \ No newline at end of file From f78be4ea5158e377fb0ed4a4077c26fbe8fe0433 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 17 Sep 2014 19:57:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4=E4=B8=8D=E4=BA=86bug=20Sig?= =?UTF-8?q?ned-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/_new_softapplication.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb index 7bb8c76a8..ebea41b43 100644 --- a/app/views/contests/_new_softapplication.html.erb +++ b/app/views/contests/_new_softapplication.html.erb @@ -221,8 +221,8 @@
- - <%#= submit_tag l(:button_create) %> + + <%= submit_tag l(:button_create) %> <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", From a8237003009c8418b4c607601ce969cee6783b9e Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 18 Sep 2014 10:10:14 +0800 Subject: [PATCH 3/3] Signed-off-by: alan <547533434@qq.com> --- app/views/contests/index.html.erb | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 app/views/contests/index.html.erb diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb new file mode 100644 index 000000000..115b154e6 --- /dev/null +++ b/app/views/contests/index.html.erb @@ -0,0 +1,48 @@ +
+ <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> + + + + + + + + + + + +
<%= l(:label_contest_innovate) %><%= l(:label_user_location) %> : + <% if User.current.logged? %> + <% unless User.current.user_extensions.identity == 1 %> + <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> + + <% end %> + <% end %> + +
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %> +
+
+ + <%= link_to request.host()+"/contests", contests_path %> + + + + <%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> + +
+ <% end %> +
+<% if @contests.size > 0%> + <%= sort_contest(@s_state)%> +
+ <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %> +
+<% else %> + <%= render :partial => "layouts/no_content"%> +<% end %> + +<% html_title l(:label_contest_list)%>