From 9b8cdce26cd397323d5e2865161374d08bfdef26 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 10 Mar 2025 08:33:04 +0000
Subject: Ansicht von Admin->Rollen und Admin->Datenfelder kaputt

Closes #4893

Merge request studip/studip!4018
---
 app/views/admin/datafields/index.php          | 41 +++++++++++----------------
 app/views/admin/role/index.php                | 25 +++++++++-------
 resources/assets/stylesheets/scss/tables.scss |  6 ++--
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/app/views/admin/datafields/index.php b/app/views/admin/datafields/index.php
index 81ac85f..64d6d6f 100644
--- a/app/views/admin/datafields/index.php
+++ b/app/views/admin/datafields/index.php
@@ -11,50 +11,43 @@
 <table class="collapsable default">
     <colgroup>
         <col>
-        <col width="20%">
         <col width="10%">
         <col width="10%">
         <col width="10%">
         <col width="10%">
         <col width="10%">
-        <col width="6%">
-        <col width="6%">
-        <col width="2%">
-        <col width="48px">
+        <col width="10%">
+        <col width="5%">
+        <col width="5%">
+        <col width="5%">
+        <col width="5%">
     </colgroup>
     <caption>
         <?= _('Verwaltung von generischen Datenfeldern') ?>
     </caption>
     <thead style="vertical-align: bottom">
         <tr>
-            <th rowspan="2"><?= _('Name') ?></th>
-            <th rowspan="2"><?= _('Feldtyp') ?></th>
-            <th rowspan="2" style="white-space: nowrap">
+            <th><?= _('Name') ?></th>
+            <th><?= _('Feldtyp') ?></th>
+            <th style="white-space: nowrap">
                 <?= _('Typ') ?>
                 <?= tooltipIcon(_('Veranstaltungskategorie, Einrichtungstyp, Sprache bzw. Nutzerstatus')) ?>
             </th>
-            <th rowspan="2">
+            <th>
                 <?= _('Institution') ?>
             </th>
-            <th colspan="2" style="text-align: center">
-                <?= _('benötigter Status') ?>
-            </th>
-            <th colspan="2" rowspan="2"></th>
-            <th rowspan="2"><?= _('Position') ?></th>
-            <th rowspan="2">
-                <abbr title="<?= _('Einträge') ?>">#</abbr>
-            </th>
-            <th rowspan="2" class="actions"></th>
-        </tr>
-        <tr>
             <th style="white-space: nowrap">
-                <?= _('Änderbar') ?>
+                <?= _('benötigter Status änderbar') ?>
                 <?= tooltipIcon(_('Gibt den Status an, ab dem das Datenfeld änderbar ist')) ?>
             </th>
             <th style="white-space: nowrap">
-                <?= _('Öffentlich') ?>
+                <?= _('benötigter Status öffentlich') ?>
                 <?= tooltipIcon(_('Gibt den Status an, ab dem das Datenfeld für andere sichtbar ist')) ?>
             </th>
+            <th colspan="2"></th>
+            <th><?= _('Position') ?></th>
+            <th><?= _('Einträge') ?></th>
+            <th class="actions"></th>
         </tr>
     </thead>
 <? foreach ($datafields_list as $key => $data): ?>
@@ -165,8 +158,8 @@
         <? else: ?>
             <td colspan="2"></td>
         <? endif; ?>
-            <td><?= $val->priority ?></td>
-            <td><?= count($val) ?></td>
+            <td style="text-align: right;"><?= $val->priority ?></td>
+            <td style="text-align: right;"><?= count($val) ?></td>
             <td class="actions">
                 <a href="<?=$controller->url_for('admin/datafields/edit/' . $val->id)?>" data-dialog>
                     <?= Icon::create('edit')->asImg(['title' => 'Datenfeld ändern']) ?>
diff --git a/app/views/admin/role/index.php b/app/views/admin/role/index.php
index fcb0353..80f5f23 100644
--- a/app/views/admin/role/index.php
+++ b/app/views/admin/role/index.php
@@ -9,26 +9,31 @@
     <caption>
         <?= _('Vorhandene Rollen') ?>
     </caption>
+    <colgroup>
+        <col width="65%">
+        <col width="10%">
+        <col width="10%">
+        <col width="10%">
+        <col width="5%">
+    </colgroup>
     <thead>
         <tr>
-            <th rowspan="2"><?= _('Name') ?></th>
-            <th colspan="2" style="text-align: right;">
-                <?= _('Benutzer') ?>
-            </th>
-            <th style="text-align: right;"  rowspan="2"><?= _('Plugins') ?></th>
-            <th rowspan="2"></th>
-        </tr>
-        <tr>
+            <th ><?= _('Name') ?></th>
             <th style="text-align: right;">
                 <abbr title="<?= _('Direkte Zuweisung') ?>">
-                    <?= _('explizit') ?>
+                    <?= _('Benutzer explizit') ?>
                 </abbr>
             </th>
             <th style="text-align: right;">
                 <abbr title="<?= _('Indirekte Zuweisung durch Berechtigungsstufe') ?>">
-                    <?= _('implizit') ?>
+                    <?= _('Benutzer implizit') ?>
                 </abbr>
             </th>
+            <th style="text-align: right;"><?= _('Plugins') ?></th>
+            <th></th>
+        </tr>
+        <tr>
+            
         </tr>
     </thead>
     <tbody>
diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 33b1f67..f380cca 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -502,7 +502,7 @@ table.default {
 
     > caption {
         background-color: transparent;
-        padding: 0 5px 5px 5px;
+        padding: 0 5px 10px 5px;
         color: var(--headings-color);
         font-size: $font-size-caption;
         line-height: $font-size-caption;
@@ -542,6 +542,7 @@ table.default {
         > tr {
             > th {
                 background-color: var(--color--table-header);
+                border-bottom: 2px solid var(--color--global-background);
                 text-align: left;
             }
 
@@ -636,10 +637,7 @@ table.default {
         font-size: $font-size-base;
         border-left: 1px solid var(--color--table-border);
         margin-bottom: -2px;
-        min-height: 30px;
-        padding-bottom: 3px;
         padding-left: 0.5em;
-        padding-top: 4px;
         input[type=text] {
             width: auto; // otherwise it can be 100%, so there is no space left for other parts of the actions-area
             max-height: 30px;
-- 
cgit v1.0