From 668d3df20156d5dbd4f34342eeadcbd5d420a8f5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 28 Jun 2011 11:58:26 +0000
Subject: [PATCH] Title rows added to several table, naming convention applied:
 - Some internal TODOs closed by adding titles to several tables - In the
 process, some message ids has been renamed for better naming convention -
 TODOs.txt updated

---
 DOCS/TODOs.txt                                |  8 +-
 inc/language/autopurge_de.php                 |  1 +
 inc/language/beg_de.php                       |  1 +
 inc/language/bonus_de.php                     |  1 +
 inc/language/mods_de.php                      |  2 +
 inc/language/primera_de.php                   |  3 +-
 inc/language/wernis_de.php                    | 11 +--
 inc/modules/admin/what-list_bonus.php         |  2 +-
 templates/de/html/admin/admin_edit_mods.tpl   | 36 +++++----
 .../de/html/admin/admin_list_autopurge.tpl    | 40 +++++-----
 templates/de/html/admin/admin_list_beg.tpl    | 74 ++++++++++---------
 templates/de/html/admin/admin_list_bonus.tpl  | 72 +++++++++---------
 .../de/html/admin/admin_list_bonus_rows.tpl   | 20 +++--
 templates/de/html/admin/admin_list_mods.tpl   | 38 +++++-----
 .../de/html/admin/admin_list_primera_main.tpl |  8 +-
 .../de/html/admin/admin_list_wernis_main.tpl  |  8 +-
 16 files changed, 184 insertions(+), 141 deletions(-)

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 8102d8aca6..dc7531ef7d 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -218,15 +218,8 @@
 ./templates/de/html/admin/admin_admins_contct_form.tpl:4:	<!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_config_other.tpl:79:			<!-- @TODO Rewrite this selection to one of our functions //-->
 ./templates/de/html/admin/admin_edit_admin_menu.tpl:4:<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_edit_mods.tpl:4:	<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_autopurge.tpl:2:	<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_beg.tpl:3:	<!-- @TODO No title here? //-->
-./templates/de/html/admin/admin_list_bonus.tpl:3:	<!-- @TODO No title here? //-->
-./templates/de/html/admin/admin_list_mods.tpl:4:	<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_primera_main.tpl:3:<!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_list_refs_level.tpl:21:		<!-- @TODO Nothing to say here? //-->
 ./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3:<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_wernis_main.tpl:2:<!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_login_form.tpl:34:	@TODO Doesn't work with sessions
 ./templates/de/html/admin/admin_login_form.tpl:37:		@TODO Try to move the select box to our generic functions
 ./templates/de/html/admin/admin_optimize.tpl:3:	<!-- @TODO Shouldn't we add a title here? //-->
@@ -237,6 +230,7 @@
 ./templates/de/html/member/member_unconfirmed_table_nopoints.tpl:11:		<!-- @TODO Nothing to say here? //-->
 ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:		<!-- @TODO These are static lines and should be replaced by a filter (see ext-sponsor) //-->
 ### ### DEPRECATION FOLLOWS: ### ###
+./inc/daily/daily_engine.php:2:// @DEPRECATED
 ./inc/loader/load_cache-admin.php:2:// @DEPRECATED
 ./inc/loader/load_cache-config.php:2:// @DEPRECATED
 ./inc/loader/load_cache-extension.php:2:// @DEPRECATED
diff --git a/inc/language/autopurge_de.php b/inc/language/autopurge_de.php
index e695437263..d862d1d696 100644
--- a/inc/language/autopurge_de.php
+++ b/inc/language/autopurge_de.php
@@ -68,6 +68,7 @@ addMessages(array(
 	'ADMIN_AUTOPURGE_NOTIFY_INACTIVE' => "Benachrichtigung bei inaktive Accounts l&ouml;schen",
 	'ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED' => "Benachrichtigung bei unbest&auml;tigte Accounts l&ouml;schen",
 	'ADMIN_AUTOPURGE_NOTIFY_TASKS' => "Benachrichtigung bei veraltete Aufgaben l&ouml;schen",
+	'ADMIN_LIST_AUTOPURGE_TITLE' => "Automatisch zu l&ouml;schende Mitglieder",
 	'ADMIN_LIST_AUTOPURGE_FOOTER' => "Hier sollte ein Hinweis kommen.",
 	'ADMIN_AUTOPURGE_NOTIFIED' => "Benachrichtigt",
 
diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 43ca1cad99..f09d5c5740 100644
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -130,6 +130,7 @@ addMessages(array(
 	'ADMIN_BEG_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
 	'BEG_NO_LIMITATION' => "Keine IP-Sperre eingerichtet!!.",
 	'ADMIN_BEG_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Bettel-Rallye dran teilnehmen?",
+	'ADMIN_LIST_BEG_TITLE' => "Alle Teilnehmer der Bettel-Rallye auflisten",
 
 // Task overview
 	'ADMIN_TASK_LIST_BEG' => "Bettel-Rallye-Teilnehmer",
diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 89248ee9d3..9d8ceaf896 100644
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -83,6 +83,7 @@ addMessages(array(
 	'ADMIN_BONUS_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
 	'ADMIN_BONUS_USERID' => "Mitgliedskonto zum Abbuchen der {?POINTS?}",
 	'ADMIN_CONFIG_BONUS_TIMEOUT' => "Verweildauer von Aktiv-Bonus-Eintr&auml;gen",
+	'ADMIN_LIST_BONUS_RALLYE_TITLE' => "Alle an der Aktiv-Rallye teilnehmenden Mitglieder:",
 	'ADMIN_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>",
 	'ADMIN_SEND_BONUS_MAILS' => "Versenden von Bonus-Mails",
 	'ADMIN_SEND_BONUS_NORMAL' => "Text-Mail versenden",
diff --git a/inc/language/mods_de.php b/inc/language/mods_de.php
index 09fd099748..90226d9150 100644
--- a/inc/language/mods_de.php
+++ b/inc/language/mods_de.php
@@ -50,11 +50,13 @@ addMessages(array(
 	'ADMIN_MODS_IS_MEMBER' => "Nur Mitglied",
 	'ADMIN_MODS_CLICKS' => "Modulklicks",
 	'ADMIN_MODS_EDIT' => "Module &auml;ndern",
+	'ADMIN_MODS_EDIT_TITLE' => "Ausgew&auml;hlte Module &auml;ndern",
 	'ADMIN_MODS_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verkn&uuml;pften Men&uuml;punkten zu erhalten.",
 	'ADMIN_MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul ausw&auml;hlen.",
 	'ADMIN_MODS_CHANGED' => "Module wurden ge&auml;ndert.",
 	'ADMIN_MODS_WHAT_ACTION' => "Men&uuml;punkt (Hauptmen&uuml;)",
 	'ADMIN_MODS_STATS_FOOTER' => "Hier soll ein Hinweis hinkommen.",
+	'ADMIN_MODS_LIST_TITLE' => "Auflsiten aller registrierten Module",
 ));
 
 // [EOF]
diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php
index cd7a3e4d3a..dc910ed58a 100644
--- a/inc/language/primera_de.php
+++ b/inc/language/primera_de.php
@@ -68,7 +68,8 @@ addMessages(array(
 	'PRIMERA_ACCOUNT' => "Primus-Portal",
 	'PRIMERA_TOTAL_PRIMERA' => "Gesamt &uuml;berwiesen",
 	'MEMBER_PRIMERA_LIST_PRIMERA' => "&Uuml;berweisungsliste von/an Primus-Portal",
-	'ADMIN_PRIMERA_FOOTER' => "Es sollte hier ein Hinweis eingebaut werden.",
+	'ADMIN_LIST_PRIMERA_TITLTE' => "Alle Transaktionen von und zum Primus-Portal auflisten:",
+	'ADMIN_LIST_PRIMERA_FOOTER' => "Es sollte hier ein Hinweis eingebaut werden.",
 
 // API messages
 	'PRIMERA_API_REQUEST_DATA_INVALID' => "Interner Fehler: Abfragedaten sind defekt.",
diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php
index 1452da8d3d..e51f1cd29d 100644
--- a/inc/language/wernis_de.php
+++ b/inc/language/wernis_de.php
@@ -42,10 +42,6 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-	'ADMIN_TASK_LIST_WERNIS_ALL' => "Alle Wernis-Ein-/Auszahlungen",
-	'ADMIN_TASK_LIST_WERNIS_ALL_TITLE' => "Listet alle Wernis-Ein- und Auszahlungen auf.",
-	'MEMBER_WERNIS_MODE_WITHDRAW' => "Wernis einzahlen",
-	'MEMBER_WERNIS_MODE_PAYOUT' => "Wernis auszahlen",
 	'WERNIS_STATUS_UNKNWOWN' => "Wernis-Typ <span class=\"data\">%s</span> unbekannt.",
 	'WERNIS_STATUS_WITHDRAW' => "Einzahlung von WDS66",
 	'WERNIS_STATUS_PAYOUT' => "Auszahlung an WDS66",
@@ -53,7 +49,6 @@ addMessages(array(
 	'WERNIS_TIMESTAMP' => "Buchungszeitmarke",
 	'WERNIS_ACCOUNT' => "WDS66-Hauptaccount",
 	'WERNIS_TOTAL_WERNIS' => "Gesamt &uuml;berwiesen",
-	'MEMBER_WERNIS_LIST_WERNIS' => "&Uuml;berweisungsliste von/an WDS66-Hauptaccount",
 
 	// Admin messages
 	'ADMIN_WERNIS_CONFIG_TITLE' => "Einstellungen zum WDS66-Hauptaccount:",
@@ -80,7 +75,10 @@ addMessages(array(
 	'ADMIN_WERNIS_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
 	'ADMIN_WERNIS_PAYOUT_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Auszahlungen",
 	'ADMIN_WERNIS_WITHDRAW_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
+	'ADMIN_LIST_WERNIS_TITLE' => "Alle Transaktionen von und zum Wernis-Portal auflisten:",
 	'ADMIN_LIST_WERNIS_FOOTER' => "Hier soll ein Hinweis hinkommen.",
+	'ADMIN_TASK_LIST_WERNIS_ALL' => "Alle Wernis-Ein-/Auszahlungen",
+	'ADMIN_TASK_LIST_WERNIS_ALL_TITLE' => "Listet alle Wernis-Ein- und Auszahlungen auf.",
 
 	// API messages
 	'WERNIS_API_REQUEST_DATA_INVALID' => "Interner Fehler: Abfragedaten sind defekt.",
@@ -134,6 +132,9 @@ addMessages(array(
 	'MEMBER_WERNIS_STATUS' => "&Uuml;berweisungsart",
 	'MEMBER_WERNIS_PAYOUT_DISABLED' => "Auszahlung wurde administrativ deaktiviert.",
 	'MEMBER_WERNIS_WITHDRAW_DISABLED' => "Einzahlung wurde administrativ deaktiviert.",
+	'MEMBER_WERNIS_MODE_WITHDRAW' => "Wernis einzahlen",
+	'MEMBER_WERNIS_MODE_PAYOUT' => "Wernis auszahlen",
+	'MEMBER_WERNIS_LIST_WERNIS' => "&Uuml;berweisungsliste von/an WDS66-Hauptaccount",
 ));
 
 // [EOF]
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 06731189cc..f1749a980b 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -131,7 +131,7 @@ ORDER BY
 		// Prepare constant for timemark
 		// @TODO Can't this be moved into our expression language?
 		if (isExtensionActive('autopurge')) {
-			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
+			$content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
 		} else {
 			$content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
 		}
diff --git a/templates/de/html/admin/admin_edit_mods.tpl b/templates/de/html/admin/admin_edit_mods.tpl
index ab80e84f0b..0f27b51e16 100644
--- a/templates/de/html/admin/admin_edit_mods.tpl
+++ b/templates/de/html/admin/admin_edit_mods.tpl
@@ -1,22 +1,26 @@
 <div align="center">
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_mods%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-	<!-- @TODO Shouldn't we add a title here? //-->
-	<tr>
-		<td align="center" class="header_column bottom right" height="25"><strong>{--ADMIN_MODS_NAME--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
-	</tr>
-	$content
-	<tr>
-		<td colspan="6" class="table_footer">
-			<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-			<input type="submit" class="form_submit" name="change" value="{--SAVE_CHANGES--}" />
-		</td>
-	</tr>
+<tr>
+	<td align="center" colspan="6" class="table_header bottom" height="40">
+		<strong>{--ADMIN_MODS_EDIT_TITLE--}</strong>
+	</td>
+</tr>
+<tr>
+	<td align="center" class="header_column bottom right" height="25"><strong>{--ADMIN_MODS_NAME--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
+</tr>
+$content
+<tr>
+	<td colspan="6" class="table_footer">
+		<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+		<input type="submit" class="form_submit" name="change" value="{--SAVE_CHANGES--}" />
+	</td>
+</tr>
 </table>
 </form>
 </div>
diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl
index e22f568426..c266e2f9d5 100644
--- a/templates/de/html/admin/admin_list_autopurge.tpl
+++ b/templates/de/html/admin/admin_list_autopurge.tpl
@@ -1,19 +1,25 @@
+<div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-	<!-- @TODO Shouldn't we add a title here? //-->
-	<tr>
-		<td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--FAMILY--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--EMAIL--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--MEMBER_JOINED--}</strong></td>
-		<td class="header_column bottom right" align="center"><strong>{--LAST_SEEN--}</strong></td>
-		<td class="header_column bottom" align="center"><strong>{--ADMIN_AUTOPURGE_NOTIFIED--}</strong></td>
-	</tr>
-	$content[rows]
-	<tr>
-		<td colspan="8" class="table_footer">
-			{--ADMIN_LIST_AUTOPURGE_FOOTER--}
-		</td>
-	</tr>
+<tr>
+	<td colspan="8" class="table_header" align="center">
+		<strong>{--ADMIN_LIST_AUTOPURGE_TITLE--}</strong>
+	</td>
+</tr>
+<tr>
+	<td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--FAMILY--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--EMAIL--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--MEMBER_JOINED--}</strong></td>
+	<td class="header_column bottom right" align="center"><strong>{--LAST_SEEN--}</strong></td>
+	<td class="header_column bottom" align="center"><strong>{--ADMIN_AUTOPURGE_NOTIFIED--}</strong></td>
+</tr>
+$content[rows]
+<tr>
+	<td colspan="8" class="table_footer">
+		{--ADMIN_LIST_AUTOPURGE_FOOTER--}
+	</td>
+</tr>
 </table>
+</div>
diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index 1fa9289d14..75a98eb811 100644
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -1,40 +1,44 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-	<!-- @TODO No title here? //-->
-	<tr>
-		<td class="header_column bottom right" align="center">
-			<strong>{--BEG_RANK--}</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--_UID--}:</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--SURNAME_FAMILY--}:</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--BEG_TOTAL--}:</strong>
-		</td>
-		<td class="header_column bottom" align="center">
-			<strong>{--LAST_ONLINE_SHORT--}:</strong>
-		</td>
-	</tr>
-	$content[rows]
-	<tr>
-		<td colspan="3" class="header_column bottom right" align="right">
-			<u>{--MEMBER_BEG_TOTAL--}:</u>
-		</td>
-		<td class="header_column bottom right">
-			<u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
-		</td>
-		<td class="header_column bottom">
-			&nbsp;
-		</td>
-	</tr>
-	<tr>
-		<td colspan="5" align="center">
-			$content[withdraw_form]
-		</td>
-	</tr>
+<tr>
+	<td colspan="5" class="table_header bottom" align="center">
+		<strong>{--ADMIN_LIST_BEG_TITLE--}/<strong>
+	</td>
+</tr>
+<tr>
+	<td class="header_column bottom right" align="center">
+		<strong>{--BEG_RANK--}</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--_UID--}:</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--SURNAME_FAMILY--}:</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--BEG_TOTAL--}:</strong>
+	</td>
+	<td class="header_column bottom" align="center">
+		<strong>{--LAST_ONLINE_SHORT--}:</strong>
+	</td>
+</tr>
+$content[rows]
+<tr>
+	<td colspan="3" class="header_column bottom right" align="right">
+		<u>{--MEMBER_BEG_TOTAL--}:</u>
+	</td>
+	<td class="header_column bottom right">
+		<u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
+	</td>
+	<td class="header_column bottom">
+		&nbsp;
+	</td>
+</tr>
+<tr>
+	<td colspan="5" align="center">
+		$content[withdraw_form]
+	</td>
+</tr>
 </table>
 
 <div class="notice">
diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl
index 482955275b..781575b221 100644
--- a/templates/de/html/admin/admin_list_bonus.tpl
+++ b/templates/de/html/admin/admin_list_bonus.tpl
@@ -1,38 +1,42 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-	<!-- @TODO No title here? //-->
-	<tr>
-		<td class="header_column bottom right" align="center">
-			<strong>{--BONUS_RANK--}</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--_UID--}:</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--SURNAME_FAMILY--}:</strong>
-		</td>
-		<td class="header_column bottom right" align="center">
-			<strong>{--ADMIN_BONUS_TURBO_TOTAL--}:</strong>
-		</td>
-		<td class="header_column bottom" align="center">
-			<strong>{--LAST_ONLINE_SHORT--}:</strong>
-		</td>
-	</tr>
-	$content[rows]
-	<tr>
-		<td colspan="3" class="header_column bottom right" align="right">
-			<u>{--ADMIN_TOTAL_MEMBER_BONUS--}:</u>&nbsp;
-		</td>
-		<td class="header_column bottom right">
-			<u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
-		</td>
-		<td class="header_column bottom">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="5" class="header_column" align="center" height="55">
-			$content[withdraw_form]
-		</td>
-	</tr>
+<tr>
+	<td colspan="5" class="table_header bottom" align="center">
+		<strong>{--ADMIN_LIST_BONUS_RALLYE_TITLE--}</strong>
+	</td>
+</tr>
+<tr>
+	<td class="header_column bottom right" align="center">
+		<strong>{--BONUS_RANK--}</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--_UID--}:</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--SURNAME_FAMILY--}:</strong>
+	</td>
+	<td class="header_column bottom right" align="center">
+		<strong>{--ADMIN_BONUS_TURBO_TOTAL--}:</strong>
+	</td>
+	<td class="header_column bottom" align="center">
+		<strong>{--LAST_ONLINE_SHORT--}:</strong>
+	</td>
+</tr>
+$content[rows]
+<tr>
+	<td colspan="3" class="header_column bottom right" align="right">
+		<u>{--ADMIN_TOTAL_MEMBER_BONUS--}:</u>&nbsp;
+	</td>
+	<td class="header_column bottom right">
+		<u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
+	</td>
+	<td class="header_column bottom">&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="5" class="header_column" align="center" height="55">
+		$content[withdraw_form]
+	</td>
+</tr>
 </table>
 
 <div class="notice">
@@ -40,7 +44,7 @@
 		<strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong>
 	</div>
 	<div>
-		{%message,ADMIN_BONUS_TIMEOUT=$content[autopurge_timeout]%}
+		$content[autopurge_timeout]
 	</div>
 </div>
 </div>
diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl
index cf5ae916c4..d64e165f42 100644
--- a/templates/de/html/admin/admin_list_bonus_rows.tpl
+++ b/templates/de/html/admin/admin_list_bonus_rows.tpl
@@ -1,7 +1,17 @@
 <tr>
-	<td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]$content[cnt]$content[win2]</td>
-	<td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]</td>
-	<td class="{%template,ColorSwitch%} bottom right">$content[win1]<a href="$content[email]">{%pipe,translateGender$content[gender]%} $content[surname] $content[family]</a>$content[win2]</td>
-	<td class="{%template,ColorSwitch%} bottom right">{%pipe,translateComma=$content[points]%} {?POINTS?}</td>
-	<td class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
+	<td class="{%template,ColorSwitch%} bottom right" align="center">
+		$content[win1]$content[cnt]$content[win2]
+	</td>
+	<td class="{%template,ColorSwitch%} bottom right" align="center">
+		$content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]
+	</td>
+	<td class="{%template,ColorSwitch%} bottom right">
+		$content[win1]<a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>$content[win2]
+	</td>
+	<td class="{%template,ColorSwitch%} bottom right">
+		{%pipe,translateComma=$content[points]%} {?POINTS?}
+	</td>
+	<td class="{%template,ColorSwitch%} bottom">
+		$content[last_online]
+	</td>
 </tr>
diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl
index 82ceedb2fa..22661da44c 100644
--- a/templates/de/html/admin/admin_list_mods.tpl
+++ b/templates/de/html/admin/admin_list_mods.tpl
@@ -1,23 +1,27 @@
 <div align="center">
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_mods%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-	<!-- @TODO Shouldn't we add a title here? //-->
-	<tr>
-		<td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_NAME--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
-		<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
-		<td align="center" class="header_column bottom"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
-	</tr>
-	$content
-	<tr>
-		<td colspan="7" class="table_footer">
-			<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-			<input type="submit" class="form_submit" name="edit" value="{--ADMIN_MODS_EDIT--}" />
-		</td>
-	</tr>
+<tr>
+	<td colspan="7" class="table_header bottom" align="center">
+		<strong>{--ADMIN_MODS_LIST_TITLE--}</strong>
+	</td>
+</tr>
+<tr>
+	<td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_NAME--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_LOCKED--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_HIDDEN--}</strong></td>
+	<td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
+	<td align="center" class="header_column bottom"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
+</tr>
+$content
+<tr>
+	<td colspan="7" class="table_footer">
+		<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+		<input type="submit" class="form_submit" name="edit" value="{--ADMIN_MODS_EDIT--}" />
+	</td>
+</tr>
 </table>
 </form>
 
diff --git a/templates/de/html/admin/admin_list_primera_main.tpl b/templates/de/html/admin/admin_list_primera_main.tpl
index 5f7dcc726f..3126600bc3 100644
--- a/templates/de/html/admin/admin_list_primera_main.tpl
+++ b/templates/de/html/admin/admin_list_primera_main.tpl
@@ -1,6 +1,10 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-<!-- @TODO No title here? //-->
+<tr>
+	<td colspan="8" class="table_header" align="center">
+		<strong>{--ADMIN_LIST_PRIMERA_TITLE--}</strong>
+	</td>
+</tr>
 <tr>
 	<td class="header_column bottom right" align="center" width="60"><strong>{--ID_SELECT--}</strong></td>
 	<td class="header_column bottom right" align="center" width="90"><strong>{--_UID--}</strong></td>
@@ -14,7 +18,7 @@
 $content
 <tr>
 	<td colspan="8" class="table_footer">
-		{--ADMIN_PRIMERA_FOOTER--}
+		{--ADMIN_LIST_PRIMERA_FOOTER--}
 	</td>
 </tr>
 </table>
diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl
index cdfc31143e..12fc3eff51 100644
--- a/templates/de/html/admin/admin_list_wernis_main.tpl
+++ b/templates/de/html/admin/admin_list_wernis_main.tpl
@@ -1,5 +1,10 @@
+<div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-<!-- @TODO No title here? //-->
+<tr>
+	<td colspan="8" class="table_header bottom" align="center">
+		<strong>{--ADMIN_LIST_WERNIS_TITLE--}</strong>
+	</td>
+</tr>
 <tr>
 	<td class="header_column bottom right" align="center" width="60"><strong>{--ID_SELECT--}</strong></td>
 	<td class="header_column bottom right" align="center" width="90"><strong>{--_UID--}</strong></td>
@@ -17,3 +22,4 @@ $content
 	</td>
 </tr>
 </table>
+</div>
-- 
2.39.5