redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revision view optimized for better reading

Browse Source
This commit is contained in:
Karel Picman 2013-05-28 14:56:07 +02:00
parent 64d8c521df
commit a2c0e1f471
7 changed files with 69 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/dmsf_files/_file_new_revision.html.erb
View File

@ -42,17 +42,7 @@
<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version + 1 %> <%= l(:option_version_minor) %><br /> <%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version + 1 %> <%= l(:option_version_minor) %><br />
<%= radio_button_tag("version", 2, @revision.major_version != @file.last_revision.major_version) %> <%= radio_button_tag("version", 2, @revision.major_version != @file.last_revision.major_version) %>
<%= @file.last_revision.major_version + 1 %>.0 <%= l(:option_version_major) %><br /> <%= @file.last_revision.major_version + 1 %>.0 <%= l(:option_version_major) %><br />
</div> </div>
<p>
<%= label_tag('workflow', l(:label_workflow) + ':') %>
<%= select_tag(
'dmsf_workflow_id',
dmsf_workflows_for_select(@project, @file.last_revision.dmsf_workflow_id))%>
<% if @file.last_revision.dmsf_workflow_id && @file.last_revision.workflow == 3%>
<%= submit_tag(l(:label_dmsf_wokflow_action_start)) %>
<% end %>
</p>
</div> </div>
<div class="splitcontentright clear"> <div class="splitcontentright clear">
<p> <p>

126
app/views/dmsf_files/show.html.erb
View File

@ -57,66 +57,72 @@
<h3><%= l(:heading_revisions) %></h3> <h3><%= l(:heading_revisions) %></h3>
<% @file.revisions.visible[@revision_pages.current.offset,@revision_pages.items_per_page].each do |revision| %> <% @file.revisions.visible[@revision_pages.current.offset,@revision_pages.items_per_page].each do |revision| %>
<div class="revision_box dmsf_detail"> <div class="revision_box dmsf_detail dataTables_wrapper">
<div class="ui-widget-header ui-corner-tl ui-corner-tr"> <div class="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix">
<div style="float:right"> <div class="dataTables_lenght">
<%= link_to(image_tag("download.png", :plugin => "redmine_dmsf"), <div class="controls" style="float: right">
{:action => "show", :id => @file, :download => revision}, <%= link_to_function(image_tag('rev_downloads.png', :plugin => 'redmine_dmsf'), "$('#revision_access-#{revision.id}').toggle()", :title => 'Download entries')%>
:title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version)) %> <%= link_to(image_tag('rev_download.png', :plugin => 'redmine_dmsf'),
<% if User.current.allowed_to?(:file_approval, @project) %> {:action => 'show', :id => @file, :download => revision},
&nbsp; :title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version)) %>
<%= link_to_function(image_tag("delete.png", :plugin => "redmine_dmsf"), <% if User.current.allowed_to?(:file_approval, @project) %>
"confirmation_link('#{url_for(:action => 'delete_revision', :id => revision)}', '#{l(:question_do_you_really_want_to_delete_this_revision)}')", <%= link_to_function(image_tag('rev_delete.png', :plugin => 'redmine_dmsf'),
:title => l(:title_delete_revision)) %> "confirmation_link('#{url_for(:action => 'delete_revision', :id => revision)}', '#{l(:question_do_you_really_want_to_delete_this_revision)}')",
<% end %> :title => l(:title_delete_revision)) %>
</div> <% end %>
</div>
<%= label_tag('', l(:info_revision, :rev => revision.id)) %> <i><%= l(:info_revision, :rev => revision.id) %></i>
<%= (revision.source_revision.nil? ? l(:label_created) : l(:label_changed)).downcase %> <%= (revision.source_revision.nil? ? l(:label_created) : l(:label_changed)).downcase %>
<%= l(:info_changed_by_user, :changed => format_time(revision.updated_at), :user => h(revision.user)) %> <%= l(:info_changed_by_user, :changed => format_time(revision.updated_at)) %>
<%= link_to(revision.user) %>
</div> </div>
<div class="clear"> </div>
<div class="splitcontentleft"> <div style="border: 1px solid #e4e4e4;">
<%= label_tag("", l(:label_title) + ":") %> <div class="clear">
<%= h(revision.title) %> <div class="splitcontentleft">
</div> <%= label_tag("", l(:label_title) + ":") %>
<div class="splitcontentright"> <%= h(revision.title) %>
<%= label_tag("", l(:label_file) + ":") %> </div>
<%= (h(revision.folder.dmsf_path_str) + "/") unless revision.folder.nil? %><%= h(revision.name) %> <div class="splitcontentright">
</div> <%= label_tag("", l(:label_file) + ":") %>
</div> <%= (h(revision.folder.dmsf_path_str) + "/") unless revision.folder.nil? %><%= h(revision.name) %>
<p class="no-ident"> </div>
<%= label_tag("", l(:label_description) + ":") %> </div>
</p> <p class="no-ident">
<div class="wiki clear" style="margin-left: 110px"> <%= label_tag("", l(:label_description) + ":") %>
<%= textilizable(revision.description) %> </p>
</div> <div class="wiki clear" style="margin-left: 110px">
<%= textilizable(revision.description) %>
<div class="splitcontentleft"> </div>
<%= label_tag("", l(:label_version) + ":") %> <div class="splitcontentleft">
<%= revision.major_version %>.<%= revision.minor_version %> <%= label_tag("", l(:label_version) + ":") %>
<br/> <%= revision.major_version %>.<%= revision.minor_version %>
<%= label_tag('', l(:label_workflow) + ':') %> <br/>
<%= revision.workflow_str true %> <%= label_tag('', l(:label_workflow) + ':') %>
</div> <%= revision.workflow_str true %>
<div class="splitcontentright clear"> </div>
<%= label_tag("", l(:label_mime) + ":") %> <div class="splitcontentright clear">
<%= h(revision.mime_type) %>&nbsp; <%= label_tag("", l(:label_mime) + ":") %>
<br/> <%= h(revision.mime_type) %>&nbsp;
<%= label_tag("", l(:label_size) + ":") %> <br/>
<%= number_to_human_size(revision.size) %> <%= label_tag("", l(:label_size) + ":") %>
</div> <%= number_to_human_size(revision.size) %>
<div class="no-ident clear"> </div>
<%= render "dmsf/custom_fields", :object => revision %> <div class="no-ident clear">
</div> <%= render "dmsf/custom_fields", :object => revision %>
<div class="splitcontentleft clear"> </div>
<%= label_tag("", l(:label_comment) + ":") %> <div class="splitcontentleft clear">
<%= h(revision.comment) %> <%= label_tag("", l(:label_comment) + ":") %>
</div> <%= h(revision.comment) %>
<%= render(:partial => "revision_access", :locals => {:revision => revision}) if User.current.allowed_to?(:file_approval, @file.project) %> </div>
</div> <br/>
<br/> <div id="<%= "revision_access-#{revision.id}" %>" style="display:none">
<%= render(:partial => "revision_access", :locals => {:revision => revision}) if User.current.allowed_to?(:file_approval, @file.project) %>
</div>
</div>
</div>
<br/>
<br/>
<% end %> <% end %>
<p class="pagination"><%= pagination_links_full @revision_pages, @file.revisions.visible.count %></p> <p class="pagination"><%= pagination_links_full @revision_pages, @file.revisions.visible.count %></p>

BIN
assets/images/rev_delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

BIN
assets/images/rev_download.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 656 B

BIN
assets/images/rev_downloads.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 642 B

3
assets/stylesheets/dmsf.css
View File

@ -244,8 +244,7 @@ table.access-table tbody td, table.access-table tbody tr:hover td {
margin-bottom: 10px; margin-bottom: 10px;
background-color:#f6f6f6; background-color:#f6f6f6;
color:#505050; color:#505050;
line-height:1.5em; line-height:1.5em;
/*border: 1px solid #e4e4e4;*/
} }
div.revision_box .ui-widget-header { div.revision_box .ui-widget-header {

2
config/locales/en.yml
View File

@ -92,7 +92,7 @@ en:
:title_delete_revision: "Delete revision" :title_delete_revision: "Delete revision"
:label_created: "Created" :label_created: "Created"
:label_changed: "Changed" :label_changed: "Changed"
:info_changed_by_user: "%{changed} by %{user}" :info_changed_by_user: "%{changed} by"
:label_filename: "Filename" :label_filename: "Filename"
:label_version: "Version" :label_version: "Version"
:label_workflow: "Workflow" :label_workflow: "Workflow"