Skip to content
Snippets Groups Projects
Commit cc54019c authored by David Siegfried's avatar David Siegfried
Browse files

fix icons und html-structure, closes #1036 

Closes #1036

Merge request studip/studip!608
parent 3ccc5474
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/views/course/statusgroups/_group.php
+ 93
− 95
View file @ cc54019c
...@@ -26,124 +26,122 @@ ...@@ -26,124 +26,122 @@
</a> </a>
<?php endif ?> <?php endif ?>
</h1> </h1>
<nav> <?php if ($is_autor && !$is_tutor && $group->id != 'nogroup' && $group->isMember($GLOBALS['user']->id)) : ?>
<?php if ($is_autor && !$is_tutor && $group->id != 'nogroup' && $group->isMember($GLOBALS['user']->id)) : ?> <a href="<?= $controller->link_for('messages/write', [
<a href="<?= $controller->link_for('messages/write', [ 'group_id' => $group->id,
'group_id' => $group->id, 'default_subject' => htmlReady($course_title . ' (' . $group->name . ')'),
'default_subject' => htmlReady($course_title . ' (' . $group->name . ')'), ]) ?>" data-dialog="size=auto">
]) ?>" data-dialog="size=auto"> <?= Icon::create('mail', Icon::ROLE_CLICKABLE, ['title' => sprintf(
<?= Icon::create('mail', 'clickable', ['title' => sprintf( _('Nachricht an alle Mitglieder der Gruppe %s schicken'),
_('Nachricht an alle Mitglieder der Gruppe %s schicken'), $group->name
$group->name ),
), ]) ?>
]) ?> </a>
</a> <?php endif ?>
<?php endif ?> <?php if (!$GLOBALS['perm']->have_perm('admin')) : ?>
<?php if (!$GLOBALS['perm']->have_perm('admin')) : ?> <nav>
<?php if ($group->id != 'nogroup' && $joinable) : ?> <?php if ($group->id != 'nogroup' && $joinable) : ?>
<a href="<?= $controller->url_for('course/statusgroups/join', $group->id) ?>"> <a href="<?= $controller->url_for('course/statusgroups/join', $group->id) ?>">
<?= Icon::create('door-enter', 'clickable', <?= Icon::create('door-enter', Icon::ROLE_CLICKABLE,
['title' => sprintf(_('Mitglied von Gruppe %s werden'), ['title' => sprintf(_('Mitglied von Gruppe %s werden'),
htmlReady($group->name))]) ?></a> htmlReady($group->name))]) ?></a>
<?php elseif ($group->id != 'nogroup' && $group->selfassign && <?php elseif ($group->id != 'nogroup' && $group->selfassign &&
$group->selfassign_start > time()) : ?> $group->selfassign_start > time()) : ?>
<?= Icon::create('door-enter', 'inactive', <?= Icon::create('door-enter', Icon::ROLE_INACTIVE,
['title' => sprintf(_('Der Eintrag in diese Gruppe ist möglich ab %s.'), ['title' => sprintf(_('Der Eintrag in diese Gruppe ist möglich ab %s.'),
date('d.m.Y H:i', $group->selfassign_start))]) ?> date('d.m.Y H:i', $group->selfassign_start))]) ?>
<?php elseif ($group->id != 'nogroup' && $group->selfassign && <?php elseif ($group->id != 'nogroup' && $group->selfassign &&
$group->selfassign_end && $group->selfassign_end < time()) : ?> $group->selfassign_end && $group->selfassign_end < time()) : ?>
<?= Icon::create('door-enter', 'inactive', <?= Icon::create('door-enter', Icon::ROLE_INACTIVE,
['title' => sprintf(_('Der Eintrag in diese Gruppe war möglich bis %s.'), ['title' => sprintf(_('Der Eintrag in diese Gruppe war möglich bis %s.'),
date('d.m.Y H:i', $group->selfassign_end))]) ?> date('d.m.Y H:i', $group->selfassign_end))]) ?>
<?php elseif ($group->id != 'nogroup' && $group->userMayLeave($GLOBALS['user']->id)) : ?> <?php elseif ($group->id != 'nogroup' && $group->userMayLeave($GLOBALS['user']->id)) : ?>
<a href="<?= $controller->url_for('course/statusgroups/leave', $group->id) ?>" data-confirm="<?= sprintf(_('Aus Gruppe %s austragen'),htmlReady($group->name)) . '?' ?>"> <a href="<?= $controller->url_for('course/statusgroups/leave', $group->id) ?>" data-confirm="<?= sprintf(_('Aus Gruppe %s austragen'),htmlReady($group->name)) . '?' ?>">
<?= Icon::create('door-leave', 'attention', <?= Icon::create('door-leave', Icon::ROLE_ATTENTION,
['title' => sprintf(_('Aus Gruppe %s austragen'), ['title' => sprintf(_('Aus Gruppe %s austragen'),
htmlReady($group->name))]) ?></a> htmlReady($group->name))]) ?></a>
<?php endif ?> <?php endif ?>
<?php endif ?> </nav>
<?php if ($is_tutor) : ?> <?php endif ?>
<?php if ($group->id != 'nogroup') : ?> <?php if ($is_tutor) : ?>
<?= ActionMenu::get()->setContext($group->name) <?php if ($group->id != 'nogroup') : ?>
->addLink( <?= ActionMenu::get()->setContext($group->name)
$controller->url_for('messages/write', [ ->addLink(
'group_id' => $group->id, $controller->url_for('messages/write', [
'default_subject' => htmlReady($course_title . ' (' . $group->name . ')'), 'group_id' => $group->id,
]), 'default_subject' => htmlReady($course_title . ' (' . $group->name . ')'),
_('Nachricht schicken'), ]),
Icon::create('mail', 'clickable', [ _('Nachricht schicken'),
'title' => sprintf( Icon::create('mail', Icon::ROLE_CLICKABLE, [
_('Nachricht an alle Mitglieder der Gruppe %s schicken'), 'title' => sprintf(
$group->name _('Nachricht an alle Mitglieder der Gruppe %s schicken'),
), $group->name
]), ),
['data-dialog' => 'size=auto'] ]),
) ['data-dialog' => 'size=auto']
->condition(!($is_participants_locked || $is_locked) && count($allmembers) < 500) )
->addMultiPersonSearch( ->condition(!($is_participants_locked || $is_locked) && count($allmembers) < 500)
MultiPersonSearch::get('add_statusgroup_member' . $group->id) ->addMultiPersonSearch(
->setTitle(sprintf(_('Personen zu Gruppe %s hinzufügen'), $group->name)) MultiPersonSearch::get('add_statusgroup_member' . $group->id)
->setLinkText(_('Personen hinzufügen')) ->setTitle(sprintf(_('Personen zu Gruppe %s hinzufügen'), $group->name))
->setSearchObject($memberSearch) ->setLinkText(_('Personen hinzufügen'))
->setDefaultSelectedUser($group->members->pluck('user_id')) ->setSearchObject($memberSearch)
->setDataDialogStatus(Request::isXhr()) ->setDefaultSelectedUser($group->members->pluck('user_id'))
->setJSFunctionOnSubmit(Request::isXhr() ? ->setDataDialogStatus(Request::isXhr())
'STUDIP.Dialog.close();' : false) ->setJSFunctionOnSubmit(Request::isXhr() ? 'STUDIP.Dialog.close();' : false)
->setExecuteURL($controller->url_for('course/statusgroups/add_member/' . ->setExecuteURL($controller->url_for('course/statusgroups/add_member/' .
$group->id)) $group->id))
->addQuickfilter(_('Veranstaltungsteilnehmende'), ->addQuickfilter(_('Veranstaltungsteilnehmende'),
$allmembers ? $allmembers->pluck('user_id') : []) $allmembers ? $allmembers->pluck('user_id') : [])
->addQuickfilter(_('Teilnehmende ohne Gruppenzuordnung'), ->addQuickfilter(_('Teilnehmende ohne Gruppenzuordnung'),
$nogroupmembers) $nogroupmembers)
) )
->condition(!($is_participants_locked || $is_locked) && count($allmembers) >= 500) ->condition(!($is_participants_locked || $is_locked) && count($allmembers) >= 500)
->addMultiPersonSearch( ->addMultiPersonSearch(
MultiPersonSearch::get('add_statusgroup_member' . $group->id) MultiPersonSearch::get('add_statusgroup_member' . $group->id)
->setTitle(sprintf(_('Personen zu Gruppe %s hinzufügen'), $group->name)) ->setTitle(sprintf(_('Personen zu Gruppe %s hinzufügen'), $group->name))
->setLinkText(_('Personen hinzufügen')) ->setLinkText(_('Personen hinzufügen'))
->setSearchObject($memberSearch) ->setSearchObject($memberSearch)
->setDefaultSelectedUser($group->members->pluck('user_id')) ->setDefaultSelectedUser($group->members->pluck('user_id'))
->setDataDialogStatus(Request::isXhr()) ->setDataDialogStatus(Request::isXhr())
->setJSFunctionOnSubmit(Request::isXhr() ? ->setJSFunctionOnSubmit(Request::isXhr() ? 'STUDIP.Dialog.close();' : false)
'STUDIP.Dialog.close();' : false) ->setExecuteURL($controller->url_for('course/statusgroups/add_member/' . $group->id))
->setExecuteURL($controller->url_for('course/statusgroups/add_member/' . )
$group->id)) ->conditionAll(!$is_locked)
) ->addLink(
->conditionAll(!$is_locked) $controller->url_for('course/statusgroups/edit', $group->id),
->addLink( _('Bearbeiten'),
$controller->url_for('course/statusgroups/edit', $group->id), Icon::create('edit', Icon::ROLE_CLICKABLE, [
_('Bearbeiten'), 'title' => sprintf(
Icon::create('edit', 'clickable', [ _('Gruppe %s bearbeiten'),
'title' => sprintf( $group->name
_('Gruppe %s bearbeiten'), )
$group->name ]),
) ['data-dialog' => '']
]), )
['data-dialog' => ''] ->addLink(
) $controller->url_for('course/statusgroups/delete', $group->id),
->addLink( _('Löschen'),
$controller->url_for('course/statusgroups/delete', $group->id), Icon::create('trash', Icon::ROLE_CLICKABLE, [
_('Löschen'), 'title' => sprintf(
Icon::create('trash', 'clickable', [ _('Gruppe %s löschen'),
'title' => sprintf( $group->name
_('Gruppe %s löschen'), )
$group->name ]),
) ['data-confirm' => _('Soll die Gruppe wirklich gelöscht werden?')]
]), ) ?>
['data-confirm' => _('Soll die Gruppe wirklich gelöscht werden?')] <?php else : ?>
) ?> <nav>
<?php else : ?>
<a href="<?= $controller->url_for('messages/write', [ <a href="<?= $controller->url_for('messages/write', [
'filter' => 'not_grouped', 'filter' => 'not_grouped',
'course_id' => $course_id, 'course_id' => $course_id,
'default_subject' => htmlReady($course_title).' ('.htmlReady($group->name).')' 'default_subject' => htmlReady($course_title).' ('.htmlReady($group->name).')'
]) ?>" data-dialog="size=auto;"> ]) ?>" data-dialog="size=auto;">
<?= Icon::create('mail', 'clickable', [ <?= Icon::create('mail')->asImg(['title' => _('Nachricht an alle nicht zugeordneten Personen schicken')]) ?>
'title' => _('Nachricht an alle nicht zugeordneten Personen schicken') </a>
])->asImg(20) ?></a> </nav>
<?php endif ?>
<?php endif ?> <?php endif ?>
</nav> <?php endif ?>
</header> </header>
<section> <section>
<article id="group-members-<?= $group->id ?>"<?= $load ? ' class="open"' : ''?>> <article id="group-members-<?= $group->id ?>"<?= $load ? ' class="open"' : ''?>>
......
resources/assets/stylesheets/less/content_box.less
+ 2
− 2
View file @ cc54019c
...@@ -150,12 +150,12 @@ section.contentbox { ...@@ -150,12 +150,12 @@ section.contentbox {
align-items: center; align-items: center;
} }
nav { nav {
a, span { a, > span {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
span { > span {
&:last-child { &:last-child {
border-right: none; border-right: none;
padding-right: 0px; padding-right: 0px;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment