Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
huang 2015-04-17 11:15:43 +08:00
commit 917701f09d
1 changed files with 8 additions and 8 deletions

View File

@ -9,13 +9,13 @@
<table class="pro_table">
<tbody>
<tr class="pro_table_tit">
<td class="w150"><%= l(:label_version) %></td>
<td class="w1150"> <%= l(:field_effective_date) %></td>
<td class="w210"><%= l(:field_description) %> </td>
<td class="w1150"><%= l(:field_status) %></td>
<td class="w190"><%= l(:field_sharing) %></td>
<td class="w190"><%= l(:label_wiki_page) %></td>
<td class="w1150"></td>
<td class="w90"><%= l(:label_version) %></td>
<td> <%= l(:field_effective_date) %></td>
<td class="w90"><%= l(:field_description) %> </td>
<td class=""><%= l(:field_status) %></td>
<td class=""><%= l(:field_sharing) %></td>
<td class=""><%= l(:label_wiki_page) %></td>
<td class=""></td>
</tr>
<% for version in @project.shared_versions.sort %>
<tr class="pro_table_on">
@ -23,7 +23,7 @@
<a class="c_blue02"><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
</td>
<td class="c_grey"><%= format_date(version.effective_date) %></td>
<td class="description" style="word-break:break-all"><%=h version.description %></td>
<td class="description" style="word-break:break-all;"><%=h version.description %></td>
<td class="status"><%= l("version_status_#{version.status}") %></td>
<td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
<td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="">