From 9de74a2b988fca0f163894d64509044e39c10542 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 16 May 2024 14:35:00 +0200
Subject: [PATCH] remove calls to TextHelper class, re #4101
---
app/views/admin/webservice_access/index.php | 2 +-
app/views/course/lvgselector/form.php | 4 ++--
app/views/course/lvgselector/subtree.php | 2 +-
.../wizard/steps/lvgroups/lvgroup_entry.php | 2 +-
.../steps/lvgroups/lvgroup_searchentry.php | 2 +-
app/views/shared/log_event/show.php | 2 +-
.../studiengaenge/versionen/abschnitte.php | 3 +--
.../versionen/details_abschnitt.php | 2 +-
resources/assets/stylesheets/scss/mvv.scss | 24 -------------------
templates/mail/notification_html.php | 2 +-
10 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php
index 07edb4c9f75..223e5c3509c 100644
--- a/app/views/admin/webservice_access/index.php
+++ b/app/views/admin/webservice_access/index.php
@@ -28,7 +28,7 @@
</th>
</tr>
<? foreach ($ws_rules as $rule): ?>
- <tr class="<?= TextHelper::cycle('table_row_even', 'table_row_odd') ?>">
+ <tr>
<? if (isset($edit) && $edit == $rule->id) :?>
<td>
<a name="edit"></a>
diff --git a/app/views/course/lvgselector/form.php b/app/views/course/lvgselector/form.php
index 86e2af9b9a6..a1ae506b64d 100644
--- a/app/views/course/lvgselector/form.php
+++ b/app/views/course/lvgselector/form.php
@@ -48,12 +48,12 @@
<em><?= sprintf(_("Der Suchbegriff '%s' lieferte kein Ergebnis."), htmlReady($selection->getSearchKey())) ?></em>
<? else : ?>
<h3><?= _('Suchergebnisse') ?>:</h3>
- <? TextHelper::reset_cycle(); $show_path = TRUE; $show_link = FALSE; ?>
+ <? $show_path = TRUE; $show_link = FALSE; ?>
<? foreach ($selection->getSearchResult() as $area) : ?>
<? // MVV: show LvGruppen with complete trails only ?>
<? $pathes = ModuleManagementModelTreeItem::getPathes($area->getTrails(['Modulteil', 'StgteilabschnittModul', 'StgteilAbschnitt', 'StgteilVersion', 'Studiengang'])); ?>
<? if (count($pathes)) : ?>
- <div class="<?= TextHelper::cycle('odd', 'even') ?>">
+ <div>
<?= $this->render_partial('course/lvgselector/entry', compact('area', 'show_path', 'show_link', 'pathes')); ?>
</div>
<? endif; ?>
diff --git a/app/views/course/lvgselector/subtree.php b/app/views/course/lvgselector/subtree.php
index f61463f69bc..b8e05d4f471 100644
--- a/app/views/course/lvgselector/subtree.php
+++ b/app/views/course/lvgselector/subtree.php
@@ -8,7 +8,7 @@
$has_children = $child->hasChildren();
?>
- <div class="<?= TextHelper::cycle('odd', 'even') ?>">
+ <div>
<?= $this->render_partial('course/lvgselector/entry',
['area' => $child,
'show_link' => $has_children]) ?>
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
index 09d2405b70e..a7e2cd00836 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
@@ -2,7 +2,7 @@
# Lifter010: TODO
$_id = htmlReady(implode('_', (array) $area->getId()));
?>
-<li id="lvgroup-tree-assigned-<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgroup-tree-assigned-<?= $_id ?>">
<? if (!$locked) : ?>
<?= Icon::create('trash', 'clickable')->asInput(["name" => 'lvgruppe_selection[remove]['.$_id.']', "onclick" => "return STUDIP.MVV.CourseWizard.removeLVGroup('".$_id."')", "class" => '',
"data-id" => $_id, "data-course_id" => htmlReady($course_id)]) ?>
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
index a6715da793b..7c5144869d0 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
@@ -1,7 +1,7 @@
<?php
$_id = htmlReady(implode('_', (array) $area->getId()));
?>
-<li id="lvgruppe_search_<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgruppe_search_<?= $_id ?>">
<?= Icon::create('arr_2left', Icon::ROLE_SORT)->asInput([
'name' => "assign[{$_id}]",
diff --git a/app/views/shared/log_event/show.php b/app/views/shared/log_event/show.php
index ea96f89c029..eec216469ce 100644
--- a/app/views/shared/log_event/show.php
+++ b/app/views/shared/log_event/show.php
@@ -32,7 +32,7 @@ use Studip\Button, Studip\LinkButton;
</th>
</tr>
<? foreach ($log_events as $log_event): ?>
- <tr class="<?= TextHelper::cycle('table_row_even', 'table_row_odd') ?>">
+ <tr>
<td style="font-size: smaller; white-space: nowrap;">
<?= date('d.m.Y H:i:s', $log_event['time']) ?>
</td>
diff --git a/app/views/studiengaenge/versionen/abschnitte.php b/app/views/studiengaenge/versionen/abschnitte.php
index 16204507ae3..83c1173e206 100644
--- a/app/views/studiengaenge/versionen/abschnitte.php
+++ b/app/views/studiengaenge/versionen/abschnitte.php
@@ -59,8 +59,7 @@
</tr>
<? endif; ?>
</tbody>
- <? endforeach;
- TextHelper::reset_cycle(); ?>
+ <? endforeach; ?>
<? if (count($version->abschnitte) > 0 && MvvPerm::haveFieldPermModul_zuordnungen('StgteilAbschnitt', MvvPerm::PERM_CREATE)
) : ?>
<tbody>
diff --git a/app/views/studiengaenge/versionen/details_abschnitt.php b/app/views/studiengaenge/versionen/details_abschnitt.php
index 3b1c0e76953..79f8da7a026 100644
--- a/app/views/studiengaenge/versionen/details_abschnitt.php
+++ b/app/views/studiengaenge/versionen/details_abschnitt.php
@@ -59,7 +59,7 @@
</tr>
<? endif; ?>
</tbody>
- <? endforeach; TextHelper::reset_cycle(); ?>
+ <? endforeach; ?>
<? if (MvvPerm::haveFieldPermModul_zuordnungen($abschnitt, MvvPerm::PERM_CREATE)) : ?>
<tbody>
<tr>
diff --git a/resources/assets/stylesheets/scss/mvv.scss b/resources/assets/stylesheets/scss/mvv.scss
index c93b214cb00..ce8570114f6 100644
--- a/resources/assets/stylesheets/scss/mvv.scss
+++ b/resources/assets/stylesheets/scss/mvv.scss
@@ -253,22 +253,6 @@ ul {
dd {
margin: 0;
}
-
- &.even {
- background-color: var(--dark-gray-color-10);
-
- &:hover {
- background-color: var(--content-color-60);
- }
- }
-
- &.odd {
- background-color: var(--dark-gray-color-5);
-
- &:hover {
- background-color: var(--content-color-40);
- }
- }
}
&.mvv-modul li {
@@ -559,14 +543,6 @@ form.default .mvv-inst-chooser select {
h3 {
margin-top: 1em;
}
-
- &.odd {
- background-color: var(--dark-gray-color-5);
- }
-
- &.even {
- background-color: var(--content-color-20);
- }
}
#lvgruppe_selection_chosen {
diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php
index 4502ae5e700..93bc1a81fbc 100644
--- a/templates/mail/notification_html.php
+++ b/templates/mail/notification_html.php
@@ -111,7 +111,7 @@
</td>
</tr>
<? foreach ($data as $module) : ?>
- <tr class="<?= TextHelper::cycle('hover_odd', 'hover_even') ?>">
+ <tr>
<td>
<a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= htmlReady($module['text']) ?></a>
</td>
--
GitLab