From d863b60ee167db89d1d5540be2207fca27cdd2c7 Mon Sep 17 00:00:00 2001 From: quix0r Date: Thu, 14 Jul 2011 21:47:54 +0000 Subject: [PATCH] Some CSS classes purged, ol.listing added, extensions fixed: - Some out-dated (superfluous) CSS classes purged - Others fixed/rewritten (really a lot!) - Extension ext-beg now displays correctly memeber menu entries and SQL query is fixed - Extension ext-refback now sends correct userids out and allows an optional note to the recipient - Other minor improvements/fixes --- inc/extensions/ext-beg.php | 23 +++-- inc/language/beg_de.php | 5 +- inc/language/de.php | 2 +- inc/language/refback_de.php | 5 +- inc/libs/refback_functions.php | 5 +- inc/modules/member/what-refback.php | 2 +- templates/de/emails/admin/admin_refback.tpl | 9 +- templates/de/emails/member/member_refback.tpl | 4 +- .../de/html/admin/admin_email_archiv_row.tpl | 2 +- .../de/html/admin/admin_list_bonus_emails.tpl | 4 +- .../admin/admin_list_bonus_emails_row.tpl | 30 +++---- .../de/html/admin/admin_list_emails_row.tpl | 18 ++-- .../admin/admin_list_notify_emails_row.tpl | 24 +++--- .../de/html/admin/admin_list_unconfirmed.tpl | 2 +- .../admin/admin_list_unconfirmed_list.tpl | 8 +- .../de/html/admin/admin_overview_table.tpl | 18 ++-- .../de/html/admin/admin_user_details.tpl | 84 +++++++++---------- templates/de/html/beg/beg_link.tpl | 38 ++++----- templates/de/html/guest/guest_beg.tpl | 10 ++- .../de/html/guest/guest_doubler_list.tpl | 6 +- templates/de/html/member/member_beg.tpl | 41 +++++---- .../de/html/member/member_doubler_list.tpl | 8 +- .../de/html/member/member_edit_refback.tpl | 6 +- templates/de/html/member/member_footer.tpl | 2 +- templates/de/html/member/member_list_beg.tpl | 60 ++++++------- .../html/member/member_mail_bonus_deleted.tpl | 41 ++++----- .../de/html/member/member_mail_bonus_new.tpl | 41 ++++----- .../html/member/member_mail_bonus_queue.tpl | 41 ++++----- .../de/html/member/member_mail_bonus_send.tpl | 41 ++++----- .../html/member/member_mail_normal_active.tpl | 37 ++++---- .../html/member/member_mail_normal_admin.tpl | 37 ++++---- .../member/member_mail_normal_deleted.tpl | 37 ++++---- .../de/html/member/member_mail_normal_new.tpl | 37 ++++---- .../html/member/member_mail_normal_send.tpl | 37 ++++---- .../html/member/member_mail_normal_temp.tpl | 37 ++++---- theme/business/css/beg.css | 3 - theme/business/css/doubler.css | 5 -- theme/business/css/general.css | 16 +++- theme/default/css/beg.css | 3 - theme/default/css/doubler.css | 5 -- theme/default/css/general.css | 8 ++ theme/desert/css/beg.css | 3 - theme/desert/css/doubler.css | 5 -- theme/desert/css/general.css | 8 ++ theme/org/css/beg.css | 3 - theme/org/css/doubler.css | 5 -- theme/org/css/general.css | 8 ++ theme/schleuder/css/beg.css | 3 - theme/schleuder/css/doubler.css | 5 -- theme/schleuder/css/general.css | 8 ++ theme/ship-simu/css/general.css | 8 ++ 51 files changed, 462 insertions(+), 436 deletions(-) diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 0210a77943..78d462322a 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -41,17 +41,19 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.3.0'); +setThisExtensionVersion('0.3.1'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0')); +setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running // SQL commands to run + // - Menu systems addAdminMenuSql('setup', 'config_beg', 'Bettel-Link', 'IP-Sperre, {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütung usw. können Sie hier einstellen.', 10); - addGuestMenuSql('main', 'beg', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG} erbetteln!', 4); + addGuestMenuSql('members', 'beg', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG} erbetteln!', 4); addMemberMenuSql('main', 'beg', 'Ihr Bettel-Link', 6); + // - Configuration addConfigAddSql('beg_timeout', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 600'); addConfigAddSql('beg_userid_timeout', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800'); addConfigAddSql('beg_points', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00100'); @@ -158,7 +160,7 @@ INDEX (`userid`)", addConfigAddSql('beg_rallye', "ENUM('Y','N') NOT NULL DEFAULT 'N'"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_points` FLOAT(21,5) UNSIGNED NOT NULL DEFAULT 0.00000"); - addMemberMenuSql('main', 'beg2', 'Bettel-Rallye', 7); + // Menu system addAdminMenuSql('user', 'list_beg', 'Bettel-Rallye', 'Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.', 12); // Update notes (these will be set as task text!) @@ -235,7 +237,6 @@ INDEX (`userid`)", case '0.2.4': // SQL queries for v0.2.4 addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=1 WHERE `what`='beg' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals', `sort`=3, `title`='Bettel-Rallye' WHERE `what`='beg2' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); @@ -283,7 +284,7 @@ INDEX (`userid`)", `remote_ip` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0', `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `referal_url` TINYTEXT NOT NULL, -PRIMARY KEY (`id), +PRIMARY KEY (`id`), INDEX (`userid`)", 'Recorded Referal URLs'); @@ -305,6 +306,16 @@ INDEX (`userid`)", // Update notes setExtensionUpdateNotes("Monatliche Bettelrallye und die erbettelten {?POINTS?} werden nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet."); break; + + case '0.3.1': // SQL queries for v0.3.1 + // Add/move menu + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='beg2'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `action`='members',`sort`=3 WHERE `what`='beg' LIMIT 1"); + addMemberMenuSql('rals', 'beg2', 'Bettel-Rallye', 3); + + // Update notes + setExtensionUpdateNotes("Bettel-Rallye re-hinzugefügt."); + break; } // END - switch break; diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php index fb22599967..748598e431 100644 --- a/inc/language/beg_de.php +++ b/inc/language/beg_de.php @@ -69,7 +69,7 @@ addMessages(array( 'GUEST_BEG_TRAILER' => "{?POINTS?} erbetteln bei...", 'GUEST_BEG_EARN_1' => "Betteln macht sich bezahlt! Für jeden Klick erhalten Sie von", 'GUEST_BEG_EARN_2' => "bis", - 'GUEST_BEG_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.", + 'GUEST_BEG_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zudem verdienen Sie an den erbettelten {?POINTS?} Ihrer Refferal mit.", 'GUEST_BEG_TIMEOUT' => "Sie können derzeit alle {%config,createFancyTime=beg_timeout%} {?POINTS?} betteln.", 'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.", 'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink", @@ -78,6 +78,7 @@ addMessages(array( 'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ", 'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.", 'BEG_SAME_USERID_AS_OWN' => "Mitglieder-Id des Webmasters benutzt.", + 'MEMBER_BEG_LINK_TITLE' => "Ihr Bettellink zum Bewerben", // Pay modes 'ADMIN_CONFIG_BEG_PAY_MODE' => "Wie sollen {?POINTS?} vergütet werden?", @@ -113,7 +114,7 @@ addMessages(array( 'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} ({?MAIN_TITLE?}) und freigegeben ist.", 'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} berücksichtig.", 'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.", - 'MEMBER_LIST_BEG_RALLYE_TITLE' => "Hier finden Sie die aktuelle Liste mit den möglichen Gewinnern.", + 'MEMBER_LIST_BEG_RALLYE_TITLE' => "Derzeitiger Stand der Bettel-Rallye", 'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.", 'ADMIN_CONFIG_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye", 'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye", diff --git a/inc/language/de.php b/inc/language/de.php index 7e169ee047..fd28a58d09 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -493,7 +493,7 @@ addMessages(array( 'ENTER_POINTS' => "Vergütung", 'ENTER_SECONDS' => "Wartezeit", 'ADMIN_MORE_SELECTED' => "Sie haben mehr Empfänger eingegeben, als das empfangsbereit sind.", - 'ADMIN_BONUS_CONTENT' => "Versendete Bonus-Mails", + 'ADMIN_LIST_BONUS_TITLE' => "Versendete Bonus-Mails", 'EMAIL_POINTS' => "Vergütung", 'EMAIL_SECONDS' => "Wartezeit", 'POOL_ACTIVE' => "Wird gerade versendet", diff --git a/inc/language/refback_de.php b/inc/language/refback_de.php index d04fa7f26b..7c8ed71400 100644 --- a/inc/language/refback_de.php +++ b/inc/language/refback_de.php @@ -62,7 +62,7 @@ addMessages(array( 'MEMBER_REFBACK_REFID' => "Mitglieder-Id", 'MEMBER_REFBACK_LEVEL_REFID' => "Werber", 'MEMBER_REFBACK_STATUS' => "Referal-Status", - 'MEMBER_REFBACK_PERCENTS' => "Refback Prozente", + 'MEMBER_REFBACK_PERCENTS' => "Refback-Prozente", 'MEMBER_REFBACK_POINTS' => "Refback Vergütung", 'MEMBER_REFBACK_EDIT' => "Einstellen", 'MEMBER_REFBACK_EDIT_TITLE' => "Refback für ausgewähltes Mitglied einstellen:", @@ -70,6 +70,9 @@ addMessages(array( 'MEMBER_REFBACK_DELETED_TITLE' => "Einstellen von Refback ist für gelöschte Mitglieder nicht möglich.", 'MEMBER_REFBACK_DISABLED' => "Refback ist administrativ deaktiviert. Bitte nutze die Referal-Übersicht links im Menü.", 'MEMBER_REFBACK_MIN_MAX_NOTE' => "Hinweis: Sie können derzeit zwischen {%config,translateComma=refback_min_perc%} und {%config,translateComma=refback_max_perc%} Prozent, inklusive, Refback einstellen.", + // - Edit form + 'MEMBER_ENTER_REFBACK_PERCENTS' => "Refback-Prozente eingeben", + 'MEMBER_ENTER_REFBACK_NOTE_FOR_RECIPIENT' => "Optionalen Hinweis an den Empfänger", // Error messages for members 'MEMBER_REFBACK_ERROR_MESSAGE' => "Fehler beim Einstellen des Refbacks. Fehlermeldung:
\n%s", diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index e97e063fec..59336045ee 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -278,7 +278,7 @@ function getArrayFromUserRefbackData ($id) { } // Update refback percents (but with some sanity-checks! -function updateMemberRefbackPercents ($id, $percents) { +function updateMemberRefbackPercents ($id, $percents, $note) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',percents=' . $percents . ' - ENTERED!'); // Default status is failed $status['message'] = 'MEMBER_REFBACK_ERROR_GENERAL'; @@ -328,6 +328,7 @@ function updateMemberRefbackPercents ($id, $percents) { // Prepare email content $dummy['refback_percents'] = $percents; + $dummy['refback_note'] = $note; // Load member email template $mail = loadEmailTemplate('member_refback', $dummy, $dummy['refid']); @@ -336,7 +337,7 @@ function updateMemberRefbackPercents ($id, $percents) { sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail); // Send admin notification - sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $dummy, getMemberId()); + sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $dummy, $dummy['refid']); // All fine! $status['ok'] = true; diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index ee7e6326a6..67e2a3013c 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -67,7 +67,7 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) { // Validate percents if ((($percents >= getConfig('refback_min_perc')) || (round($percents) == 0)) && ($percents <= getConfig('refback_max_perc'))) { // Change ref-back for this direct id - $status = updateMemberRefbackPercents(postRequestParameter('id'), postRequestParameter('refback_percents')); + $status = updateMemberRefbackPercents(postRequestParameter('id'), postRequestParameter('refback_percents'), postRequestParameter('refback_note')); // Check status if (isset($status['ok'])) { diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl index 1385ffd19a..6afdc8697d 100644 --- a/templates/de/emails/admin/admin_refback.tpl +++ b/templates/de/emails/admin/admin_refback.tpl @@ -1,9 +1,8 @@ Hallo Administrator, -Das Mitglied $userid hat soeben Refback für ein anderes Mitglied eingestellt. +Das Mitglied {%pipe,getMemberId%} hat soeben Refback für das Mitglied $userid eingestellt. ------------------------------------ -Mitglied-Id: {%user,refid,bigintval=$userid%} (der den Refback bekommt) +Hier sind alle relevanten Daten des Refback-Empfängers: ----------------------------------- Vorname: {%user,surname=$userid%} ----------------------------------- @@ -13,7 +12,9 @@ Email-Adresse: {%user,email=$userid%} ----------------------------------- Refback: {%pipe,translateComma=$content[refback_percents]%}% ----------------------------------- -Bereits erhalten: {%pipe,translateComma=$content[refback_points]%} {?POINTS?} +Bereits verdient: {%pipe,translateComma=$content[refback_points]%} {?POINTS?} +----------------------------------- +Hinweis: $content[refback_note] ----------------------------------- Mit freundlichen Grüßen, diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl index f160d3f278..697a55c7ed 100644 --- a/templates/de/emails/member/member_refback.tpl +++ b/templates/de/emails/member/member_refback.tpl @@ -1,12 +1,14 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[refback_percents]%}% Refback eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. +das Mitglied {%pipe,getMemberId%} hat Ihnen soeben {%pipe,translateComma=$content[refback_percents]%}% Refback eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. ------------------------------ Ihr Mitglieder-Id ist: $userid ------------------------------ Refback: {%pipe,translateComma=$content[refback_percents]%}% ------------------------------ +Hinweis: $content[refback_note] +------------------------------ Sie haben bereits {%pipe,translateComma=$content[refback_points]%} {?POINTS?} Refback-Vergütung an das Mitglied abgegeben. diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 97928a7b59..d27f4368aa 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -9,7 +9,7 @@ {--EMAIL_TEXT--}:
- $content[text] + 
$content[text]
 diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl index 5dcc37d0cd..ca24a37343 100644 --- a/templates/de/html/admin/admin_list_bonus_emails.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails.tpl @@ -1,8 +1,8 @@
- $content[nav] diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl index 52843f88d5..12c32dde98 100644 --- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl index 650df97700..6706777deb 100644 --- a/templates/de/html/admin/admin_list_emails_row.tpl +++ b/templates/de/html/admin/admin_list_emails_row.tpl @@ -1,39 +1,39 @@ - - - - - - - - diff --git a/templates/de/html/admin/admin_list_notify_emails_row.tpl b/templates/de/html/admin/admin_list_notify_emails_row.tpl index 6541d8ea0e..9ecc0e252c 100644 --- a/templates/de/html/admin/admin_list_notify_emails_row.tpl +++ b/templates/de/html/admin/admin_list_notify_emails_row.tpl @@ -1,52 +1,52 @@ - - - - - - - - - - - diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index 8a95d176b3..6887d31501 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -21,7 +21,7 @@
-
{--ADMIN_BONUS_CONTENT--}
+ 		+ {--ADMIN_LIST_BONUS_TITLE--}
+
{--EMAIL_SUBJECT--}:
$content[subject]
 +
{--EMAIL_TEXT--}:
-
$content[text]
+ 
$content[text]
+
{--EMAIL_POINTS--}:
{%pipe,translateComma=$content[points]%} {?POINTS?}
 +
{--EMAIL_SECONDS--}:
{%pipe,createFancyTime=$content[time]%}
 +
{--EMAIL_CATEGORY--}:
{%pipe,getCategory=$content[cat_id]%}
+
{--EMAIL_RECEIVERS--}:
{%pipe,translateComma=$content[mails_sent]%} ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%})
 +
{--USERS_LINKS--}:
$content[unconfirmed]
 +
{--EMAIL_POOL_TYPE--}:
{%pipe,translatePoolType=$content[data_type]%}
+
{--EMAIL_TSEND--}:
$content[target_send]
 +
{--EMAIL_URL--}:
 +
{--EMAIL_TIMESTAMP--}:
$content[timestamp]
+
{--EMAIL_URL--}:
$content[url]
 + {--_UNUSED--}:
---
+ {%template,AdminBonusMailLinks=$content[id]%}
+ {--EMAIL_SENDER--}:
{%pipe,generateUserProfileLink=$content[sender]%} 		+ {--EMAIL_SUBJECT--}:
$content[subject] 		+ {--EMAIL_TEXT--}:
- $content[text] + 
$content[text]
+ {--EMAIL_PAYMENT--}:
{%pipe,getPaymentTitlePrice=$content[payment_id]%} 		+ {--EMAIL_CATEGORY--}:
{%pipe,getCategory=$content[cat_id]%}
+ {--EMAIL_RECEIVERS--}:
{%pipe,translateComma=$content[mails_sent]%}
({--EMAIL_RUIDS--}:
{%pipe,convertReceivers=$content[receivers]%}
) 		+ {--USERS_LINKS--}:
$content[unconfirmed] 		+ {--EMAIL_POOL_TYPE--}:
{%pipe,translatePoolType=$content[data_type]%}
+ {--EMAIL_SUBJECT--}:
$content[subject] 		+ {--EMAIL_TEXT--}:
- $content[text] + 
$content[text]
+ {--EMAIL_POINTS--}:
{%pipe,translateComma=$content[points]%} {?POINTS?} 		+ {--EMAIL_SECONDS--}:
{%pipe,createFancyTime=$content[time]%} 		+ {--EMAIL_CATEGORY--}:
{%pipe,getCategory=$content[cat_id]%}
+ {--EMAIL_RECEIVERS--}:
{%pipe,translateComma=$content[mails_sent]%} ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%}) 		+ {--USERS_LINKS--}:
$content[unconfirmed_content] 		+ {--EMAIL_POOL_TYPE--}:
{%pipe,translatePoolType=$content[data_type]%}
+ {--EMAIL_TSEND--}:
{%pipe,translateComma=$content[target_send]%} 		+ {--EMAIL_URL--}:
{--ADMIN_TEST_URL--} 		+ {--EMAIL_TIMESTAMP--}:
$content[timestamp]
{--EMAIL_TEXT--}:
- $content[text] + 
$content[text]
 		{--USERS_LINKS--}:
$content[unconfirmed] diff --git a/templates/de/html/admin/admin_list_unconfirmed_list.tpl b/templates/de/html/admin/admin_list_unconfirmed_list.tpl index 7b11e7c3da..fa2af78682 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_list.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_list.tpl @@ -2,10 +2,10 @@ - - - - + + + + $content
{--ID_SELECT--}{--MAILID_LINK--}{--SURNAME_FAMILY--}{--ACCOUNT_STATUS--}{--ID_SELECT--}{--MAILID_LINK--}{--SURNAME_FAMILY--}{--ACCOUNT_STATUS--}
diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index 8bdd8ebb4d..d0791c2cbe 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -2,22 +2,22 @@
- - - - - - - - + + + + + + + $content -
+ {--ADMIN_TASK_SYSTEM_WELCOME--}
{--ID_SELECT--}{--ADMIN_ASSIGNED_ADMIN--}{--ADMIN_REGISTER_EXTENSION--}{--ADMIN_TASK_INFOS--}{--ADMIN_MEMBER_USERID--}{--ADMIN_TASK_TYPE--}{--ADMIN_TASK_CREATED--}{--ID_SELECT--}{--ADMIN_ASSIGNED_ADMIN--}{--ADMIN_REGISTER_EXTENSION--}{--ADMIN_TASK_INFOS--}{--ADMIN_MEMBER_USERID--}{--ADMIN_TASK_TYPE--}{--ADMIN_TASK_CREATED--}
+ diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 6433f48dfd..670f01e6f4 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -1,192 +1,192 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl index f78837803b..89a93c8a5c 100644 --- a/templates/de/html/guest/guest_beg.tpl +++ b/templates/de/html/guest/guest_beg.tpl @@ -1,9 +1,10 @@ -
-
+
+
+
{--GUEST_BEG_TRAILER--}
{?MAIN_TITLE?}
-
+
{--GUEST_BEG_EARN_1--} {%config,translateComma=beg_points%} {?POINTS?} {--GUEST_BEG_EARN_2--} {%config,translateComma=beg_points_max%} {?POINTS?} @@ -16,7 +17,8 @@ {--GUEST_BEG_HAVE_FUN--}
-
+
{--BEG_CONTINUE_REGISTER--}
+
diff --git a/templates/de/html/guest/guest_doubler_list.tpl b/templates/de/html/guest/guest_doubler_list.tpl index 90d3449163..af914431a1 100644 --- a/templates/de/html/guest/guest_doubler_list.tpl +++ b/templates/de/html/guest/guest_doubler_list.tpl @@ -1,13 +1,13 @@
+ {--_USERID--} $content[userid]
+ {--GENDER--}:
{%user,gender,translateGender=$content[userid]%} 		+ {--SURNAME--}:
{%user,surname=$content[userid]%} 		+ {--FAMILY--}:
{%user,family=$content[userid]%} 		+ {--STREET_NR--}:
{%user,street_nr=$content[userid]%}
+ {--BIRTHDAY2--}:
$content[birthday] 		+ {--COUNTRY--}:
$content[country] 		+ {--ZIP--}:
{%user,zip,bigintval=$content[userid]%} 		+ {--CITY--}:
{%user,city=$content[userid]%}
+ {--EMAIL--}:
$content[email] 		+ {--ACCOUNT_STATUS--}:
{%user,status,translateUserStatus=$content[userid]%} 		+ {--RECEIVE_MAILS--}:
{%user,receive_mails,translateComma=$content[userid]%} 		+ {--MAX_PER_DAY--}:
{%user,max_mails,translateComma=$content[userid]%}
+ {--REFERAL_USERID--}:
{%user,refid,generateUserProfileLink=$content[userid]%} 		+ {--REFERAL_CLICKS--}:
{%user,ref_clicks,translateComma=$content[userid]%} 		+ {--TOTAL_LOGINS--}:
{%user,total_logins,translateComma=$content[userid]%} 		+ {--REMOTE_IP--}:
{%user,REMOTE_ADDR=$content[userid]%}
+ {--LAST_ONLINE_SHORT--}:
$content[last_online] 		+ {--ADMIN_LAST_MODULE--}:
{%user,last_module,fixEmptyContentToDashes=$content[userid]%} 		+ {--HAS_JOINED--}:
$content[joined] 		+ {--MAILS_SENT--}:
$content[emails_sent]
+ {--USED_POINTS--}:
{%user,used_points,translateComma=$content[userid]%} 		+ {--TOTAL_POINTS--}:
{%pipe,getTotalPoints,translateComma=$content[userid]%} 		+ {--LOCKED_POINTS--}:
{%pipe,translateComma=$content[locked_points]%} 		+ {--OWN_POINTS--}:
{%pipe,translateComma=$content[own_points]%}
+ {--TOTAL_CATEGORIES--}:
$content[cats] 		+ {--RAND_CONFIRMED--}:
{%user,rand_confirmed,translateComma=$content[userid]%}/{%config,translateComma=user_min_confirmed%} 		+ {--LOCK_TIMESTAMP--}:
$content[lock_timestamp] 		+ {--LOCK_REASON--}:
{%user,lock_reason,fixEmptyContentToDashes=$content[userid]%}
+ {--UNCONFIRMED_LINKS--}:
$content[links] 		+ {--TOTAL_REFERALS--}:
$content[refs] 		+ {--LAST_UPDATE--}:
$content[last_update] 		+ {--LAST_PROFILE_SENT--}:
$content[last_profile_sent]
+ {--ADMIN_USER_REFERAL_PAYOUT--}:
{%user,ref_payout,translateComma=$content[userid]%} 		+ {--USER_NICKNAME--}:
{%user,nickname,fixEmptyContentToDashes=$content[userid]%} 		+ {--CLICK_RATE--}:
{%pipe,translateComma=$content[click_rate]%}% 		+ {--EMAILS_RECEIVED--}:
{%user,emails_received,translateComma=$content[userid]%}
+ {--MAILS_CONFIRMED--}:
{%user,mails_confirmed,translateComma=$content[userid]%} 		+ {--_UNUSED--}:
--- 		+ {--_UNUSED--}:
--- 		+ {--_UNUSED--}:
---
+
{--ADMIN_MEMBER_FUNCTIONS--}:
diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl index f0942dbc73..a2d0f4c22d 100644 --- a/templates/de/html/beg/beg_link.tpl +++ b/templates/de/html/beg/beg_link.tpl @@ -7,29 +7,23 @@
- - - - - - - - - - -
-
- {--BEG_LINK_BY--} -
+
+
+
+ {--BEG_LINK_BY--} +
-
- {%message,BEG_LINK_USERID=$content[userid]%} -
-
- $content[message] -
- {--BEG_CONTINUE_REGISTER--} -
+
+ {%message,BEG_LINK_USERID=$content[userid]%} +
+ +
+
$content[message]
+
+
+ {--BEG_CONTINUE_REGISTER--} +
+
- - - diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl index 1d43b75a30..de3cfd21c7 100644 --- a/templates/de/html/member/member_beg.tpl +++ b/templates/de/html/member/member_beg.tpl @@ -1,27 +1,26 @@ -
-
-
- {--MEMBER_BEG_YOUR_LINK--}: -
- +
+
+
+ {--MEMBER_BEG_LINK_TITLE--}
-
+
+ {--MEMBER_BEG_YOUR_LINK--}:
+ {?URL?}/beg.php?userid=$content[userid] +
+
{--MEMBER_BEG_CLICKS_TOTAL--}: {%user,beg_clicks,translateComma%}
-
-
- {--MEMBER_BEG_EARN_1--} {%config,translateComma=beg_points%} {?POINTS?} - {--MEMBER_BEG_EARN_2--} {%config,translateComma=beg_points_max%} {?POINTS?} - {--MEMBER_BEG_EARN_3--} -
-
- {%message,MEMBER_BEG_TIMEOUT%} -
-
- {--MEMBER_BEG_HAVE_FUN--} -
+
+ {--MEMBER_BEG_EARN_1--} {%config,translateComma=beg_points%} {?POINTS?} + {--MEMBER_BEG_EARN_2--} {%config,translateComma=beg_points_max%} {?POINTS?} + {--MEMBER_BEG_EARN_3--} +
+
+ {%message,MEMBER_BEG_TIMEOUT%}
+
+ {--MEMBER_BEG_HAVE_FUN--} +
+
diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl index b0586dc464..276f99cc9f 100644 --- a/templates/de/html/member/member_doubler_list.tpl +++ b/templates/de/html/member/member_doubler_list.tpl @@ -1,15 +1,15 @@
+ {--_USERID--} + {?POINTS?} + {--DOUBLER_TIMEMARK--}
- - - - diff --git a/templates/de/html/member/member_edit_refback.tpl b/templates/de/html/member/member_edit_refback.tpl index 89d3985917..37cded7ea4 100644 --- a/templates/de/html/member/member_edit_refback.tpl +++ b/templates/de/html/member/member_edit_refback.tpl @@ -7,9 +7,13 @@ {--MEMBER_REFBACK_REFID--}: $content[refid]
- {--MEMBER_REFBACK_PERCENTS--}: + {--MEMBER_ENTER_REFBACK_PERCENTS--}: %
+
+ {--MEMBER_ENTER_REFBACK_NOTE_FOR_RECIPIENT--}:
+ +
diff --git a/templates/de/html/member/member_footer.tpl b/templates/de/html/member/member_footer.tpl index 3710a7032c..be554d58a5 100644 --- a/templates/de/html/member/member_footer.tpl +++ b/templates/de/html/member/member_footer.tpl @@ -1,5 +1,5 @@
- diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl index 9ffa0497b0..fffae2868c 100644 --- a/templates/de/html/member/member_list_beg.tpl +++ b/templates/de/html/member/member_list_beg.tpl @@ -1,48 +1,38 @@
-
-
- {--MEMBER_LIST_BEG_RALLYE_TITLE--} -
-
-
+ {--_USERID--} + {--REFERAL_USERID--} + {?POINTS?} + {--DOUBLER_TIMEMARK--}
+
- - - + + + + + + $content[rows] - +
{--BEG_RANK--}:{--_USERID--}:{--BEG_POINTS--}: + {--MEMBER_LIST_BEG_RALLYE_TITLE--} +
{--BEG_RANK--}:{--_USERID--}:{--BEG_POINTS--}: {--LAST_ONLINE_SHORT--}:
-
{--BEG_RALLYE_NOTE--}
 + {--BEG_RALLYE_NOTE--} +
- - - - - - - - - - -
{--BEG_RALLYE_CONDITIONS--}:
-
    -
  1. {--BEG_RALLYE_CONDITION_1--}
    2. -
  2. {--BEG_RALLYE_CONDITION_2--}
    3. -
  3. {--BEG_RALLYE_CONDITION_3--}
    4. -
  4. {--BEG_RALLYE_CONDITION_4--}
    5. +
    +
    {--BEG_RALLYE_CONDITIONS--}: +
    +
    +
      +
    1. {--BEG_RALLYE_CONDITION_1--}
      2. +
    2. {--BEG_RALLYE_CONDITION_2--}
      3. +
    3. {--BEG_RALLYE_CONDITION_3--}
      4. +
    4. {--BEG_RALLYE_CONDITION_4--}
    -
+ +
{--BEG_LINK_HERE--} -
+
+ diff --git a/templates/de/html/member/member_mail_bonus_deleted.tpl b/templates/de/html/member/member_mail_bonus_deleted.tpl index cdb2ed8268..43d68d1d51 100644 --- a/templates/de/html/member/member_mail_bonus_deleted.tpl +++ b/templates/de/html/member/member_mail_bonus_deleted.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + - - + @@ -62,4 +63,4 @@
@@ -5,54 +6,54 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_DELETED--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_DELETED--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: {--USERNAME_ADMIN_SHORT--}
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_IS_NOTIFY--} + {--EMAIL_IS_NOTIFY--} {%pipe,translateYesNo=$content[is_notify]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_bonus_new.tpl b/templates/de/html/member/member_mail_bonus_new.tpl index b04b6ed99a..ba0ed28e8f 100644 --- a/templates/de/html/member/member_mail_bonus_new.tpl +++ b/templates/de/html/member/member_mail_bonus_new.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + - - + @@ -62,4 +63,4 @@
@@ -5,54 +6,54 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_NEW--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_NEW--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: {--USERNAME_ADMIN_SHORT--}
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_IS_NOTIFY--} + {--EMAIL_IS_NOTIFY--} {%pipe,translateYesNo=$content[is_notify]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_bonus_queue.tpl b/templates/de/html/member/member_mail_bonus_queue.tpl index 649019f7c7..1c81962288 100644 --- a/templates/de/html/member/member_mail_bonus_queue.tpl +++ b/templates/de/html/member/member_mail_bonus_queue.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + - - + @@ -62,4 +63,4 @@
@@ -5,54 +6,54 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_QUEUE--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_QUEUE--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: {--USERNAME_ADMIN_SHORT--}
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_IS_NOTIFY--} + {--EMAIL_IS_NOTIFY--} {%pipe,translateYesNo=$content[is_notify]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_bonus_send.tpl b/templates/de/html/member/member_mail_bonus_send.tpl index d0c361e7ed..061275f5f0 100644 --- a/templates/de/html/member/member_mail_bonus_send.tpl +++ b/templates/de/html/member/member_mail_bonus_send.tpl @@ -1,3 +1,4 @@ +
- - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -64,4 +65,4 @@
@@ -5,56 +6,56 @@
{--CONFIRM_LINK--}: + {--CONFIRM_LINK--}: [$content[id]]
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: {--USERNAME_ADMIN_SHORT--}
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_IS_NOTIFY--} + {--EMAIL_IS_NOTIFY--} {%pipe,translateYesNo=$content[is_notify]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_active.tpl b/templates/de/html/member/member_mail_normal_active.tpl index e220da1ae3..fd39879c5f 100644 --- a/templates/de/html/member/member_mail_normal_active.tpl +++ b/templates/de/html/member/member_mail_normal_active.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + @@ -56,4 +57,4 @@
@@ -5,48 +6,48 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_ACTIVE--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_ACTIVE--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_admin.tpl b/templates/de/html/member/member_mail_normal_admin.tpl index 39106dd2b8..8067480314 100644 --- a/templates/de/html/member/member_mail_normal_admin.tpl +++ b/templates/de/html/member/member_mail_normal_admin.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + @@ -56,4 +57,4 @@
@@ -5,48 +6,48 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_ADMIN--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_ADMIN--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_deleted.tpl b/templates/de/html/member/member_mail_normal_deleted.tpl index 6a7937a071..c87053db1a 100644 --- a/templates/de/html/member/member_mail_normal_deleted.tpl +++ b/templates/de/html/member/member_mail_normal_deleted.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + @@ -56,4 +57,4 @@
@@ -5,48 +6,48 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_DELETED--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_DELETED--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_new.tpl b/templates/de/html/member/member_mail_normal_new.tpl index 3e8c523f74..e546900372 100644 --- a/templates/de/html/member/member_mail_normal_new.tpl +++ b/templates/de/html/member/member_mail_normal_new.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + @@ -56,4 +57,4 @@
@@ -5,48 +6,48 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_NEW--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_NEW--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_send.tpl b/templates/de/html/member/member_mail_normal_send.tpl index 0a7480bc8d..c5b4cb3aeb 100644 --- a/templates/de/html/member/member_mail_normal_send.tpl +++ b/templates/de/html/member/member_mail_normal_send.tpl @@ -1,3 +1,4 @@ +
- - + - - + - - + - - + - - + - - + - - + - - + @@ -58,4 +59,4 @@
@@ -5,50 +6,50 @@
{--CONFIRM_LINK--}: + {--CONFIRM_LINK--}: [$content[id]]
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/templates/de/html/member/member_mail_normal_temp.tpl b/templates/de/html/member/member_mail_normal_temp.tpl index 51dda1c7a1..8daf4e4fd7 100644 --- a/templates/de/html/member/member_mail_normal_temp.tpl +++ b/templates/de/html/member/member_mail_normal_temp.tpl @@ -1,3 +1,4 @@ +
- - + + - - + - - + - - + - - + - - + - - + - - + @@ -56,4 +57,4 @@
@@ -5,48 +6,48 @@
{--CONFIRM_LINK--}:{--EMAIL_STATUS_TEMP--}{--CONFIRM_LINK--}:{--EMAIL_STATUS_TEMP--}
{--EMAIL_SENDER--}: + {--EMAIL_SENDER--}: $content[sender]
{--EMAIL_SUBJECT--}: + {--EMAIL_SUBJECT--}: $content[subject]
{--EMAIL_TEXT--}: - $content[text] + {--EMAIL_TEXT--}: + 
$content[text]
{--EMAIL_CATEGORY--}: + {--EMAIL_CATEGORY--}: {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_TIMESTAMP--}: + {--EMAIL_TIMESTAMP--}: $content[timestamp]
{--EMAIL_TIME--}: + {--EMAIL_TIME--}: {%pipe,createFancyTime=$content[time]%}
{--EMAIL_POINTS--}: + {--EMAIL_POINTS--}: {%pipe,translateComma=$content[points]%} {?POINTS?}
-

+
diff --git a/theme/business/css/beg.css b/theme/business/css/beg.css index 6d959d4528..e69de29bb2 100644 --- a/theme/business/css/beg.css +++ b/theme/business/css/beg.css @@ -1,3 +0,0 @@ -.beg_table { - background-color: #FFFFFF; -} diff --git a/theme/business/css/doubler.css b/theme/business/css/doubler.css index f7d00145ba..e69de29bb2 100644 --- a/theme/business/css/doubler.css +++ b/theme/business/css/doubler.css @@ -1,5 +0,0 @@ -.doubler_header { - text-align: center; - height: 24px; - background-color: #EEEEFF; -} diff --git a/theme/business/css/general.css b/theme/business/css/general.css index d87e8e860a..a7a29a6c89 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -617,13 +617,21 @@ strong.menu_invisible, strong.sub_menu_invisible { ul.listing { text-align: left; - margin-top: 5px; - margin-left: 5px; - margin-right: 5px; - padding-left: 5px; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } diff --git a/theme/default/css/beg.css b/theme/default/css/beg.css index d654a003fb..e69de29bb2 100644 --- a/theme/default/css/beg.css +++ b/theme/default/css/beg.css @@ -1,3 +0,0 @@ -.beg_table { - background-color: #ddeedd -} diff --git a/theme/default/css/doubler.css b/theme/default/css/doubler.css index 2a0d88def7..e69de29bb2 100644 --- a/theme/default/css/doubler.css +++ b/theme/default/css/doubler.css @@ -1,5 +0,0 @@ -.doubler_header { - background-color: #ddeedd; - text-align: center; - height: 24px; -} diff --git a/theme/default/css/general.css b/theme/default/css/general.css index d515e298dd..f81a956c47 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -670,6 +670,14 @@ ul.listing { list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } diff --git a/theme/desert/css/beg.css b/theme/desert/css/beg.css index 8f570aeecb..e69de29bb2 100644 --- a/theme/desert/css/beg.css +++ b/theme/desert/css/beg.css @@ -1,3 +0,0 @@ -.beg_table { - background-color: #FFFFCC; -} diff --git a/theme/desert/css/doubler.css b/theme/desert/css/doubler.css index 8de6bf351e..e69de29bb2 100644 --- a/theme/desert/css/doubler.css +++ b/theme/desert/css/doubler.css @@ -1,5 +0,0 @@ -.doubler_header { - text-align: center; - height: 24px; - background-color: #DDDDAA; -} diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index ad7379093a..3d77fd31b4 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -610,6 +610,14 @@ ul.listing { list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } diff --git a/theme/org/css/beg.css b/theme/org/css/beg.css index d654a003fb..e69de29bb2 100644 --- a/theme/org/css/beg.css +++ b/theme/org/css/beg.css @@ -1,3 +0,0 @@ -.beg_table { - background-color: #ddeedd -} diff --git a/theme/org/css/doubler.css b/theme/org/css/doubler.css index d9b5742cb6..e69de29bb2 100644 --- a/theme/org/css/doubler.css +++ b/theme/org/css/doubler.css @@ -1,5 +0,0 @@ -.doubler_header { - background-color : #ddeedd; - align : center; - height : 24px; -} diff --git a/theme/org/css/general.css b/theme/org/css/general.css index afbcff623f..2ceec4cc2e 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -509,6 +509,14 @@ ul.listing { list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } diff --git a/theme/schleuder/css/beg.css b/theme/schleuder/css/beg.css index 95f02241ed..e69de29bb2 100644 --- a/theme/schleuder/css/beg.css +++ b/theme/schleuder/css/beg.css @@ -1,3 +0,0 @@ -.beg_table { - background-color: #0571cc; -} diff --git a/theme/schleuder/css/doubler.css b/theme/schleuder/css/doubler.css index c26838c8a0..e69de29bb2 100644 --- a/theme/schleuder/css/doubler.css +++ b/theme/schleuder/css/doubler.css @@ -1,5 +0,0 @@ -.doubler_header { - text-align : center; - height : 24px; - background-color : #69b2ff; -} diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css index 417773d6bf..02940cf6bd 100644 --- a/theme/schleuder/css/general.css +++ b/theme/schleuder/css/general.css @@ -549,6 +549,14 @@ ul.listing { list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css index f764c9b75b..08f154fabf 100644 --- a/theme/ship-simu/css/general.css +++ b/theme/ship-simu/css/general.css @@ -519,6 +519,14 @@ ul.listing { list-style-type: none; } +ol.listing { + text-align: left; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 0px; + margin-left: 25px; +} + li.listing { padding-bottom: 5px; } -- 2.39.5