Step 4201

Closes #4201

Merge request studip/studip!3121

app/views/admin/cronjobs/logs/index.php

@@ -134,7 +134,7 @@ use Studip\Button, Studip\LinkButton;
         </tbody>
         <tfoot>
         <tr>
-            <td colspan="6">
+            <td colspan="6" class="groupactions">
                 <select name="action" data-activates="button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                     <option value="">- <?= _('Aktion auswählen') ?></option>
                     <option value="delete"><?= _('Löschen') ?></option>

app/views/admin/cronjobs/schedules/index.php

@@ -131,7 +131,7 @@ use Studip\Button, Studip\LinkButton;
         </tbody>
         <tfoot>
         <tr>
-            <td colspan="9">
+            <td colspan="9" class="groupactions">
                 <select name="action" data-activates=".cronjobs button[name=bulk]" aria-label="<?= _('Aktion auswählen')?>">
                     <option value="">- <?= _('Aktion auswählen') ?> -</option>
                     <option value="activate"><?= _('Aktivieren') ?></option>

app/views/admin/cronjobs/tasks/index.php

@@ -77,7 +77,7 @@ use Studip\Button;
         </tbody>
         <tfoot>
             <tr>
-                <td colspan="6">
+                <td colspan="6" class="groupactions">
                     <select name="action" data-activates=".cronjobs button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="activate"><?= _('Aktivieren') ?></option>

app/views/contact/index.php

@@ -105,7 +105,7 @@
         </tbody>
         <tfoot>
             <tr>
-                <td colspan="5">
+                <td colspan="5" class="groupactions">
                     <select name="action_contact" id="contact_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="remove"><?= $filter ? _('Kontakte aus Gruppe entfernen') : _('Kontakte entfernen') ?></option>

app/views/course/details/index.php

@@ -30,7 +30,7 @@
     <header>
         <h1><?= _('Allgemeine Informationen') ?></h1>
     </header>
-    <table class="default">
+    <table class="default nohover">
         <colgroup>
             <col style="width: 40%">
             <col style="width: 60%">

app/views/course/members/autor_list.php

@@ -182,7 +182,7 @@
     <? if ($is_tutor && !$is_locked && count($autoren) > 0) : ?>
         <tfoot>
             <tr>
-                <td colspan="<?= $cols_foot ?>">
+                <td colspan="<?= $cols_foot ?>" class="groupactions">
                     <select name="action_autor" id="action_autor" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                     <? if($is_dozent) : ?>

app/views/course/members/awaiting_list.php

@@ -138,7 +138,7 @@
     <? if (!$is_locked) : ?>
         <tfoot>
             <tr>
-                <td colspan="6">
+                <td colspan="6" class="groupactions">
                     <select name="action_awaiting" id="action_awaiting" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="upgrade_autor">

app/views/course/members/index.php

@@ -16,7 +16,6 @@
 <? endif ?>
 
 <? if (count($tutoren) > 0) : ?>
-    <br />
     <?= $this->render_partial('course/members/tutor_list') ?>
 <? endif ?>
 
@@ -31,12 +30,10 @@
 <? endif ?>
 
 <? if (count($autoren) > 0) : ?>
-    <br />
     <?= $this->render_partial('course/members/autor_list') ?>
 <? endif ?>
 
 <? if (count($users) > 0) : ?>
-    <br />
     <?= $this->render_partial('course/members/user_list') ?>
 <? endif ?>
 

app/views/course/members/tutor_list.php

@@ -162,7 +162,7 @@
     <? if ($is_dozent && !$tutor_is_locked): ?>
         <tfoot>
             <tr>
-                <td colspan="6">
+                <td colspan="6" class="groupactions">
                     <select name="action_tutor" id="tutor_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="downgrade"><?= sprintf(_('Zu %s herunterstufen'), htmlReady($status_groups['autor'])) ?></option>

app/views/course/members/user_list.php

@@ -153,7 +153,7 @@
     <? if ($is_tutor) : ?>
         <tfoot>
             <tr>
-                <td colspan="6">
+                <td colspan="6" class="groupactions">
                     <select name="action_user" id="user_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="upgrade">

app/views/file/_terms_of_use_select.php

@@ -24,8 +24,8 @@ if (!$selected_terms_of_use_id) {
                aria-description="<?= htmlReady(kill_format($content_terms_of_use_entry->description)) ?>">
 
         <label for="content_terms_of_use-<?= htmlReady($content_terms_of_use_entry->id) ?>">
-            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
+            <?= Icon::create('radiobutton-unchecked')->asImg(20, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(20, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($content_terms_of_use_entry->name) ?>
             </div>

app/views/file/new_edit_folder_form.php

@@ -27,8 +27,8 @@
                id="folder-type-<?= htmlReady($folder_type['class']) ?>"
                <? if ($folder_type['class'] === get_class($folder)) echo 'checked'; ?>>
         <label for="folder-type-<?= htmlReady($folder_type['class']) ?>">
-            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
+            <?= Icon::create('radiobutton-unchecked')->asImg(20, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(20, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($folder_type['name']) ?>
             <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?>

app/views/settings/deputies.php

@@ -2,6 +2,9 @@
     <form method="post" action="<?= $controller->link_for('settings/deputies/store') ?>" class="default">
         <?= CSRFProtection::tokenTag() ?>
         <table class="default no-hover">
+        <caption>
+            <?= _('Standardvertretung')?>
+        </caption>
             <colgroup>
                 <col>
                 <? if ($edit_about_enabled): ?>

app/views/settings/notification.php

@@ -4,6 +4,9 @@
     <input type="hidden" name="studip_ticket" value="<?= get_ticket() ?>">
 
     <table class="default" id="settings-notifications">
+        <caption>
+            <?= _('Benachrichtigung über neue Inhalte anpassen')?>
+        </caption>
         <colgroup>
             <col width="7px">
             <col width="100%">

app/views/start/_widget.php

@@ -28,12 +28,12 @@
 
         <? if (isset($admin_url)): ?>
             <a href="<?= URLHelper::getLink($admin_url) ?>">
-                <?= Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => $admin_title]) ?>
+                <?= Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => $admin_title, 'size' => 20]) ?>
             </a>
         <? endif ?>
 
         <a href="<?= $controller->url_for('start/delete/' . $widget->getPluginId()) ?>">
-            <?= Icon::create('decline', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')]) ?>
+            <?= Icon::create('decline', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen'), 'size' => 20]) ?>
         </a>
     </span>
     <span id="widgetName<?= $widget->getPluginId() ?>" class="widget-title">

lib/modules/ActivityFeed.php

@@ -27,7 +27,7 @@ class ActivityFeed extends CorePlugin implements PortalPlugin
         $template->config = UserConfig::get($GLOBALS['user']->id)->getValue('ACTIVITY_FEED');
 
         $navigation = new Navigation('', 'dispatch.php/activityfeed/configuration');
-        $navigation->setImage(Icon::create('edit', 'clickable', ["title" => _('Konfigurieren')]), ['data-dialog'=>'size=auto']);
+        $navigation->setImage(Icon::create('edit', 'clickable', ["title" => _('Konfigurieren'), 'size' => 20]), ['data-dialog'=>'size=auto']);
         $icons[] = $navigation;
 
         $navigation = new Navigation('', '#', ['cid' => null]);

lib/modules/NewsWidget.php

@@ -32,21 +32,21 @@ class NewsWidget extends CorePlugin implements PortalPlugin
         $icons = [];
         if (StudipNews::CountUnread() > 0) {
             $navigation = new Navigation('', 'dispatch.php/news/visit_all');
-            $navigation->setImage(Icon::create('refresh', Icon::ROLE_CLICKABLE, ['title' => _('Alle als gelesen markieren')]), ['class' => 'visit-all']);
+            $navigation->setImage(Icon::create('refresh', Icon::ROLE_CLICKABLE, ['title' => _('Alle als gelesen markieren'), 'size' => 20]), ['class' => 'visit-all']);
             $icons[] = $navigation;
         }
 
         if (Config::get()->NEWS_RSS_EXPORT_ENABLE) {
             if ($rss_id = StudipNews::GetRssIdFromRangeId('studip')) {
                 $navigation = new Navigation('', 'rss.php', ['id' => $rss_id]);
-                $navigation->setImage(Icon::create('rss', Icon::ROLE_CLICKABLE, ['title' => _('RSS-Feed')]));
+                $navigation->setImage(Icon::create('rss', Icon::ROLE_CLICKABLE, ['title' => _('RSS-Feed'), 'size' => 20]));
                 $icons[] = $navigation;
             }
         }
 
         if ($GLOBALS['perm']->have_perm('root')) {
             $navigation = new Navigation('', 'dispatch.php/news/edit_news/new/studip');
-            $navigation->setImage(Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('Ankündigungen bearbeiten')]), ['data-dialog' => '1']);
+            $navigation->setImage(Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('Ankündigungen bearbeiten'), 'size' => 20]), ['data-dialog' => '1']);
             $icons[] = $navigation;
             if (Config::get()->NEWS_RSS_EXPORT_ENABLE) {
                 $navigation = new Navigation('', 'dispatch.php/news/rss_config/studip');

lib/modules/QuickSelection.php

@@ -31,7 +31,7 @@ class QuickSelection extends CorePlugin implements PortalPlugin
         $template->navigation = $this->getFilteredNavigation($names);
 
         $navigation = new Navigation('', 'dispatch.php/quickselection/configuration');
-        $navigation->setImage(Icon::create('edit', 'clickable', ["title" => _('Konfigurieren')]), ['data-dialog'=>'size=auto']);
+        $navigation->setImage(Icon::create('edit', 'clickable', ["title" => _('Konfigurieren'), 'size' => 20]), ['data-dialog'=>'size=auto']);
 
         $template->icons = [$navigation];
 

lib/modules/TerminWidget.php

@@ -32,7 +32,7 @@ class TerminWidget extends CorePlugin implements PortalPlugin
         $template->content = $response->body;
 
         $navigation = new Navigation('', 'dispatch.php/calendar/date/add');
-        $navigation->setImage(Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('Neuen Termin anlegen')]));
+        $navigation->setImage(Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('Neuen Termin anlegen'), 'size' => 20]));
         $navigation->setLinkAttributes(['data-dialog' => 'reload-on-close']);
         $template->icons = [$navigation];
 

resources/assets/stylesheets/mixins/colors.scss

@@ -108,7 +108,7 @@ $dark-green-60: mix($dark-green, #fff, 60%); // #66b570
 $dark-green-40: mix($dark-green, #fff, 40%); // #99cea0
 $dark-green-20: mix($dark-green, #fff, 20%); // #cce6cf
 
-$petrol: #129c94;
+$petrol: #0E817B; // old #129c94;
 $petrol-80: mix($petrol, #fff, 80%); // #41afaa
 $petrol-60: mix($petrol, #fff, 60%); // #70c3bf
 $petrol-40: mix($petrol, #fff, 40%); // #a0d7d4
@@ -120,7 +120,8 @@ $brown-60: mix($brown, #fff, 60%); // #ca9eaf
 $brown-40: mix($brown, #fff, 40%); // #dcbeb4
 $brown-20: mix($brown, #fff, 20%); // #edded9
 
-$fieldset-header: $content-color-20;
+// $fieldset-header: $content-color-20;
+$fieldset-header: $dark-gray-color-10;
 $fieldset-border: $base-color-20;
 
 // contrast colors
@@ -238,7 +239,7 @@ $color--brand-secondary: $color--gray-2;
 
 $color--font-primary: $color--gray-1;
 $color--font-secondary: $color--gray-3;
-$color--font-inactive: $color--gray-4;
+$color--font-inactive: $color--gray-3;
 $color--font-inverted: $color--white;
 
 $color--main-navigation-background: $color--gray-7;
@@ -262,6 +263,7 @@ $color--tile-background-focus: $color--gray-6;
 $color--tile-background-hover: $color--gray-6;
 
 $color--content-box-border: $color--gray-5;
+$color--content-box-header: $color--gray-6;
 $color--content-box-background: $color--white;
 
 $color--table-header: $color--gray-6;
@@ -269,10 +271,12 @@ $color--table-border: $color--gray-6;
 $color--table-focus: $color--gray-6;
 $color--table-hover: $color--gray-6;
 
-$color--button-background:$color--white;
+$color--button-background: $color--white;
 $color--button-border: $color--blue-1;
 $color--button-focus: $color--blue-1;
 $color--button-hover: $color--blue-1;
+$color--button-inactive-background: $color--gray-7;
+$color--button-inactive-border: $color--gray-5;
 
 $color--input-field-border: $color--gray-5;
 $color--input-field-background: $color--white;