From 9d95f7f6b060acf52942b62cf6d8ff7de4ab61cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 29 Mar 2023 15:58:32 +0200 Subject: [PATCH] Easy facelift 2 --- app/views/settings/_dmsf_settings.html.erb | 172 +++++++++++---------- assets/stylesheets/easy_extensions.css | 9 ++ 2 files changed, 100 insertions(+), 81 deletions(-) diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb index 0c30e7cf..68414578 100644 --- a/app/views/settings/_dmsf_settings.html.erb +++ b/app/views/settings/_dmsf_settings.html.erb @@ -1,35 +1,45 @@ <% -# encoding: utf-8 -# -# Redmine plugin for Document Management System "Features" -# -# Copyright © 2011 Vít Jonáš -# Copyright © 2012 Daniel Munn -# Copyright © 2011-23 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 -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # encoding: utf-8 + # + # Redmine plugin for Document Management System "Features" + # + # Copyright © 2011 Vít Jonáš + # Copyright © 2012 Daniel Munn + # Copyright © 2011-23 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 + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> - +<% + if defined?(EasyExtensions) + klass = 'small dmsf-info' + title_klass = 'small dmsf-info dmsf-info-title' + else + klass = 'info'; + title_klass = 'info' + end +%> + + <%= l(:label_general) %>

<%= content_tag :label, l(:label_maximum_files_download) %> <%= text_field_tag 'settings[dmsf_max_file_download]', @settings['dmsf_max_file_download'], size: 10 %> - + <%= l(:note_maximum_number_of_files_downloaded) %> <%= l(:label_default) %>: 0

@@ -38,7 +48,7 @@ <%= content_tag :label, l(:label_dmsf_max_notification_receivers_info) %> <% @settings['dmsf_max_notification_receivers_info'] ||= 10 %> <%= text_field_tag 'settings[dmsf_max_notification_receivers_info]', @settings['dmsf_max_notification_receivers_info'], size: 10 %> - + <%= l(:note_dmsf_max_notification_receivers_info) %> <%= l(:label_default) %>: 10

@@ -46,25 +56,25 @@

<%= content_tag :label, l(:label_maximum_email_filesize) %> <%= text_field_tag 'settings[dmsf_max_email_filesize]', @settings['dmsf_max_email_filesize'], size: 10 %> - - <%= l(:note_maximum_email_filesize) %> <%= l(:label_default) %>: 0 + + <%= l(:note_maximum_email_filesize) %> <%= l(:label_default) %>: 0

<%= content_tag :label, l(:label_file_storage_directory) %> - <% + <% storage_dir = @settings['dmsf_storage_directory'].strip if @settings['dmsf_storage_directory'].present? storage_dir = 'dmsf' if storage_dir.blank? %> <%= text_field_tag 'settings[dmsf_storage_directory]', storage_dir, size: 256 %> - + <%= l(:label_default) %>: dmsf

<% unless File.exist?(DmsfFile.storage_path) %> <% begin %> - <% FileUtils.mkdir_p DmsfFile.storage_path %> + <% FileUtils.mkdir_p DmsfFile.storage_path %> <% rescue %>

<%= l(:error_file_storage_directory_does_not_exist) %>

<% end %> @@ -88,7 +98,7 @@ <%= l(:note_dmsf_office_bin_not_available, @settings['office_bin'] ||= 'libreoffice') %> <% end %> - + <%= l(:note_dmsf_office_bin) %> <%= l(:label_default) %>: 'libreoffice'

@@ -96,7 +106,7 @@

<%= content_tag :label, l(:label_physical_file_delete) %> <%= check_box_tag 'settings[dmsf_really_delete_files]', true, @settings['dmsf_really_delete_files'] %> - + <%= l(:label_default)%>: <%= l(:general_text_No)%>

@@ -104,11 +114,11 @@

<%= content_tag :label, l(:label_default_notifications) %> <%= select_tag 'settings[dmsf_default_notifications]', - options_for_select([ - [l(:select_option_deactivated), nil], - [l(:select_option_activated), '1']], - selected: @settings['dmsf_default_notifications']) %> - + options_for_select([ + [l(:select_option_deactivated), nil], + [l(:select_option_activated), '1']], + selected: @settings['dmsf_default_notifications']) %> + <%= l(:label_default) %>: <%= l(:select_option_deactivated) %>

@@ -116,11 +126,11 @@

<%= content_tag :label, l(:label_display_notified_recipients) %> <%= select_tag 'settings[dmsf_display_notified_recipients]', - options_for_select([ - [l(:select_option_deactivated), nil], - [l(:select_option_activated), '1']], - selected: @settings['dmsf_display_notified_recipients']) %> - + options_for_select([ + [l(:select_option_deactivated), nil], + [l(:select_option_activated), '1']], + selected: @settings['dmsf_display_notified_recipients']) %> + <%= l(:note_display_notified_recipients).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_deactivated) %>

@@ -128,7 +138,7 @@

<%= content_tag :label, l(:label_title_format) %> <%= text_field_tag 'settings[dmsf_global_title_format]', @settings['dmsf_global_title_format'], size: 10 %> - + <%= l(:text_title_format) %>

@@ -136,7 +146,7 @@

<%= content_tag :label, l(:label_act_as_attachable) %> <%= check_box_tag 'settings[dmsf_act_as_attachable]', true, @settings['dmsf_act_as_attachable'] %> - + <%= l(:note_dmsf_act_as_attachable) %>
<%= l(:label_default) %>: <%= l(:general_text_No) %> @@ -145,7 +155,7 @@

<%= content_tag :label, l(:label_dmsf_projects_as_subfolders) %> <%= check_box_tag 'settings[dmsf_projects_as_subfolders]', true, @settings['dmsf_projects_as_subfolders'] %> - + <%= l(:note_dmsf_projects_as_subfolders) %>
<%= l(:label_default) %>: <%= l(:general_text_No) %> @@ -154,7 +164,7 @@

<%= content_tag :label, l(:label_dmsf_global_menu_disabled) %> <%= check_box_tag 'settings[dmsf_global_menu_disabled]', true, @settings['dmsf_global_menu_disabled'] %> - + <%= l(:note_dmsf_global_menu_disabled) %>
<%= l(:label_default) %>: <%= l(:general_text_No) %> @@ -163,13 +173,13 @@

<%= content_tag :label, l(:label_empty_minor_version_by_default) %> <%= check_box_tag 'settings[empty_minor_version_by_default]', false, @settings['empty_minor_version_by_default'] %> - + <%= l(:label_default) %>: <%= l(:general_text_No) %>

- + <%= l(:label_dmsf_columns) %> @@ -180,18 +190,18 @@ <% options = [[l(:label_none), nil]] %> <% options.concat DmsfQuery.only_public.where(project_id: nil).pluck(:name, :id) %> <%= select_tag 'settings[dmsf_default_query]', - options_for_select(options, selected: @settings['dmsf_default_query']) %> + options_for_select(options, selected: @settings['dmsf_default_query']) %>

- + <%= l(:heading_send_documents_by_email) %>

<%= content_tag :label, l(:label_email_from_override) %> <%= text_field_tag 'settings[dmsf_documents_email_from]', @settings['dmsf_documents_email_from'], size: 128 %> - + <%= l(:label_default) %>: <%= l(:text_email_from_override) %>

@@ -199,7 +209,7 @@

<%= content_tag :label, l(:label_email_reply_to) %> <%= text_field_tag 'settings[dmsf_documents_email_reply_to]', @settings['dmsf_documents_email_reply_to'], size: 128 %> - + <%= l(:label_default) %>: <%= "''" %>

@@ -207,20 +217,20 @@

<%= content_tag :label, l(:label_links_only).capitalize %> <%= check_box_tag 'settings[dmsf_documents_email_links_only]', true, @settings['dmsf_documents_email_links_only'] %> - + <%= l(:label_default) %>: <%= l(:general_text_No) %>

- + <%= l(:field_label_dmsf_workflow) %>

<%= content_tag :label, l(:label_dmsf_keep_documents_locked) %> <%= check_box_tag 'settings[dmsf_keep_documents_locked]', false, @settings['dmsf_keep_documents_locked'] %> - + <%= l(:note_dmsf_keep_documents_locked) %>
<%= l(:label_default)%>: <%= l(:general_text_No)%> @@ -229,13 +239,13 @@

<%= content_tag(:label, l(:only_approval_zero_minor_version)) %> <%= check_box_tag 'settings[only_approval_zero_minor_version]', false, @settings['only_approval_zero_minor_version'], size: 50 %> - + <%= l(:only_approval_zero_minor_version) %>
<%= l(:label_default) %>: <%= l(:general_text_No)%>

- + <%= l(:label_webdav) %> @@ -243,20 +253,20 @@ <%= content_tag :label, l(:label_webdav) %> <% webdav_disabled = Redmine::Plugin.installed?(:easy_hosting_services) && EasyHostingServices::EasyMultiTenancy.activated? %> <%= select_tag 'settings[dmsf_webdav]', - options_for_select([ - [l(:select_option_deactivated), nil], - [l(:select_option_activated), '1']], - selected: webdav_disabled ? nil : @settings['dmsf_webdav']), - disabled: webdav_disabled, - onchange: "$('#dmsf_webdav_block').toggle()" %> - + options_for_select([ + [l(:select_option_deactivated), nil], + [l(:select_option_activated), '1']], + selected: webdav_disabled ? nil : @settings['dmsf_webdav']), + disabled: webdav_disabled, + onchange: "$('#dmsf_webdav_block').toggle()" %> + <% if webdav_disabled %> <% @settings['dmsf_webdav'] = nil %> <%= l(:note_webdav_disabled) %> <% else %> <%= l(:note_webdav, protocol: Setting.protocol, domain: Setting.host_name).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_activated) %> - <% end %> + <% end %>

@@ -266,13 +276,13 @@

<%= content_tag :label, l(:label_webdav_strategy) %> <%= select_tag'settings[dmsf_webdav_strategy]', - options_for_select([ - [l(:select_option_webdav_readonly), 'WEBDAV_READ_ONLY'], - [l(:select_option_webdav_readwrite), 'WEBDAV_READ_WRITE']], - selected: @settings['dmsf_webdav_strategy']), - onchange: "$('#dmsf_webdav_ro_block').toggle()" %> + options_for_select([ + [l(:select_option_webdav_readonly), 'WEBDAV_READ_ONLY'], + [l(:select_option_webdav_readwrite), 'WEBDAV_READ_WRITE']], + selected: @settings['dmsf_webdav_strategy']), + onchange: "$('#dmsf_webdav_ro_block').toggle()" %>
- + <%= l(:note_webdav_strategy).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_webdav_readonly) %>

@@ -283,21 +293,21 @@

<%= content_tag(:label, l(:label_webdav_ignore)) %> <%= text_field_tag 'settings[dmsf_webdav_ignore]', @settings['dmsf_webdav_ignore'], size: 50 %> - + <%= l(:note_webdav_ignore) %> <%= l(:label_default) %>: ^(\._|\.DS_Store$|Thumbs.db$)

<%= content_tag(:label, l(:dmsf_webdav_ignore_1b_file_for_authentication)) %> <%= check_box_tag 'settings[dmsf_webdav_ignore_1b_file_for_authentication]', true, @settings['dmsf_webdav_ignore_1b_file_for_authentication'], size: 50 %> - + <%= l(:dmsf_webdav_ignore_1b_file_for_authentication_info) %> <%= l(:label_default) %>: <%= l(:general_text_Yes)%>

<%= content_tag :label, l(:label_webdav_disable_versioning) %> <%= text_field_tag 'settings[dmsf_webdav_disable_versioning]', @settings['dmsf_webdav_disable_versioning'], size: 50 %> - + <%= l(:note_webdav_disable_versioning) %>
<%= l(:label_default) %>: ^\~\$|\.tmp$ @@ -306,8 +316,8 @@

<%= content_tag :label, l(:label_webdav_use_project_names) %> <%= check_box_tag 'settings[dmsf_webdav_use_project_names]', true, @settings['dmsf_webdav_use_project_names'] %> - - <%= l(:note_webdav_use_project_names) %>
+ + <%= l(:note_webdav_use_project_names) %>
<%= l(:label_default)%>: <%= l(:general_text_No)%>

@@ -324,7 +334,7 @@ <% xapian_disabled = true %> <% end %> - + <%= l(:label_full_text) %> @@ -335,18 +345,18 @@ <% if xapian_disabled %> <%= l(:warning_xapian_not_available) %> <% end %> - + <%= l(:label_default) %>: <%= File.expand_path('dmsf_index', Rails.root) %>

<% stem_langs = %w(danish dutch english finnish french german hungarian italian norwegian portuguese romanian russian spanish swedish turkish) %> -

+

<%= content_tag :label, l(:label_stemming_language) %> <%= select_tag 'settings[dmsf_stemming_lang]', options_for_select(stem_langs, @settings['dmsf_stemming_lang']), disabled: xapian_disabled %> - + <%= l(:note_possible_values) %>: <%= stem_langs.join(', ') %>. <%= "#{l(:label_default)}: #{stem_langs[2]}" %>

@@ -359,7 +369,7 @@ disabled: xapian_disabled %> <%= l(:option_stem_some) %>
<%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_ALL', @settings['dmsf_stemming_strategy'] == 'STEM_ALL', disabled: xapian_disabled %> <%= l(:option_stem_all) %>
- + <%= l(:text_stemming_info) %>

@@ -367,7 +377,7 @@

<%= content_tag :label, l(:label_enable_cjk_ngrams) %> <%= check_box_tag 'settings[enable_cjk_ngrams]', true, @settings['dmsf_enable_cjk_ngrams'], disabled: xapian_disabled %> - + <%= l(:text_enable_cjk_ngrams) %>

diff --git a/assets/stylesheets/easy_extensions.css b/assets/stylesheets/easy_extensions.css index b4f71297..d01b1dd6 100644 --- a/assets/stylesheets/easy_extensions.css +++ b/assets/stylesheets/easy_extensions.css @@ -176,3 +176,12 @@ div.autoscroll.dmsf-revision-access { width: auto; position: static; } + +/* Plugin's settings */ +.dmsf-info { + display: block; +} + +.dmsf-info-title { + font-weight: bold; +} \ No newline at end of file