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

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 0210a7794374709ae34df58faf1656c3070d4cf9..78d462322a0715b4adc2ddc7f71303fb5f539668 100644 (file)
--- 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 &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> 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&uuml;gt.");
+                               break;
                } // END - switch
                break;
 

diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index fb225999672554ab66453aae9d98418f25f36ca3..748598e43132c093e1aa613baa2bb68707810449 100644 (file)
--- 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&ouml;nnen derzeit alle <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span> {?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&uuml;tet werden?",
@@ -113,7 +114,7 @@ addMessages(array(
        'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} (<strong>{?MAIN_TITLE?}</strong>) und freigegeben ist.",
        'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} ber&uuml;cksichtig.",
        'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.",
-       'MEMBER_LIST_BEG_RALLYE_TITLE' => "Hier finden Sie die aktuelle Liste mit den m&ouml;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 7e169ee0476462d308f6d70571025ee54a06661f..fd28a58d09061f632b65b045dfbf6107cab41ab3 100644 (file)
--- 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 d04fa7f26b60e24a704710cf6e12f2a862d1f19c..7c8ed7140033c7965c219688e6e26ac54a323149 100644 (file)
--- 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' => "<strong>Hinweis:</strong> Sie k&ouml;nnen derzeit zwischen <u>{%config,translateComma=refback_min_perc%}</u> und <u>{%config,translateComma=refback_max_perc%}</u> Prozent, inklusive, Refback einstellen.",
+       // - Edit form
+       'MEMBER_ENTER_REFBACK_PERCENTS' => "Refback-Prozente eingeben",
+       'MEMBER_ENTER_REFBACK_NOTE_FOR_RECIPIENT' => "Optionalen Hinweis an den Empf&auml;nger",
 
        // Error messages for members
        'MEMBER_REFBACK_ERROR_MESSAGE' => "Fehler beim Einstellen des Refbacks. Fehlermeldung:<br />\n<span class=\"data\">%s</span>",

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index e97e063fecf43478a86c19cc26dcd096b8eb94f8..59336045ee583af438905b60294043ed5c979e9d 100644 (file)
--- 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 ee7e6326a657a57a8a28d4049ee9c2cf706428a3..67e2a3013c625cc408be3f9167f5d12cb5f12188 100644 (file)
--- 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 1385ffd19ac9f6b9b20db575e20e70969a81a4ee..6afdc8697d41aaca3782783d9656b4f92712e1e5 100644 (file)
--- 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 f160d3f278f698c4908cc4907feb4c08b728eb70..697a55c7ed4df8e2110682f7143a67842ab297b7 100644 (file)
--- 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 97928a7b59a78c2877ad74e85b102d47b8b33f28..d27f4368aa7eabca89a48fabef0ca3d9e0ed9075 100644 (file)
--- a/templates/de/html/admin/admin_email_archiv_row.tpl
+++ b/templates/de/html/admin/admin_email_archiv_row.tpl
@@ -9,7 +9,7 @@
        </td>
        <td class="{%template,ColorSwitch%} bottom" width="54%" align="center">
                {--EMAIL_TEXT--}:<br />
-               <strong>$content[text]</strong>
+               <strong><pre>$content[text]</pre></strong>
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl
index 5dcc37d0cdfced6308204ac45586d8f99f7ab43e..ca24a37343be8660b8ec44163ecb4e17b769eaaf 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus_emails.tpl
+++ b/templates/de/html/admin/admin_list_bonus_emails.tpl
@@ -1,8 +1,8 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="99%">
 <tr>
-       <td colspan="3" align="center" height="25" class="table_header">
-               <div class="table">{--ADMIN_BONUS_CONTENT--}</div>
+       <td colspan="3" align="center" height="25" class="table_header bottom">
+               <strong>{--ADMIN_LIST_BONUS_TITLE--}</strong>
        </td>
 </tr>
 $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 52843f88d5aa31b0add63697cfe6db57eed49ee3..12c32dde98ebeaf7c94970fdb0a9464652698d4c 100644 (file)
--- 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 @@
 <tr>
-       <td class="bottom top right" colspan="2" width="46%" align="center">
+       <td class="bottom right" colspan="2" width="46%" align="center">
                <div>{--EMAIL_SUBJECT--}:</div>
                <div><strong>$content[subject]</strong></div>
        </td>
-       <td class="bottom top" width="54%" align="center">
+       <td class="bottom" width="54%" align="center">
                <div>{--EMAIL_TEXT--}:</div>
-               <div><strong>$content[text]</strong></div>
+               <div><strong><pre>$content[text]</pre></strong></div>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top bottom right" width="23%">
+       <td align="center" class="bottom right" width="23%">
                <div>{--EMAIL_POINTS--}:</div>
                <div><strong>{%pipe,translateComma=$content[points]%} {?POINTS?}</strong></div>
        </td>
-       <td align="center" class="top bottom right" width="23%">
+       <td align="center" class="bottom right" width="23%">
                <div>{--EMAIL_SECONDS--}:</div>
                <div><strong>{%pipe,createFancyTime=$content[time]%}</strong></div>
        </td>
-       <td align="center" class="top bottom">
+       <td align="center" class="bottom">
                <div>{--EMAIL_CATEGORY--}:</div>
                <div><strong>{%pipe,getCategory=$content[cat_id]%}</strong></div>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                <div>{--EMAIL_RECEIVERS--}:</div>
                <div><strong>{%pipe,translateComma=$content[mails_sent]%}</strong>
                ({--EMAIL_RUIDS--}: <strong>{%pipe,convertReceivers=$content[receivers]%}</strong>)</div>
        </td>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                <div>{--USERS_LINKS--}:</div>
                <div><strong>$content[unconfirmed]</strong></div>
        </td>
-       <td align="center" class="top bottom">
+       <td align="center" class="bottom">
                <div>{--EMAIL_POOL_TYPE--}:</div>
                <div><strong>{%pipe,translatePoolType=$content[data_type]%}</strong></div>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                <div>{--EMAIL_TSEND--}:</div>
                <div><strong>$content[target_send]</strong></div>
        </td>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                <div>{--EMAIL_URL--}:</div>
                <div><strong><a href="{%pipe,generateFrametesterUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a></strong></div>
        </td>
-       <td align="center" class="top bottom">
+       <td align="center" class="bottom">
                <div>{--EMAIL_TIMESTAMP--}:</div>
                <div><strong>$content[timestamp]</strong></div>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top right" colspan="2">
+       <td align="center" class="bottom right" colspan="2">
                <div>{--EMAIL_URL--}:</div>
                <div><strong>$content[url]</strong></div>
        </td>
-       <td align="center" class="top">
+       <td align="center" class="bottom">
                {--_UNUSED--}:<br />
                <strong>---</strong>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top admin_delete_link" colspan="3">
+       <td align="center" class="bottom admin_delete_link" colspan="3">
                {%template,AdminBonusMailLinks=$content[id]%}
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl
index 650df97700e9b72ffe3e59b1ad8d852b084efd60..6706777deb17184ba5e5234c06e9c7f6b0346fd2 100644 (file)
--- a/templates/de/html/admin/admin_list_emails_row.tpl
+++ b/templates/de/html/admin/admin_list_emails_row.tpl
@@ -1,39 +1,39 @@
 <tr>
-       <td class="bottom top right" width="23%" align="center">
+       <td class="bottom right" width="23%" align="center">
                {--EMAIL_SENDER--}:<br />
                {%pipe,generateUserProfileLink=$content[sender]%}
        </td>
-       <td class="bottom top right" width="23%" align="center">
+       <td class="bottom right" width="23%" align="center">
                {--EMAIL_SUBJECT--}:<br />
                $content[subject]
        </td>
-       <td class="bottom top" width="54%" align="center">
+       <td class="bottom" width="54%" align="center">
                {--EMAIL_TEXT--}:<br />
-               $content[text]
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td colspan="2" align="center" class="top bottom right">
+       <td colspan="2" align="center" class="bottom right">
                {--EMAIL_PAYMENT--}:<br />
                {%pipe,getPaymentTitlePrice=$content[payment_id]%}
        </td>
-       <td align="center" class="top bottom">
+       <td align="center" class="bottom">
                {--EMAIL_CATEGORY--}:<br />
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                {--EMAIL_RECEIVERS--}:<br />
                <div>{%pipe,translateComma=$content[mails_sent]%}</div>
                ({--EMAIL_RUIDS--}:
                <div>{%pipe,convertReceivers=$content[receivers]%}</div>)
        </td>
-       <td align="center" class="top bottom right">
+       <td align="center" class="bottom right">
                {--USERS_LINKS--}:<br />
                $content[unconfirmed]
        </td>
-       <td align="center" class="top bottom">
+       <td align="center" class="bottom">
                {--EMAIL_POOL_TYPE--}:<br />
                {%pipe,translatePoolType=$content[data_type]%}
        </td>

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 6541d8ea0efc1c8f061b4f0b7607989aa7d715bf..9ecc0e252c41f8dfb69968ba3119594128bfe6be 100644 (file)
--- 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 @@
 <tr>
-  <td class="bottom top right" colspan="2" width="46%" align="center">
+  <td class="bottom right" colspan="2" width="46%" align="center">
     {--EMAIL_SUBJECT--}:<br />
     <strong>$content[subject]</strong>
   </td>
-  <td class="bottom top" width="54%" align="center">
+  <td class="bottom" width="54%" align="center">
     {--EMAIL_TEXT--}:<br />
-    <strong>$content[text]</strong>
+    <strong><pre>$content[text]</pre></strong>
   </td>
 </tr>
 <tr>
-  <td align="center" class="top bottom right" width="23%">
+  <td align="center" class="bottom right" width="23%">
     {--EMAIL_POINTS--}:<br />
     <strong>{%pipe,translateComma=$content[points]%} {?POINTS?}</strong>
   </td>
-  <td align="center" class="top bottom right" width="23%">
+  <td align="center" class="bottom right" width="23%">
     {--EMAIL_SECONDS--}:<br />
     <strong>{%pipe,createFancyTime=$content[time]%}</strong>
   </td>
-  <td align="center" class="top bottom">
+  <td align="center" class="bottom">
     {--EMAIL_CATEGORY--}:<br />
     <strong>{%pipe,getCategory=$content[cat_id]%}</strong>
   </td>
 </tr>
 <tr>
-  <td align="center" class="top bottom right">
+  <td align="center" class="bottom right">
     {--EMAIL_RECEIVERS--}:<br />
     <strong>{%pipe,translateComma=$content[mails_sent]%}</strong>
     ({--EMAIL_RUIDS--}: <strong>{%pipe,convertReceivers=$content[receivers]%}</strong>)
   </td>
-  <td align="center" class="top bottom right">
+  <td align="center" class="bottom right">
     {--USERS_LINKS--}:<br />
     <strong>$content[unconfirmed_content]</strong>
   </td>
-  <td align="center" class="top bottom">
+  <td align="center" class="bottom">
     {--EMAIL_POOL_TYPE--}:<br />
     <strong>{%pipe,translatePoolType=$content[data_type]%}</strong>
   </td>
 </tr>
 <tr>
-  <td align="center" class="top bottom right">
+  <td align="center" class="bottom right">
     {--EMAIL_TSEND--}:<br />
     <strong>{%pipe,translateComma=$content[target_send]%}</strong>
   </td>
-  <td align="center" class="top bottom right">
+  <td align="center" class="bottom right">
     {--EMAIL_URL--}:<br />
     <strong><a href="{%pipe,generateFrametesterUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a></strong>
   </td>
-  <td align="center" class="top bottom">
+  <td align="center" class="bottom">
     {--EMAIL_TIMESTAMP--}:<br />
     <strong>$content[timestamp]</strong>
   </td>

diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl
index 8a95d176b3e796737f7e979239507d27657b14ae..6887d31501c77fcbd8f82d12ae9e9de4bfee5179 100644 (file)
--- a/templates/de/html/admin/admin_list_unconfirmed.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed.tpl
@@ -21,7 +21,7 @@
 </tr>
 <tr>
        <td align="center" class="bottom right">{--EMAIL_TEXT--}:<br />
-               <strong>$content[text]</strong>
+               <strong><pre>$content[text]</pre></strong>
        </td>
        <td align="center" class="bottom">{--USERS_LINKS--}:<br />
                <strong>$content[unconfirmed]</strong>

diff --git a/templates/de/html/admin/admin_list_unconfirmed_list.tpl b/templates/de/html/admin/admin_list_unconfirmed_list.tpl
index 7b11e7c3daa1c3fd822826e6d73f6566c91a3b2d..fa2af78682baa690227849d2d8e715301872db86 100644 (file)
--- a/templates/de/html/admin/admin_list_unconfirmed_list.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed_list.tpl
@@ -2,10 +2,10 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <!-- @TODO Shouldn't we add a title here? //-->
 <tr>
-       <td width="20%" align="center" class="header_column bottom top right" height="26"><strong>{--ID_SELECT--}</strong></td>
-       <td width="20%" align="center" class="header_column bottom top right"><strong>{--MAILID_LINK--}</strong></td>
-       <td width="40%" align="center" class="header_column bottom top right"><strong>{--SURNAME_FAMILY--}</strong></td>
-       <td width="20%" align="center" class="header_column bottom top"><strong>{--ACCOUNT_STATUS--}</strong></td>
+       <td width="20%" align="center" class="header_column bottom right" height="26"><strong>{--ID_SELECT--}</strong></td>
+       <td width="20%" align="center" class="header_column bottom right"><strong>{--MAILID_LINK--}</strong></td>
+       <td width="40%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
+       <td width="20%" align="center" class="header_column bottom"><strong>{--ACCOUNT_STATUS--}</strong></td>
 </tr>
 $content
 </table>

diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl
index 8bdd8ebb4d228bf0d6d859a5a4e9a4b660579d81..d0791c2cbe58e532cb3b2c054f28e490800e65b8 100644 (file)
--- a/templates/de/html/admin/admin_overview_table.tpl
+++ b/templates/de/html/admin/admin_overview_table.tpl
@@ -2,22 +2,22 @@
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
-       <td colspan="7" align="center" class="admin_task_header top left right">
+       <td colspan="7" align="center" class="admin_task_header bottom">
                <strong>{--ADMIN_TASK_SYSTEM_WELCOME--}</strong>
        </td>
 </tr>
 <tr>
-       <td align="center" class="top bottom right left header_column"><strong>{--ID_SELECT--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_INFOS--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_MEMBER_USERID--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_TYPE--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_CREATED--}</strong></td>
+       <td align="center" class="bottom right left header_column"><strong>{--ID_SELECT--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_TASK_INFOS--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_MEMBER_USERID--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_TASK_TYPE--}</strong></td>
+       <td align="center" class="bottom right header_column"><strong>{--ADMIN_TASK_CREATED--}</strong></td>
 </tr>
 $content
 <tr>
-       <td colspan="7" align="center" class="table_footer bottom left right">
+       <td colspan="7" align="center" class="table_footer">
                <input type="reset" value="{--ADMIN_UNSELECT_ALL--}" class="form_reset" />
                <input type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="form_submit" />
                <input type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="form_submit" />

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index 6433f48dfd61911aff9e5b510552837117993b2d..670f01e6f4ae0762443711901fff7852024aeb80 100644 (file)
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -1,192 +1,192 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" align="center" class="table dashed">
        <tr>
-               <td colspan="4" class="table_header" align="center" style="height: 30px">
+               <td colspan="4" class="table_header bottom" align="center" style="height: 30px">
                        <strong class="big">{--_USERID--} $content[userid]</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" width="25%" class="top right">
+               <td align="center" width="25%" class="bottom right">
                        {--GENDER--}:<br />
                        <strong>{%user,gender,translateGender=$content[userid]%}</strong>
                </td>
-               <td align="center" width="25%" class="top right">
+               <td align="center" width="25%" class="bottom right">
                        {--SURNAME--}:<br />
                        <strong>{%user,surname=$content[userid]%}</strong>
                </td>
-               <td align="center" width="25%" class="top right">
+               <td align="center" width="25%" class="bottom right">
                        {--FAMILY--}:<br />
                        <strong>{%user,family=$content[userid]%}</strong>
                </td>
-               <td align="center" width="25%" class="top">
+               <td align="center" width="25%" class="bottom">
                        {--STREET_NR--}:<br />
                        <strong>{%user,street_nr=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--BIRTHDAY2--}:<br />
                        <strong>$content[birthday]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--COUNTRY--}:<br />
                        <strong>$content[country]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--ZIP--}:<br />
                        <strong>{%user,zip,bigintval=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--CITY--}:<br />
                        <strong>{%user,city=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--EMAIL--}:<br />
                        <strong><a href="$content[email_link]">$content[email]</a></strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--ACCOUNT_STATUS--}:<br />
                        <strong>{%user,status,translateUserStatus=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--RECEIVE_MAILS--}:<br />
                        <strong>{%user,receive_mails,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--MAX_PER_DAY--}:<br />
                        <strong>{%user,max_mails,translateComma=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--REFERAL_USERID--}:<br />
                        <strong>{%user,refid,generateUserProfileLink=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--REFERAL_CLICKS--}:<br />
                        <strong>{%user,ref_clicks,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--TOTAL_LOGINS--}:<br />
                        <strong>{%user,total_logins,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--REMOTE_IP--}:<br />
                        <strong>{%user,REMOTE_ADDR=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--LAST_ONLINE_SHORT--}:<br />
                        <strong>$content[last_online]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--ADMIN_LAST_MODULE--}:<br />
                        <strong>{%user,last_module,fixEmptyContentToDashes=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--HAS_JOINED--}:<br />
                        <strong>$content[joined]</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--MAILS_SENT--}:<br />
                        <strong>$content[emails_sent]</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--USED_POINTS--}:<br />
                        <strong>{%user,used_points,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--TOTAL_POINTS--}:<br />
                        <strong>{%pipe,getTotalPoints,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--LOCKED_POINTS--}:<br />
                        <strong>{%pipe,translateComma=$content[locked_points]%}</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--OWN_POINTS--}:<br />
                        <strong>{%pipe,translateComma=$content[own_points]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--TOTAL_CATEGORIES--}:<br />
                        <strong>$content[cats]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--RAND_CONFIRMED--}:<br />
                        <strong>{%user,rand_confirmed,translateComma=$content[userid]%}/{%config,translateComma=user_min_confirmed%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--LOCK_TIMESTAMP--}:<br />
                        <strong>$content[lock_timestamp]</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--LOCK_REASON--}:<br />
                        <strong>{%user,lock_reason,fixEmptyContentToDashes=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--UNCONFIRMED_LINKS--}:<br />
                        <strong>$content[links]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--TOTAL_REFERALS--}:<br />
                        <strong>$content[refs]</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--LAST_UPDATE--}:<br />
                        <strong>$content[last_update]</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--LAST_PROFILE_SENT--}:<br />
                        <strong>$content[last_profile_sent]</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--ADMIN_USER_REFERAL_PAYOUT--}:<br />
                        <strong>{%user,ref_payout,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--USER_NICKNAME--}:<br />
                        <strong>{%user,nickname,fixEmptyContentToDashes=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--CLICK_RATE--}:<br />
                        <strong>{%pipe,translateComma=$content[click_rate]%}&#37;</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--EMAILS_RECEIVED--}:<br />
                        <strong>{%user,emails_received,translateComma=$content[userid]%}</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--MAILS_CONFIRMED--}:<br />
                        <strong>{%user,mails_confirmed,translateComma=$content[userid]%}</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--_UNUSED--}:<br />
                        <strong>---</strong>
                </td>
-               <td align="center" class="top right">
+               <td align="center" class="bottom right">
                        {--_UNUSED--}:<br />
                        <strong>---</strong>
                </td>
-               <td align="center" class="top">
+               <td align="center" class="bottom">
                        {--_UNUSED--}:<br />
                        <strong>---</strong>
                </td>
        </tr>
        <tr>
-               <td align="center" class="table_footer top" colspan="4">
+               <td align="center" class="table_footer" colspan="4">
                        <div>
                                <strong>{--ADMIN_MEMBER_FUNCTIONS--}:</strong>
                        </div>

diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl
index f0942dbc730b2493c230cee16d2ec54b9e1b3171..a2d0f4c22df2369ddadfb48abc020d4a91672ea1 100644 (file)
--- a/templates/de/html/beg/beg_link.tpl
+++ b/templates/de/html/beg/beg_link.tpl
@@ -7,29 +7,23 @@
        </tr>
        <tr>
                <td height="80%" align="center">
-               <table border="0" cellspacing="0" cellpadding="0" class="beg_table dashed">
-                       <tr>
-                               <td align="center" height="50" class="bottom">
-                                       <div class="para big">
-                                               {--BEG_LINK_BY--}
-                                       </div>
+               <div class="table dashed">
+                       <div class="table_header bottom">
+                               <div class="para big">
+                                       {--BEG_LINK_BY--}
+                               </div>
 
-                                       <div class="para">
-                                               {%message,BEG_LINK_USERID=$content[userid]%}
-                                       </div>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="center" height="120" class="notice bottom">
-                                       $content[message]
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="center">
-                                       <a href="{%url=ref.php?refid=$content[userid]%}">{--BEG_CONTINUE_REGISTER--}</a>
-                               </td>
-                       </tr>
-               </table>
+                               <div class="para">
+                                       {%message,BEG_LINK_USERID=$content[userid]%}
+                               </div>
+                       </div>
+                       <div height="120" class="bottom">
+                               <div align="center">$content[message]</div>
+                       </div>
+                       <div class="table_footer">
+                               <a href="{%url=ref.php?refid=$content[userid]%}">{--BEG_CONTINUE_REGISTER--}</a>
+                       </div>
+               </div>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl
index f78837803baf6dfa1c6c59a93d71bb7e09e78075..89a93c8a5c68f8811f5eb28f393a99e538dcdc8a 100644 (file)
--- a/templates/de/html/guest/guest_beg.tpl
+++ b/templates/de/html/guest/guest_beg.tpl
@@ -1,9 +1,10 @@
-<div align="center" class="beg_table dashed">
-       <div class="notice">
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
                <div class="big">{--GUEST_BEG_TRAILER--}</div>
                <div>{?MAIN_TITLE?}</div>
        </div>
-       <div class="notice">
+       <div class="bottom" style="padding-top:7px">
                <div class="para">
                        {--GUEST_BEG_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
                        {--GUEST_BEG_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
@@ -16,7 +17,8 @@
                        {--GUEST_BEG_HAVE_FUN--}
                </div>
        </div>
-       <div align="center" class="notice">
+       <div align="center" class="table_footer">
                <a href="{%url=ref.php?refid={%pipe,determineReferalId%}%}">{--BEG_CONTINUE_REGISTER--}</a>
        </div>
 </div>
+</div>

diff --git a/templates/de/html/guest/guest_doubler_list.tpl b/templates/de/html/guest/guest_doubler_list.tpl
index 90d3449163804d3fd56aa2dd0def07ed4f2491c5..af914431a139f90d206935a78cef148073052ea5 100644 (file)
--- a/templates/de/html/guest/guest_doubler_list.tpl
+++ b/templates/de/html/guest/guest_doubler_list.tpl
@@ -1,13 +1,13 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="doubler_list dashed">
        <tr>
-               <td class="doubler_header bottom right" align="center" width="100">
+               <td class="header_column bottom right" align="center" width="100">
                        <strong>{--_USERID--}</strong>
                </td>
-               <td class="doubler_header bottom right" align="center" width="160">
+               <td class="header_column bottom right" align="center" width="160">
                        <strong>{?POINTS?}</strong>
                </td>
-               <td class="doubler_header bottom" align="center" width="160">
+               <td class="header_column bottom" align="center" width="160">
                        <strong>{--DOUBLER_TIMEMARK--}</strong>
                </td>
        </tr>

diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl
index 1d43b75a30b03a83e4a4dc21fcb37b6f1ec77182..de3cfd21c777fcb8a1be77a76a9328881dcd0a45 100644 (file)
--- a/templates/de/html/member/member_beg.tpl
+++ b/templates/de/html/member/member_beg.tpl
@@ -1,27 +1,26 @@
-<div align="center" class="beg_table dashed">
-       <div class="notice">
-               <div>
-                       {--MEMBER_BEG_YOUR_LINK--}:
-               </div>
-               <div>
-                       <strong><a href="{?URL?}/beg.php?userid=$content[userid]">{?URL?}/beg.php?userid=$content[userid]</a></strong>
-               </div>
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>{--MEMBER_BEG_LINK_TITLE--}</strong>
        </div>
-       <div class="notice">
+       <div class="para">
+               {--MEMBER_BEG_YOUR_LINK--}:<br />
+               <strong><a href="{?URL?}/beg.php?userid=$content[userid]">{?URL?}/beg.php?userid=$content[userid]</a></strong>
+       </div>
+       <div class="para">
                {--MEMBER_BEG_CLICKS_TOTAL--}:
                <strong>{%user,beg_clicks,translateComma%}</strong>
        </div>
-       <div align="left" class="notice">
-               <div class="para">
-                       {--MEMBER_BEG_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
-                       {--MEMBER_BEG_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
-                       {--MEMBER_BEG_EARN_3--}
-               </div>
-               <div class="para">
-                       {%message,MEMBER_BEG_TIMEOUT%}
-               </div>
-               <div class="para" align="right">
-                       {--MEMBER_BEG_HAVE_FUN--}
-               </div>
+       <div class="para">
+               {--MEMBER_BEG_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
+               {--MEMBER_BEG_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
+               {--MEMBER_BEG_EARN_3--}
+       </div>
+       <div class="para">
+               {%message,MEMBER_BEG_TIMEOUT%}
        </div>
+       <div class="table_footer top">
+               <strong>{--MEMBER_BEG_HAVE_FUN--}</strong>
+       </div>
+</div>
 </div>

diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl
index b0586dc464345b8aa4ba5cc283409d2faa74844e..276f99cc9fc3acea555111c4236cdfb7c9449038 100644 (file)
--- a/templates/de/html/member/member_doubler_list.tpl
+++ b/templates/de/html/member/member_doubler_list.tpl
@@ -1,15 +1,15 @@
 <table border="0" cellspacing="0" cellpadding="0" class="doubler_list dashed">
        <tr>
-               <td class="doubler_header bottom right" align="center" width="100">
+               <td class="header_column bottom right" align="center" width="100">
                        <strong>{--_USERID--}</strong>
                </td>
-               <td class="doubler_header bottom right" align="center" width="100">
+               <td class="header_column bottom right" align="center" width="100">
                        <strong>{--REFERAL_USERID--}</strong>
                </td>
-               <td class="doubler_header bottom right" align="center" width="160">
+               <td class="header_column bottom right" align="center" width="160">
                        <strong>{?POINTS?}</strong>
                </td>
-               <td class="doubler_header bottom" align="center" width="160">
+               <td class="header_column bottom" align="center" width="160">
                        <strong>{--DOUBLER_TIMEMARK--}</strong>
                </td>
        </tr>

diff --git a/templates/de/html/member/member_edit_refback.tpl b/templates/de/html/member/member_edit_refback.tpl
index 89d3985917b0a180cc746e07a18940d115d80c22..37cded7ea4ad96d8e6d326c5979331e778b5da26 100644 (file)
--- a/templates/de/html/member/member_edit_refback.tpl
+++ b/templates/de/html/member/member_edit_refback.tpl
@@ -7,9 +7,13 @@
        <span class="notice">{--MEMBER_REFBACK_REFID--}: $content[refid]</span>
 </div>
 <div class="bottom" align="center">
-       {--MEMBER_REFBACK_PERCENTS--}:
+       {--MEMBER_ENTER_REFBACK_PERCENTS--}:
        <input type="text" class="form_field" name="refback_percents" size="6" maxlength="7" value="{%pipe,translateComma=$content[refback_percents]%}" />&#37;
 </div>
+<div class="bottom" align="center">
+       {--MEMBER_ENTER_REFBACK_NOTE_FOR_RECIPIENT--}:<br />
+       <textarea class="form_field" rows="5" cols="30" name="refback_note"></textarea>
+</div>
 <div class="table_footer">
        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
        <input type="submit" class="form_submit" name="edit" value="{--MEMBER_REFBACK_EDIT_SUBMIT--}" />

diff --git a/templates/de/html/member/member_footer.tpl b/templates/de/html/member/member_footer.tpl
index 3710a7032c4a1c912d1c8997a4caf5b7d81fe547..be554d58a50f4f7588961f2f7f79a9b87bb510e7 100644 (file)
--- a/templates/de/html/member/member_footer.tpl
+++ b/templates/de/html/member/member_footer.tpl
@@ -1,5 +1,5 @@
 <tr>
-               <td class="guest_advert" colspan="3" align="center">
+       <td class="guest_advert" colspan="3" align="center">
                <!-- Horizontal footer banner //-->
        </td>
 </tr>

diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl
index 9ffa0497b0d91bbe34fb151e1063bcc0616c7cec..fffae2868c6068ed86d5cb1b011f48a181d09513 100644 (file)
--- a/templates/de/html/member/member_list_beg.tpl
+++ b/templates/de/html/member/member_list_beg.tpl
@@ -1,48 +1,38 @@
 <div align="center">
-<div class="table dashed">
-<div class="table_header">
-       <strong>{--MEMBER_LIST_BEG_RALLYE_TITLE--}</strong>
-</div>
-</div>
-
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
-               <td width="80" align="center" class="header_column bottom"><strong>{--BEG_RANK--}:</strong></td>
-               <td width="120" align="center" class="header_column bottom"><strong>{--_USERID--}:</strong></td>
-               <td width="100" align="center" class="header_column bottom"><strong>{--BEG_POINTS--}:</strong></td>
+               <td colspan="4" class="table_header">
+                       <strong>{--MEMBER_LIST_BEG_RALLYE_TITLE--}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td width="80" align="center" class="header_column bottom right"><strong>{--BEG_RANK--}:</strong></td>
+               <td width="120" align="center" class="header_column bottom right"><strong>{--_USERID--}:</strong></td>
+               <td width="100" align="center" class="header_column bottom right"><strong>{--BEG_POINTS--}:</strong></td>
                <td width="220" align="center" class="header_column bottom"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
        </tr>
        $content[rows]
        <tr>
-               <td colspan="4" class="table_footer" align="center"
-                       style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-               <div class="tiny notice">{--BEG_RALLYE_NOTE--}</div></td>
+               <td colspan="4" class="table_footer">
+                       {--BEG_RALLYE_NOTE--}
+               </td>
        </tr>
 </table>
 
-<table border="0" cellspacing="0" cellpadding="0" width="90%"
-       class="table dashed">
-       <tr>
-               <td class="header_column bottom"
-                       style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px"
-                       align="center"><strong>{--BEG_RALLYE_CONDITIONS--}:</strong></td>
-       </tr>
-       <tr>
-               <td class="notice bottom"
-                       style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-               <ol align="left">
-                       <li class="tiny">{--BEG_RALLYE_CONDITION_1--}</li>
-                       <li class="tiny">{--BEG_RALLYE_CONDITION_2--}</li>
-                       <li class="tiny">{--BEG_RALLYE_CONDITION_3--}</li>
-                       <li class="tiny">{--BEG_RALLYE_CONDITION_4--}</li>
+<div class="table dashed">
+       <div class="table_header bottom"
+               <strong>{--BEG_RALLYE_CONDITIONS--}:</strong>
+       </div>
+       <div class="bottom">
+               <ol class="listing">
+                       <li>{--BEG_RALLYE_CONDITION_1--}</li>
+                       <li>{--BEG_RALLYE_CONDITION_2--}</li>
+                       <li>{--BEG_RALLYE_CONDITION_3--}</li>
+                       <li>{--BEG_RALLYE_CONDITION_4--}</li>
                </ol>
-               </td>
-       </tr>
-       <tr>
-               <td colspan="4" class="table_footer" align="center"
-                       style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
+       </div>
+       <div class="table_footer">
                <a href="{%url=modules.php?module=login&amp;what=beg%}">{--BEG_LINK_HERE--}</a>
-               </td>
-       </tr>
-</table>
+       </div>
+</div>
 </div>

diff --git a/templates/de/html/member/member_mail_bonus_deleted.tpl b/templates/de/html/member/member_mail_bonus_deleted.tpl
index cdb2ed8268982dab2a5534b8afdad6b193b9d706..43d68d1d514917d7144d542a47507e4b4ec36d10 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_deleted.tpl
+++ b/templates/de/html/member/member_mail_bonus_deleted.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,54 +6,54 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_DELETED--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_DELETED--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_IS_NOTIFY--}</td>
+       <td align="center" class="switch_sw1 bottom">
                {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw2 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -62,4 +63,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_bonus_new.tpl b/templates/de/html/member/member_mail_bonus_new.tpl
index b04b6ed99a672f13f2b59a861c6d0f851ecbae87..ba0ed28e8f7552aac965bb223c76c9dd196a0b9e 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_new.tpl
+++ b/templates/de/html/member/member_mail_bonus_new.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,54 +6,54 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_NEW--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_NEW--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_IS_NOTIFY--}</td>
+       <td align="center" class="switch_sw1 bottom">
                {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw2 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -62,4 +63,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_bonus_queue.tpl b/templates/de/html/member/member_mail_bonus_queue.tpl
index 649019f7c7992de63373e21ba4c4226777cc989f..1c819622888fca2be2fc7aef4317c21e2fbc9f1e 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_queue.tpl
+++ b/templates/de/html/member/member_mail_bonus_queue.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,54 +6,54 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_QUEUE--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_QUEUE--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_IS_NOTIFY--}</td>
+       <td align="center" class="switch_sw1 bottom">
                {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw2 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -62,4 +63,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_bonus_send.tpl b/templates/de/html/member/member_mail_bonus_send.tpl
index d0c361e7ede177f47e9d75917b3ba254eda7b678..061275f5f05369e2779b36e10431b670771e8a97 100644 (file)
--- a/templates/de/html/member/member_mail_bonus_send.tpl
+++ b/templates/de/html/member/member_mail_bonus_send.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,56 +6,56 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom">
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom">
                [<a href="{%url=mailid.php?userid=$content[userid]&amp;bonusid=$content[id]%}" target="_blank" title="{--CONFIRM_LINK--}">$content[id]</a>]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                {--USERNAME_ADMIN_SHORT--}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_IS_NOTIFY--}</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_IS_NOTIFY--}</td>
+       <td align="center" class="switch_sw1 bottom">
                {%pipe,translateYesNo=$content[is_notify]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw2 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -64,4 +65,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_active.tpl b/templates/de/html/member/member_mail_normal_active.tpl
index e220da1ae3539228ce7a51e3ee13b601c4b4b780..fd39879c5f2715bc31f8b5be529559579f748d06 100644 (file)
--- a/templates/de/html/member/member_mail_normal_active.tpl
+++ b/templates/de/html/member/member_mail_normal_active.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,48 +6,48 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_ACTIVE--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</strong></td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_ACTIVE--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</strong></td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</strong></td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</strong></td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</strong></td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</strong></td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</strong></td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</strong></td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -56,4 +57,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_admin.tpl b/templates/de/html/member/member_mail_normal_admin.tpl
index 39106dd2b87cb883943a839bd091c9603a33c122..80674803146540937e1717ebcb7188626d078ac5 100644 (file)
--- a/templates/de/html/member/member_mail_normal_admin.tpl
+++ b/templates/de/html/member/member_mail_normal_admin.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,48 +6,48 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_ADMIN--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_ADMIN--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -56,4 +57,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_deleted.tpl b/templates/de/html/member/member_mail_normal_deleted.tpl
index 6a7937a071a9bdbbc6bdf62a4f1471bf2dd4870a..c87053db1a857f0333b7fc0b8390d4d10520a243 100644 (file)
--- a/templates/de/html/member/member_mail_normal_deleted.tpl
+++ b/templates/de/html/member/member_mail_normal_deleted.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,48 +6,48 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_DELETED--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_DELETED--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -56,4 +57,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_new.tpl b/templates/de/html/member/member_mail_normal_new.tpl
index 3e8c523f74f582a355c7a5e11bd375b9a1a224ea..e5469003729d5c2548069db16517d47fc18cfcdf 100644 (file)
--- a/templates/de/html/member/member_mail_normal_new.tpl
+++ b/templates/de/html/member/member_mail_normal_new.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,48 +6,48 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_NEW--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_NEW--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -56,4 +57,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_send.tpl b/templates/de/html/member/member_mail_normal_send.tpl
index 0a7480bc8d9453ed8a585f2962876c7c78f13ccd..c5b4cb3aeba0acb8dfaf49b70d5597c504336d2e 100644 (file)
--- a/templates/de/html/member/member_mail_normal_send.tpl
+++ b/templates/de/html/member/member_mail_normal_send.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,50 +6,50 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom">
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom">
                [<a href="{%url=mailid.php?userid=$content[userid]&amp;mailid=$content[id]%}" target="_blank" title="{--CONFIRM_LINK--}">$content[id]</a>]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -58,4 +59,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/templates/de/html/member/member_mail_normal_temp.tpl b/templates/de/html/member/member_mail_normal_temp.tpl
index 51dda1c7a1a74fd3a05906c273be6c0444e00490..8daf4e4fd7a2087a46b3c6530f44e1825d228bab 100644 (file)
--- a/templates/de/html/member/member_mail_normal_temp.tpl
+++ b/templates/de/html/member/member_mail_normal_temp.tpl
@@ -1,3 +1,4 @@
+<div class="para"><div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="650">
 <tr>
        <td colspan="2" align="center" class="header_column bottom">
@@ -5,48 +6,48 @@
        </td>
 </tr>
 <tr>
-       <td width="45%" align="center" class="bottom right"><strong>{--CONFIRM_LINK--}:</strong></td>
-       <td width="55%" align="center" class="bottom"><em>{--EMAIL_STATUS_TEMP--}</em></td>
+       <td width="45%" align="center" class="switch_sw2 bottom right">{--CONFIRM_LINK--}:</td>
+       <td width="55%" align="center" class="switch_sw2 bottom"><em>{--EMAIL_STATUS_TEMP--}</em></td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SENDER--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_SENDER--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[sender]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_SUBJECT--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_SUBJECT--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                $content[subject]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TEXT--}:</strong></td>
-       <td align="center" class="bottom">
-               $content[text]
+       <td align="center" class="switch_sw1 bottom right" valign="top">{--EMAIL_TEXT--}:</td>
+       <td align="center" class="switch_sw1 bottom">
+               <pre>$content[text]</pre>
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_CATEGORY--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_CATEGORY--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,getCategory=$content[cat_id]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIMESTAMP--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_TIMESTAMP--}:</td>
+       <td align="center" class="switch_sw1 bottom">
                $content[timestamp]
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_TIME--}:</strong></td>
-       <td align="center" class="bottom">
+       <td align="center" class="switch_sw2 bottom right">{--EMAIL_TIME--}:</td>
+       <td align="center" class="switch_sw2 bottom">
                {%pipe,createFancyTime=$content[time]%}
        </td>
 </tr>
 <tr>
-       <td align="center" class="bottom right"><strong>{--EMAIL_POINTS--}:</strong></td>
-       <td align="center" class="bottom" style="padding-right:5px">
+       <td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
+       <td align="center" class="switch_sw1 bottom" style="padding-right:5px">
                {%pipe,translateComma=$content[points]%} {?POINTS?}
        </td>
 </tr>
@@ -56,4 +57,4 @@
        </td>
 </tr>
 </table>
-<p></p>
+</div></div>

diff --git a/theme/business/css/beg.css b/theme/business/css/beg.css
index 6d959d4528ece5620a6e431b788339c1e559f878..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 f7d00145ba7940d6d42e05b07424a918485dd34d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 d87e8e860a5fa1e3a250e185908542a7cb2b0d38..a7a29a6c895c1ef65370f31a64c725a145bc9491 100644 (file)
--- 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 d654a003fbe2ceb38fddf381adf50ffe66acaf3c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 2a0d88def74e40dbf7f6088a569f95723a9c9706..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 d515e298dd198f530500ad1001b6c0f9ce4fcff6..f81a956c47602320f0aca6cf01dfd4ef934129ef 100644 (file)
--- 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 8f570aeecb43df4f5aeff4c16a131e560dc19019..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 8de6bf351efd55ccf7cfba1bb5cfe32c32cd5129..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 ad7379093aa4a87220e42740193e9641483d38e2..3d77fd31b4e1678fcbd0fc9736c16b5420a5839e 100644 (file)
--- 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 d654a003fbe2ceb38fddf381adf50ffe66acaf3c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 d9b5742cb626537753ae686d47d967055429ec60..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 afbcff623fd87f7b64b9ae54e4150e44de0967ec..2ceec4cc2e6f8fc0daf62d8278d1e37252591e5c 100644 (file)
--- 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 95f02241ed5d22e43a698b50631c26a6a9d935b6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 c26838c8a0ceaf5d725fb6fe84d0110eb3ec45b4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 417773d6bfe731be066858b21a8c92c5f8e3c2ac..02940cf6bdf317153c5a957d3d1be05ee1a081fa 100644 (file)
--- 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 f764c9b75b1bd966cd3c77e6ede008c771b83acf..08f154fabfa96da4ad967498c927e6213b00e44b 100644 (file)
--- 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;
 }