diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index e3dc0297..b2b07d65 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -61,7 +61,7 @@ <% end %> -<%= render(:partial => '/dmsf/path', :locals => {:folder => @file.folder, :filename => @file.title}) %> +<%= render(:partial => '/dmsf/path', :locals => {:folder => @file.folder, :filename => @file.title}) %> <% if User.current.allowed_to?(:file_manipulation, @file.project) && !@file.locked_for_user? %> <%= error_messages_for('file') %> @@ -69,6 +69,11 @@ <%= render(:partial => 'file_new_revision') %> <% end %> +
+ <%= label_tag('', "#{l(:label_document)}:") %> + <%= "##{@file.id}" %> +
+

<%= l(:heading_revisions) %>

<% @file.revisions.visible[@revision_pages.offset,@revision_pages.per_page].each do |revision| %>
@@ -92,7 +97,7 @@ <%= link_to(revision.user.name, user_path(revision.user)) if revision.user %>
-
+
<%= label_tag('', "#{l(:label_title)}:") %> @@ -117,12 +122,9 @@ <% wf = DmsfWorkflow.find_by_id(revision.dmsf_workflow_id) %> <% if wf %> <%= "#{wf.name} - " %> - <%= link_to( - revision.workflow_str(false), - log_dmsf_workflow_path( - :project_id => @project.id, - :id => wf.id, - :dmsf_file_revision_id => revision.id), + <%= link_to(revision.workflow_str(false), + log_dmsf_workflow_path(:project_id => @project.id, + :id => wf.id, :dmsf_file_revision_id => revision.id), :title => DmsfWorkflow.assignments_to_users_str(wf.next_assignments(revision.id)), :remote => true) %> <% else %> @@ -131,7 +133,7 @@
<%= label_tag('', "#{l(:label_mime)}:") %> - <%= h(revision.mime_type) %>  + <%= h(revision.mime_type) %>
<%= label_tag('', "#{l(:label_size)}:") %> <%= number_to_human_size(revision.size) %> diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css index 1e52d358..643dfdb5 100644 --- a/assets/stylesheets/dmsf.css +++ b/assets/stylesheets/dmsf.css @@ -2,7 +2,7 @@ * Redmine plugin for Document Management System "Features" * * Copyright (C) 2011 Vít Jonáš -* Copyright (C) 2011-15 Karel Pičman +* Copyright (C) 2011-16 Karel Pičman * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -209,11 +209,11 @@ table.access-table tbody td, table.access-table tbody tr:hover td { /* Approval workflow */ #admin-menu a.approvalworkflows { background-image: url(../../../images/ticket_go.png); } -#users_for_delegate {height: 200px; overflow:auto;} -#users_for_delegate label {display: block;} +#users_for_delegate { height: 200px; overflow:auto; } +#users_for_delegate label { display: block; } tr.workflow.locked a { color: #aaa; } -.revision_box{ +.revision_box { padding: 0px 0px 0px 0px; margin-bottom: 10px; background-color:#f6f6f6; @@ -221,6 +221,20 @@ tr.workflow.locked a { color: #aaa; } line-height:1.5em; } +.dmsf_revision_inner_box { + border: 1px solid #e4e4e4; +} + +.dmsf_id_box { + float: right; + white-space: nowrap; + line-height: 1.5em; + color: #505050; + margin-top: 5px; + padding-left: 10px; + //font-size: 0.9em; +} + div.revision_box .ui-widget-header { font-weight: normal; }