Commit 056830cd authored by Elias Villiger's avatar Elias Villiger
Browse files

Merge branch 'master' into 4542-input-type-decimal

parents 7315791a 06e1392b
......@@ -47,8 +47,8 @@ Neue Versionsnummer
6) **New Tag**:
git tag v0.25.11
git push -u origin v0.25.11
git tag v0.25.11a
git push -u origin v0.25.11a
7) PhpStorm: **Sync** all files to VM qfq.
......
......@@ -5927,8 +5927,13 @@ QFQ CSS Classes
---------------
* `qfq-table-50`, `qfq-table-80`, `qfq-table-100` - set min-width and column width to 'auto'
* Background Color: `qfq-color-grey-1`, `qfq-color-grey-2` (table, row, cell)
* `qfq-100`: Makes an element 'width: 100%'.
* `qfq-left`: Text align left.
Bootstrap
'''''''''
* Table: `table`
* Table > hover: `table-hover`
* Table > condensed: `table-condensed`
......@@ -5938,9 +5943,9 @@ E.g.::
10.sql = SELECT id, name, firstName, ...
10.head = <table class='table table-condensed qfq-table-50'>
* `qfq-full-width-left` - makes e.g. a button full width and aligns the text left. ::
* `qfq-100`, `qfq-left` - makes e.g. a button full width and aligns the text left. ::
10.sql = SELECT "p:home&r=0|t:Home|c:qfq-full-width-left" AS _pagev
10.sql = SELECT "p:home&r=0|t:Home|c:qfq-100 qfq-left" AS _pagev
Examples
--------
......
......@@ -3,7 +3,7 @@
project = QFQ - Quick Form Query
version = 0.25
release = 0.25.11
release = 0.25.11a
t3author = Carsten Rose
copyright = since 2017 by the author
......
......@@ -59,7 +59,7 @@ copyright = u'2017, Carsten Rose'
# The short X.Y version.
version = '0.25'
# The full version, including alpha/beta/rc tags.
release = '0.25.11'
release = '0.25.11a'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -10,6 +10,6 @@ $EM_CONF[$_EXTKEY] = array(
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'alpha',
'version' => '0.25.11'
'version' => '0.25.11a'
);
......@@ -2864,6 +2864,10 @@ abstract class AbstractBuildForm {
$link = new Link($this->sip);
$value = $link->renderLink('s|M:file|d|F:' . $value . '|' . $formElement[FE_FILE_DOWNLOAD_BUTTON]);
} else {
// In case debugging is off: showing download button means 'never show the real pathfilename'
if (!$this->showDebugInfoFlag) {
$value = '';
}
$value .= " - file not found, please check field 'value'";
}
}
......
......@@ -99,7 +99,7 @@ $UPDATE_ARRAY = array(
],
'0.25.11' => [
"UPDATE FormElement SET parameter = CONCAT(parameter, '\nmin = ', SUBSTRING_INDEX(checkPattern, '|', 1), '\nmax = ', SUBSTRING_INDEX(checkPattern, '|', -1)) WHERE checkType LIKE 'min|max%' AND checkPattern <> ''",
"UPDATE FormElement SET checkType = 'alnumx', checkPattern = '', parameter = CONCAT(parameter, '\nmin = ', SUBSTRING_INDEX(checkPattern, '|', 1), '\nmax = ', SUBSTRING_INDEX(checkPattern, '|', -1)) WHERE checkType LIKE 'min|max%' AND checkPattern <> ''",
"ALTER TABLE `FormElement` CHANGE `checkType` `checkType` ENUM('alnumx','digit','numerical','email','pattern','allbut','all') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'alnumx';",
],
......
......@@ -112,7 +112,7 @@ class AbstractException extends \Exception {
}
}
$debug = "<table border=1>" . $debug . "</table>";
$debug = '<table border=1 class="qfq-table-100">' . $debug . "</table>";
}
$html = "<h2>Error</h2>" . Support::wrapTag('<p>', $html . $htmlForm);
......
......@@ -343,8 +343,12 @@ i.@{spinner_class} {
pointer-events: none;
}
// Buttons width full width and text left aligned
.qfq-full-width-left {
// Buttons: full width
.qfq-100 {
width: 100%;
}
// Buttons: text left aligned
.qfq-left {
text-align: left;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment