Commit 9ff53db6 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'punktetool'

parents 6156a6ca b9553436
......@@ -753,6 +753,7 @@ EOF;
*/
public function buildRowSubrecord(array $formElement, $elementHtml) {
$formElement[FE_LABEL] = Support::wrapTag("<label class='control-label'>", $formElement[FE_LABEL], true);
$html = $this->wrapItem(WRAP_SETUP_ELEMENT, $this->wrapItem(WRAP_SETUP_SUBRECORD, $formElement[FE_LABEL]));
$html .= $this->wrapItem(WRAP_SETUP_ELEMENT, $this->wrapItem(WRAP_SETUP_SUBRECORD, $elementHtml));
$html .= $this->wrapItem(WRAP_SETUP_ELEMENT, $this->wrapItem(WRAP_SETUP_SUBRECORD, $formElement[FE_NOTE]));
......@@ -760,6 +761,7 @@ EOF;
$attribute = ($formElement[FE_MODE] == FE_MODE_HIDDEN) ? ' style="display: none;"' : '';
$attribute .= Support::doAttribute('id', $formElement[FE_HTML_ID]);
return Support::wrapTag("<span name='qfq-subrecord' $attribute>", $html);
}
......
......@@ -169,9 +169,11 @@ class Thumbnail {
$ext = strtolower(OnString::strrstr($pathFilenameSource, '.'));
// SVG files are best to thumbnail via 'inkscape'
if ($ext == 'svg' && $this->inkscape != '') {
// if ( ($ext == 'svg' || $ext == 'pdf') && $this->inkscape != '') {
if (($ext == 'svg') && $this->inkscape != '') {
$inkscapeDimension = Token::explodeDimension($dimension);
// Automatically cut white border: --export-area-drawing
// --export-text-to-path
$cmdInkscape = $this->inkscape . " --without-gui $inkscapeDimension --export-png $pathFilenameThumbnail $pathFilenameSource";
$outputInkscape = Support::qfqExec($cmdInkscape, $rc);
if ($rc == 0) {
......
......@@ -287,7 +287,7 @@ VALUES
(2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120, 0, 0,
'<a href="{{DOCUMENTATION_QFQ:Y}}#class-container">Info</a>', '', '',
'{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name, " (", COUNT(feSub.id), ")" ) FROM FormElement As fe LEFT JOIN FormElement As feSub ON feSub.feIdContainer=fe.id WHERE fe.formId={{formId:S0}} AND fe.class="container" GROUP BY fe.id ORDER BY fe.type, fe.ord, fe.name }}',
'{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name, " (", COUNT(feSub.id), ")" ) FROM FormElement As fe LEFT JOIN FormElement As feSub ON feSub.feIdContainer=fe.id WHERE fe.formId={{formId:SR0}} AND fe.class="container" GROUP BY fe.id ORDER BY fe.type, fe.ord, fe.name }}',
'emptyItemAtStart', 100, '', 'no', '', '', '',
'{{SELECT IF(COUNT(fe.id)>0, "show", "hidden") FROM Form AS f LEFT JOIN FormElement AS fe ON f.id=fe.formId AND fe.class="container" WHERE f.id={{formId:S0}} GROUP BY f.id}}',
'', 'specialchar'),
......
Supports Markdown
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