* organized list entries manipulation icons

* organized list styles

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@37 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-05-12 07:58:20 +00:00
parent 1e01b15187
commit 4cd99ee598
2 changed files with 76 additions and 36 deletions

View File

@ -30,10 +30,10 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
<table class="list entries" id="browser"> <table class="list entries" id="browser">
<thead> <thead>
<tr id="root"> <tr id="root">
<th style="width: 17px; padding: 2px; text-align: left;"> <th class="check">
<input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_zip_download_or_email) %>" type="checkbox" /> <input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_zip_download_or_email) %>" type="checkbox" />
</th> </th>
<%= sort_header_tag("title", :caption => l(:link_title), :style => "width: 50%") %> <%= sort_header_tag("title", :caption => l(:link_title)) %>
<%= sort_header_tag("size", :caption => l(:link_size)) %> <%= sort_header_tag("size", :caption => l(:link_size)) %>
<%= sort_header_tag("modified", :caption => l(:link_modified)) %> <%= sort_header_tag("modified", :caption => l(:link_modified)) %>
<%= sort_header_tag("version", :caption => l(:link_ver)) %> <%= sort_header_tag("version", :caption => l(:link_ver)) %>
@ -44,8 +44,8 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
<tbody> <tbody>
<% @subfolders.each do |subfolder| %> <% @subfolders.each do |subfolder| %>
<tr class="dir"> <tr class="dir">
<td class="size"><%= check_box_tag("subfolders[]", subfolder.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td> <td class="check"><%= check_box_tag("subfolders[]", subfolder.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td>
<td class="filename"> <td class="title">
<%= link_to(h(subfolder.name), <%= link_to(h(subfolder.name),
{:action => "index", :folder_id => subfolder}, {:action => "index", :folder_id => subfolder},
:class => "icon icon-folder") %> :class => "icon icon-folder") %>
@ -55,14 +55,8 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
<td class="version">-</td> <td class="version">-</td>
<td class="author">-</td> <td class="author">-</td>
<td class="actions"> <td class="actions">
<div class="right_icon_box">
<% if User.current.allowed_to?(:folder_manipulation, @project) %>
<%= link_to(image_tag("delete.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_detail", :action => "delete_folder", :id => @project,
:folder_id => @folder, :delete_folder_id => subfolder}, :class => "delete-link",
:title => l(:title_delete)) %>
<% end %>
<% if User.current.allowed_to?(:file_approval, @project) %> <% if User.current.allowed_to?(:file_approval, @project) %>
<div class="right_icon_box">
<% if subfolder.notification %> <% if subfolder.notification %>
<%= link_to(image_tag("notify.png", :plugin => "redmine_dmsf"), <%= link_to(image_tag("notify.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_state", :action => "folder_notify_deactivate", :id => @project, {:controller => "dmsf_state", :action => "folder_notify_deactivate", :id => @project,
@ -72,15 +66,31 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
{:controller => "dmsf_state", :action => "folder_notify_activate", :id => @project, {:controller => "dmsf_state", :action => "folder_notify_activate", :id => @project,
:folder_id => subfolder}, :title => l(:title_notifications_not_active_activate)) %> :folder_id => subfolder}, :title => l(:title_notifications_not_active_activate)) %>
<% end %> <% end %>
</div>
<% end %> <% end %>
</div><br class="clear" /> <div class="right_icon_box" style="width: 70px;">
<% if User.current.allowed_to?(:folder_manipulation, @project) %>
<div style="float: left">
<%= link_to(image_tag("filedetails.png", :plugin => "redmine_dmsf", :class =>"detail_icon"),
{:controller => "dmsf_detail", :action => "folder_detail", :id => @project, :folder_id => subfolder },
:title => l(:link_details, :title => h(subfolder.name))) %>
</div>
<% end %>
<div style="float: right">
<%= link_to(image_tag("delete.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_detail", :action => "delete_folder", :id => @project,
:folder_id => @folder, :delete_folder_id => subfolder}, :class => "delete-link",
:title => l(:title_delete)) if User.current.allowed_to?(:folder_manipulation, @project) %>
</div>
</div>
<br class="clear" />
</td> </td>
</tr> </tr>
<% end %> <% end %>
<% @files.each do |file| %> <% @files.each do |file| %>
<tr class="file"> <tr class="file">
<td class="size"><%= check_box_tag("files[]", file.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td> <td class="check"><%= check_box_tag("files[]", file.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td>
<td class="filename"> <td class="title">
<%= link_to(h(file.last_revision.display_title), <%= link_to(h(file.last_revision.display_title),
{:action => "download_file", :id => @project, :file_id => file}, {:action => "download_file", :id => @project, :file_id => file},
:class => "icon icon-file #{Redmine::MimeType.css_class_of(file.name)}", :class => "icon icon-file #{Redmine::MimeType.css_class_of(file.name)}",
@ -112,11 +122,26 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
</td> </td>
<td class="author"><%= h(file.last_revision.user) unless file.last_revision.nil? %></td> <td class="author"><%= h(file.last_revision.user) unless file.last_revision.nil? %></td>
<td class="actions"> <td class="actions">
<% if User.current.allowed_to?(:file_approval, @project) %>
<div class="right_icon_box"> <div class="right_icon_box">
<%= link_to(image_tag("filedetails.png", :plugin => "redmine_dmsf"), <% if file.notification %>
<%= link_to(image_tag("notify.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_state", :action => "file_notify_deactivate", :id => @project,
:file_id => file}, :title => l(:title_notifications_active_deactivate)) %>
<% else %>
<%= link_to(image_tag("notifynot.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_state", :action => "file_notify_activate", :id => @project,
:file_id => file}, :title => l(:title_notifications_not_active_activate)) %>
<% end %>
</div>
<% end %>
<div class="right_icon_box" style="width: 70px;">
<div style="float: left">
<%= link_to(image_tag("filedetails.png", :plugin => "redmine_dmsf", :class =>"detail_icon"),
{:controller => "dmsf_detail", :action => "file_detail", :id => @project, :file_id => file }, {:controller => "dmsf_detail", :action => "file_detail", :id => @project, :file_id => file },
:title => l(:link_details, :title =>h(file.last_revision.title))) %> :title => l(:link_details, :title =>h(file.last_revision.title))) %>
&nbsp; </div>
<div style="float: right">
<% unless file.locked_for_user? && !User.current.allowed_to?(:force_file_unlock, @project)%> <% unless file.locked_for_user? && !User.current.allowed_to?(:force_file_unlock, @project)%>
<% if file.locked? %> <% if file.locked? %>
<%= link_to(image_tag("unlock.png", :plugin => "redmine_dmsf"), <%= link_to(image_tag("unlock.png", :plugin => "redmine_dmsf"),
@ -134,18 +159,9 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
{:controller => "dmsf_detail", :action => "delete_file", :id => @project, {:controller => "dmsf_detail", :action => "delete_file", :id => @project,
:file_id => file}, :class => "delete-link", :title => l(:title_delete)) %> :file_id => file}, :class => "delete-link", :title => l(:title_delete)) %>
<% end %> <% end %>
<% if User.current.allowed_to?(:file_approval, @project) %> </div>
<% if file.notification %> </div>
<%= link_to(image_tag("notify.png", :plugin => "redmine_dmsf"), <br class="clear" />
{:controller => "dmsf_state", :action => "file_notify_deactivate", :id => @project,
:file_id => file}, :title => l(:title_notifications_active_deactivate)) %>
<% else %>
<%= link_to(image_tag("notifynot.png", :plugin => "redmine_dmsf"),
{:controller => "dmsf_state", :action => "file_notify_activate", :id => @project,
:file_id => file}, :title => l(:title_notifications_not_active_activate)) %>
<% end %>
<% end %>
</div><br class="clear" />
</td> </td>
</tr> </tr>
<% end %> <% end %>

View File

@ -6,6 +6,24 @@ table.entries {
margin-bottom: 10px; margin-bottom: 10px;
} }
table.entries td.modified {
width: 120px;
}
table.entries td.actions {
width: 108px;
}
table.entries td.title {
width: 50%;
}
table.entries th.check {
width: 17px;
padding: 2px;
text-align: left;
}
#sidebar h3 { #sidebar h3 {
border: none; border: none;
} }
@ -66,6 +84,11 @@ div.right_icon_box {
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
} }
div.right_icon_box img.detail_icon {
padding-top: 2px;
}
.dmsf_upload textarea { .dmsf_upload textarea {
width: 90%; width: 90%;
} }
@ -129,3 +152,4 @@ input[type="checkbox"] {
.ui-resizable-s { .ui-resizable-s {
bottom: 0px; bottom: 0px;
} }