Moved Print style directly into layout avoiding user condition, CSS fix, removed unused file

This commit is contained in:
Hugo 2021-12-29 20:30:10 +01:00
parent 90f23e3629
commit 99de29a7a8
3 changed files with 24 additions and 32 deletions

View File

@ -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;
}
}

View File

@ -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 : 'Это поле обязательно для перехода к следующему шагу'

View File

@ -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 = "<script>\n"
content << " var _TXT_CONFLICT_TITLE = \"" + l(:ide_txt_notice_conflict_title) + "\";\n"
content << " var _TXT_CONFLICT_TXT = \"" + l(:ide_txt_notice_conflict_text) + "\";\n"
content << "</script>\n"
return content.html_safe
end
content = "<script>\n"
content << " var _TXT_CONFLICT_TITLE = \"" + l(:ide_txt_notice_conflict_title) + "\";\n"
content << " var _TXT_CONFLICT_TXT = \"" + l(:ide_txt_notice_conflict_text) + "\";\n"
content << "</script>\n"
content << "<style>/* PRINT MEDIAQUERY */\n"
content << "@media print {\n"
content << "body.controller-issues.action-show div.issue.details .subject .refreshData,\n"
content << "body.controller-issues.action-show div.issue.details .iconEdit,\n"
content << "body.controller-issues.action-show .dynamicEditField {\n"
content << "display : none !important;\n"
content << "height: 0;\n"
content << "width: 0;\n"
content << "overflow: hidden;\n"
content << "padding : 0;\n"
content << "margin: 0;\n"
content << "}\n"
content << "}</style>\n"
return content.html_safe
end
end