Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
commit
5115d606ff
|
@ -82,7 +82,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding-top: 5px">
|
<td style="padding-top: 5px">
|
||||||
<% for user in @bid.watcher_users%>
|
<% for user in @bid.watcher_users%>
|
||||||
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %>
|
<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
|
||||||
<% end%>
|
<% end%>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -100,7 +100,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding-top: 5px">
|
<td style="padding-top: 5px">
|
||||||
<% for project in @bid.projects%>
|
<% for project in @bid.projects%>
|
||||||
<%= link_to image_tag(url_to_avatar(project), :class => "avatar"), project_path(project), :class => "avatar" %>
|
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
|
||||||
<% end%></td>
|
<% end%></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
Loading…
Reference in New Issue