diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 79118fca7..f8c7056b6 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -56,29 +56,34 @@ <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> - + + - - - - - <% if User.current.login? %> - - - - <% end %> - -
<%= h @contest.name %>
- <%= join_in_competition(@contest, User.current)%> - <%= new_watcher_link(@contest, User.current) %> -
- + + + + + <% if User.current.login? %> + + + + <% end %> + <% if User.current.logged? %> <% if @contest.author.id == User.current.id %> - <%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %> + + + <% end %> - <% end %> - + <% end %> +
<%= h @contest.name %>
+ <%= join_in_competition(@contest, User.current)%> + <%= new_watcher_link(@contest, User.current) %> +
+ <%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %> +
+ + @@ -201,8 +206,10 @@ +
+
<% if display_main_menu?(@contest) %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 3135595f8..f3d7f092e 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -119,7 +119,7 @@
<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> - <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px;'%> + <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>   <%= hidden_field_tag 'project_type', params[:project_type] %> <%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%> @@ -175,7 +175,7 @@ <%= link_to "更多>>", forums_path %>
    - <% find_new_forum_topics(10).each do |topic|%> + <% find_new_forum_topics(11).each do |topic|%>
  •