diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb
index 2a58bf45..e09f73f7 100644
--- a/app/views/dmsf_files/_file_new_revision.html.erb
+++ b/app/views/dmsf_files/_file_new_revision.html.erb
@@ -42,17 +42,7 @@
<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version + 1 %> <%= l(:option_version_minor) %>
<%= radio_button_tag("version", 2, @revision.major_version != @file.last_revision.major_version) %>
<%= @file.last_revision.major_version + 1 %>.0 <%= l(:option_version_major) %>
-
-
- <%= 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 %> - -
+diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index f1458a6a..2c86be27 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -57,66 +57,72 @@
- <%= label_tag("", l(:label_description) + ":") %> -
-+ <%= label_tag("", l(:label_description) + ":") %> +
+<%= pagination_links_full @revision_pages, @file.revisions.visible.count %>
diff --git a/assets/images/rev_delete.png b/assets/images/rev_delete.png new file mode 100644 index 00000000..8c631734 Binary files /dev/null and b/assets/images/rev_delete.png differ diff --git a/assets/images/rev_download.png b/assets/images/rev_download.png new file mode 100644 index 00000000..c3c74e1a Binary files /dev/null and b/assets/images/rev_download.png differ diff --git a/assets/images/rev_downloads.png b/assets/images/rev_downloads.png new file mode 100644 index 00000000..d1d9debc Binary files /dev/null and b/assets/images/rev_downloads.png differ diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css index 18fbde1f..21f077df 100644 --- a/assets/stylesheets/dmsf.css +++ b/assets/stylesheets/dmsf.css @@ -244,8 +244,7 @@ table.access-table tbody td, table.access-table tbody tr:hover td { margin-bottom: 10px; background-color:#f6f6f6; color:#505050; - line-height:1.5em; - /*border: 1px solid #e4e4e4;*/ + line-height:1.5em; } div.revision_box .ui-widget-header { diff --git a/config/locales/en.yml b/config/locales/en.yml index 2b4d38fb..60c31ada 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -92,7 +92,7 @@ en: :title_delete_revision: "Delete revision" :label_created: "Created" :label_changed: "Changed" - :info_changed_by_user: "%{changed} by %{user}" + :info_changed_by_user: "%{changed} by" :label_filename: "Filename" :label_version: "Version" :label_workflow: "Workflow"