Skip to content
Snippets Groups Projects
Commit 4baa1f28 authored by Carsten  Rose's avatar Carsten Rose
Browse files

BuildFormBootstrap.php: wrapping of optional 'submitButtonText' now done with...

BuildFormBootstrap.php: wrapping of optional 'submitButtonText' now done with the configured form wrap setup
qfq-bs.css.less: dislay characterCount inside of input/textarea element.
parent 20c72c8e
No related branches found
No related tags found
No related merge requests found
...@@ -2715,7 +2715,8 @@ abstract class AbstractBuildForm { ...@@ -2715,7 +2715,8 @@ abstract class AbstractBuildForm {
* @return mixed * @return mixed
*/ */
public function buildNote(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) { public function buildNote(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) {
return Support::wrapTag("<div class='qfq-note'>", $value); //
return Support::wrapTag("<div class='" . CLASS_NOTE . "'>", $value);
} }
/** /**
......
...@@ -329,6 +329,11 @@ class BuildFormBootstrap extends AbstractBuildForm { ...@@ -329,6 +329,11 @@ class BuildFormBootstrap extends AbstractBuildForm {
// Button Save at bottom of form - only if there is a button text given. // Button Save at bottom of form - only if there is a button text given.
if ($this->formSpec[F_SUBMIT_BUTTON_TEXT] !== '') { if ($this->formSpec[F_SUBMIT_BUTTON_TEXT] !== '') {
// Default setzen:
$this->fillWrapLabelInputNote($this->formSpec[F_BS_LABEL_COLUMNS], $this->formSpec[F_BS_INPUT_COLUMNS], $this->formSpec[F_BS_NOTE_COLUMNS]);
$buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT]; $buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT];
$htmlElement = $this->buildButtonCode('save-button', $buttonText, '', '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS]); $htmlElement = $this->buildButtonCode('save-button', $buttonText, '', '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS]);
...@@ -429,7 +434,6 @@ EOF; ...@@ -429,7 +434,6 @@ EOF;
[$this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_INPUT); [$this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_INPUT);
// Note // Note
// $note = Support::wrapTag("<div class='qfq-note'>", $formElement[FE_NOTE], true);
$note = $formElement[FE_NOTE]; $note = $formElement[FE_NOTE];
$html .= $this->customWrap($formElement, $note, FE_WRAP_NOTE, $formElement[FE_BS_NOTE_COLUMNS], $html .= $this->customWrap($formElement, $note, FE_WRAP_NOTE, $formElement[FE_BS_NOTE_COLUMNS],
[$this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_NOTE); [$this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_NOTE);
......
...@@ -460,6 +460,9 @@ const DATA_REQUIRED = 'data-required'; ...@@ -460,6 +460,9 @@ const DATA_REQUIRED = 'data-required';
const CLASS_TYPEAHEAD = 'qfq-typeahead'; const CLASS_TYPEAHEAD = 'qfq-typeahead';
const DATA_TYPEAHEAD_SIP = 'data-typeahead-sip'; // Used for typeAhead const DATA_TYPEAHEAD_SIP = 'data-typeahead-sip'; // Used for typeAhead
const CLASS_NOTE = 'qfq-note';
//const CLASS_TYPEAHEAD = 'qfq-type-ahead'; //const CLASS_TYPEAHEAD = 'qfq-type-ahead';
//const DATA_TYPEAHEAD_SIP = 'data-sip'; // Used for typeAhead //const DATA_TYPEAHEAD_SIP = 'data-sip'; // Used for typeAhead
......
...@@ -136,9 +136,12 @@ i.@{spinner_class} { ...@@ -136,9 +136,12 @@ i.@{spinner_class} {
.qfq-cc-style { .qfq-cc-style {
font-size: 0.8em; font-size: 0.8em;
text-color: #ededed; color: #777;
padding-left: 14px; position: relative;
padding-top: 2px; top: -24px;
right: 10px;
text-align: right;
display: block;
} }
// TypeAhead Suggestions // TypeAhead Suggestions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment