diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 0f2f4cf96..913e5b426 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -22,7 +22,7 @@
-
+
<%=render :partial => 'layouts/base_header'%>
@@ -34,9 +34,9 @@
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= text_field_tag 'name', params[:name], :size => 20 %> <%= hidden_field_tag 'reward_type', @bid.reward_type %> - <%= 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 %> <% end %>
@@ -44,7 +44,7 @@ <%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %> - <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > + <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > <%= link_to @bid.name, bid_path %> @@ -58,13 +58,13 @@ <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> - + - - <% if User.current.login? %> + + <% if User.current.login? %> <% end %> -
<%= h @bid.name %>
<%= join_in_contest(@bid, User.current)%> @@ -72,27 +72,27 @@
+ <% if User.current.logged? %> <% if @bid.author.id == User.current.id %> <%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %> - <% end %> + <% end %> <% end %>
-
+
- - - + + + - - + +
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", - :action => "show_participator" %><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids', - :action => 'show_project' %>
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", + :action => "show_participator" %><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids', + :action => 'show_project' %>
<%= l(:label_participator) %> <%= l(:label_bidding_project) %> <%= l(:label_participator) %> <%= l(:label_bidding_project) %>
@@ -104,8 +104,8 @@ <%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%> - - <%= l(:label_bids_reward_method) %><%= @bid.budget%> + + <%= l(:label_bids_reward_method) %><%= @bid.budget%> <%= l(:label_limit_time) %> : <%= @bid.deadline%> @@ -138,9 +138,9 @@
- +
- @@ -160,7 +160,7 @@ - +
+ <%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%>
<%= show_bid_fans_picture(@bid)%>
@@ -179,14 +179,14 @@ <%= show_bid_project(@bid) %> - +
- +
@@ -207,14 +207,14 @@
- +
<% if display_main_menu?(@bid) %>
<%= render_menu :bid_menu %>
<% end %> - + <%= yield %> <%= call_hook :view_layouts_base_content %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 9dfb4a5dd..3ab2a10fc 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -17,39 +17,39 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - + <%= yield :header_tags -%>
-
- <%=render :partial => 'layouts/base_header'%> +
+ <%=render :partial => 'layouts/base_header'%>
- +
- - - - - - - - - - -
<%=l(:label_contest_innovate_community)%><%= l(:label_user_location) %> : -
- <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <% end %> -
-
<%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > - <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > - <%= link_to @contest.name, show_contest_contest_path(@contest) %> -
+ + + + + + + + + + +
<%=l(:label_contest_innovate_community)%><%= l(:label_user_location) %> : +
+ <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> + <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> +
+
<%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > + <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %> +
-
+
- - + + - - - - + + + - - - - + + + +
<%=link_to "#{@contest.watcher_users.count}",show_project_contest_path(@contest) %> + + <% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> <%=link_to "#{@contest.projects.where('is_public=1').count}" %> <% else %> <%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %> <% end %> -
<%= l(:label_contest_watchers) %> <%= l(:label_contest_work) %> <%= l(:label_contest_watchers) %> <%= l(:label_contest_work) %>
@@ -127,9 +127,9 @@ - - - + + + @@ -137,7 +137,7 @@
<%= l(:lable_contest_user) %>: <%= link_to(@user.name, user_path(@user))%>
<%= l(:label_bids_reward_method) %><%= @contest.budget%>
<%= l(:label_bids_reward_method) %><%= @contest.budget%>
<%= l(:label_limit_time) %> : <%= @contest.deadline%>
- +
<%= l(:label_project_overview) %> @@ -166,19 +166,19 @@
- +
- +
-
+ <%= render :partial => 'tags/tag', :locals => {:obj => @contest, :object_flag => "7"}%>
- +
@@ -194,29 +194,29 @@ <%= show_contest_fans_picture(@contest)%> - +
- + - + - +
- +
- -
+ +
- - + +
<% if display_main_menu?(@contest) %> -
+
  • <%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %>
  • <%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %>
    • @@ -224,7 +224,7 @@
<% end %> - + <%= yield %> <%= call_hook :view_layouts_base_content %>