diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index 34f3e71eb..501cefbb5 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -1,37 +1,37 @@ -<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> -
- + +
+ <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> +
- - + + - - + -
- <%= l(:label_contest_list) %> - <% if User.current.logged? %> - - - <% if User.current.user_extensions.identity == 0 %> + <%= l(:label_contest_innovate) %>当前位置 : + <% if User.current.logged? %> + <% unless User.current.user_extensions.identity == 1 %> <%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %> - <% 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 => nil %> + <% 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 => nil %> -
-
-<%end%> - -<% if User.current.logged? %> - -<% end %> + + + + + + <%= link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'index' %> + <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> + + + <% end %> + + <%= sort_contest(@s_state)%> diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 52ee990ca..5b7897c3f 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -1,61 +1,53 @@ -<%= form_tag(calls_path, :method => :get) do %> -
- + +
+ <%= form_tag(calls_path, :method => :get) do %> +
- - + + - - + + + + + + +
- <% if @project_type == '1' %> - <%= l(:label_bids_task_list) %> - <% else %> - <%= l(:label_call_list)%> - <% end %><% if User.current.logged? %> - - - <% unless @project_type == '1' %> + <%= l(:label_requirement_enterprise ) %>当前位置 : + <% if User.current.logged? %> <%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %> - <% end %> - - - <% end %> -
- <%= text_field_tag 'name', params[:name], :size => 30 %> + <% end %> +
+
+ <%= text_field_tag 'name', params[:name], :size => 28 %> + <%= 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 %> +
+
<%= link_to "forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %>
+ <% 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 %> - - - - -<%end%> -<% if User.current.logged? %> - -<% end %> + <%= sort_bid(@s_state, @project_type)%> -<%= sort_bid(@s_state, @project_type)%> + - +
  • + <%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %> +
    • + + -
    - <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> -
    +
    + <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> +
    diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 1b1f22eb2..2cd973009 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -28,7 +28,7 @@ <%=render :partial => 'layouts/base_header'%> <% end %> -
    +
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 679910e14..64afdc8b2 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -46,7 +46,7 @@
    - +