'fix'
This commit is contained in:
parent
2c5cd7a12a
commit
60489bdbfd
|
@ -1,45 +1,54 @@
|
|||
<!-- fq -->
|
||||
<style>
|
||||
.portrait{
|
||||
float: left;
|
||||
width: 40px;
|
||||
padding-top: 3px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
display: block;
|
||||
}
|
||||
.body{
|
||||
float: left;
|
||||
width: 405px;
|
||||
overflow: hidden;
|
||||
font-size: 9pt;
|
||||
margin: 0px 10px;
|
||||
padding: 0px;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
<% if jour.size >0 %>
|
||||
<% remove_allowed = (User.current.id == jour.first.user_id) %>
|
||||
|
||||
<ul>
|
||||
<% for journal in jour%>
|
||||
<table width="660px" border="0" align="center">
|
||||
<tr>
|
||||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
|
||||
<td>
|
||||
<table width="580px" border="0">
|
||||
<tr>
|
||||
<td colspan="2" valign="top"><strong> <%= link_to journal.user, user_path(journal.user)%></strong>
|
||||
<% if @user == User.current %>
|
||||
<span class="font_lighter"><%= l(:label_leave_me_message) %></span>
|
||||
<% else %>
|
||||
<span class="font_lighter"><%= l(:label_leave_others_message) %></span>
|
||||
<% end %> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" width="580px" >
|
||||
<div class="info-break">
|
||||
<%= textilizable journal.notes%>
|
||||
</div></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>: <%= format_time journal.created_on %></span></td>
|
||||
|
||||
<td width="200" align="right" class="a"> <% if @user == User.current %>
|
||||
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,
|
||||
:method => 'post', :title => l(:button_quote))%>
|
||||
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user},
|
||||
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %></td>
|
||||
<% else %>
|
||||
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,
|
||||
:method => 'post', :title => l(:button_quote))%>
|
||||
<li>
|
||||
<span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
|
||||
<span class="body">
|
||||
<span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
|
||||
<% if @user == User.current %>
|
||||
<span class="font_lighter"><%= l(:label_leave_me_message) %></span>
|
||||
<% else %>
|
||||
<span class="font_lighter"><%= l(:label_leave_others_message) %></span>
|
||||
<% end %>
|
||||
<span>
|
||||
<%= textilizable journal.notes%>
|
||||
</span>
|
||||
<span class="font_lighter"> <%= l :label_comment_time %>: <%= format_time journal.created_on %></span>
|
||||
<% if @user == User.current %>
|
||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||
<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
|
||||
<% end %>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="line_under"></div>
|
||||
</span>
|
||||
<div style="clear: both;"></div>
|
||||
<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">
|
||||
<%= render :partial => 'words/new_respond', :locals => {:journal => journal} %>
|
||||
</div>
|
||||
<div>
|
||||
<%= render :partial => "words/journal_reply", :locals => {:journal => journal} %>
|
||||
</div>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
|
|
Loading…
Reference in New Issue