diff options
| -rw-r--r-- | app/views/projects/settings/_versions.rhtml | 22 | ||||
| -rw-r--r-- | public/images/link.png | bin | 0 -> 343 bytes | |||
| -rw-r--r-- | public/stylesheets/application.css | 3 |
3 files changed, 15 insertions, 10 deletions
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml index 4fb5e9375..2a6acc37c 100644 --- a/app/views/projects/settings/_versions.rhtml +++ b/app/views/projects/settings/_versions.rhtml @@ -1,4 +1,4 @@ -<% if @project.versions.any? %> +<% if @project.shared_versions.any? %> <table class="list versions"> <thead> <th><%= l(:label_version) %></th> @@ -10,17 +10,19 @@ <th style="width:15%"></th> </thead> <tbody> -<% for version in @project.versions.sort %> - <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %>"> - <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td> - <td align="center"><%= format_date(version.effective_date) %></td> - <td><%=h version.description %></td> - <td><%= l("version_status_#{version.status}") %></td> - <td><%=h format_version_sharing(version.sharing) %></td> +<% for version in @project.shared_versions.sort %> + <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>"> + <td class="name"><%= link_to_version version %></td> + <td class="date"><%= format_date(version.effective_date) %></td> + <td class="description"><%=h version.description %></td> + <td class="status"><%= l("version_status_#{version.status}") %></td> + <td class="sharing"><%=h format_version_sharing(version.sharing) %></td> <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td> <td class="buttons"> - <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> - <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> + <% if version.project == @project %> + <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> + <% end %> </td> </tr> <% end; reset_cycle %> diff --git a/public/images/link.png b/public/images/link.png Binary files differnew file mode 100644 index 000000000..25eacb7c2 --- /dev/null +++ b/public/images/link.png diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8f328a2da..afbee7638 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -125,6 +125,9 @@ tr.message.locked td.subject a { background-image: url(../images/locked.png); } tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; } tr.version.closed, tr.version.closed a { color: #999; } +tr.version td.name { padding-left: 20px; } +tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; } +tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; } tr.user td { width:13%; } tr.user td.email { width:18%; } |
