diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb index b8f733bf2..5c4f2cef0 100644 --- a/app/views/contestnotifications/index.html.erb +++ b/app/views/contestnotifications/index.html.erb @@ -36,11 +36,19 @@ <%= image_tag(url_to_avatar(@contest.author), :class => "avatar")%> + + <%= render :partial => "/praise_tread/praise_tread", + :locals => {:obj => @contest, + :show_flag => true, + :user_id =>User.current.id, + :horizontal => false} + %> +

<%= link_to(@contest.author.lastname+@contest.author.firstname, - user_path(@contest.author)) - %> - :<%= @contest.name %>

+ user_path(@contest.author))%> + :<%= @contest.name %> +

<%= l(:label_bids_reward_method) %> @@ -52,14 +60,6 @@

<%= @contest.description %>
- - <%= render :partial => "/praise_tread/praise_tread", - :locals => {:obj => @contest, - :show_flag => true, - :user_id =>User.current.id, - :horizontal => false} - %> -
@@ -69,28 +69,46 @@ <% @contestnotificationss.each do |contestnotifications| %> - +
<%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %> + <%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %> + + + <%= textilizable(contestnotifications, :description) %> + + - - + +
- <%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %> - <%= l(:label_project_notice) %><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %> - - <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> - <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> - + + <%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %> + + + <%= l(:label_project_notice) %> + + + <%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %> + + + <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> + <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> +
- <%= textilizable(contestnotifications, :description) %>
<%= l :label_update_time %> -  <%= format_time(contestnotifications.created_at) %><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %> + <%= l :label_update_time %> +   + <%= format_time(contestnotifications.created_at) %> + + + <%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %> +