调整竞赛踩、顶的位置
This commit is contained in:
parent
6285b2454a
commit
c48f66015d
|
@ -36,11 +36,19 @@
|
||||||
<%= image_tag(url_to_avatar(@contest.author), :class => "avatar")%>
|
<%= image_tag(url_to_avatar(@contest.author), :class => "avatar")%>
|
||||||
</span>
|
</span>
|
||||||
<span class="body">
|
<span class="body">
|
||||||
|
<span id="praise_tread" style="float: right">
|
||||||
|
<%= render :partial => "/praise_tread/praise_tread",
|
||||||
|
:locals => {:obj => @contest,
|
||||||
|
:show_flag => true,
|
||||||
|
:user_id =>User.current.id,
|
||||||
|
:horizontal => false}
|
||||||
|
%>
|
||||||
|
</span>
|
||||||
<h3>
|
<h3>
|
||||||
<%= link_to(@contest.author.lastname+@contest.author.firstname,
|
<%= link_to(@contest.author.lastname+@contest.author.firstname,
|
||||||
user_path(@contest.author))
|
user_path(@contest.author))%>
|
||||||
%>
|
:<%= @contest.name %>
|
||||||
:<%= @contest.name %></h3>
|
</h3>
|
||||||
<p>
|
<p>
|
||||||
<strong>
|
<strong>
|
||||||
<%= l(:label_bids_reward_method) %>
|
<%= l(:label_bids_reward_method) %>
|
||||||
|
@ -52,14 +60,6 @@
|
||||||
<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
|
<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
|
||||||
<%= @contest.description %>
|
<%= @contest.description %>
|
||||||
</div>
|
</div>
|
||||||
<span id="praise_tread" style="float: right">
|
|
||||||
<%= render :partial => "/praise_tread/praise_tread",
|
|
||||||
:locals => {:obj => @contest,
|
|
||||||
:show_flag => true,
|
|
||||||
:user_id =>User.current.id,
|
|
||||||
:horizontal => false}
|
|
||||||
%>
|
|
||||||
</span>
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -69,14 +69,23 @@
|
||||||
<% @contestnotificationss.each do |contestnotifications| %>
|
<% @contestnotificationss.each do |contestnotifications| %>
|
||||||
<table class="content-text-list">
|
<table class="content-text-list">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>
|
<td colspan="2" valign="top" width="50">
|
||||||
|
<%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<table width="580px" border="0">
|
<table width="580px" border="0">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top">
|
<td colspan="2" valign="top">
|
||||||
<strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter">
|
<strong>
|
||||||
<%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %></span>
|
<%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %>
|
||||||
|
</strong>
|
||||||
|
<span style="margin-left: 4px;" class="font_lighter">
|
||||||
|
<%= l(:label_project_notice) %>
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %>
|
||||||
|
</span>
|
||||||
<span style="float: right">
|
<span style="float: right">
|
||||||
<%= 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?) %>
|
<%= 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?) %>
|
<%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
|
||||||
|
@ -85,12 +94,21 @@
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" width="580px">
|
<td colspan="2" width="580px">
|
||||||
<span class="font_description"><%= textilizable(contestnotifications, :description) %></span></td>
|
<span class="font_description">
|
||||||
|
<%= textilizable(contestnotifications, :description) %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>
|
<td align="left"><span class="font_lighter">
|
||||||
<%= format_time(contestnotifications.created_at) %></span></td>
|
<%= l :label_update_time %>
|
||||||
<td width="350" align="right" class="a"><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
|
|
||||||
|
<%= format_time(contestnotifications.created_at) %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td width="350" align="right" class="a">
|
||||||
|
<%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
|
Loading…
Reference in New Issue