Merge branch 'master' into master

This commit is contained in:
Hugo Zilliox 2019-10-20 12:10:26 +02:00 committed by GitHub
commit bb0cedaf7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 37 deletions

View File

@ -35,7 +35,7 @@ body.controller-issues.action-show .dynamicEdit {
display: inline-block; display: inline-block;
position:absolute; position:absolute;
opacity: 0; opacity: 0;
left:0; /* left:0; correct position on top of icon */
bottom: 100%; bottom: 100%;
margin-bottom: 5px; margin-bottom: 5px;
box-sizing: border-box; box-sizing: border-box;

9
config/locales/de.yml Normal file
View File

@ -0,0 +1,9 @@
# Translation by Peter Pfläging <peter@pflaeging.net>
de:
ide_txt_validation_btn : 'Änderung bestätitgen'
ide_txt_error_positive_number : 'Hier muss eine positive Zahl stehen'
ide_txt_error_start_date : 'Das Startdatum muss vor dem Enddatum liegen'
ide_txt_error_due_date : 'Das Enddatum muss nach dem Startdatum liegen'
ide_txt_error_ajax_call : 'Error (Javascript Konsole kontrollieren)'
ide_txt_cancel_btn : 'Änderungen ignorieren'
ide_txt_required_field : 'Pflichtfeld bitte ausfüllen'

View File

@ -166,8 +166,10 @@ class DetailsIssueHooks < Redmine::Hook::ViewListener
end end
# Title # Title
# Make quotings in subject! (PP)
clonesubject = issue.subject.gsub('"','&quot;')
o << "<span class='dynamicEdit' id='TitleInput'>" o << "<span class='dynamicEdit' id='TitleInput'>"
o << " <input size=\"50\" value=\"#{issue.subject}\" type=\"text\">" o << " <input size=\"50\" value=\"#{clonesubject}\" type=\"text\">"
o << " <a href='#' class='btn btn-primary validate' aria-label='" + l(:ide_txt_validation_btn) + "'><i class='fa fa-check fa-fw' aria-hidden='true'></i></a>" o << " <a href='#' class='btn btn-primary validate' aria-label='" + l(:ide_txt_validation_btn) + "'><i class='fa fa-check fa-fw' aria-hidden='true'></i></a>"
o << " <a href='#' class='btn btn-primary close' aria-label='" + l(:ide_txt_cancel_btn) + "'><i class='fa fa-times fa-fw' aria-hidden='true'></i></a>" o << " <a href='#' class='btn btn-primary close' aria-label='" + l(:ide_txt_cancel_btn) + "'><i class='fa fa-times fa-fw' aria-hidden='true'></i></a>"
o << "</span>" o << "</span>"
@ -205,6 +207,7 @@ class DetailsIssueHooks < Redmine::Hook::ViewListener
o << "</div>" o << "</div>"
return o return o
end end
end end
end end