blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-23 06:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

4th release

Browse Source
This commit is contained in:
Paolo
2017-04-28 17:17:31 +02:00
parent 0fd34807ca
commit a6a6592db0
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/WidgetLib.php
+2 -2
View File
@@ -799,7 +799,7 @@ class DropdownWidget extends WidgetTpl
$this->setElementsArray(
success($tmpElements),
true,
'Select a value...',
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER],
'No data found for this UDF'
);
@@ -932,7 +932,7 @@ abstract class UDFWidgetTpl extends Widget
const FIELD_ARG_NAME = 'field';
const TITLE = 'title';
const DESCRIPTION = 'description';
const LABEL = 'description';
const PLACEHOLDER = 'placeholder';
const DEFAULT_VALUE = 'defaultValue';
const REGEX = 'regex';
application/views/system/testudf.php
+1 -5
View File
@@ -1,10 +1,6 @@
<?php $this->load->view("templates/header", array("title" => "UDF")); ?>
<body>
<div>
UDFWidget:
</div>
<div>
<?php
@@ -19,7 +15,7 @@
);
?>
</div>
</body>
<?php $this->load->view("templates/footer"); ?>
application/views/widgets/dropdown.php
+2 -2
View File
@@ -1,9 +1,9 @@
<?php
if (isset(${Widget::HTML_ARG_NAME}[UDFWidgetTpl::DESCRIPTION]))
if (isset(${Widget::HTML_ARG_NAME}[UDFWidgetTpl::LABEL]))
{
?>
<label for="<?php echo ${Widget::HTML_ARG_NAME}[Widget::HTML_ID]; ?>">
<?php Widget::printAttribute(${Widget::HTML_ARG_NAME}, UDFWidgetTpl::DESCRIPTION); ?>
<?php echo ${Widget::HTML_ARG_NAME}[UDFWidgetTpl::LABEL]; ?>
</label>
<?php
}
application/widgets/UDFWidget.php
+27 -3
View File
@@ -83,17 +83,41 @@ class UDFWidget extends UDFWidgetTpl
if (isset($jsonSchema->title))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->title);
$tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->title, null, null, 'no');
if (hasData($tmpResult))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::LABEL] = $tmpResult->retval[0]->text;
}
else
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::LABEL] = null;
}
}
if (isset($jsonSchema->description))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::DESCRIPTION] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->description);
$tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->description, null, null, 'no');
if (hasData($tmpResult))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = $tmpResult->retval[0]->text;
}
else
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = null;
}
}
if (isset($jsonSchema->placeholder))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->placeholder);
$tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->placeholder, null, null, 'no');
if (hasData($tmpResult))
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = $tmpResult->retval[0]->text;
}
else
{
$this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = null;
}
}
}