Skip to content
Snippets Groups Projects
Commit d951db97 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by Jan-Hendrik Willms
Browse files

correctly render clipboard widgets 

Closes #1102

Merge request studip/studip!654
parent 65865c7f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/classes/sidebar/ClipboardWidget.class.php
+ 20
− 51
View file @ d951db97
...@@ -65,7 +65,7 @@ class ClipboardWidget extends SidebarWidget ...@@ -65,7 +65,7 @@ class ClipboardWidget extends SidebarWidget
$this->allowed_item_classes = $allowed_item_classes; $this->allowed_item_classes = $allowed_item_classes;
$this->template = 'sidebar/clipboard-widget'; $this->template = 'sidebar/clipboard-widget';
$this->title = _('Merkzettel'); $this->title = _('Eigene Merkzettel');
$this->readonly = false; $this->readonly = false;
$this->apply_button_title = _('Hauptbereich aktualisieren'); $this->apply_button_title = _('Hauptbereich aktualisieren');
...@@ -78,6 +78,10 @@ class ClipboardWidget extends SidebarWidget ...@@ -78,6 +78,10 @@ class ClipboardWidget extends SidebarWidget
if (!is_array($this->current_selected_items)) { if (!is_array($this->current_selected_items)) {
$this->current_selected_items = []; $this->current_selected_items = [];
} }
$this->setId("ClipboardWidget_{$this->clipboard_widget_id}");
$this->setAdditionalAttribute('data-widget_id', $this->getId());
$this->addLayoutCSSClass('clipboard-widget');
} }
...@@ -158,62 +162,27 @@ class ClipboardWidget extends SidebarWidget ...@@ -158,62 +162,27 @@ class ClipboardWidget extends SidebarWidget
public function render($variables = []) public function render($variables = [])
{ {
$template = $GLOBALS['template_factory']->open(
$this->template
);
$layout = $GLOBALS['template_factory']->open(
'widgets/widget-layout'
);
$template->set_layout('widgets/widget-layout');
$clipboards = Clipboard::getClipboardsForUser( $clipboards = Clipboard::getClipboardsForUser(
$GLOBALS['user']->id $GLOBALS['user']->id
); );
if (!$this->current_clipboard_id) { if (!$this->current_clipboard_id && $clipboards) {
if ($clipboards) { $_SESSION['selected_clipboard_id'] = $clipboards[0]->id;
$_SESSION['selected_clipboard_id'] = $clipboards[0]->id; $_SESSION['selected_clipboard_items'] = [];
$_SESSION['selected_clipboard_items'] = []; $this->current_clipboard_id = $clipboards[0]->id;
$this->current_clipboard_id = $clipboards[0]->id;
}
} }
$template->set_attribute( return parent::render($variables + [
'selected_clipboard_id', 'clipboards' => $clipboards,
$this->current_clipboard_id 'allowed_item_classes' => $this->allowed_item_classes,
); 'clipboard_widget_id' => $this->clipboard_widget_id,
$template->set_attribute( 'draggable_items' => $this->draggable_items,
'selected_clipboard_items', 'readonly' => $this->readonly,
$this->current_selected_items 'apply_button_title' => $this->apply_button_title,
); 'elements' => $this->elements,
$template->set_attribute('clipboards', $clipboards); 'selected_clipboard_id' => $this->current_clipboard_id,
$template->set_attribute( 'selected_clipboard_items' => $this->current_selected_items,
'allowed_item_classes', ]);
$this->allowed_item_classes
);
$template->set_attribute(
'clipboard_widget_id',
$this->clipboard_widget_id
);
$template->set_attribute(
'draggable_items',
$this->draggable_items
);
$template->set_attribute(
'readonly',
$this->readonly
);
$template->set_attribute(
'apply_button_title',
$this->apply_button_title
);
$template->set_attribute(
'elements',
$this->elements
);
return $template->render();
} }
/** /**
......
lib/classes/sidebar/RoomClipboardWidget.class.php
+ 3
− 2
View file @ d951db97
...@@ -18,6 +18,9 @@ class RoomClipboardWidget extends ClipboardWidget ...@@ -18,6 +18,9 @@ class RoomClipboardWidget extends ClipboardWidget
parent::__construct(['Room']); parent::__construct(['Room']);
$this->setTitle(_('Individuelle Raumgruppen'));
$this->template = 'sidebar/room-clipboard-widget';
$current_user = User::findCurrent(); $current_user = User::findCurrent();
$this->addLink( $this->addLink(
...@@ -49,7 +52,5 @@ class RoomClipboardWidget extends ClipboardWidget ...@@ -49,7 +52,5 @@ class RoomClipboardWidget extends ClipboardWidget
'data-show_in_dialog' => '1'] 'data-show_in_dialog' => '1']
); );
} }
$this->template = 'sidebar/room-clipboard-widget';
} }
} }
lib/classes/sidebar/SidebarWidget.php
+ 29
− 2
View file @ d951db97
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
*/ */
class SidebarWidget extends Widget class SidebarWidget extends Widget
{ {
protected $additional_attributes = [];
public function __construct() public function __construct()
{ {
$this->layout = 'sidebar/widget-layout.php'; $this->layout = 'sidebar/widget-layout.php';
...@@ -46,7 +49,7 @@ class SidebarWidget extends Widget ...@@ -46,7 +49,7 @@ class SidebarWidget extends Widget
{ {
$this->extra = $extra; $this->extra = $extra;
} }
public function getExtra() public function getExtra()
{ {
return $this->extra; return $this->extra;
...@@ -57,6 +60,24 @@ class SidebarWidget extends Widget ...@@ -57,6 +60,24 @@ class SidebarWidget extends Widget
$this->extra = false; $this->extra = false;
} }
public function setAdditionalAttribute(string $key, $value)
{
$this->additional_attributes[$key] = $value;
}
public function setAdditionalAttributes(array $attributes)
{
foreach ($attributes as $key => $value) {
$this->setAdditionalAttribute($key, $value);
}
}
public function removeAdditionalAttribute(string $key)
{
unset($this->additional_attributes[$key]);
}
/** /**
* Renders the widget. * Renders the widget.
* The widget will only be rendered if it contains at least one element. * The widget will only be rendered if it contains at least one element.
...@@ -65,6 +86,12 @@ class SidebarWidget extends Widget ...@@ -65,6 +86,12 @@ class SidebarWidget extends Widget
*/ */
public function render($variables = []) public function render($variables = [])
{ {
$attributes = $this->additional_attributes;
if (!empty($this->id)) {
$attributes['id'] = $this->id;
}
$variables['additional_attributes'] = $attributes;
return parent::render($variables); return parent::render($variables);
} }
} }
\ No newline at end of file
templates/sidebar/clipboard-widget.php
+ 44
− 53
View file @ d951db97
<section class="sidebar-widget clipboard-widget" <?= $this->render_partial(
id="ClipboardWidget_<?= htmlReady($clipboard_widget_id) ?>" 'sidebar/clipboard-area.php',
data-widget_id="<?= htmlReady($clipboard_widget_id) ?>"> [
<header class="sidebar-widget-header"> 'clipboards' => $clipboards,
<?= _('Eigene Merkzettel') ?> 'empty_clipboard_string' => _('Ziehen Sie Elemente in diesen Bereich um den Merkzettel zu füllen.'),
</header> 'selected_clipboard_id' => ($clipboards[0] instanceof Clipboard
<section class="sidebar-widget-content"> ? $clipboards[0]->id
<?= $this->render_partial( : ''),
'sidebar/clipboard-area.php', 'draggable_items' => $draggable_items,
[ 'clipboard_widget_id' => $clipboard_widget_id
'clipboards' => $clipboards, ]
'empty_clipboard_string' => _('Ziehen Sie Elemente in diesen Bereich um den Merkzettel zu füllen.'), ) ?>
'selected_clipboard_id' => ($clipboards[0] instanceof Clipboard
? $clipboards[0]->id
: ''),
'draggable_items' => $draggable_items,
'clipboard_widget_id' => $clipboard_widget_id
]
) ?>
<ul class="widget-list widget-links invisible"> <ul class="widget-list widget-links invisible">
<? foreach ($elements as $index => $element): ?> <? foreach ($elements as $index => $element): ?>
<li id="<?= htmlReady('link-' . md5($element->url)) ?>" <?= $element->icon ? 'style="' . $element->icon->asCSS() .'"' : '' ?>> <li id="<?= htmlReady('link-' . md5($element->url)) ?>" <?= $element->icon ? 'style="' . $element->icon->asCSS() .'"' : '' ?>>
<?= $element->render() ?> <?= $element->render() ?>
</li> </li>
<? endforeach; ?> <? endforeach; ?>
</ul> </ul>
<? if (!$readonly): ?> <? if (!$readonly): ?>
<form class="default new-clipboard-form" <form class="default new-clipboard-form"
action="<?= URLHelper::getLink( action="<?= URLHelper::getLink(
'dispatch.php/clipboard/add' 'dispatch.php/clipboard/add'
)?>" )?>"
method="post"> method="post">
<?= CSRFProtection::tokenTag() ?> <?= CSRFProtection::tokenTag() ?>
<input type="hidden" name="allowed_item_class" <input type="hidden" name="allowed_item_class"
value="<?= htmlReady($allowed_item_class) ?>"> value="<?= htmlReady($allowed_item_class) ?>">
<input type="hidden" name="widget_id" <input type="hidden" name="widget_id"
value="<?= htmlReady($clipboard_widget_id) ?>"> value="<?= htmlReady($clipboard_widget_id) ?>">
<label> <label>
<?= _('Merkzettel hinzufügen') ?> <?= _('Merkzettel hinzufügen') ?>
<?= tooltipIcon(_('Geben Sie bitte einen Namen ein und klicken Sie auf das Plus-Symbol um einen neuen Merkzettel zu erstellen.')) ?> <?= tooltipIcon(_('Geben Sie bitte einen Namen ein und klicken Sie auf das Plus-Symbol um einen neuen Merkzettel zu erstellen.')) ?>
<input type="text" name="name" placeholder="<?= _('Name des neuen Merkzettels') ?>" <input type="text" name="name" placeholder="<?= _('Name des neuen Merkzettels') ?>"
</label> </label>
<?= Icon::create('add', 'clickable', <?= Icon::create('add', 'clickable',
[ 'title' => _('Hinzufügen')])->asInput([ [ 'title' => _('Hinzufügen')])->asInput([
'name' => 'save', 'name' => 'save',
'id' => 'add-clipboard-button', 'id' => 'add-clipboard-button',
'class' => 'middle', 'class' => 'middle',
'disabled' => 'disabled' 'disabled' => 'disabled'
]) ?> ]) ?>
</form> </form>
<? endif ?> <? endif ?>
</section>
</section>
templates/sidebar/room-clipboard-widget.php
+ 49
− 60
View file @ d951db97
<section class="sidebar-widget clipboard-widget" <div id="clipboard-group-container" class="<?= $clipboards ? '' : 'invisible' ?>">
id="ClipboardWidget_<?= htmlReady($clipboard_widget_id) ?>" <?= $this->render_partial(
data-widget_id="<?= htmlReady($clipboard_widget_id) ?>"> 'sidebar/clipboard-area.php',
<header class="sidebar-widget-header"> [
<?= _('Individuelle Raumgruppen') ?> 'clipboards' => $clipboards,
</header> 'allowed_item_class' => $allowed_item_class,
<section class="sidebar-widget-content"> 'empty_clipboard_string' => _('Ziehen Sie Räume in diesen Bereich um die Raumgruppe zu füllen.'),
<div id="clipboard-group-container" class="<?= $clipboards ? '' : 'invisible' ?>"> 'selected_clipboard_id' => $selected_clipboard_id,
<?= $this->render_partial( 'draggable_items' => $draggable_items,
'sidebar/clipboard-area.php', 'special_item_template' => 'sidebar/room-clipboard-item',
[ 'clipboard_widget_id' => $clipboard_widget_id
'clipboards' => $clipboards, ]
'allowed_item_class' => $allowed_item_class, ); ?>
'empty_clipboard_string' => _('Ziehen Sie Räume in diesen Bereich um die Raumgruppe zu füllen.'),
'selected_clipboard_id' => $selected_clipboard_id,
'draggable_items' => $draggable_items,
'special_item_template' => 'sidebar/room-clipboard-item',
'clipboard_widget_id' => $clipboard_widget_id
]
); ?>
<? if (!$readonly): ?> <? if (!$readonly): ?>
<ul class="widget-list widget-links invisible"> <ul class="widget-list widget-links invisible">
<? foreach ($elements as $index => $element): ?> <? foreach ($elements as $index => $element): ?>
<li id="<?= htmlReady('link-' . md5($element->url)) ?>" <?= $element->icon ? 'style="' . $element->icon->asCSS() .'"' : '' ?>> <li id="<?= htmlReady('link-' . md5($element->url)) ?>" <?= $element->icon ? 'style="' . $element->icon->asCSS() .'"' : '' ?>>
<a <?= arrayToHtmlAttributes($element->attributes) ?> <a <?= arrayToHtmlAttributes($element->attributes) ?>
data-url_path = "<?= htmlReady($element->url) ?>"> data-url_path = "<?= htmlReady($element->url) ?>">
<?= htmlReady($element->label) ?> <?= htmlReady($element->label) ?>
</a> </a>
</li> </li>
<? endforeach; ?> <? endforeach; ?>
</ul> </ul>
<form class="default new-clipboard-form"
action="<?= URLHelper::getLink(
'dispatch.php/clipboard/add'
)?>"
method="post">
<?= CSRFProtection::tokenTag() ?>
<input type="hidden" name="allowed_item_class"
value="<?= htmlReady($allowed_item_class) ?>">
<input type="hidden" name="widget_id"
value="<?= htmlReady($clipboard_widget_id) ?>">
<label>
<?= _('Raumgruppe hinzufügen') ?>
<?= tooltipIcon(_('Geben Sie bitte einen Namen ein und klicken Sie auf das Plus-Symbol um eine neue Raumgruppe zu erstellen.')) ?>
<input type="text" name="name" placeholder="<?= _('Name der neuen Raumgruppe') ?>">
</div> <?= Icon::create('add', 'clickable',
[ 'title' => _('Hinzufügen')])->asInput([
'name' => 'save',
'id' => 'add-clipboard-button',
'class' => 'middle',
'disabled' => 'disabled'
]) ?>
</label>
<form class="default new-clipboard-form" </form>
action="<?= URLHelper::getLink( <? endif ?>
'dispatch.php/clipboard/add' </div>
)?>"
method="post">
<?= CSRFProtection::tokenTag() ?>
<input type="hidden" name="allowed_item_class"
value="<?= htmlReady($allowed_item_class) ?>">
<input type="hidden" name="widget_id"
value="<?= htmlReady($clipboard_widget_id) ?>">
<label>
<?= _('Raumgruppe hinzufügen') ?>
<?= tooltipIcon(_('Geben Sie bitte einen Namen ein und klicken Sie auf das Plus-Symbol um eine neue Raumgruppe zu erstellen.')) ?>
<input type="text" name="name" placeholder="<?= _('Name der neuen Raumgruppe') ?>">
<?= Icon::create('add', 'clickable',
[ 'title' => _('Hinzufügen')])->asInput([
'name' => 'save',
'id' => 'add-clipboard-button',
'class' => 'middle',
'disabled' => 'disabled'
]) ?>
</label>
</form>
<? endif ?>
</section>
</section>
templates/sidebar/widget-layout.php
+ 2
− 3
View file @ d951db97
<div class="<?= $base_class ?>-widget <? if ($layout_css_classes && is_array($layout_css_classes)) echo htmlReady(implode(' ', $layout_css_classes)); ?>" <div class="<?= $base_class ?>-widget <?= is_array($layout_css_classes) ? htmlReady(implode(' ', $layout_css_classes)) : '' ?>"
<? if ($id) printf('id="%s"', htmlReady($id)) ?> <?= arrayToHtmlAttributes($additional_attributes) ?>>
<? if ($style) printf('style="%s"', $style) ?>>
<? if ($title): ?> <? if ($title): ?>
<div class="<?= $base_class ?>-widget-header"> <div class="<?= $base_class ?>-widget-header">
<? if ($extra): ?> <? if ($extra): ?>
......
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