diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index ec375758..a05dea53 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -39,24 +39,26 @@ <%= link_to l(:button_lock), lock_dmsf_files_path(id: @file), title: l(:title_lock_file), class: 'icon icon-lock' %> <% end %> - <% if @file.notification %> - <%= link_to l(:label_notifications_off), - notify_deactivate_dmsf_files_path(id: @file), - title: l(:title_notifications_active_deactivate), - class: 'icon icon-email' %> - <% else %> - <%= link_to l(:label_notifications_on), - notify_activate_dmsf_files_path(id: @file), - title: l(:title_notifications_not_active_activate), - class: 'icon icon-email-add' %> + <%= actions_dropdown do %> + <% if @file.notification %> + <%= link_to l(:label_notifications_off), + notify_deactivate_dmsf_files_path(id: @file), + title: l(:title_notifications_active_deactivate), + class: 'icon icon-email' %> + <% else %> + <%= link_to l(:label_notifications_on), + notify_activate_dmsf_files_path(id: @file), + title: l(:title_notifications_not_active_activate), + class: 'icon icon-email-add' %> + <% end %> + <%= link_to l(:label_link_to), + new_dmsf_link_path(project_id: @project.id, dmsf_folder_id: @file.dmsf_folder ? @file.dmsf_folder.id : nil, dmsf_file_id: @file.id, type: 'link_to'), + title: l(:title_create_link), + class: 'icon icon-link' %> + <%= link_to "#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: @file), + title: l(:title_copy), class: 'icon icon-copy' %> + <%= delete_link(dmsf_file_path(id: @file, details: true)) if @file_delete_allowed %> <% end %> - <%= link_to l(:label_link_to), - new_dmsf_link_path(project_id: @project.id, dmsf_folder_id: @file.dmsf_folder ? @file.dmsf_folder.id : nil, dmsf_file_id: @file.id, type: 'link_to'), - title: l(:title_create_link), - class: 'icon icon-link' %> - <%= link_to "#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: @file), - title: l(:title_copy), class: 'icon icon-copy' %> - <%= delete_link(dmsf_file_path(id: @file, details: true)) if @file_delete_allowed %> <% end %> <% end %> @@ -77,28 +79,28 @@

<%= l(:heading_revisions) %>

<% @file.dmsf_file_revisions.visible[@revision_pages.offset, @revision_pages.per_page].each do |revision| %>
-
-
-
- <%= actions_dropdown do %> - <%= link_to_function l(:title_download_entries), - "$('#revision_access-#{revision.id}').toggle()", - class: 'icon icon-group' %> - <%= link_to l(:title_download), - view_dmsf_file_path(@file, download: revision), - title: l(:title_title_version_version_download, title: h(revision.title), version: revision.version), - class: 'icon icon-download' %> - <%= link_to l(:title_obsolete_revision), - obsolete_revision_path(revision), - data: { confirm: l(:text_are_you_sure) }, - class: 'icon icon-close' if @file_manipulation_allowed && (revision.workflow == DmsfWorkflow::STATE_APPROVED) %> - <%= link_to l(:button_delete), - delete_revision_path(revision), - data: { confirm: l(:text_are_you_sure) }, - title: l(:title_delete_revision), - class: 'icon icon-del' if @file_delete_allowed && (@file.dmsf_file_revisions.visible.count > 1) %> - <% end %> -
+
+
+ <%= actions_dropdown do %> + <%= link_to_function l(:title_download_entries), + "$('#revision_access-#{revision.id}').toggle()", + class: 'icon icon-group' %> + <%= link_to l(:title_download), + view_dmsf_file_path(@file, download: revision), + title: l(:title_title_version_version_download, title: h(revision.title), version: revision.version), + class: 'icon icon-download' %> + <%= link_to l(:title_obsolete_revision), + obsolete_revision_path(revision), + data: { confirm: l(:text_are_you_sure) }, + class: 'icon icon-close' if @file_manipulation_allowed && (revision.workflow == DmsfWorkflow::STATE_APPROVED) %> + <%= link_to l(:button_delete), + delete_revision_path(revision), + data: { confirm: l(:text_are_you_sure) }, + title: l(:title_delete_revision), + class: 'icon icon-del' if @file_delete_allowed && (@file.dmsf_file_revisions.visible.count > 1) %> + <% end %> +
+
<%= l(:info_revision, rev: revision.id) %> <%= (revision.source_revision.nil? ? l(:label_created) : l(:label_changed)).downcase %> <%= l(:info_changed_by_user, changed: format_time(revision.updated_at)) %> diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index baa5ef0b..72c59f89 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -71,11 +71,7 @@ } .dmsf_revision_box { - padding: 0 0 0 0; - margin-bottom: 10px; background-color:#f6f6f6; - color:#505050; - line-height:1.5em; } .dmsf_revision_inner_box { @@ -114,13 +110,22 @@ div.dmsf_revision_inner_box .attribute .label { float: left; } -.dmsf_log_header_box label{ +.dmsf_log_header_box label { font-weight: bold; margin-left: 0; margin-right: 3px; padding: 3px 0 3px 0; } +#dmsf_widget_header { + font-weight: normal; + padding: 0 10px 0 10px; +} + +#dmsf_widget_header_text { + padding: 5px 0 0 0; +} + /* Command icons */ .icon-link { background-image: url(../../../images/link.png); } .icon-approvalworkflows { background-image: url(../../../images/ticket_go.png); } diff --git a/config/locales/cs.yml b/config/locales/cs.yml index c1460c00..1bf8ec14 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -402,11 +402,11 @@ cs: button_edit_content: Upravit obsah field_workflow: Workflow - field_modified: Aktualizoval - field_updated: Aktualizováno - field_count: Stažebí/E-mail + field_modified: Datum + field_count: Stažení field_first_at: První field_last_at: Poslední + field_size: Velikost easy_pages: modules: diff --git a/config/locales/de.yml b/config/locales/de.yml index f342ddaf..4ac5632c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -113,7 +113,7 @@ de: ID, %r - Revision). z.B.: %t_%v" title_save_preferences: Einstellungen speichern heading_revisions: Versionen - title_download: Download + title_download: Speichern title_delete_revision: Lösche Version title_obsolete_revision: Obsolete revision label_created: Erstellt @@ -303,7 +303,7 @@ de: label_notifications_on: Benachrichtigungen ein label_notifications_off: Benachrichtigungen aus field_target_file: Quelldatei - title_download_entries: Download entries + title_download_entries: Speicherung label_external: Extern label_internal: Internal @@ -385,9 +385,9 @@ de: error_file_tmpdir_does_not_exist: "Temporary file path doesn't exist and can't be created" error_tmpfile_can_not_be_created: "Files can't be created in temporary file path directory" - label_email_from_override: From + label_email_from_override: Von text_email_from_override: The user currently logged in - label_email_reply_to: Reply-to + label_email_reply_to: Antwort an label_enable_cjk_ngrams: Enable generation of n-grams from CJK text text_enable_cjk_ngrams: "With this enabled, spans of CJK characters are split into unigrams and bigrams, with the @@ -401,13 +401,13 @@ de: label_inherited_permissions: Inherited permissions - button_edit_content: Edit content + button_edit_content: Bearbeiten den Inhalt field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email - field_first_at: First - field_last_at: Last + field_modified: Datum + field_count: Speicherung + field_first_at: Erste + field_last_at: Letzte + field_size: Größe easy_pages: modules: diff --git a/config/locales/en.yml b/config/locales/en.yml index 2dce44de..e8dab2a7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -402,11 +402,11 @@ en: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/es.yml b/config/locales/es.yml index da4ecb39..e84b0d7e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -402,11 +402,11 @@ es: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4b112fc1..d1bd4bc8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -402,11 +402,11 @@ fr: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index e96d46cb..7779d2ac 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -401,11 +401,11 @@ hu: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/it.yml b/config/locales/it.yml index 922b6ed6..0fbb4342 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -402,11 +402,11 @@ it: # Italian strings thx 2 Matteo Arceci! button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 387ab924..92a019c3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -402,11 +402,11 @@ ja: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index b0cf0ccc..29337513 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -396,11 +396,11 @@ ko: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 6d9b82ea..7aa32fa1 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -402,11 +402,11 @@ nl: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 6af43305..c48d92dc 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -402,11 +402,11 @@ pl: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 941f17f2..236a2084 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -402,11 +402,11 @@ pt-BR: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index de8c56ed..0e0534a7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -402,11 +402,11 @@ ru: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 9c2b746f..3e776461 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -402,11 +402,11 @@ sl: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 60509c43..bc11b01c 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -402,11 +402,11 @@ zh-TW: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 52e50996..5b8952d4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -402,11 +402,11 @@ zh: button_edit_content: Edit content field_workflow: Workflow - field_modified: Updated - field_updated: Updated - field_count: Downloads/Email + field_modified: Date + field_count: D/L field_first_at: First field_last_at: Last + field_size: Size easy_pages: modules: