From 99de29a7a8f2eae406f776e7f5844bf58cd8eab2 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 29 Dec 2021 20:30:10 +0100 Subject: [PATCH] Moved Print style directly into layout avoiding user condition, CSS fix, removed unused file --- assets/stylesheets/issue_dynamic_edit.css | 23 ++++++--------------- config/locales/ru.yml | 8 -------- lib/details_issue_hooks.rb | 25 ++++++++++++++++------- 3 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 config/locales/ru.yml diff --git a/assets/stylesheets/issue_dynamic_edit.css b/assets/stylesheets/issue_dynamic_edit.css index efa1b6f..4cdaed3 100644 --- a/assets/stylesheets/issue_dynamic_edit.css +++ b/assets/stylesheets/issue_dynamic_edit.css @@ -99,9 +99,7 @@ body.controller-issues.action-show .dynamicEditField button.action.valid { body.controller-issues.action-show .dynamicEditField select { - border:none; - display:none; - background-image:none; + background-image:none; background-color:transparent; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -112,6 +110,11 @@ body.controller-issues.action-show .dynamicEditField select { border-radius: 3px; } +body.controller-issues.action-show .dynamicEditField select[multiple="multiple"] { + display: block; + width: 100%; +} + body.controller-issues.action-show .dynamicEditField select option[disabled="disabled"] { display:none; } @@ -171,18 +174,4 @@ body.controller-issues.action-show .dynamicEditField .check_box_group { height: auto; padding: 10px; } -} - -/* PRINT MEDIAQUERY */ -@media print { - body.controller-issues.action-show div.issue.details .subject .refreshData, - body.controller-issues.action-show div.issue.details .iconEdit, - body.controller-issues.action-show .dynamicEditField { - display : none !important; - height: 0; - width: 0; - overflow: hidden; - padding : 0; - margin: 0; - } } \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml deleted file mode 100644 index c1f6f41..0000000 --- a/config/locales/ru.yml +++ /dev/null @@ -1,8 +0,0 @@ -ru: - ide_txt_validation_btn : 'Подтвердите изменение' - ide_txt_error_positive_number : 'Должно быть положительным числом' - ide_txt_error_start_date : 'Дата начала должна быть раньше срока' - ide_txt_error_due_date : 'Дата должна быть после даты начала' - ide_txt_error_ajax_call : 'Ошибка (проверьте Вашу JS консоль)' - ide_txt_cancel_btn : 'Отменить изменения' - ide_txt_required_field : 'Это поле обязательно для перехода к следующему шагу' diff --git a/lib/details_issue_hooks.rb b/lib/details_issue_hooks.rb index f416ed5..fd2a090 100644 --- a/lib/details_issue_hooks.rb +++ b/lib/details_issue_hooks.rb @@ -25,13 +25,24 @@ class DetailsIssueHooks < Redmine::Hook::ViewListener end def view_issues_show_details_bottom(context) - if User.current.allowed_to?(:edit_issues, context[:project]) - content = "\n" - return content.html_safe - end + content = "\n" + content << "\n" + return content.html_safe end end