Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker

This commit is contained in:
Andreas Österreicher
2020-03-10 16:59:15 +01:00
1041 changed files with 16845 additions and 22774 deletions
+5 -5
View File
@@ -11,7 +11,7 @@
$align = "valign-top";
}
?>
<div class="div-cell width-150px <?php echo $align; ?>">
<div class="div-cell <?php echo $align; ?>">
<label
for="<?php echo ${HTMLWidget::HTML_ARG_NAME}[HTMLWidget::HTML_ID]; ?>"
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::REQUIRED); ?>
@@ -22,7 +22,7 @@
<?php
}
?>
<div class="div-cell width-150px">
<div class="div-cell">
<select
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_ID); ?>
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_NAME); ?>
@@ -37,11 +37,11 @@
<?php
$elements = ${DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME};
$selectedElements = ${DropdownWidget::SELECTED_ELEMENT};
foreach($elements as $element)
{
$selected = '';
if (is_array($selectedElements))
{
foreach($selectedElements as $selectedElement)
@@ -71,4 +71,4 @@
</div>
</div>
<?php HTMLWidget::printEndBlock(${HTMLWidget::HTML_ARG_NAME}); ?>
<?php HTMLWidget::printEndBlock(${HTMLWidget::HTML_ARG_NAME}); ?>