From: quix0r Date: Wed, 25 Aug 2010 13:47:37 +0000 (+0000) Subject: A lot CSS classes rewritten, please update all your themes. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ab494ec65f8d912c075480312b15b15a5076ea4;p=mailer.git A lot CSS classes rewritten, please update all your themes. --- diff --git a/.gitattributes b/.gitattributes index 3187d6222e..f4dc8022d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1733,9 +1733,7 @@ templates/en/html/mailid/.htaccess -text svneol=unset#text/plain templates/en/html/member/.htaccess -text svneol=unset#text/plain templates/en/html/register_header.tpl -text svneol=unset#text/plain templates/en/html/welcome.tpl -text svneol=unset#text/plain -theme/business/css/active.css -text theme/business/css/beg.css -text -theme/business/css/bonus.css -text theme/business/css/doubler.css -text theme/business/css/general.css -text theme/business/css/imprint.css -text @@ -1751,9 +1749,7 @@ theme/business/css/uberwach.css -text theme/business/images/code_bg.jpg -text svneol=unset#image/jpeg theme/business/images/code_bg.png -text svneol=unset#image/png theme/business/theme.php -text svneol=unset#text/plain -theme/default/css/active.css -text theme/default/css/beg.css -text -theme/default/css/bonus.css -text theme/default/css/doubler.css -text theme/default/css/general.css -text theme/default/css/imprint.css -text @@ -1769,9 +1765,7 @@ theme/default/css/uberwach.css -text theme/default/images/code_bg.jpg -text svneol=unset#image/jpeg theme/default/images/code_bg.png -text svneol=unset#image/png theme/default/theme.php -text svneol=unset#text/plain -theme/desert/css/active.css -text theme/desert/css/beg.css -text -theme/desert/css/bonus.css -text theme/desert/css/doubler.css -text theme/desert/css/general.css -text theme/desert/css/imprint.css -text @@ -1799,4 +1793,40 @@ theme/org/images/menus/bottom.jpg -text svneol=unset#image/jpeg theme/org/images/menus/row.jpg -text svneol=unset#image/jpeg theme/org/images/menus/title.jpg -text svneol=unset#image/jpeg theme/org/theme.php svneol=native#text/plain +theme/schleuder/css/beg.css -text +theme/schleuder/css/doubler.css -text +theme/schleuder/css/general.css -text +theme/schleuder/css/install.css -text +theme/schleuder/css/mailid.css -text +theme/schleuder/css/register.css -text +theme/schleuder/css/sponsor.css -text +theme/schleuder/css/surfbar.css -text +theme/schleuder/css/top10.css -text +theme/schleuder/css/transfer.css -text +theme/schleuder/css/uberwach.css -text +theme/schleuder/images/code_bg.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/code_bg.png -text svneol=unset#image/png +theme/schleuder/images/help/bullet.png -text svneol=unset#image/png +theme/schleuder/images/help/down.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/help/left.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/help/right.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/help/up.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_bottom.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_row.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_account.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_extras.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_logout.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_main.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_member.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_online.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_order.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_rals.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_stats.jpg -text svneol=unset#image/jpeg +theme/schleuder/images/menu/menu_title_themes.jpg -text svneol=unset#image/jpeg +theme/schleuder/theme.php svneol=native#text/plain +theme/ship-simu/css/general.css -text +theme/ship-simu/css/register.css -text +theme/ship-simu/images/code_bg.jpg -text svneol=unset#image/jpeg +theme/ship-simu/images/code_bg.png -text svneol=unset#image/png +theme/ship-simu/theme.php svneol=native#text/plain /view.php -text svneol=unset#text/plain diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 698cebf28e..87971ecfe6 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -103,7 +103,7 @@ switch (getExtensionMode()) { case '0.1.4': // SQL queries for v0.1.4 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); + setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); break; case '0.1.5': // SQL queries for v0.1.5 diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index 4d0497e82d..487e7d66c7 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -66,9 +66,9 @@ switch (getExtensionMode()) { unregisterFilter(__FUNCTION__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun()); unregisterFilter(__FUNCTION__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun()); unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); - unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); - unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); - unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); + unregisterFilter(__FUNCTION__, __LINE__, 'post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); + unregisterFilter(__FUNCTION__, __LINE__, 'post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); + unregisterFilter(__FUNCTION__, __LINE__, 'post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun()); unregisterFilter(__FUNCTION__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', true, isExtensionDryRun()); unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', true, isExtensionDryRun()); break; @@ -205,9 +205,9 @@ switch (getExtensionMode()) { registerFilter('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun()); registerFilter('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun()); registerFilter('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); - registerFilter('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); - registerFilter('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); - registerFilter('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); + registerFilter('post_form_submited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); + registerFilter('post_form_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); + registerFilter('post_form_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun()); registerFilter('extension_remove', 'CACHE_DESTROY_ALL', false, true, isExtensionDryRun()); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index 3732e21872..0c264ff2d9 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -79,7 +79,7 @@ switch (getExtensionMode()) { switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); + setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); break; case '0.0.2': // SQL queries for v0.0.2 diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index e79c835499..99a9f09dca 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -94,7 +94,7 @@ switch (getExtensionMode()) { case '0.0.4': // SQL queries for v0.0.4 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); + setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); break; case '0.0.5': // SQL queries for v0.0.5 diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 1b3aee19e9..5c2d665136 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -125,7 +125,7 @@ PRIMARY KEY (`id`) switch (getCurrentExtensionVersion()) { case '0.0.2': // SQL queries for v0.0.2 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); + setExtensionUpdateNotes("Fehler
Warning: Missing argument 2 for create_timestamp_from_selections() in {?PATH?}inc/libs/pro_functions.php on line 227
behoben."); break; case '0.0.3': // SQL queries for v0.0.3 diff --git a/inc/functions.php b/inc/functions.php index f1a41e67ec..dfb97948c1 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1447,7 +1447,7 @@ function getMessageFromErrorCode ($code) { switch ($code) { case '': break; case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; break; - case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break; + case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break; case getCode('DATA_INVALID') : $message = '{--MAIL_DATA_INVALID--}'; break; case getCode('POSSIBLE_INVALID') : $message = '{--MAIL_POSSIBLE_INVALID--}'; break; case getCode('USER_404') : $message = '{--USER_404--}'; break; diff --git a/inc/install-inc.php b/inc/install-inc.php index 5b3337251a..5a93e2d0e7 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -307,7 +307,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { default: logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page'))); - addTemplateToInstallContent('admin_settings_saved', '
{--WRONG_PAGE--}
'); + addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}'); break; } // END - switch } else { diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php index 80a4b12315..625986ba99 100644 --- a/inc/language/beg_de.php +++ b/inc/language/beg_de.php @@ -105,7 +105,7 @@ addMessages(array( 'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am %s noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.", 'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye", 'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails können optional versendet werden!)", - 'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?
(Nur in Verbindung mit der Erweiterung autopurge!)
", + 'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?
(Nur in Verbindung mit der Erweiterung autopurge!)
", 'ADMIN_BEG_NO_RALLYE' => "Niemand nimmt an der Bettel-Rallye dran teil.", 'ADMIN_BEG_WITHDRAW_NOW' => "Jetzt Vergütung Bettel-Rallye vergüten", 'ADMIN_BEG_WITHDRAW_NOTE' => "Es wird nur die Vergütung vorbereitet. Die eigentliche Vergütung erfolgt beim Täglichen Reset um 00:00 Uhr.", @@ -127,7 +127,7 @@ addMessages(array( 'ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS' => "Benachrichtungen per Mail zur Bettel-Rallye", 'ADMIN_BEG_RALLYE_ENABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye aktiviert wurde?", 'ADMIN_BEG_RALLYE_DISABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye deaktiviert wurde?", - 'ADMIN_BEG_NOTIFY_BONUS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bettel-Rallye aktiviert wurde.
(0 = Unvergütete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung bonus!)
", + 'ADMIN_BEG_NOTIFY_BONUS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bettel-Rallye aktiviert wurde.
(0 = Unvergütete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung bonus!)
", 'ADMIN_BEG_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail über eine laufende Bettel-Rallye benachrichtigt werden?", 'ADMIN_BEG_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?", 'BEG_NO_LIMITATION' => "Keine IP-Sperre eingerichtet!!.", diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php index 2652dc6dab..469ba4153c 100644 --- a/inc/language/birthday_de.php +++ b/inc/language/birthday_de.php @@ -53,7 +53,7 @@ addMessages(array( 'ADMIN_SELECT_BIRTHDAY_MODE' => "Vergütungsmodus der {?POINTS?}", 'ADMIN_BIRTHDAY_MODE_DIRECT' => "Nur direktem Mitglied gutschreiben.", 'ADMIN_BIRTHDAY_MODE_REF' => "Auch dem Werber des Mitgliedes gutschreiben.", - 'ADMIN_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?
(Nur in Verbindung mit der Erweiterung autopurge!)
", + 'ADMIN_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?
(Nur in Verbindung mit der Erweiterung autopurge!)
", )); // [EOF] diff --git a/inc/language/de.php b/inc/language/de.php index 2fa3562fba..27cd90160e 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -484,11 +484,11 @@ addMessages(array( 'REFERAL_UID' => "Werber-Id", 'ACCOUNT_STATUS_UNKNOWN_STATUS' => "Unbekannter Status %s erkannt.", 'ACCOUNT_STATUS' => "Account-Status", - 'ACCOUNT_STATUS_UNCONFIRMED' => "Unbestätigt", - 'ACCOUNT_STATUS_CONFIRMED' => "Bestätigt", - 'ACCOUNT_STATUS_LOCKED' => "Gesperrt", - 'ACCOUNT_STATUS_DELETED' => "Gelöscht", - 'ACCOUNT_STATUS_PENDING' => "Wartend", + 'ACCOUNT_STATUS_UNCONFIRMED' => "Unbestätigt", + 'ACCOUNT_STATUS_CONFIRMED' => "Bestätigt", + 'ACCOUNT_STATUS_LOCKED' => "Gesperrt", + 'ACCOUNT_STATUS_DELETED' => "Gelöscht", + 'ACCOUNT_STATUS_PENDING' => "Wartend", 'ADMIN_ALL_ACCOUNTS' => "Alle Mitglieder-Accounts auflisten", 'ADMIN_NO_NONE_REGISTERED' => "Ihre Suchkriterieren ergaben keine Treffer in der Mitgliederliste. ", 'ADMIN_MEMBER_404' => "Mitglieds-Account %s existiert nicht.", diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php index ec54cec70a..5abfb72f61 100644 --- a/inc/language/mailid_de.php +++ b/inc/language/mailid_de.php @@ -46,13 +46,13 @@ if (!defined('__SECURITY')) { addMessages(array( 'MAIL_DATA_INVALID' => "Daten der Mailbuchung sind fehlerhaft.", 'ERROR_CONFIRMING_MAIL' => "Bitte klicken Sie nur Links aus Ihrem Mitgliedsbereich oder aus den Mails an.", - 'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank für die Bestätigung der Mail. Die %s {?POINTS?} wurden Ihnen gerade gutgeschrieben.", - 'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank für die Bestätigung der Mail. Die %s {?POINTS?} werden Ihnen bald gutgeschrieben.", - 'MEMBER_POINTS_NOT_ADDED' => "Falscher Bestätigungscode eingegeben! Die %s {?POINTS?} wurden dem Versender wieder gutgeschrieben.", + 'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank für die Bestätigung der Mail. Die %s {?POINTS?} wurden Ihnen gerade gutgeschrieben.", + 'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank für die Bestätigung der Mail. Die %s {?POINTS?} werden Ihnen bald gutgeschrieben.", + 'MEMBER_POINTS_NOT_ADDED' => "Falscher Bestätigungscode eingegeben! Die %s {?POINTS?} wurden dem Versender wieder gutgeschrieben.", 'MEMBER_ENTER_CODE' => "Code eingeben", 'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in %s ...", 'MEMBER_SUBMIT_CODE' => "Abschicken", - 'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand beträgt jetzt %s {?POINTS?}.", + 'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand beträgt jetzt %s {?POINTS?}.", 'MEMBER_MAILID_CLICK_BUTTON' => "Einmal den Button anklicken", )); diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index 58a6f2b4b8..d4689d5e70 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -68,7 +68,7 @@ addMessages(array( 'ADMIN_PAYOUT_YOUR_ACCOUNT' => "Ihre Account-Id", 'ADMIN_PAYOUT_YOUR_PASSWORD' => "Passwort", 'ADMIN_PAYOUT_YOUR_URL' => "URL zum ext. Script", - 'ADMIN_PAYOUT_YOUR_URL_NOTE' => "
+ 'ADMIN_PAYOUT_YOUR_URL_NOTE' => "
Wobei $fuserid/$fpass und $f/$fpass die Logindaten sind und $points die zu übberweisenden {?POINTS?} sind:
http://url/engine.php?action=trans&from_userid=$fuserid&from_pass=$fpass&to_userid=$tuserid&to_pass=$tpass&points=$points
", diff --git a/inc/language/refback_de.php b/inc/language/refback_de.php index f9d58878c1..5feea7c40c 100644 --- a/inc/language/refback_de.php +++ b/inc/language/refback_de.php @@ -49,7 +49,7 @@ addMessages(array( 'ADMIN_LIST_USER_NODATA' => "Das Mitglied %s wurde bereits gelöscht.", 'ADMIN_CONFIG_REFBACK_TITLE' => "Refback-Einstellungen", 'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referal-Übersicht funktionell.)", - 'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:
(0% ist immer erlaubt!)", + 'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:
(0% ist immer erlaubt!)", 'ADMIN_CONFIG_REFBACK_MAX_PERCENTS' => "Maximum erlaubte Refback-Prozente:", // Member language strings diff --git a/inc/language/register_de.php b/inc/language/register_de.php index 3730f58ed0..f1c7e0cfed 100644 --- a/inc/language/register_de.php +++ b/inc/language/register_de.php @@ -58,7 +58,7 @@ addMessages(array( 'REGISTER_CITY_REQUIRED' => "Bitte geben Sie den Wohnort ein.", 'CNTRY' => "Ländercode", 'ADMIN_CONFIG_REGISTER_DEFAULT' => "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein", - 'ADMIN_CONFIG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden?
(Nein = id wird editierbar!)
", + 'ADMIN_CONFIG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden?
(Nein = id wird editierbar!)
", 'ADMIN_CONFIG_REGISTER_IP_TIMEOUT' => "IP-Zeitsperre", )); diff --git a/inc/language/removeip_de.php b/inc/language/removeip_de.php index de9d06f74a..3cb0ac222c 100644 --- a/inc/language/removeip_de.php +++ b/inc/language/removeip_de.php @@ -45,10 +45,10 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( 'ADMIN_CONFIG_REMOVEIP_TITLE' => "Konfiguration zur Anonymität/Privatsphähre", - 'ADMIN_CONFIG_REMOVEIP_ANON_IP' => "IP-Nummer anonymisieren?
(Siehe dazu weiter unten)", - 'ADMIN_CONFIG_REMOVEIP_ANON_HOST' => "Hostname anonymisieren?
(Dieser wird als localhost.localnet ausgegeben.)", - 'ADMIN_CONFIG_REMOVEIP_ANON_UA' => "User-Agent anonymisieren?
(Dieser wird als Strich ausgegeben.)", - 'ADMIN_CONFIG_REMOVEIP_ANON_REF' => "Referer anonymisieren?
(Dieser wird als Strich ausgegeben.)", + 'ADMIN_CONFIG_REMOVEIP_ANON_IP' => "IP-Nummer anonymisieren?
(Siehe dazu weiter unten)", + 'ADMIN_CONFIG_REMOVEIP_ANON_HOST' => "Hostname anonymisieren?
(Dieser wird als localhost.localnet ausgegeben.)", + 'ADMIN_CONFIG_REMOVEIP_ANON_UA' => "User-Agent anonymisieren?
(Dieser wird als Strich ausgegeben.)", + 'ADMIN_CONFIG_REMOVEIP_ANON_REF' => "Referer anonymisieren?
(Dieser wird als Strich ausgegeben.)", 'ADMIN_CONFIG_REMOVEIP_ANONYMOUS_IP' => "Als was soll die anonymisierte IP-Nummer ausgegeben werden?", 'ADMIN_CONFIG_REMOVEIP_LOCAL' => "127.0.0.1 (Lokal)", 'ADMIN_CONFIG_REMOVEIP_ZERO' => "0.0.0.0 (Nicht existierend)", diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index 8f73f72832..7d664b0b52 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -62,7 +62,7 @@ addMessages(array( 'ADMIN_CONFIG_SURFBAR_NOTE' => "Hinweise: Es wird empfohlen, die Ruhezeit etwas länger als die Reload-Sperre einzustellen. Migrierte URLs sind aus Mailbuchungen übernommene URLs, die das Mitglied noch bestätigen muss. Werden URLs aus freigeschalteten Mailbuchungen in die Surfbar "migriert" so muss erst das Mitglied der Aufnahme zustimmen. Tut es dies nicht, wird die URL wieder aus der Surfbar entfernt. Eine sofortige Freischaltung ist nicht möglich.", 'ADMIN_CONFIG_SURFBAR_PAUSE_MODE' => "Auf welche Seite soll umgeleitet werden, wenn das Mitglied alle gebuchten URLs besucht hat? (Wenn sie also im Reload-Lock sind)", 'ADMIN_CONFIG_SURFBAR_PAUSE_MODE_INTERNAL' => "Auf interne Pausenseite umleiten.", - 'ADMIN_CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL' => "Auf externe Seite umleiten.
(Bitte angeben)", + 'ADMIN_CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL' => "Auf externe Seite umleiten.
(Bitte angeben)", 'ADMIN_CONFIG_SURFBAR_PAUSE_URL' => "Externe Pausenseite: (leer lassen, wenn auf interne umgeleitet werden soll)", 'ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS' => "Soll das Mitglied per Mail benachrichtigt werden, wenn aufrufbegrenzte URLs abgelaufen und auf "pausierend" gesetzt sind? (Derzeit nicht verwendet!)", 'ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK' => "Soll der Administrator auch bei durch ihn freigegebene URLs benachrichtigt werden?", diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 362597d312..2643cba2c1 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -282,7 +282,7 @@ LIMIT 1", } // END - if // Remove cache file - runFilterChain('post_admin_edited', postRequestArray()); + runFilterChain('post_form_submited', postRequestArray()); } // Make admin accounts editable @@ -318,12 +318,12 @@ function adminsEditAdminAccount ($postData) { $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']); // Load row template and switch color - $OUT .= loadTemplate('admin_edit_admins_row', true, $content); + $OUT .= loadTemplate('form_submit_admins_row', true, $content); } // END - if } // END - foreach // Load template - loadTemplate('admin_edit_admins', false, $OUT); + loadTemplate('form_submit_admins', false, $OUT); } // Delete given admin accounts @@ -387,7 +387,7 @@ function adminsRemoveAdminAccount ($postData) { } // Remove cache if cache system is activated - runFilterChain('post_admin_deleted', postRequestArray()); + runFilterChain('post_form_deleted', postRequestArray()); } // List all admin accounts diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 0cba632fea..a8d01baa07 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -201,7 +201,7 @@ LIMIT 1", // @TODO Move this HTML to a template $OUT = ' -
' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '
+
' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '
'; } @@ -305,7 +305,7 @@ LIMIT 1', $GLOBALS['message'] .= '
{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}
'; } elseif (isExtensionActive('bonus')) { // No login bonus added! - $GLOBALS['message'] .= '
{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}
'; + $GLOBALS['message'] .= '
{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}
'; } } diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 4b550e706d..427c74b326 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -114,7 +114,7 @@ LIMIT %s", } else { // List no entries $OUT = ' - + ' . loadTemplate('admin_settings_saved', true, $message) . ' '; diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index ae47871fa8..f28386f9a7 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -776,7 +776,7 @@ function doAdminNetworkProcessHandleNetwork () { if (count($networkData) > 0) { if (isFormSent('edit')) { // Add row template for editing - $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData); + $OUT .= loadTemplate('form_submit_networks_row', true, $networkData); } elseif (isFormSent('del')) { // Add row template for deleting $OUT .= loadTemplate('admin_del_networks_row', true, $networkData); @@ -792,7 +792,7 @@ function doAdminNetworkProcessHandleNetwork () { if (!empty($OUT)) { // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_networks', false, $OUT); + loadTemplate('form_submit_networks', false, $OUT); } elseif (isFormSent('del')) { loadTemplate('admin_del_networks', false, $OUT); } else { @@ -828,7 +828,7 @@ function doAdminNetworkProcessHandleNetworkType () { if (count($networkTypeData) > 0) { if (isFormSent('edit')) { // Add row template for deleting - $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData); + $OUT .= loadTemplate('form_submit_network_types_row', true, $networkTypeData); } elseif (isFormSent('del')) { // Add row template for deleting $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData); @@ -844,7 +844,7 @@ function doAdminNetworkProcessHandleNetworkType () { if (!empty($OUT)) { // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_types', false, $OUT); + loadTemplate('form_submit_network_types', false, $OUT); } elseif (isFormSent('del')) { loadTemplate('admin_del_network_types', false, $OUT); } else { @@ -883,7 +883,7 @@ function doAdminNetworkProcessHandleRequestParams () { if (count($networkRequestData) > 0) { if (isFormSent('edit')) { // Add row template for deleting - $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData); + $OUT .= loadTemplate('form_submit_network_params_row', true, $networkRequestData); } elseif (isFormSent('del')) { // Get type data $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']); @@ -902,7 +902,7 @@ function doAdminNetworkProcessHandleRequestParams () { if (!empty($OUT)) { // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_params', false, $OUT); + loadTemplate('form_submit_network_params', false, $OUT); } elseif (isFormSent('del')) { loadTemplate('admin_del_network_params', false, $OUT); } else { diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php index 492eeda10e..9714f018f3 100644 --- a/inc/libs/payout_functions.php +++ b/inc/libs/payout_functions.php @@ -73,14 +73,14 @@ ORDER BY loadTemplate('member_payout_list', true, $OUT); } else { // No payout types setup so far - loadTemplate('admin_settings_saved', false, '
{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}
'); + loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}'); } // Free memory SQL_FREERESULT($result); } else { // Points is empty - loadTemplate('admin_settings_saved', false, '
{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}
'); + loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}'); } } diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 26babebf3f..5aa0a1805c 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -840,7 +840,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { // Do we have found templates which we can link with the new rallye? if (!empty($ral[0])) { // Generate selection box for all found templates - $OUT = ''; $OUT .= generateOptionList('/ARRAY/', array_keys($ral), array_values($ral), $default, '', 'none'); $OUT .= ''; } else { diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 7e08dcbdf8..6ff22480a4 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -126,9 +126,9 @@ function registerGenerateCategoryTable ($mode, $return=false) { // Outputs a 'failed message' function registerOutputFailedMessage ($messageId, $extra='') { if (empty($messageId)) { - outputHtml('
' . $extra . '
'); + outputHtml('
' . $extra . '
'); } else { - outputHtml('
{--' . $messageId . '--}' . $extra . '
'); + outputHtml('
{--' . $messageId . '--}' . $extra . '
'); } } @@ -142,7 +142,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) { while ($row = SQL_FETCHARRAY($result)) { // Must the user fill out this element? $value = ''; - if ($row['field_required'] == 'Y') $value = '(*)'; + if ($row['field_required'] == 'Y') $value = '(*)'; // Add it $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value; diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index cd34401abc..85a4dac71d 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -210,11 +210,11 @@ function outputAdvancedOverview (&$result_main) { } elseif (isExtensionActive('bonus')) { $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8'); } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; - $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; } // diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index eb6c96c344..4a24b2d73b 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -467,7 +467,7 @@ function doNewUserPassword ($email, $userid) { } } else { // id or email is wrong - loadTemplate('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}'); + loadTemplate('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}'); } // Return the error code diff --git a/inc/modules/admin.php b/inc/modules/admin.php index ffb9c69fdd..8571dfe0c3 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -186,7 +186,7 @@ if (!isAdminRegistered()) { ); // Validation okay so display form for final password change - loadTemplate('admin_reset_password_form', false, $content); + loadTemplate('form_reset_password_form', false, $content); } else { // Cannot validate the login data and hash loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}'); @@ -195,7 +195,7 @@ if (!isAdminRegistered()) { // Okay, we shall the admin password here. So first revalidate the hash if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) { // Output result - loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1'))); + loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1'))); } else { // Validation failed loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}'); @@ -349,7 +349,7 @@ if (!isAdminRegistered()) { } } else { // Something went wrong here... - loadTemplate('admin_settings_saved', false, '
{--ADMIN_LOGOUT_FAILED--}
'); + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}'); // Add fatal message addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}'); diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 04f16c2dc2..9a3c519451 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -289,7 +289,7 @@ ORDER BY $OUT .= '['; } } else { - $OUT .= ''; + $OUT .= ''; } $OUT .= $title; @@ -359,7 +359,7 @@ ORDER BY $OUT .= '['; } } else { - $OUT .= ''; + $OUT .= ''; } $OUT .= $title_what; @@ -423,14 +423,14 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no if ($return === false) { // Remeber options in constant - $content['member_selection'] = $OUT; + $content['form_selection'] = $OUT; $content['what'] = getWhat(); // Load template - loadTemplate('admin_member_selection_box', false, $content); + loadTemplate('admin_form_selection_box', false, $content); } else { // Return content in selection frame - return ''; + return ''; } } @@ -447,7 +447,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') { // Load menu as selection $OUT = ''; + $OUT = ' + $OUT = ' + $OUT .= '
({?POINTS?})
'; + $OUT .= '
  • ({?POINTS?})
  • '; } // END - if $cnt++; } // END - foreach @@ -100,7 +100,7 @@ if (isFormSent()) { // Add more empty fields for ($i = $cnt; $i < $max; $i++) { - $OUT .= '
  • ({?POINTS?})
  • '; + $OUT .= '
  • ({?POINTS?})
  • '; } // END - for $OUT .= ''; $content['trates_list'] = $OUT; diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index d51e798a05..6b381b3dc3 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -64,7 +64,7 @@ if (isFormSent('add')) { $content = '{--CATEGORY_ADDED--}'; } else { // Category does already exists - $content = '{--CATEGORY_ALREADY_EXISTS--}'; + $content = '{--CATEGORY_ALREADY_EXISTS--}'; } // Free memory @@ -137,11 +137,11 @@ if (isFormSent('add')) { $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']); // Load row template and switch colors - $OUT .= loadTemplate('admin_edit_cats_row', true, $content); + $OUT .= loadTemplate('form_submit_cats_row', true, $content); } // END - foreach // Load main template - loadTemplate('admin_edit_cats', false, $OUT); + loadTemplate('form_submit_cats', false, $OUT); } else { // Init variable here $CATS = ''; diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index 8c816b205e..421752c55d 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -74,7 +74,7 @@ if (isFormSent()) { } // END - foreach // Transfer options - $content['member_selection'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid'); + $content['form_selection'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid'); // Number of rows to display (option lines!!!) foreach (array('new','pay','old') as $entry) { diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php index 0ce3c74db9..8ebccd48bf 100644 --- a/inc/modules/admin/what-config_email.php +++ b/inc/modules/admin/what-config_email.php @@ -59,7 +59,7 @@ if (isPostRequestParameterSet('add_max')) { $content = '{--ADMIN_MAX_VALUE_SAVED--}'; } else { // Value does alread exists! - $content = '{--ADMIN_MAX_VALUE_ALREADY--}'; + $content = '{--ADMIN_MAX_VALUE_ALREADY--}'; } // Free memory diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 46e22c3d30..fdca7f061e 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -76,7 +76,7 @@ VALUES ('%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s')", SQL_FREERESULT($result); // Does already exist - $message = '
    {--ADMIN_PAYOUT_TYPE_ALREADY--}
    '; + $message = '
    {--ADMIN_PAYOUT_TYPE_ALREADY--}
    '; } } diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 30b0a9703b..abae1058a9 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -154,7 +154,7 @@ WHERE rebuildCache('config', 'config'); } else { // Prepare failed-message - $message = '{--SETTINGS_NOT_SAVED--}'; + $message = '{--SETTINGS_NOT_SAVED--}'; } // Remove SQL queries @@ -210,11 +210,11 @@ WHERE SQL_FREERESULT($result); // Load row template and switch color - $OUT .= loadTemplate('admin_edit_reflevel_row', true, $content); + $OUT .= loadTemplate('form_submit_reflevel_row', true, $content); } // END - foreach // Load main template - loadTemplate('admin_edit_reflevel', false, $OUT); + loadTemplate('form_submit_reflevel', false, $OUT); } else { // Referal levels $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php index 3dd6b50652..614200bb55 100644 --- a/inc/modules/admin/what-config_refid.php +++ b/inc/modules/admin/what-config_refid.php @@ -50,7 +50,7 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Prepare member selection - $content['member_selection'] = addMemberSelectionBox(getConfig('def_refid'), false, true, true, 'def_refid'); + $content['form_selection'] = addMemberSelectionBox(getConfig('def_refid'), false, true, true, 'def_refid'); // Prepare contants for the template foreach (array('refid_target_index','refid_target_register','select_user_zero_refid_y','select_user_zero_refid_n') as $entry) { diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php index 3b578c409c..c95dc88a10 100644 --- a/inc/modules/admin/what-del_transfer.php +++ b/inc/modules/admin/what-del_transfer.php @@ -108,8 +108,8 @@ $content['total'] = translateComma($total); $content['title'] = '{--TRANSFER_LIST_ALL--}'; // Show delete button here -$content['delete'] = ' -'; +$content['delete'] = ' +'; // Load final template loadTemplate('admin_list_transfer', false, $content); diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php index 5439c32177..faf1f78594 100644 --- a/inc/modules/admin/what-del_user.php +++ b/inc/modules/admin/what-del_user.php @@ -56,7 +56,7 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet('reason loadTemplate('admin_settings_saved', false, '{--ADMIN_DELETE_COMPLETED--}'); } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } elseif (isPostRequestParameterSet('no')) { // Do not delete him... @@ -77,7 +77,7 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet('reason loadTemplate('admin_del_user', false, $content); } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index 794fd2de8f..a4d49bed36 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -71,7 +71,7 @@ if (!SQL_HASZERONUMS($result)) { SQL_FREERESULT($result); // Load template - loadTemplate('admin_edit_email', false, $content); + loadTemplate('form_submit_email', false, $content); } elseif (isPostRequestParameterSet('save')) { // Save changes SQL_QUERY_ESC("UPDATE @@ -93,7 +93,7 @@ LIMIT 1", if (SQL_AFFECTEDROWS() == 1) { $content = '{--SETTINGS_SAVED--}'; } else { - $content = '{--SETTINGS_NOT_SAVED--}'; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Display message @@ -103,18 +103,18 @@ LIMIT 1", $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Load row template and switch colors - $OUT .= loadTemplate('admin_edit_email_row', true, $content); + $OUT .= loadTemplate('form_submit_email_row', true, $content); } // END - while // Free memory SQL_FREERESULT($result); // Load email template - loadTemplate('admin_edit_email_select', false, $OUT); + loadTemplate('form_submit_email_select', false, $OUT); } } else { // No mail orders left in pool - loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); } // [EOF] diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 81d68c2228..0220db1dee 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -76,7 +76,7 @@ LIMIT 1", $content['warning_interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh'); // Init variables here - $TPL = sprintf("admin_edit_sponsor_%s", getRequestParameter('mode')); + $TPL = sprintf("form_submit_sponsor_%s", getRequestParameter('mode')); initSqls(); // Sponsor was found diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index dadb537c42..83bc543e7b 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -132,11 +132,11 @@ LIMIT 1", $content['gender_' . strtolower($content['gender'])] = ' selected="selected"'; // Load template - loadTemplate('admin_edit_user', false, $content); + loadTemplate('form_submit_user', false, $content); } } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } // Free the result diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php index 4d459eb739..7ddbce1462 100644 --- a/inc/modules/admin/what-guest_add.php +++ b/inc/modules/admin/what-guest_add.php @@ -154,7 +154,7 @@ ORDER BY `sort` ASC", // Free memory SQL_FREERESULT($result_menu); - $OUT = ' '; foreach ($below as $key => $m) { if (is_array($m)) { diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index 722b9eea4e..88f185e987 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -79,7 +79,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() ); // Load row template - $OUT .= loadTemplate('admin_edit_guest_menu_row', true, $DATA); + $OUT .= loadTemplate('form_submit_guest_menu_row', true, $DATA); } else { // Entry not found $DATA = array( @@ -97,7 +97,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() $content['cnt'] = $cnt; // Load template - loadTemplate('admin_edit_guest_menu_form', false, $content); + loadTemplate('form_submit_guest_menu_form', false, $content); } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) { // Del menu entries with or without confirmation $content['sub'] = $SUB; @@ -309,7 +309,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() SQL_FREERESULT($result); // Load template - loadTemplate('admin_edit_guest_menu', false, $content); + loadTemplate('form_submit_guest_menu', false, $content); } else { // Menu entries are missing... (???) loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}'); diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 1a2b8fefa2..eeb1f7f8e7 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -115,7 +115,7 @@ ORDER BY $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '
    {--ADMIN_BEG_ALREADY_WITHDRAW--}
    '); + $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_BEG_ALREADY_WITHDRAW--}'); } // Prepare constant for timemark diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 029b357bf7..9fc35e7e6b 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -127,7 +127,7 @@ ORDER BY $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '
    {--ADMIN_BONUS_ALREADY_WITHDRAW--}
    '); + $content['withdraw_form'] = loadTemplate('admin_settings_unsaved', true, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}'); } // Prepare constant for timemark diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 1525b03830..ef80b5cc6a 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -86,15 +86,15 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest // Edit template $row = 'admin_list_country_edit_row'; $post = 'modify'; - $class = 'admin_submit'; + $class = 'form_submit'; $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}'; $title = '{--ADMIN_COUNTRY_EDIT_TITLE--}'; - $reset = ' '; + $reset = ' '; } else { // Delete template $row = 'admin_list_country_del_row'; $post = 'remove'; - $class = 'admin_delete'; + $class = 'form_delete'; $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}'; $title = '{--ADMIN_COUNTRY_DELETE_TITLE--}'; $reset = ''; diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index b846eb8b56..d53474bca9 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -160,7 +160,7 @@ LIMIT 1", } } else { // Cannot load payout id - loadTemplate('admin_settings_saved', false, '
    {--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}'); } } else { // Prepare content diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index c4344ab7fe..e55c5bbd3b 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -219,11 +219,11 @@ LIMIT 1", $content['id'] = $id; // Output row - $OUT .= loadTemplate('admin_edit_rallyes_row', true, $content); + $OUT .= loadTemplate('form_submit_rallyes_row', true, $content); } // END - foreach // Load final template - loadTemplate('admin_edit_rallyes', false, $OUT); + loadTemplate('form_submit_rallyes', false, $OUT); } else { // Nothing selected to edit loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}'); @@ -319,7 +319,7 @@ ORDER BY // Transfer data into array for the template $row = array( - 'select' => '', + 'select' => '', 'admin_id' => $data['admin_id'], 'login' => $data['login'], 'id' => $data['id'], diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 32d6f2a299..7de92cb226 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -150,7 +150,7 @@ LIMIT 1", loadTemplate('admin_lock_user', false, $content); } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); } } @@ -161,14 +161,14 @@ LIMIT 1", } elseif ($isActive) { // An action was performed... if (!empty($message)) { - loadTemplate('admin_settings_saved', false, '
    ' . $message . '
    '); + loadTemplate('admin_settings_unsaved', false, $message); } else { - loadTemplate('admin_settings_saved', false, '
    {--ADMIN_USER_UPDATED--}
    '); + loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_UPDATED--}'); } } } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } else { // List all users diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php index 5c99507b6a..78e06a63ab 100644 --- a/inc/modules/admin/what-mem_add.php +++ b/inc/modules/admin/what-mem_add.php @@ -143,7 +143,7 @@ if (!isFormSent()) { } // END - foreach } // END - if - $OUT = ' '; foreach ($below as $key => $m) { if (is_array($m)) { diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 658f45675c..d3c27d7c0f 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -76,7 +76,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() ); // Load template - $OUT .= loadTemplate('admin_edit_member_menu_row', true, $data); + $OUT .= loadTemplate('form_submit_member_menu_row', true, $data); } else { // Entry not found? $data = array( @@ -95,7 +95,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() $content['cnt'] = $cnt; // Load template - loadTemplate('admin_edit_member_menu', false, $content); + loadTemplate('form_submit_member_menu', false, $content); } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) { // Del menu entries with or without confirmation $content['sub'] = $SUB; diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index 71dad294d4..abd2e1fcf3 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -76,10 +76,10 @@ if (isFormSent()) { if (countSqls() > 0) { // Run all queries runFilterChain('run_sqls'); - $content = '{--SETTINGS_SAVED--}'; + $content = '{--SETTINGS_SAVED--}'; } else { // Nothing has changed! - $content = '{--SETTINGS_NOT_SAVED--}'; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Output template @@ -113,11 +113,11 @@ if (isFormSent()) { SQL_FREERESULT($result); // Load row template and switch colors - $OUT .= loadTemplate('admin_edit_payments_row', true, $content); + $OUT .= loadTemplate('form_submit_payments_row', true, $content); } // END - foreach // Load main template - loadTemplate('admin_edit_payments', false, $OUT); + loadTemplate('form_submit_payments', false, $OUT); } else { // Referal levels $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index a35223aa6d..fc1cfaecde 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -99,7 +99,7 @@ VALUES ('%s','%s','%s')", $content = '{--SETTINGS_SAVED--}'; } else { // Nothing has been updated - $content = '{--SETTINGS_NOT_SAVED--}'; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Display message @@ -118,11 +118,11 @@ VALUES ('%s','%s','%s')", $content['visible'] = addSelectionBox('yn', $content['visible'], 'visible'); // Load row template and switch color - $OUT .= loadTemplate('admin_edit_refbanner_row', true, $content); + $OUT .= loadTemplate('form_submit_refbanner_row', true, $content); } // END - foreach // Load main template - loadTemplate('admin_edit_refbanner', false, $OUT); + loadTemplate('form_submit_refbanner', false, $OUT); } else { if ((ifPostContainsSelections()) && (isFormSent('del'))) { // Delete banner diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php index 32b6e415d3..1ee75c4bfc 100644 --- a/inc/modules/admin/what-repair_cats.php +++ b/inc/modules/admin/what-repair_cats.php @@ -67,11 +67,11 @@ if (!SQL_HASZERONUMS($result)) { $content = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REMOVED); } else { // Nothing repaired - $content = '
    {--ADMIN_REPAIR_NOTHING_FIXED--}
    '; + $content = '
    {--ADMIN_REPAIR_NOTHING_FIXED--}
    '; } } else { // No category selections found, no members registered? - $content = '
    {--ADMIN_REPAIR_CATEGORIES_NOTHING--}
    '; + $content = '
    {--ADMIN_REPAIR_CATEGORIES_NOTHING--}
    '; } // Load template diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index b7c6c86e88..4d894d8fda 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -112,7 +112,7 @@ if (getRequestParameter('userid') == 'all') { } } else { // User not found! - loadTemplate('admin_settings_saved', false, '
    ' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
    '); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } else { // Output selection form with all confirmed user accounts listed diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index baf910dfef..372159f331 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -129,7 +129,7 @@ array_pk_sort($THEMES, array('theme_name')); $OUT = ''; foreach ($THEMES['theme_unix'] as $key => $unix) { // Already installed is default - $formContent = '
    ' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '
    '; + $formContent = '
    ' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '
    '; // Check if current theme is already imported or not if (!ifThemeExists($unix)) { diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 33b0d7f7b6..1df2177ddf 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -90,7 +90,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($ // Is a newer version available? if (empty($ONLINE['version'])) { // Disconnected? - loadTemplate('admin_settings_saved', false, '
    {--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')
    '); + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')'); } elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrSvnRevision())) { // New full-version available (all previous released patches are included in this version!) $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2); diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php index fa5f8dc9b0..a153bcb2e8 100644 --- a/inc/modules/frametester.php +++ b/inc/modules/frametester.php @@ -108,7 +108,7 @@ if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || ( break; case 'test_top': - loadTemplate('admin_settings_saved', false, '
    {--GUEST_FRAMETESTER_TOP--}'); + loadTemplate('admin_settings_saved', false, '{--GUEST_FRAMETESTER_TOP--}'); break; case 'back': // Back buttom diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index f2c6938e87..159735d801 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -123,7 +123,7 @@ if (!empty($errorCode)) { // @TODO Move this HTML code into a template $content['message'] = ' - ' . getMessageFromErrorCode($errorCode) . ' + ' . getMessageFromErrorCode($errorCode) . ' '; } // END - if diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 10ab84497d..84712ba0dd 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -152,7 +152,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) { if (isAdmin()) $whereStatement = ''; // Prepare country selection box - $OUT = ''; $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement); $OUT .= ''; $content['country'] = $OUT; diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 31b438b6e3..23f0b933c3 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -75,7 +75,7 @@ switch ($mode) { // How far is last change on his profile away from now? if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) { // You cannot change your account - $content['change'] = loadTemplate('admin_settings_saved', true, '
    ' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '
    '); + $content['change'] = loadTemplate('admin_settings_saved', true, '
    ' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '
    '); } else { // He is allowed to change his profile $content['change'] = loadTemplate('member_mydata_button', true); @@ -170,7 +170,7 @@ LIMIT 1", if (isExtensionActive('country')) { // Generate selection box - $OUT = ''; $whereStatement = "WHERE `is_active`='Y'"; if (isAdmin()) $whereStatement = ''; $OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement); @@ -178,7 +178,7 @@ LIMIT 1", $content['country'] = $OUT; } else { // Ouput default input box - $content['country'] = ''; + $content['country'] = ''; } // Load template diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php index 9037d7f956..67705fdebe 100644 --- a/inc/modules/member/what-nickname.php +++ b/inc/modules/member/what-nickname.php @@ -88,7 +88,7 @@ if ($isValid === true) { } else { // Do we have already submit the form? if (isPostRequestParameterSet('nickname')) { - loadTemplate('admin_settings_saved', false, '
    {--MEMBER_NICKNAME_IS_INVALID--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--MEMBER_NICKNAME_IS_INVALID--}'); } // END - if // Load Template diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 853bffc391..815e174c42 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -662,15 +662,15 @@ LIMIT 1", } } else { // No mail types defined - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}'); } } else { // No points left - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}'); } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}'); } } else { // Please confirm some mails first diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index a141f3009a..49dc8e5c51 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -172,30 +172,30 @@ switch ($mode) { sendAdminNotification($adminSubject, 'admin_transfer_points', $content); // Transfer is completed - loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '
    {--TRANSFER_CONTINUE_OVERVIEW--}'); + loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_COMPLETED--}' . '
    '); } elseif ($valid_code === false) { // Invalid Touring code! - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_CODE--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}'); unsetPostRequestParameter('ok'); } elseif ($valid_pass === false) { // Wrong password entered - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_PASSWORD--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}'); unsetPostRequestParameter('ok'); } elseif ($valid_amount === false) { // Too much points entered - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_POINTS--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}'); unsetPostRequestParameter('ok'); } elseif ($valid_reason === false) { // No transfer reason entered - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_REASON--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}'); unsetPostRequestParameter('ok'); } elseif ($valid_recipient === false) { // No recipient selected - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_RECIPIENT--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}'); unsetPostRequestParameter('ok'); } elseif ($valid_data === false) { // No recipient/sender selected - loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_DATA--}
    '); + loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}'); unsetPostRequestParameter('ok'); } @@ -217,7 +217,7 @@ switch ($mode) { if (!SQL_HASZERONUMS($result)) { // Load list - $OUT = ' '; // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries while (list($userid, $nick) = SQL_FETCHROW($result)) { @@ -252,7 +252,7 @@ switch ($mode) { $rand = mt_rand(0, 99999); $code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']); $img = generateImageOrCode($code, false); - $content['captcha_code'] = ' ' . $img; + $content['captcha_code'] = ' ' . $img; } else { $code = '00000'; $content['captcha_code'] = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_CODE--}'); @@ -471,7 +471,7 @@ KEY (`party_userid`) array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__); // "Settings saved..." - loadTemplate('admin_settings_saved', false, '
    {--SETTINGS_SAVED--}
    '); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); } // END - if // Init entries diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 0d0e060d66..eff3023e4f 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -262,7 +262,7 @@ ORDER BY $OUT .= ''; } else { // Not found! - open - $OUT .= ''; + $OUT .= ''; } // Menu title @@ -1671,7 +1671,7 @@ function generateCategoryOptionsList ($mode) { } // END - foreach } else { // No cateogries are defined yet - $OUT = ''; + $OUT = ''; } // Return HTML code diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php index 0a57a3aeff..825023575e 100644 --- a/inc/reset/reset_profile.php +++ b/inc/reset/reset_profile.php @@ -51,17 +51,24 @@ if (!defined('__SECURITY')) { if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) { // Load personal data - $result = SQL_QUERY('SELECT `userid`, `email`, `last_update`, `joined` + $result = SQL_QUERY("SELECT + `userid`, `email`, `last_update`, `joined` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE - (`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND - `last_update` > 0 AND - `last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?})) -OR - (`last_update` = 0 AND `last_profile_sent` = 0 AND `joined` < (UNIX_TIMESTAMP() - {?profile_update?})) + `status`='CONFIRMED' AND ( + ( + `last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND + `last_update` > 0 AND + `last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?}) + ) OR ( + `last_update` = 0 AND + `last_profile_sent` = 0 AND + `joined` < (UNIX_TIMESTAMP() - {?profile_update?}) + ) + ) ORDER BY - `userid` ASC', __FILE__, __LINE__); + `userid` ASC", __FILE__, __LINE__); // Do we have some notifications to sent? if (!SQL_HASZERONUMS($result)) { diff --git a/inc/template-functions.php b/inc/template-functions.php index 1c2fac4d40..931d18d2c4 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -326,7 +326,7 @@ function loadTemplate ($template, $return = false, $content = array()) { } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { // Only admins shall see this warning or when installation mode is active $ret = '
    - {--TEMPLATE_404--} + {--TEMPLATE_404--}
    (' . $template . ') @@ -654,7 +654,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true } // -function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'guest_select') { +function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'form_select') { $OUT = ''; if ($type == 'yn') { @@ -1524,21 +1524,21 @@ function sendModeMails ($mod, $modes) { $sub_mem = '{--MEMBER_CHANGED_DATA--}'; // Output success message - $content = '{--MEMBER_MYDATA_MAIL_SENT--}'; + $content = '{--MEMBER_MYDATA_MAIL_SENT--}'; break; default: // Unsupported module! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); - $content = '{--UNKNOWN_MODULE--}'; + $content = '{--UNKNOWN_MODULE--}'; break; } // END - switch } else { // Passwords mismatch - $content = '{--MEMBER_PASSWORD_ERROR--}'; + $content = '{--MEMBER_PASSWORD_ERROR--}'; } } else { // Could not load profile - $content = '{--MEMBER_CANNOT_LOAD_PROFILE--}'; + $content = '{--MEMBER_CANNOT_LOAD_PROFILE--}'; } // Send email to user if required @@ -1557,7 +1557,7 @@ function sendModeMails ($mod, $modes) { $content = '{--CANNOT_SEND_ADMIN_MAILS--}'; } else { // No mail to admin - $content = '{--MEMBER_MYDATA_MAIL_SENT--}'; + $content = '{--MEMBER_MYDATA_MAIL_SENT--}'; } } // END - if @@ -1568,7 +1568,7 @@ function sendModeMails ($mod, $modes) { // Generates a 'selection box' from given array function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') { // Start the output - $OUT = ' '; // Walk through all options @@ -1704,7 +1704,7 @@ function doTemplateExtensionRegistrationLink ($template, $dummy, $ext_name) { // Is the given extension non-productive? if (!isExtensionProductive($ext_name)) { // Non-productive code - $OUT = '{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}'; + $OUT = '{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}'; } // END - if // Return code diff --git a/mailid_top.php b/mailid_top.php index b0300fda88..5bc0116022 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -344,30 +344,30 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr break; } // END - switch } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (6)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (6)'); $mode = 'failed'; } } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (5)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (5)'); $mode = 'failed'; } } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (4)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (4)'); $mode = 'failed'; } } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (3)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)'); $mode = 'failed'; } } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (2)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)'); $mode = 'failed'; } // Free result SQL_FREERESULT($result_mailid); } else { - loadTemplate('admin_settings_saved', false, '
    {--MAIL_ALREADY_CONFIRMED--} (1)
    '); + loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)'); $mode = 'failed'; } diff --git a/show_bonus.php b/show_bonus.php index cc1ad2af63..89659b9431 100644 --- a/show_bonus.php +++ b/show_bonus.php @@ -115,18 +115,18 @@ LIMIT 1", $content['message'] = loadTemplate('show_bonus_msg', true, $content); } else { // No data found - $content['message'] = '{--BONUS_SHOW_NO_DATA--}'; + $content['message'] = '{--BONUS_SHOW_NO_DATA--}'; } // Free memory SQL_FREERESULT($result); } else { // Wrong type entered - $content['message'] = '{--BONUS_SHOW_WRONG_TYPE--}'; + $content['message'] = '{--BONUS_SHOW_WRONG_TYPE--}'; } } else { // Wrong call! - $content['message'] = '{--BONUS_SHOW_WRONG_CALL--}'; + $content['message'] = '{--BONUS_SHOW_WRONG_CALL--}'; } // Load send_bonus header template (for your banners, e.g.?) diff --git a/templates/de/html/admin/admin_add_admin_menu.tpl b/templates/de/html/admin/admin_add_admin_menu.tpl index c83e093988..e0376529e7 100644 --- a/templates/de/html/admin/admin_add_admin_menu.tpl +++ b/templates/de/html/admin/admin_add_admin_menu.tpl @@ -1,30 +1,30 @@
    - +
    @@ -32,9 +32,9 @@ -
    {--ENTER_TITLE--}: - +
    {--SELECT_WHAT_NAME--}: $content[what_selection]
    - ({--CREATE_WHAT_FIRST--}) + ({--CREATE_WHAT_FIRST--})
    {--SELECT_PARENT_MENU--}: $content[action_selection]
    - ({--CREATE_ACTION_FIRST--}) + ({--CREATE_ACTION_FIRST--})
    {--ENTER_DESCR--}: - +
    $content[below_selection]
    diff --git a/templates/de/html/admin/admin_add_admins.tpl b/templates/de/html/admin/admin_add_admins.tpl index 09911be03c..4d7a4728d1 100644 --- a/templates/de/html/admin/admin_add_admins.tpl +++ b/templates/de/html/admin/admin_add_admins.tpl @@ -1,39 +1,39 @@
    - +
    - -
    + {--ADMIN_ADMINS_ADD_NEW_ADMIN--}:
    {--ADMIN_ADMINS_ENTER_LOGIN--}: - +
    {--ADMIN_ADMINS_ENTER_EMAIL--}: - +
    {--ADMIN_ADMINS_ENTER_PASS1--}: - +
    {--ADMIN_ADMINS_ENTER_PASS2--}: - +
    diff --git a/templates/de/html/admin/admin_add_admins_acl.tpl b/templates/de/html/admin/admin_add_admins_acl.tpl index 604905dee1..382d9f694f 100644 --- a/templates/de/html/admin/admin_add_admins_acl.tpl +++ b/templates/de/html/admin/admin_add_admins_acl.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -25,15 +25,15 @@ -
    + {--ADMIN_ADMINS_ADD_ACL--}:
    {--ADMIN_ADMINS_SELECT_LOGIN--}: - $content[admins_selection]
    {--ADMIN_ADMINS_SELECT_MODE--}: - $content[mode_options]
    diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index 07bb7183c6..502a17eabc 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -17,7 +17,7 @@ {--ADMIN_BANK_PACKAGE_DESCRIPTION--} @@ -25,20 +25,20 @@ {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--} @@ -83,13 +83,13 @@ {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--} @@ -97,20 +97,20 @@ {--ADMIN_BANK_PACKAGE_ACTIVE--} -
    + {--ADMIN_ADD_BANK_PACKAGE_TITLE--}
    {--ADMIN_BANK_PACKAGE_TITLE--} - +
    - +
    - + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_FREE_TRANSFERS--} - +
    {--ADMIN_BANK_PACKAGE_OUTPUT_MODE--} - @@ -48,33 +48,33 @@
    {--ADMIN_BANK_PACKAGE_FREE_MONTHS_FEE--} - + {--_MONTHS--}
    {--ADMIN_BANK_PACKAGE_INTEREST_PLUS--} - % + %
    {--ADMIN_BANK_PACKAGE_INTEREST_MINUS--} - % + %
    {--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--} - + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--} - + ({?POINTS?})
    - +
    {--ADMIN_BANK_PACKAGE_TAN_LOCK--} - +
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    -
    +
    {--ADMIN_BANK_FOOTER_NOTE--}
    diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index a70b2aa105..3214c7d333 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -12,7 +12,7 @@ {--ADMIN_ENTER_CATEGORY_NAME--}: @@ -21,7 +21,7 @@ {--ADMIN_SELECT_PARENT_CATEGORY--} -
    + {--ADMIN_ADD_NEW_CATEGORY_TITLE--}
    - +
    - $content[cats] @@ -33,15 +33,15 @@ {--ADMIN_CATEGORY_IS_VISIBLE--} - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl index 758d0d7fee..11105040ee 100644 --- a/templates/de/html/admin/admin_add_country.tpl +++ b/templates/de/html/admin/admin_add_country.tpl @@ -1,36 +1,36 @@ - +
    - -
    + {--ADMIN_ADD_COUNTRY_CODE_TITLE--}
    {--ADMIN_ENTER_COUNTRY_CODE--}: - +
    {--ADMIN_ENTER_COUNTRY_NAME--}: - +
    {--ADMIN_COUNTRY_CODE_ACTIVE--}: -
    diff --git a/templates/de/html/admin/admin_add_guest_menu.tpl b/templates/de/html/admin/admin_add_guest_menu.tpl index aaebdb1c0c..cddf51f8f8 100644 --- a/templates/de/html/admin/admin_add_guest_menu.tpl +++ b/templates/de/html/admin/admin_add_guest_menu.tpl @@ -1,24 +1,24 @@
    - +
    @@ -28,7 +28,7 @@ -
    {--ADMIN_ENTER_TITLE--}: - +
    {--ADMIN_SELECT_WHAT_NAME--}: $content[what_selection]
    - ({--CREATE_WHAT_FIRST--}) + ({--CREATE_WHAT_FIRST--})
    {--ADMIN_SELECT_PARENT_MENU--}: $content[action_selection]
    - ({--CREATE_ACTION_FIRST--}) + ({--CREATE_ACTION_FIRST--})
    {--MENU_IS_VISIBLE--}: - @@ -37,16 +37,16 @@
    {--MENU_IS_ACTIVE--}: -
    diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 288d1a4190..1a407a3364 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -12,19 +12,19 @@ -
    + {--ADMIN_ADD_MAX_VALUE--}
    {--ADMIN_ENTER_MAX_VALUE--}: - +
    {--ADMIN_ENTER_MAX_COMMENT--}: - +
    diff --git a/templates/de/html/admin/admin_add_member_menu.tpl b/templates/de/html/admin/admin_add_member_menu.tpl index 2036905941..26c80bfa12 100644 --- a/templates/de/html/admin/admin_add_member_menu.tpl +++ b/templates/de/html/admin/admin_add_member_menu.tpl @@ -1,24 +1,24 @@
    - +
    @@ -28,7 +28,7 @@ -
    {--ADMIN_ENTER_TITLE--}: - +
    {--ADMIN_SELECT_WHAT_NAME--}: $content[what_selection]
    - ({--CREATE_WHAT_FIRST--}) + ({--CREATE_WHAT_FIRST--})
    {--ADMIN_SELECT_PARENT_MENU--}: $content[action_selection]
    - ({--CREATE_ACTION_FIRST--}) + ({--CREATE_ACTION_FIRST--})
    {--MENU_IS_VISIBLE--}: - @@ -37,16 +37,16 @@
    {--MENU_IS_ACTIVE--}: -
    diff --git a/templates/de/html/admin/admin_add_network.tpl b/templates/de/html/admin/admin_add_network.tpl index c3b59abe18..55a3f5f03f 100644 --- a/templates/de/html/admin/admin_add_network.tpl +++ b/templates/de/html/admin/admin_add_network.tpl @@ -1,45 +1,45 @@
    - +
    - @@ -47,19 +47,19 @@ -
    + {--ADMIN_NETWORK_ADD_TITLE--}
    {--ADMIN_NETWORK_SHORT_NAME--}: - +
    {--ADMIN_NETWORK_TITLE--}: - +
    {--ADMIN_NETWORK_REFERAL_LINK--}: - +
    {--ADMIN_NETWORK_DATA_SEPERATOR--}: - +
    {--ADMIN_NETWORK_ROW_SEPERATOR--}: - +
    {--ADMIN_NETWORK_REQUEST_TYPE--}: - {%pipe,generateNetworkRequestTypeOptions%}
    {--ADMIN_NETWORK_CHARSET--}: - +
    -
    +
    {--ADMIN_NETWORK_ADD_NOTE--}
    diff --git a/templates/de/html/admin/admin_add_network_api_translation.tpl b/templates/de/html/admin/admin_add_network_api_translation.tpl index bd0dc49c77..7e18286000 100644 --- a/templates/de/html/admin/admin_add_network_api_translation.tpl +++ b/templates/de/html/admin/admin_add_network_api_translation.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -20,21 +20,21 @@ -
    + {--ADMIN_NETWORK_API_TRANSLATION_ADD_TITLE--}
    {--ADMIN_NETWORK_TYPE_SELECT--}: - {%pipe,generateNetworkTypeOptions=$content[network_type_id]%}
    {--ADMIN_NETWORK_API_TRANSLATION_INDEX_TRANSLATION--}: - {%pipe,generateNetworkTranslationOptions%}
    -
    +
    {--ADMIN_NETWORK_API_TRANSLATION_ADD_NOTE--}
    diff --git a/templates/de/html/admin/admin_add_network_params.tpl b/templates/de/html/admin/admin_add_network_params.tpl index cca3da4bf1..90095a1705 100644 --- a/templates/de/html/admin/admin_add_network_params.tpl +++ b/templates/de/html/admin/admin_add_network_params.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -20,7 +20,7 @@ @@ -28,25 +28,25 @@ -
    + {--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_TITLE--}
    {--ADMIN_NETWORK_TYPE_SELECT--}: - {%pipe,generateNetworkTypeOptions=$content[network_type_id]%}
    {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}: - {%pipe,generateNetworkRequestKeyOptions%}
    {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}: - +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}: - +
    -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE--}
    diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl index 0e9ec65c46..f9d3e2c8ee 100644 --- a/templates/de/html/admin/admin_add_network_type.tpl +++ b/templates/de/html/admin/admin_add_network_type.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -20,31 +20,31 @@ -
    + {--ADMIN_NETWORK_TYPES_ADD_TITLE--}
    {--ADMIN_NETWORK_TYPES_HANDLE--}: - {%pipe,generateNetworkTypesAvailableOptions%}
    {--ADMIN_NETWORK_TYPES_API_URL--}: - +
    {--ADMIN_NETWORK_TYPES_CLICK_URL--}: - +
    {--ADMIN_NETWORK_TYPES_BANNER_URL--}: - +
    -
    +
    {--ADMIN_NETWORK_TYPES_ADD_NOTE--}
    diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index a798a87229..a583495e77 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -1,41 +1,41 @@
    - +
    - -
    + {--ADMIN_ADD_NEW_PAYMENT_TITLE--}
    {--ADMIN_ENTER_PAYMENT_TIME--}: - {--_SECONDS--} + {--_SECONDS--}
    {--ADMIN_ENTER_PAYMENT_PAYMENT--}: - + ({?POINTS?})
    {--ADMIN_ENTER_PAYMENT_PRICE--}: - + ({?POINTS?})
    {--ADMIN_ENTER_PAYMENT_TITLE--}: - +
    diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 7621155963..165dec14e2 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -10,19 +10,19 @@ -
    + {--ADMIN_ADD_POINTS_TO_USER--}:
    [{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}]
    {--ADMIN_ENTER_POINTS_ADD--}: - +
    {--ADMIN_ENTER_ADD_REASON--}: - +
    diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index 6c097dc7c1..d7b99a6d27 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -1,25 +1,25 @@
    - +
    - + -
    {--ADMIN_ADD_POINTS_TO_ALL--}:{--ADMIN_ADD_POINTS_TO_ALL--}:
    {--ADMIN_ENTER_POINTS_ADD--}: - +
    {--ADMIN_ENTER_ADD_REASON--}: - +
    diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index 25f8dfd66b..771416ffd7 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -1,21 +1,21 @@
    - +
    - @@ -39,7 +39,7 @@ @@ -47,7 +47,7 @@ @@ -55,7 +55,7 @@ @@ -63,19 +63,19 @@ -
    + {--ADMIN_RALLYE_ADD_NEW_TITLE--}:
    {--RALLYE_TITLE--}: - +
    {--RALLYE_DESCR--}: - +
    {--RALLYE_IS_ACTIVE--}: - $content[active_options]
    {--RALLYE_AUTO_ADD_USER--}: - $content[auto_add_options]
    {--RALLYE_SEND_NOTIFY--}: - $content[notify_options]
    {--RALLYE_MIN_USERS--}: - +
    {--RALLYE_MIN_PRICES--}: - +
    diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 64abd933dc..b8947dc914 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -1,33 +1,33 @@
    - +
    - -
    + {%message,RALLYE_CONFIG_PRICES,$content%}:
    {--RALLYE_PRICE_LEVEL--}: - +
    {--RALLYE_PRICE_POINTS--}: - +
    {--RALLYE_PRICE_INFOS--}: - +
    diff --git a/templates/de/html/admin/admin_add_refbanner.tpl b/templates/de/html/admin/admin_add_refbanner.tpl index 97b72f920d..9a503ff1db 100644 --- a/templates/de/html/admin/admin_add_refbanner.tpl +++ b/templates/de/html/admin/admin_add_refbanner.tpl @@ -1,36 +1,36 @@
    - +
    - -
    + {--ADMIN_ADD_REFERAL_BANNER_TITLE--}
    {--ADMIN_ENTER_REFERAL_BANNER_URL--}: - +
    {--ADMIN_ENTER_ALTERNATE_REFERAL_BANNER_TEXT--}: - +
    {--ADMIN_SELECT_REFERAL_BANNER_ACTIVE--} -
    diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index 1c211c5fdf..dd4acd9365 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,27 +1,27 @@
    - +
    - -
    + {--ADMIN_ADD_NEW_REFERAL_DEPTH_TITLE--}
    {--ADMIN_ENTER_REFERAL_LEVEL--}: - +
    {--ADMIN_ENTER_REFERAL_PERCENTS--}: - % + %
    diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index eef7cb4932..6ad5d77160 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -1,14 +1,14 @@
    - +
    - @@ -16,7 +16,7 @@ {--SPONSOR_ENTER_COMPANY_TITLE--}: @@ -24,7 +24,7 @@ {--SPONSOR_ENTER_COMPANY_POSITION--}: @@ -32,11 +32,11 @@ {--SPONSOR_ENTER_TAX_IDENT--}: - @@ -45,7 +45,7 @@ {--GENDER--}: @@ -65,11 +65,11 @@ {--GUEST_FAMILY--}: - @@ -78,7 +78,7 @@ {--SPONSOR_ENTER_STREET_NR1--}: @@ -86,7 +86,7 @@ {--SPONSOR_ENTER_STREET_NR2--}: @@ -94,8 +94,8 @@ {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: @@ -103,7 +103,7 @@ {--SPONSOR_ENTER_PHONE--}: @@ -111,7 +111,7 @@ {--SPONSOR_ENTER_FAX--}: @@ -119,7 +119,7 @@ {--SPONSOR_ENTER_CELL--}: @@ -127,7 +127,7 @@ {--SPONSOR_ENTER_EMAIL--}: @@ -135,11 +135,11 @@ {--SPONSOR_ENTER_URL--}: - @@ -148,12 +148,12 @@ {--SPONSOR_ENTER_PASSWORDS--}: - @@ -162,7 +162,7 @@ {--SPONSOR_RECEIVE_WARNINGS--}: -
    + {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}
    - {--ADMIN_SPONSOR_COMPANY_NOTE--} + {--ADMIN_SPONSOR_COMPANY_NOTE--}
    - +
    - +
    - +
    + {--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}
    - @@ -57,7 +57,7 @@ {--GUEST_SURNAME--}: - +
    - +
    + {--ADMIN_SPONSOR_ENTER_CONTACT_DATA--}
    - +
    - +
    - - - + - +
    - +
    - +
    - +
    - +
    - +
    + {--ADMIN_SPONSOR_ENTER_PASSWORDS--}
    - - + +
    + {--ADMIN_SPONSOR_WARNINGS_POINTS--}
    - @@ -173,7 +173,7 @@ {--SPONSOR_WARNING_INTERVAL--}: - @@ -189,13 +189,13 @@ {--SPONSOR_ENTER_POINTS--}: - +
    diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl index 815a69c58c..13ff2900c3 100644 --- a/templates/de/html/admin/admin_add_sponsor_already.tpl +++ b/templates/de/html/admin/admin_add_sponsor_already.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,10 +13,10 @@ -
    + {--ADMIN_SPONSOR_REALLY_ADD_SPONSOR--}
    diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index e0902ba009..39eaa8a6c2 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -1,38 +1,38 @@
    - +
    - - + - + - + - + -
    + {--ADMIN_ADD_SPONSOR_PAYTYPE_TITLE--}:
    {--SPONSOR_PAYTYPE_NAME--}:
    {--SPONSOR_PAYTYPE_NAME_HINT--}
    {--SPONSOR_PAYTYPE_RATE--}:
    {--SPONSOR_PAYTYPE_RATE_HINT--}
    {--SPONSOR_PAYTYPE_MIN_COUNT--}:
    {--SPONSOR_PAYTYPE_CURRENCY--}:
    -
    +
    {--SPONSOR_ADD_PAYTYPES_NOTES--}:
    diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl index af24387b2b..acc4c21319 100644 --- a/templates/de/html/admin/admin_add_surfbar_url.tpl +++ b/templates/de/html/admin/admin_add_surfbar_url.tpl @@ -1,7 +1,7 @@
    -
    -
    +
    +
    URL in Surfbar hinzufügen:
    @@ -11,17 +11,17 @@
    Maximale Einblendung:
    - (0 = Unbegrenzt) + (0 = Unbegrenzt)
    Reloadsperre: $content[reload] - (0 = Standarteinstellungen) + (0 = Standarteinstellungen)
    - diff --git a/templates/de/html/admin/admin_admins_contct_default.tpl b/templates/de/html/admin/admin_admins_contct_default.tpl index 6a05ee90fd..755f7b9306 100644 --- a/templates/de/html/admin/admin_admins_contct_default.tpl +++ b/templates/de/html/admin/admin_admins_contct_default.tpl @@ -1,5 +1,5 @@ - + {--ADMINS_CONTACT_DEFAULT_MAIL--} diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index 4c70faf7d2..866f60aa7f 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -1,6 +1,6 @@
    - +
    @@ -9,14 +9,14 @@ $content[message_selection] -
    {--ADMINS_ADMIN_ID--}:
    {--ADMINS_ENTER_CONTACT_TEXT--}:
    - +
    diff --git a/templates/de/html/admin/admin_admins_contct_select.tpl b/templates/de/html/admin/admin_admins_contct_select.tpl index 313367d4f5..4c665d81a1 100644 --- a/templates/de/html/admin/admin_admins_contct_select.tpl +++ b/templates/de/html/admin/admin_admins_contct_select.tpl @@ -1,13 +1,13 @@ - + {--ADMINS_SELECT_CONTACT_TYPE--} - {--ADMINS_CONTACT_TYPE_MAIL--} + {--ADMINS_CONTACT_TYPE_MAIL--} - {--ADMINS_CONTACT_TYPE_MSG--} + {--ADMINS_CONTACT_TYPE_MSG--} diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl index 9cfef21998..f36e1d9a0e 100644 --- a/templates/de/html/admin/admin_admins_mails_edit.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -16,9 +16,9 @@ $content -
    + {--ADMINS_MAILS_EDIT_TITLE--}
    diff --git a/templates/de/html/admin/admin_admins_mails_edit_form.tpl b/templates/de/html/admin/admin_admins_mails_edit_form.tpl index f0172216f0..172816f69e 100644 --- a/templates/de/html/admin/admin_admins_mails_edit_form.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit_form.tpl @@ -1,7 +1,7 @@
    {--ADMINS_ADD_MORE_ADMINS--}:

    diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index 0b6a34c482..8ec459f8c9 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -19,9 +19,9 @@ $content -
    + {--ADMINS_MAILS_TITLE--}
    diff --git a/templates/de/html/admin/admin_admins_mails_list_row.tpl b/templates/de/html/admin/admin_admins_mails_list_row.tpl index 17503c9b92..257887086b 100644 --- a/templates/de/html/admin/admin_admins_mails_list_row.tpl +++ b/templates/de/html/admin/admin_admins_mails_list_row.tpl @@ -1,6 +1,6 @@ - + $content[mail_template] diff --git a/templates/de/html/admin/admin_cache_stats.tpl b/templates/de/html/admin/admin_cache_stats.tpl index dd87abfb21..6b07e069ff 100644 --- a/templates/de/html/admin/admin_cache_stats.tpl +++ b/templates/de/html/admin/admin_cache_stats.tpl @@ -1,8 +1,8 @@
    + class="table dashed"> - @@ -25,12 +25,12 @@ - -
    + {--ADMIN_CACHE_STATS_TITLE--}
    -
    +
    {--ADMIN_CACHE_NOTES--}
    diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl index 2ac1bc51c8..8625725d8e 100644 --- a/templates/de/html/admin/admin_config_active.tpl +++ b/templates/de/html/admin/admin_config_active.tpl @@ -1,21 +1,21 @@
    - +
    - -
    + {--ADMIN_ACTIVE_SETTINGS--}:
    {--ADMIN_ACTIVE_LIMIT--}: - +
    diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index 8d7b446b36..51df994a54 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,20 +11,20 @@ {--ADMIN_SELECT_MENU_TYPE--}: -
    + {--ADMIN_CONFIG_ADMIN_MENU_TITLE--}
    - + {--ADMIN_MENU_NEW--}
    - + {--ADMIN_MENU_OLD--}
    diff --git a/templates/de/html/admin/admin_config_admins.tpl b/templates/de/html/admin/admin_config_admins.tpl index 18e40fbab8..5b9f3d114f 100644 --- a/templates/de/html/admin/admin_config_admins.tpl +++ b/templates/de/html/admin/admin_config_admins.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,10 +15,10 @@ $content -
    + {--ADMIN_ADMINS_LIST_ACLS--}:
    diff --git a/templates/de/html/admin/admin_config_admins_del.tpl b/templates/de/html/admin/admin_config_admins_del.tpl index 13f239f45e..04d7684745 100644 --- a/templates/de/html/admin/admin_config_admins_del.tpl +++ b/templates/de/html/admin/admin_config_admins_del.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,9 +15,9 @@ $content -
    + {--ADMIN_ADMINS_DELETE_ACLS--}:
    diff --git a/templates/de/html/admin/admin_config_admins_edit.tpl b/templates/de/html/admin/admin_config_admins_edit.tpl index 3a6d620702..425a78c24a 100644 --- a/templates/de/html/admin/admin_config_admins_edit.tpl +++ b/templates/de/html/admin/admin_config_admins_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,9 +15,9 @@ $content -
    + {--ADMIN_ADMINS_EDIT_ACLS--}:
    diff --git a/templates/de/html/admin/admin_config_admins_edit_row.tpl b/templates/de/html/admin/admin_config_admins_edit_row.tpl index cd344680eb..59f18b7c81 100644 --- a/templates/de/html/admin/admin_config_admins_edit_row.tpl +++ b/templates/de/html/admin/admin_config_admins_edit_row.tpl @@ -4,7 +4,7 @@ - $content[admins_selection] @@ -15,7 +15,7 @@ $content[what_selection] - $content[mode_options] diff --git a/templates/de/html/admin/admin_config_admins_row.tpl b/templates/de/html/admin/admin_config_admins_row.tpl index 86c2fa2f39..7a00f3599b 100644 --- a/templates/de/html/admin/admin_config_admins_row.tpl +++ b/templates/de/html/admin/admin_config_admins_row.tpl @@ -1,6 +1,6 @@ - + {%pipe,generateAdminLink=$content[admin_id]%} diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index 22abe57b93..33d352bd34 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -1,13 +1,13 @@
    - +
    - - @@ -24,7 +24,7 @@ - @@ -37,7 +37,7 @@ - @@ -50,7 +50,7 @@ - @@ -80,7 +80,7 @@ - @@ -101,7 +101,7 @@ - @@ -130,9 +130,9 @@ -
    + {--ADMIN_AUTOPURGE_CONFIGURATION--}
    + {--ADMIN_AUTOPURGE_INACTIVE_TITLE--}
    $content[ap_in_time]
    + {--ADMIN_AUTOPURGE_UNCONFIRMED_TITLE--}
    $content[ap_un_time]
    + {--ADMIN_AUTOPURGE_TASKS_TITLE--}
    $content[ap_task_time]
    + {--ADMIN_AUTOPURGE_MAILID_TITLE--}
    + {--ADMIN_AUTOPURGE_DELETE_MAILS_TITLE--}
    + {--ADMIN_AUTOPURGE_NOTIFICATION_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 53ca7aa1bc..9d33941cd8 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_BEG_POINTS--}: @@ -19,7 +19,7 @@ {--ADMIN_BEG_POINTS_MAX--}: @@ -49,24 +49,24 @@ - - @@ -75,8 +75,8 @@ {--ADMIN_BEG_RALLYE_ACTIVE--} @@ -84,8 +84,8 @@ {--ADMIN_BEG_INCLUDE_OWN--} @@ -93,7 +93,7 @@ {--ADMIN_BEG_RANKS--} @@ -101,8 +101,8 @@ {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--} @@ -110,7 +110,7 @@ {--ADMIN_BEG_PAY_MODE--} - @@ -128,8 +128,8 @@ {--ADMIN_BEG_RALLYE_ENABLE_NOTIFY--} @@ -137,8 +137,8 @@ {--ADMIN_BEG_RALLYE_DISABLE_NOTIFY--} @@ -146,8 +146,8 @@ {--ADMIN_BEG_NEW_MEMBER_NOTIFY--} @@ -155,7 +155,7 @@ {--ADMIN_BEG_NOTIFY_BONUS--} @@ -167,9 +167,9 @@ -
    + {--ADMIN_EDIT_BEG_SETTINGS--}
    - +
    - +
    {--ADMIN_BEG_USERID--}: - $content[member_selection] + $content[form_selection]
    + {--ADMIN_SELECT_BEG_MODE--}:
    - {--BEG_MODE_DIRECT--} + {--BEG_MODE_DIRECT--} - {--BEG_MODE_REF--} + {--BEG_MODE_REF--}
    + {--ADMIN_EDIT_BEG_RALLYE_SETTINGS--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - +
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - @@ -119,7 +119,7 @@
    + {--ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - +
    diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 5aaa2c6137..063d7411ec 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -1,47 +1,47 @@
    - +
    - - -
    + {--ADMIN_CONFIG_BIRTHDAY_TITLE--}
    {--ADMIN_BIRTHDAY_POINTS--}: - ({--ADMIN_BIRTHDAY_POINTS_NOTE--}) + ({--ADMIN_BIRTHDAY_POINTS_NOTE--}) - +
    ({?POINTS?})
    {--ADMIN_BIRTHDAY_ONLY_ACTIVE--} - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    + {--ADMIN_SELECT_BIRTHDAY_MODE--}:
    - + {--ADMIN_BIRTHDAY_MODE_DIRECT--} - + {--ADMIN_BIRTHDAY_MODE_REF--}
    diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 25ba187569..75e56b4170 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,8 +11,8 @@ {--ADMIN_BONUS_RALLYE_IS_ACTIVE--} @@ -20,8 +20,8 @@ {--ADMIN_BONUS_INCLUDE_OWN--} @@ -29,8 +29,8 @@ {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--} @@ -38,8 +38,8 @@ {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--} @@ -47,8 +47,8 @@ {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--} @@ -56,8 +56,8 @@ {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--} @@ -65,12 +65,12 @@ {--ADMIN_BONUS_RALLYE_REFERAL_INCLUDE--} - @@ -79,8 +79,8 @@ {--ADMIN_BONUS_ORDER_BONUS--}: @@ -88,8 +88,8 @@ {--ADMIN_BONUS_REFERAL_BONUS--}: @@ -97,8 +97,8 @@ {--ADMIN_BONUS_STATS_BONUS--}: @@ -106,20 +106,20 @@ {--ADMIN_BONUS_LOGIN_BONUS--}: - @@ -138,7 +138,7 @@ - @@ -151,30 +151,30 @@ - - @@ -183,8 +183,8 @@ {--ADMIN_BONUS_RALLYE_ENABLE_NOTIFY--} @@ -192,8 +192,8 @@ {--ADMIN_BONUS_RALLYE_DISABLE_NOTIFY--} @@ -201,8 +201,8 @@ {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} @@ -210,8 +210,8 @@ {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--} @@ -223,9 +223,9 @@ -
    + {--ADMIN_ACTIVATE_BONUS_SETTINGS--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    + {--ADMIN_EDIT_BONUS_SETTINGS--}
    - - ({?POINTS?}) + + ({?POINTS?})
    - - ({?POINTS?}) + + ({?POINTS?})
    - - ({?POINTS?}) + + ({?POINTS?})
    - - ({?POINTS?}) + + ({?POINTS?})
    + {--ADMIN_BONUS_TURBO_BONUS_TITLE--}:
    {--ADMIN_BONUS_TURBO_BONUS--}: - - ({?POINTS?}) + + ({?POINTS?})
    $content[trates_list]
    + {--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:
    $content[bonus_timeout_selection]
    + {--ADMIN_BONUS_TURBO_MISC_TITLE--}:
    {--ADMIN_BONUS_TURBO_RANKS--}: - +
    {--ADMIN_BONUS_TURBO_LINES--}: - +
    {--ADMIN_BONUS_USERID--}: - $content[member_selection] + $content[form_selection]
    + {--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - - ({?POINTS?}) + + ({?POINTS?})
    diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl index 667145157e..376311d5c6 100644 --- a/templates/de/html/admin/admin_config_cats.tpl +++ b/templates/de/html/admin/admin_config_cats.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -14,10 +14,10 @@ $content -
    + {--ADMIN_CONFIG_CATEGORIES_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_cats_row.tpl b/templates/de/html/admin/admin_config_cats_row.tpl index fff42fc1a0..211ba4e756 100644 --- a/templates/de/html/admin/admin_config_cats_row.tpl +++ b/templates/de/html/admin/admin_config_cats_row.tpl @@ -1,6 +1,6 @@ - + {%pipe,getCategory=$content[id]%} diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index d8d1bacfdd..4e5386d86c 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_DOUBLER_CHARGE--}: @@ -19,7 +19,7 @@ {--ADMIN_DOUBLER_REFERAL--}: @@ -27,7 +27,7 @@ {--ADMIN_DOUBLER_MINIMUM--}: @@ -35,7 +35,7 @@ {--ADMIN_DOUBLER_MAXIMUM--}: @@ -43,7 +43,7 @@ {--ADMIN_DOUBLER_LEFT--}: @@ -51,7 +51,7 @@ {--ADMIN_DOUBLER_GROUP_SENT--}: @@ -59,14 +59,14 @@ {--ADMIN_DOUBLER_MAX_SENT--}: @@ -74,8 +74,8 @@ {--ADMIN_DOUBLER_JACKPOT--}: @@ -83,8 +83,8 @@ {--ADMIN_DOUBLER_OWN--}: @@ -100,11 +100,11 @@ {--ADMIN_DOUBLER_USERID--}: - @@ -118,21 +118,21 @@ - @@ -140,7 +140,7 @@ @@ -148,15 +148,15 @@ -
    + {--ADMIN_EDIT_DOUBLER_SETTINGS--}
    - (%) + (%)
    - (%) + (%)
    - ({?POINTS?}) + ({?POINTS?})
    - ({?POINTS?}) + ({?POINTS?})
    - ({?POINTS?}) + ({?POINTS?})
    - +
    - +
    {--ADMIN_DOUBLER_SENT_ALL--}: - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - $content[member_selection] + $content[form_selection]
    + {--ADMIN_DOUBLER_SEND_MODE--}:
    - + - +
    + {--ADMIN_DOUBLER_DISPLAY_SETTINGS--}:
    {--ADMIN_DOUBLER_DISPLAY_NEW--}: - $content[display_new]
    {--ADMIN_DOUBLER_DISPLAY_PAY--}: - $content[display_pay]
    {--ADMIN_DOUBLER_DISPLAY_OLD--}: - $content[display_old]
    diff --git a/templates/de/html/admin/admin_config_email.tpl b/templates/de/html/admin/admin_config_email.tpl index 24a7a68111..ecbd7c760a 100644 --- a/templates/de/html/admin/admin_config_email.tpl +++ b/templates/de/html/admin/admin_config_email.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,10 +13,10 @@ $content[rows] -
    + {--ADMIN_EDIT_DELETE_MAX_VALUES_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_email_del.tpl b/templates/de/html/admin/admin_config_email_del.tpl index 8c3501772c..255604eae4 100644 --- a/templates/de/html/admin/admin_config_email_del.tpl +++ b/templates/de/html/admin/admin_config_email_del.tpl @@ -1,16 +1,16 @@
    - +
    - $content[rows] -
    + {--ADMIN_DELETE_MAX_RECEIVE_TITLE--}:
    diff --git a/templates/de/html/admin/admin_config_email_edit.tpl b/templates/de/html/admin/admin_config_email_edit.tpl index c44bcee7a0..1932f476ef 100644 --- a/templates/de/html/admin/admin_config_email_edit.tpl +++ b/templates/de/html/admin/admin_config_email_edit.tpl @@ -1,16 +1,16 @@
    - +
    - $content[rows] -
    + {--ADMIN_EDIT_MAX_RECEIVE_TITLE--}:
    diff --git a/templates/de/html/admin/admin_config_email_edit_row.tpl b/templates/de/html/admin/admin_config_email_edit_row.tpl index ee665b540c..7001a4c6c1 100644 --- a/templates/de/html/admin/admin_config_email_edit_row.tpl +++ b/templates/de/html/admin/admin_config_email_edit_row.tpl @@ -7,12 +7,12 @@ {--ADMIN_MAX_RECEIVE_VALUE--}:  - + {--ADMIN_MAX_RECEIVE_COMMENT--}:  - + diff --git a/templates/de/html/admin/admin_config_email_row.tpl b/templates/de/html/admin/admin_config_email_row.tpl index a3ef0e8f99..acae20dba0 100644 --- a/templates/de/html/admin/admin_config_email_row.tpl +++ b/templates/de/html/admin/admin_config_email_row.tpl @@ -1,6 +1,6 @@ - + $content[value] diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index 3a21158733..ec647ea3de 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,14 +11,14 @@ {--ADMIN_VERBOSE_SQL--}: -
    + {--ADMIN_CONFIG_EXTENSIONS_SETTINGS--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 6691f723f3..af645dc2ee 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -20,16 +20,16 @@ -
    + {--ADMIN_HOLIDAY_CONFIG_HEADER--}
    {--ADMIN_HOLIDAY_MAX_HOLIDAY--}: - +
    ({--DAYS--})
    {--ADMIN_HOLIDAY_MODE--}: - + {--ADMIN_HOLIDAY_MODE_RESET--}
    - + {--ADMIN_HOLIDAY_MODE_DIRECT--}
    diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl index e4adf1d0ed..97f9683f02 100644 --- a/templates/de/html/admin/admin_config_home.tpl +++ b/templates/de/html/admin/admin_config_home.tpl @@ -1,7 +1,7 @@
    - +
    - @@ -12,8 +12,8 @@ $content -
    + {--ADMIN_CONFIG_HOME--}
    diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index e284e0198e..d86bb77faf 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    {--ADMIN_CONFIG_HOME_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl index aa0576d21d..81e7b8b5d9 100644 --- a/templates/de/html/admin/admin_config_home_settings.tpl +++ b/templates/de/html/admin/admin_config_home_settings.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_CONFIG_INDEX_DELAY--}: -
    + {--ADMIN_CONFIG_HOME_SETTINGS_TITLE--}
    - @@ -32,9 +32,9 @@ $content[cookie_selection]
    diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl index 75f356c33b..f2a41c1131 100644 --- a/templates/de/html/admin/admin_config_mediadata.tpl +++ b/templates/de/html/admin/admin_config_mediadata.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,19 +13,19 @@ -
    + {--ADMIN_MEDIADATA_SETTINGS--}:
    {--ADMIN_MEDIADATA_MT_STAGE--}: - +
    -
    +
    · {--ADMIN_MEDIADATA_MT_START_NOTE--}
    · {--ADMIN_MEDIADATA_MT_STAGE_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index 76f8212626..771c7a9a20 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -25,9 +25,9 @@ -
    + {--ADMIN_CONFIG_MENU_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl index 42628eee1e..b3edaeec9e 100644 --- a/templates/de/html/admin/admin_config_newsletter.tpl +++ b/templates/de/html/admin/admin_config_newsletter.tpl @@ -1,15 +1,15 @@
    - +
    - -
    + {--ADMIN_CONFIG_NEWSLETTER_SETTINGS--}
    diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 1c01f707fd..f07d1b0ddd 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -1,33 +1,33 @@
    - +
    - -
    + {--ADMIN_NICKNAME_CONFIG_HEADER--}
    {--ADMIN_NICKNAME_MIN_LENGTH--}: - +
    {--ADMIN_NICKNAME_PATTERN--}: - +
    {--ADMIN_NICKNAME_CHARACTERS--}: - +
    diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 22671b7370..0a0e9bc30a 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -12,14 +12,14 @@ {--ADMIN_ORDER_MAX_ORDER_SELECT--} @@ -29,7 +29,7 @@ {--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}: @@ -38,7 +38,7 @@ {--ADMIN_OPTION_MAX_TEXT_LENGTH--}: @@ -75,7 +75,7 @@ - @@ -94,7 +94,7 @@ {--ADMIN_ORDER_SELECTION_COLUMN--}: @@ -103,7 +103,7 @@ - @@ -121,14 +121,14 @@ {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}: -
    + {--ADMIN_ORDER_SETTINGS--}:
    - + {--ADMIN_ORDER_MAX--}
    - + {--ADMIN_ORDER_ORDER--}
    - +
    - +
    {--ADMIN_REPAY_ON_DELETE_MODE--} - @@ -84,7 +84,7 @@
    + {--ADMIN_ORDER_SELECTION_SETTINGS--}:
    - $content[order_selection]
    {--ADMIN_ORDER_SELECTION_MODE--}: - @@ -111,7 +111,7 @@
    + {--ADMIN_ORDER_MISC_SETTINGS--}:
    - +
    diff --git a/templates/de/html/admin/admin_config_order_form.tpl b/templates/de/html/admin/admin_config_order_form.tpl index 432955b714..172d122a39 100644 --- a/templates/de/html/admin/admin_config_order_form.tpl +++ b/templates/de/html/admin/admin_config_order_form.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,14 +13,14 @@ - @@ -29,13 +29,13 @@ {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}: -
    + {--ADMIN_ORDER_SETTINGS--}:
    {--ADMIN_ORDER_MAX--}:  + type="radio" name="order_max_full" class="form_field" value="MAX"$content[order_max_full_max] /> {--ADMIN_ORDER_ORDER--}:  + type="radio" name="order_max_full" class="form_field" value="ORDER"$content[order_max_full_order] />
    + {--ADMIN_ORDER_MISC_SETTINGS--}:
    - +
    diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index d50bcd3a05..74f9115e1f 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -10,7 +10,7 @@ @@ -20,7 +20,7 @@ {--ADMIN_OPTION_ACTIVATE_EXCHANGE--}: @@ -29,35 +29,35 @@ {--ADMIN_OPTION_MINIMUM_AGE--}: @@ -65,7 +65,7 @@ @@ -141,7 +141,7 @@ - @@ -149,7 +149,7 @@ @@ -170,7 +170,7 @@ - @@ -192,7 +192,7 @@ - @@ -208,7 +208,7 @@ - @@ -229,7 +229,7 @@ - @@ -243,7 +243,7 @@ - @@ -257,9 +257,9 @@ -
    + {--ADMIN_OTHER_SETTINGS--}
    {--ADMIN_OPTION_CODE_LENGTH--}: - +
    {--ADMIN_CODE_LENGTH_NOTE--}
    - +
    - +
    {--ADMIN_OPTION_POINTS_WORD--}: - +
    {--ADMIN_OPTION_MT_WORD--}: - +
    {--ADMIN_OPTION_MT_WORD2--}: - +
    {--ADMIN_OPTION_MT_WORD3--}: - +
    {--ADMIN_OPTION_MAX_COMMA--}: - @@ -79,7 +79,7 @@
    {--ADMIN_OPTION_REJECT_URL--}: - +
    + {--ADMIN_SENDING_SETTINGS--}
    {--ADMIN_OPTION_POOL_MAX_SEND--}: - +
    + {--ADMIN_NOTIFY_SETTINGS--}
    + {--ADMIN_TIMEOUT_SETTINGS--}
    + {--ADMIN_PROFILE_TIME_SETTINGS--}
    + {--ADMIN_SQL_SETTINGS--}
    + {--ADMIN_STATS_SETTINGS--}
    - - + + +
    diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl index bca566795f..8b4a2d1d2c 100644 --- a/templates/de/html/admin/admin_config_payouts.tpl +++ b/templates/de/html/admin/admin_config_payouts.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -14,11 +14,11 @@ $content -
    + {--ADMIN_PAYOUT_EDIT_DELETE_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_payouts_del.tpl b/templates/de/html/admin/admin_config_payouts_del.tpl index 699a0d80c0..1b94cdf9ad 100644 --- a/templates/de/html/admin/admin_config_payouts_del.tpl +++ b/templates/de/html/admin/admin_config_payouts_del.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,8 +13,8 @@ $content -
    + {--ADMIN_PAYOUT_DELETE_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_payouts_edit.tpl b/templates/de/html/admin/admin_config_payouts_edit.tpl index 229abeb4c2..3c70711fe4 100644 --- a/templates/de/html/admin/admin_config_payouts_edit.tpl +++ b/templates/de/html/admin/admin_config_payouts_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,9 +15,9 @@ $content -
    + {--ADMIN_PAYOUT_EDIT_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_payouts_edit_row.tpl b/templates/de/html/admin/admin_config_payouts_edit_row.tpl index 8bdafaa2bc..1893a5582b 100644 --- a/templates/de/html/admin/admin_config_payouts_edit_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_edit_row.tpl @@ -4,13 +4,13 @@ - + - + - + $content[allow_url] diff --git a/templates/de/html/admin/admin_config_payouts_row.tpl b/templates/de/html/admin/admin_config_payouts_row.tpl index 1266e3d55e..38fd64f9bf 100644 --- a/templates/de/html/admin/admin_config_payouts_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_row.tpl @@ -1,6 +1,6 @@ - + $content[from_account] diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index 3b4a76deea..b89749b653 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -12,32 +12,32 @@ -
    + {--ADMIN_CONFIG_POINT_SETTINGS_TITLE--}
    {--ADMIN_CONFIG_POINTS_DIRECT--} -
    +

    {--ADMIN_CONFIG_POINTS_MAILS--} - +
    {--ADMIN_CONFIG_REFMODE--} {--ADMIN_CONFIG_REFMODE_REF--} - +
    {--ADMIN_CONFIG_REFMODE_DIRECT--} - +
    {--REFERAL_PAYOUT--} - +
    diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl index 01114bf383..e0a19c8726 100644 --- a/templates/de/html/admin/admin_config_points.tpl +++ b/templates/de/html/admin/admin_config_points.tpl @@ -1,5 +1,5 @@
    -
    +
    {--ADMIN_CONFIG_POINTS_TITLE--} diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index 64dace5b09..cdb8778270 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -1,26 +1,26 @@
    - +
    - - @@ -28,33 +28,33 @@ -
    + {--ADMIN_PRIMERA_CONFIG_TITLE--}
    {--ADMIN_PRIMERA_API_NAME--}: - +
    {--ADMIN_PRIMERA_API_MD5--}:
    + Gespeicherter Hash:
    »{?primera_api_md5]«
    {--ADMIN_PRIMERA_REFID--}: - +
    {--ADMIN_PRIMERA_MIN_PAYOUT--}: - + Wernis
    {--ADMIN_PRIMERA_MIN_WITHDRAW--}: - + Wernis
    -
    +
    {--ADMIN_PRIMERA_CONFIG_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index 3aea7a42fd..6aaabf1080 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -39,9 +39,9 @@ -
    + {--ADMIN_EDIT_PROXY_SETTINGS--}
    diff --git a/templates/de/html/admin/admin_config_rallye_del.tpl b/templates/de/html/admin/admin_config_rallye_del.tpl index ec3788faf5..a8d0f95600 100644 --- a/templates/de/html/admin/admin_config_rallye_del.tpl +++ b/templates/de/html/admin/admin_config_rallye_del.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -22,8 +22,8 @@ $content[rows] -
    + {--RALLYE_REMOVE_PRICES--}
    diff --git a/templates/de/html/admin/admin_config_rallye_del_row.tpl b/templates/de/html/admin/admin_config_rallye_del_row.tpl index 6396fe30cf..eedc4847ae 100644 --- a/templates/de/html/admin/admin_config_rallye_del_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_del_row.tpl @@ -1,6 +1,6 @@ - $content[rallye_id] + $content[rallye_id] $content[price_level] diff --git a/templates/de/html/admin/admin_config_rallye_edit.tpl b/templates/de/html/admin/admin_config_rallye_edit.tpl index 89453a80e9..14bbcdf929 100644 --- a/templates/de/html/admin/admin_config_rallye_edit.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -22,9 +22,9 @@ $content[rows] -
    + {--RALLYE_EDIT_SELECTED_PRICES--}
    diff --git a/templates/de/html/admin/admin_config_rallye_edit_row.tpl b/templates/de/html/admin/admin_config_rallye_edit_row.tpl index a74ffebb0d..8e95de2258 100644 --- a/templates/de/html/admin/admin_config_rallye_edit_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit_row.tpl @@ -1,16 +1,16 @@ - $content[rallye_content] - + - + - + diff --git a/templates/de/html/admin/admin_config_rallye_prices.tpl b/templates/de/html/admin/admin_config_rallye_prices.tpl index a17083d619..190d1965d3 100644 --- a/templates/de/html/admin/admin_config_rallye_prices.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -22,10 +22,10 @@ $content[rows] -
    + {--RALLYE_EDIT_DELETE_PRICES--}
    diff --git a/templates/de/html/admin/admin_config_rallye_prices_row.tpl b/templates/de/html/admin/admin_config_rallye_prices_row.tpl index 4c9ae55f11..f8bd71ef1f 100644 --- a/templates/de/html/admin/admin_config_rallye_prices_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices_row.tpl @@ -1,6 +1,6 @@ - + $content[price_level] diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index 24e7b658b4..509b4ea3f3 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -32,9 +32,9 @@ -
    + {--ADMIN_CONFIG_REFBACK_TITLE--}
    diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 47ed7e2a7f..2268a1f0e6 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -10,14 +10,14 @@ -
    + {--ADMIN_CONFIG_REFID_TITLE--}
    {--ADMIN_SELECT_DEF_REFID--}: - $content[member_selection] + $content[form_selection]
    {--ADMIN_SELECT_REFID_TARGRT--}: - @@ -27,7 +27,7 @@
    {--ADMIN_RANDOM_ZERO_REFID--} - @@ -37,14 +37,14 @@
    {--ADMIN_RANDOM_MIN_CONFIRMED--} - +
    diff --git a/templates/de/html/admin/admin_config_register.tpl b/templates/de/html/admin/admin_config_register.tpl index 113c7f00e4..4f913e779a 100644 --- a/templates/de/html/admin/admin_config_register.tpl +++ b/templates/de/html/admin/admin_config_register.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,8 +13,8 @@ $content - diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 3a560da8fc..d918bba38f 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,15 +1,15 @@
    -
    + {--ADMIN_CONFIG_REGISTER_MUST_TITLE--}:
    +
    - @@ -33,9 +33,9 @@ -
    + {--ADMIN_CONFIG_REGFORM_SETTINGS_TITLE--}
    {--ADMIN_CONFIG_LEAST_CATEGORIES--}: - +
    $content[check_double_pass]
    diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 1ee466246d..1a37d9178e 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,8 +11,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_IP--} @@ -20,8 +20,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_HOST--} @@ -29,8 +29,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_UA--} @@ -38,8 +38,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_REF--} @@ -47,7 +47,7 @@ {--ADMIN_CONFIG_REMOVEIP_ANONYMOUS_IP--} @@ -68,8 +68,8 @@ {--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--} @@ -77,8 +77,8 @@ {--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--} @@ -86,14 +86,14 @@ {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--} -
    + {--ADMIN_CONFIG_REMOVEIP_TITLE--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--} - {--NO--} + {--YES--} + {--NO--}
    - {--YES--} - {--NO--} + {--YES--} + {--NO--}
    - @@ -59,8 +59,8 @@ {--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--} - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    diff --git a/templates/de/html/admin/admin_config_rewrite.tpl b/templates/de/html/admin/admin_config_rewrite.tpl index 55efa1084f..41858e281b 100644 --- a/templates/de/html/admin/admin_config_rewrite.tpl +++ b/templates/de/html/admin/admin_config_rewrite.tpl @@ -1,28 +1,28 @@
    - +
    - - - $content -
    + {--ADMIN_MODULE_NAME--} + {--ADMIN_MODULE_TITLE--} + {--ADMIN_MODULE_SKIPPED--}
    -
    +
    {--ADMIN_CONFIG_REWRITE_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_rewrite_rows.tpl b/templates/de/html/admin/admin_config_rewrite_rows.tpl index 6ce668b4f4..d52475944c 100644 --- a/templates/de/html/admin/admin_config_rewrite_rows.tpl +++ b/templates/de/html/admin/admin_config_rewrite_rows.tpl @@ -2,7 +2,7 @@ $content[module] {%pipe,fixEmptyContentToDashes=$content[title]%} - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--} diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index ca8ebbee61..37755c8dce 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_CONFIG_MIN_PASS_LENGTH--}: @@ -19,19 +19,19 @@ {--ADMIN_SALT_LENGTH--}: -
    + {--ADMIN_CONFIG_SECURITY_SETTINGS_TITLE--}
    - +
    - +
    -
    +
    {--ADMIN_SALT_LENGTH_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index 0a368463b3..f4be81aec5 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -16,7 +16,7 @@ -
    + {--ADMIN_CONFIG_SESSION_SETTINGS_TITLE--}
    - + {--ADMIN_BASE_PATH--}:
    {?PATH?}
    {--ADMIN_SESSION_SAVE_PATH_NOTE--} @@ -24,9 +24,9 @@
    diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index f5f335dc87..7b52f36f40 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_SPONSOR_MIN_POINTS--}: @@ -19,13 +19,13 @@ {--ADMIN_SPONSOR_REFERAL_POINTS--}: -
    + {--ADMIN_CONFIG_SPONSOR_TITLE--}
    - +
    - +
    diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index 6949d6f3f4..bdca8dddd9 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@
    ({--ADMIN_GSTATS_MEMBERS_NOTE--})
    @@ -19,7 +19,7 @@
    ({--ADMIN_GSTATS_MODULES_NOTE--})
    @@ -27,24 +27,24 @@
    ({--ADMIN_GSTATS_INACTIVE_NOTE--})
    - -
    + {--ADMIN_CONFIG_STATS_TITLE--}
    - +
    - +
    - +
    + {--ADMIN_MEMBER_STATS_TITLE--}
    {--ADMIN_MEMBER_STATS_LIMIT--}: - +
    diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index de8369a5f8..a2285cdd9f 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -1,27 +1,27 @@
    - +
    - -
    + {--ADMIN_EDIT_POINTS_SETTINGS_TITLE--}
    {--ADMIN_ENTER_POINTS_REGISTER--}: - +
    {--ADMIN_ENTER_POINTS_REFERAL--}: - +
    diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index ad3e78b6f9..aecd355634 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -89,7 +89,7 @@ - @@ -110,7 +110,7 @@ - @@ -170,7 +170,7 @@ {--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE--} -
    + {--ADMIN_CONFIG_SURFBAR_TITLE--}
    - @@ -212,15 +212,15 @@
    -
    +
    {--ADMIN_CONFIG_SURFBAR_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_timezone.tpl b/templates/de/html/admin/admin_config_timezone.tpl index be13ad39c8..630c3142d8 100644 --- a/templates/de/html/admin/admin_config_timezone.tpl +++ b/templates/de/html/admin/admin_config_timezone.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,9 +15,9 @@ -
    + {--ADMIN_EDIT_TIMEZONE_SETTINGS--}
    diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index bc3ee552c4..d7146ce967 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -19,32 +19,32 @@ - -
    + {--ADMIN_CONFIG_TITLE_SETTINGS--}
    $content[enable_what_title]
    + {--ADMIN_CONFIG_TITLE_DECORATIONS--}
    {--ADMIN_CONFIG_TITLE_LEFT--}: - +
    {--ADMIN_CONFIG_TITLE_MIDDLE--}: - +
    {--ADMIN_CONFIG_TITLE_RIGHT--}: - +
    diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 4999fedaa6..9e43f79382 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -1,21 +1,21 @@
    - +
    - -
    + {--ADMIN_CONFIG_TOP10_TITLE--}
    {--ADMIN_TOP10_MAX_TOP10--}: - +
    diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index aaf1b1ac9d..9e0d775fa9 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -23,32 +23,32 @@ -
    + {--ADMIN_CONFIG_TRANSFER_HEADER--}
    {--ADMIN_TRANSFER_MAX--}: - +
    {--ADMIN_TRANSFER_BALANCE--}: - + ({?POINTS?})
    {--ADMIN_TRANSFER_CODE--}:
    -
    ({--ADMIN_TRANSFER_CODE_NOTE--})
    +
    ({--ADMIN_TRANSFER_CODE_NOTE--})
    - +
    {--ADMIN_AUTOPURGE_TRANSFER--} -
    diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index 3f77ea28bf..10b96c9fc9 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -1,27 +1,27 @@
    - +
    - -
    + {--ADMIN_CONFIG_USER_TITLE--}
    {--ADMIN_USER_LIMIT_USER--}: - +
    {--ADMIN_USER_ALPHA_USER--}: - +
    diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl index 8d06fd3061..7603fcd5f2 100644 --- a/templates/de/html/admin/admin_config_validator.tpl +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,14 +11,14 @@ {--ADMIN_CONFIG_VALIDATOR_ENABLED--} -
    + {--ADMIN_CONFIG_VALIDATOR_TITLE--}
    - {--YES--}
    - {--NO--} + {--YES--}
    + {--NO--}
    diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 8c31b700c3..97b0ad816c 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_WERNIS_API_ID--}: @@ -19,7 +19,7 @@ {--ADMIN_WERNIS_API_MD5--}: @@ -27,7 +27,7 @@ {--ADMIN_WERNIS_API_URL--}: @@ -35,7 +35,7 @@ {--ADMIN_WERNIS_REFID--}: @@ -43,7 +43,7 @@ {--ADMIN_WERNIS_WPASS--}: @@ -51,7 +51,7 @@ {--ADMIN_WERNIS_MIN_PAYOUT--}: @@ -59,7 +59,7 @@ {--ADMIN_WERNIS_MIN_WITHDRAW--}: @@ -67,7 +67,7 @@ {--ADMIN_WERNIS_PAYOUT_FACTOR--}: @@ -75,7 +75,7 @@ {--ADMIN_WERNIS_WITHDRAW_FACTOR--}: @@ -83,7 +83,7 @@ {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}: @@ -91,7 +91,7 @@ {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}: @@ -99,7 +99,7 @@ {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}: @@ -108,7 +108,7 @@ {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}: @@ -131,15 +131,15 @@ -
    + {--ADMIN_WERNIS_CONFIG_TITLE--}
    - +
    - +
    - +
    - +
    - +
    - Wernis + Wernis
    - Wernis + Wernis
    - +
    - +
    - % + %
    - % + %
    - + ({?POINTS?})
    - + ({?POINTS?})
    -
    +
    {--ADMIN_WERNIS_CONFIG_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index a182f7e513..21fc1326e7 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_CONFIG_YOOMEDIA_ID--} @@ -19,7 +19,7 @@ {--ADMIN_CONFIG_YOOMEDIA_SID--} @@ -27,7 +27,7 @@ {--ADMIN_CONFIG_YOOMEDIA_PASSWD--} @@ -35,7 +35,7 @@ {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--} @@ -43,7 +43,7 @@ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--} @@ -51,7 +51,7 @@ {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--} @@ -59,7 +59,7 @@ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--} @@ -67,7 +67,7 @@ {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--} -
    + {--ADMIN_CONFIG_YOOMEDIA_TITLE--}
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - @@ -75,15 +75,15 @@
    -
    +
    {--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--}
    diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl index 60fa38000d..5bc883c28d 100644 --- a/templates/de/html/admin/admin_contct_user_form.tpl +++ b/templates/de/html/admin/admin_contct_user_form.tpl @@ -1,20 +1,20 @@
    - +
    - -
    + {--ADMIN_CONTACT_USER--}:
    $content[surname] $content[family] <$content[email]>
    - +
    diff --git a/templates/de/html/admin/admin_del_admin_menu.tpl b/templates/de/html/admin/admin_del_admin_menu.tpl index f3e4dd1d1f..08082f3c17 100644 --- a/templates/de/html/admin/admin_del_admin_menu.tpl +++ b/templates/de/html/admin/admin_del_admin_menu.tpl @@ -1,22 +1,22 @@
    - +
    - - $content[rows] -
    + {--DEL_ADMIN_MENU--}
    + {--DEL_MENU_1--}$content[chk]{--DEL_MENU_2--}
    diff --git a/templates/de/html/admin/admin_del_admins.tpl b/templates/de/html/admin/admin_del_admins.tpl index b41182a73b..d533bcd791 100644 --- a/templates/de/html/admin/admin_del_admins.tpl +++ b/templates/de/html/admin/admin_del_admins.tpl @@ -1,7 +1,7 @@ - +
    - @@ -13,9 +13,9 @@ $content -
    + {--ADMIN_ADMINS_DELETE_ACCOUNTS--}
    diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl index fb5a6a2d66..ded4844100 100644 --- a/templates/de/html/admin/admin_del_bank_packages.tpl +++ b/templates/de/html/admin/admin_del_bank_packages.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -14,14 +14,14 @@ $content -
    + {--ADMIN_DELETE_BANK_PACKAGES--}:
    -
    +
    {--ADMIN_DELETE_BANK_PACKAGES_NOTES--}
    diff --git a/templates/de/html/admin/admin_del_bank_packages_row.tpl b/templates/de/html/admin/admin_del_bank_packages_row.tpl index f0865e90b4..631b49c733 100644 --- a/templates/de/html/admin/admin_del_bank_packages_row.tpl +++ b/templates/de/html/admin/admin_del_bank_packages_row.tpl @@ -1,6 +1,6 @@ - + $content[id] diff --git a/templates/de/html/admin/admin_del_cats.tpl b/templates/de/html/admin/admin_del_cats.tpl index 3f24b8c422..23bcac9d28 100644 --- a/templates/de/html/admin/admin_del_cats.tpl +++ b/templates/de/html/admin/admin_del_cats.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_DELETE_CATEGORIES_TITLE--}:
    diff --git a/templates/de/html/admin/admin_del_email_bonus.tpl b/templates/de/html/admin/admin_del_email_bonus.tpl index e1ba0e4bba..01f9ac1b18 100644 --- a/templates/de/html/admin/admin_del_email_bonus.tpl +++ b/templates/de/html/admin/admin_del_email_bonus.tpl @@ -1,7 +1,7 @@ - +
    - @@ -12,12 +12,12 @@ - - - + + - - + +
    -
    {--ADMIN_EMAIL_DELETED--}
    +
    + {--ADMIN_EMAIL_DELETED--}
    {--EMAIL_DELETE_COUNT--}
    $content[id]$content[subject] + $content[id]$content[subject] {--ADMIN_TEST_URL--} $content[timestamp]$content[cnt]$content[timestamp]$content[cnt]
    diff --git a/templates/de/html/admin/admin_del_email_normal.tpl b/templates/de/html/admin/admin_del_email_normal.tpl index 064f70aed1..20f0007617 100644 --- a/templates/de/html/admin/admin_del_email_normal.tpl +++ b/templates/de/html/admin/admin_del_email_normal.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,13 +13,13 @@ - - - - + + + - +
    -
    {--ADMIN_EMAIL_DELETED--}
    +
    + {--ADMIN_EMAIL_DELETED--}
    {--EMAIL_TIMESTAMP--}
    $content[id]{%pipe,generateUserProfileLink=$content[sender]%}$content[subject] + $content[id]{%pipe,generateUserProfileLink=$content[sender]%}$content[subject] {--ADMIN_TEST_URL--} $content[timestamp]$content[timestamp]
    diff --git a/templates/de/html/admin/admin_del_email_notify.tpl b/templates/de/html/admin/admin_del_email_notify.tpl index 418be71af3..1f40e5c244 100644 --- a/templates/de/html/admin/admin_del_email_notify.tpl +++ b/templates/de/html/admin/admin_del_email_notify.tpl @@ -1,7 +1,7 @@ - +
    - @@ -12,11 +12,10 @@ - - - - - + + + + +
    -
    {--ADMIN_NOTIFICATION_DELETED_TITLE--}
    +
    + {--ADMIN_NOTIFICATION_DELETED_TITLE--}
    {--EMAIL_DELETE_COUNT--}
    $content[id]$content[subject]{--ADMIN_TEST_URL--}$content[timestamp]$content[cnt]$content[id]$content[subject]{--ADMIN_TEST_URL--}$content[timestamp]$content[cnt]
    diff --git a/templates/de/html/admin/admin_del_guest_menu.tpl b/templates/de/html/admin/admin_del_guest_menu.tpl index b788ae9e0f..4d95af3aed 100644 --- a/templates/de/html/admin/admin_del_guest_menu.tpl +++ b/templates/de/html/admin/admin_del_guest_menu.tpl @@ -1,22 +1,22 @@
    - +
    - - $content[rows] -
    + {--DEL_GUEST_MENU--}
    + {--DEL_MENU_1--}$content[chk]{--DEL_MENU_2--}
    diff --git a/templates/de/html/admin/admin_del_member_menu.tpl b/templates/de/html/admin/admin_del_member_menu.tpl index 104e25aea5..3ea78e7f79 100644 --- a/templates/de/html/admin/admin_del_member_menu.tpl +++ b/templates/de/html/admin/admin_del_member_menu.tpl @@ -1,6 +1,6 @@
    - +
    $content[rows] -
    {--DEL_MEMBER_MENU--} @@ -13,10 +13,10 @@
    diff --git a/templates/de/html/admin/admin_del_network_params.tpl b/templates/de/html/admin/admin_del_network_params.tpl index b0cc4c8441..80fc3267d3 100644 --- a/templates/de/html/admin/admin_del_network_params.tpl +++ b/templates/de/html/admin/admin_del_network_params.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE--}
    @@ -13,15 +13,15 @@
    -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_del_network_types.tpl b/templates/de/html/admin/admin_del_network_types.tpl index 51380332b2..a9c507cd74 100644 --- a/templates/de/html/admin/admin_del_network_types.tpl +++ b/templates/de/html/admin/admin_del_network_types.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_TYPES_DELETE_TITLE--}
    @@ -13,15 +13,15 @@
    -
    +
    {--ADMIN_NETWORK_TYPES_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_del_networks.tpl b/templates/de/html/admin/admin_del_networks.tpl index 9c295172e7..58fb5578bc 100644 --- a/templates/de/html/admin/admin_del_networks.tpl +++ b/templates/de/html/admin/admin_del_networks.tpl @@ -1,22 +1,22 @@
    - +
    - $content -
    + {--ADMIN_NETWORK_DELETE_TITLE--}
    -
    +
    {--ADMIN_NETWORK_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_del_payments.tpl b/templates/de/html/admin/admin_del_payments.tpl index 0b64d70a22..67f8b3ee5b 100644 --- a/templates/de/html/admin/admin_del_payments.tpl +++ b/templates/de/html/admin/admin_del_payments.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_DELETE_PAYMENT_TITLE--}:
    diff --git a/templates/de/html/admin/admin_del_payments_row.tpl b/templates/de/html/admin/admin_del_payments_row.tpl index 6335924efe..aabac23676 100644 --- a/templates/de/html/admin/admin_del_payments_row.tpl +++ b/templates/de/html/admin/admin_del_payments_row.tpl @@ -1,5 +1,5 @@ - + {--ADMIN_PAYMENT_ID--} $content[id]: diff --git a/templates/de/html/admin/admin_del_reflevel.tpl b/templates/de/html/admin/admin_del_reflevel.tpl index db1a1f00ba..e8f6c02d5d 100644 --- a/templates/de/html/admin/admin_del_reflevel.tpl +++ b/templates/de/html/admin/admin_del_reflevel.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_DELETE_REFERAL_DEPTHS_TITLE--}:
    diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl index 06b78e4ff1..7d930d2fae 100644 --- a/templates/de/html/admin/admin_del_sponsor.tpl +++ b/templates/de/html/admin/admin_del_sponsor.tpl @@ -1,8 +1,8 @@ -
    +
    -
    -
    {%message,ADMIN_HEADER_DELETE_SPONSOR=$content[userid]%}
    +
    +
    {%message,ADMIN_HEADER_DELETE_SPONSOR=$content[userid]%}
    @@ -14,12 +14,12 @@
    - +
    - diff --git a/templates/de/html/admin/admin_del_surfbar_urls.tpl b/templates/de/html/admin/admin_del_surfbar_urls.tpl index f681e79a07..47f93e0f67 100644 --- a/templates/de/html/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_del_surfbar_urls.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,9 +13,9 @@ $content -
    + {--ADMIN_SURFBAR_DELETE_URLS_TITLE--}
    diff --git a/templates/de/html/admin/admin_del_transfer_row.tpl b/templates/de/html/admin/admin_del_transfer_row.tpl index 9cddafabb7..9777e72b1e 100644 --- a/templates/de/html/admin/admin_del_transfer_row.tpl +++ b/templates/de/html/admin/admin_del_transfer_row.tpl @@ -1,6 +1,6 @@ - + $content[time_trans] diff --git a/templates/de/html/admin/admin_del_user.tpl b/templates/de/html/admin/admin_del_user.tpl index aa13117608..4d4e3b166d 100644 --- a/templates/de/html/admin/admin_del_user.tpl +++ b/templates/de/html/admin/admin_del_user.tpl @@ -1,8 +1,8 @@
    -
    -
    +
    +
    {%message,ADMIN_HEADER_DELETE_ACCOUNT=$content[userid]%}
    @@ -15,12 +15,12 @@
    - +
    - diff --git a/templates/de/html/admin/admin_edit_admin_menu.tpl b/templates/de/html/admin/admin_edit_admin_menu.tpl index 44f9012734..3752310dc4 100644 --- a/templates/de/html/admin/admin_edit_admin_menu.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu.tpl @@ -1,6 +1,6 @@
    - +
    @@ -11,10 +11,10 @@ $content[rows] -
    {--ID_SELECT--}
    diff --git a/templates/de/html/admin/admin_edit_admin_menu_form.tpl b/templates/de/html/admin/admin_edit_admin_menu_form.tpl index a0f84ce275..398e3926dd 100644 --- a/templates/de/html/admin/admin_edit_admin_menu_form.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu_form.tpl @@ -1,23 +1,23 @@
    - +
    - - $content[rows] -
    + {--ADMIN_EDIT_ADMIN_MENU_TITLE--}
    + {%message,ADMIN_EDIT_MENU=$content[chk]%}
    diff --git a/templates/de/html/admin/admin_edit_admin_menu_row.tpl b/templates/de/html/admin/admin_edit_admin_menu_row.tpl index 95ab588ab6..d17321ebbc 100644 --- a/templates/de/html/admin/admin_edit_admin_menu_row.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu_row.tpl @@ -1,37 +1,37 @@ - + $content[cnt]. {--ADMIN_ENTRY_MODIFY--}: - + {--ADMIN_EDIT_ACTION--}: - + $content[action] - + {--ADMIN_EDIT_WHAT--}: - + $content[what] - + {--ADMIN_EDIT_TITLE--}: - - + + - + {--ADMIN_EDIT_DESCRIPTION--}: - - + + diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl index 6134572943..6bff0ad3d6 100644 --- a/templates/de/html/admin/admin_edit_admins.tpl +++ b/templates/de/html/admin/admin_edit_admins.tpl @@ -1,7 +1,7 @@ - +
    - @@ -15,15 +15,15 @@ $content -
    + {--ADMIN_ADMINS_EDIT_ACCOUNTS--}
    -
    +
    {--ADMIN_ADMINS_ACL_NOTE--}

    {--ADMIN_ADMINS_EDIT_NOTE--} diff --git a/templates/de/html/admin/admin_edit_admins_row.tpl b/templates/de/html/admin/admin_edit_admins_row.tpl index 9262bb1cb6..476f063526 100644 --- a/templates/de/html/admin/admin_edit_admins_row.tpl +++ b/templates/de/html/admin/admin_edit_admins_row.tpl @@ -1,22 +1,22 @@ $content[id] - + - + - - + + - $content[mode] - $content[la_mode] diff --git a/templates/de/html/admin/admin_edit_bank_packages.tpl b/templates/de/html/admin/admin_edit_bank_packages.tpl index d1e6f42b82..39bd9980e1 100644 --- a/templates/de/html/admin/admin_edit_bank_packages.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages.tpl @@ -1,18 +1,18 @@
    - +
    - $content -
    + {--ADMIN_EDIT_BANK_PACKAGES--}:
    -
    {--ADMIN_EDIT_BANK_PACKAGES_NOTES--}
    +
    {--ADMIN_EDIT_BANK_PACKAGES_NOTES--}
    diff --git a/templates/de/html/admin/admin_edit_bank_packages_row.tpl b/templates/de/html/admin/admin_edit_bank_packages_row.tpl index f35f81dd80..d4691e3ce8 100644 --- a/templates/de/html/admin/admin_edit_bank_packages_row.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages_row.tpl @@ -5,7 +5,7 @@ {--ADMIN_BANK_PACKAGE_DESCRIPTION--}:
    - + {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:
    @@ -60,7 +60,7 @@ {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--}:
    - + {--ADMIN_BANK_PACKAGE_EDIT_TAN_LOCK--}:
    diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index 0efbdbad8a..9aa6b90536 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_EDIT_CATEGORIES_TITLE--}:
    diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl index 54719a57b3..5445164617 100644 --- a/templates/de/html/admin/admin_edit_cats_row.tpl +++ b/templates/de/html/admin/admin_edit_cats_row.tpl @@ -1,12 +1,12 @@ - + {--ADMIN_CATEGORY_ID--} $content[id]: {--ADMIN_CATEGORY_DESCRIPTION--}:  - + @@ -16,6 +16,6 @@ {--ADMIN_ENTER_SORT_KEY--}:  - + diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index dd9712b7e1..869bb6b3c5 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -11,7 +11,7 @@ {--ADMIN_EDIT_URL--}: @@ -19,7 +19,7 @@ {--ADMIN_EDIT_EMAIL_SUBJECT--}: @@ -27,14 +27,14 @@ {--ADMIN_EDIT_EMAIL_TEXT--}: -
    + {--ADMIN_EDIT_EMAIL--}: ($content[id])
    - +
    - +
    - +
    diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl index f75b846144..76a7609a85 100644 --- a/templates/de/html/admin/admin_edit_email_row.tpl +++ b/templates/de/html/admin/admin_edit_email_row.tpl @@ -1,7 +1,7 @@ $content[id] - + $content[subject] diff --git a/templates/de/html/admin/admin_edit_email_select.tpl b/templates/de/html/admin/admin_edit_email_select.tpl index b199182a28..68a95035ff 100644 --- a/templates/de/html/admin/admin_edit_email_select.tpl +++ b/templates/de/html/admin/admin_edit_email_select.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_SELECT_EMAIL_EDIT--}:
    diff --git a/templates/de/html/admin/admin_edit_guest_menu.tpl b/templates/de/html/admin/admin_edit_guest_menu.tpl index 76c9da6594..ac820e0473 100644 --- a/templates/de/html/admin/admin_edit_guest_menu.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu.tpl @@ -1,6 +1,6 @@
    - +
    @@ -10,11 +10,11 @@ $content[rows] -
    {--ID_SELECT--} {--DISPLAY_ACTION--}
    diff --git a/templates/de/html/admin/admin_edit_guest_menu_form.tpl b/templates/de/html/admin/admin_edit_guest_menu_form.tpl index 51058aaa3a..94207c8e08 100644 --- a/templates/de/html/admin/admin_edit_guest_menu_form.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu_form.tpl @@ -1,23 +1,23 @@
    - +
    - - $content[rows] -
    + {--ADMIN_EDIT_GUEST_MENU_TITLE--}
    + {%message,ADMIN_EDIT_MENU=$content[chk]%}
    diff --git a/templates/de/html/admin/admin_edit_guest_menu_row.tpl b/templates/de/html/admin/admin_edit_guest_menu_row.tpl index 34e2c6bcdd..05c46dd637 100644 --- a/templates/de/html/admin/admin_edit_guest_menu_row.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu_row.tpl @@ -1,29 +1,29 @@ - + $content[cnt]. {--ADMIN_ENTRY_MODIFY--}: - + {--ADMIN_EDIT_ACTION--}: - + $content[action] - + {--ADMIN_EDIT_WHAT--}: - + $content[what] - + {--ADMIN_EDIT_TITLE--}: - - + + diff --git a/templates/de/html/admin/admin_edit_member_menu.tpl b/templates/de/html/admin/admin_edit_member_menu.tpl index 157eda8076..7029421b30 100644 --- a/templates/de/html/admin/admin_edit_member_menu.tpl +++ b/templates/de/html/admin/admin_edit_member_menu.tpl @@ -1,23 +1,23 @@
    - +
    - - $content[rows] -
    + {--ADMIN_EDIT_MEMBER_MENU_TITLE--}
    + {%message,ADMIN_EDIT_MENU=$content[chk]%}
    diff --git a/templates/de/html/admin/admin_edit_member_menu_row.tpl b/templates/de/html/admin/admin_edit_member_menu_row.tpl index 8c22607d4b..1773ce4da0 100644 --- a/templates/de/html/admin/admin_edit_member_menu_row.tpl +++ b/templates/de/html/admin/admin_edit_member_menu_row.tpl @@ -24,6 +24,6 @@ {--ADMIN_EDIT_TITLE--}: - + diff --git a/templates/de/html/admin/admin_edit_network_params.tpl b/templates/de/html/admin/admin_edit_network_params.tpl index a66236fdc3..1430a010fa 100644 --- a/templates/de/html/admin/admin_edit_network_params.tpl +++ b/templates/de/html/admin/admin_edit_network_params.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE--}
    @@ -13,15 +13,15 @@
    -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_edit_network_params_row.tpl b/templates/de/html/admin/admin_edit_network_params_row.tpl index 1a25912a53..197565ca32 100644 --- a/templates/de/html/admin/admin_edit_network_params_row.tpl +++ b/templates/de/html/admin/admin_edit_network_params_row.tpl @@ -2,7 +2,7 @@ {--ADMIN_NETWORK_TYPES_HANDLE--}: - {%pipe,generateNetworkTypeOptions=$content[network_type_id]%} @@ -10,7 +10,7 @@ {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}: - {%pipe,generateNetworkRequestKeyOptions=$content[network_param_key]%} @@ -18,12 +18,12 @@ {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}: - + {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}: - + diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl index 5cffb182fb..670d155391 100644 --- a/templates/de/html/admin/admin_edit_network_types.tpl +++ b/templates/de/html/admin/admin_edit_network_types.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_TYPES_EDIT_TITLE--}
    @@ -13,15 +13,15 @@
    -
    +
    {--ADMIN_NETWORK_TYPES_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_edit_network_types_row.tpl b/templates/de/html/admin/admin_edit_network_types_row.tpl index dbc4ce1c35..027eedb611 100644 --- a/templates/de/html/admin/admin_edit_network_types_row.tpl +++ b/templates/de/html/admin/admin_edit_network_types_row.tpl @@ -2,24 +2,24 @@ {--ADMIN_NETWORK_TYPES_HANDLE--}: - + {--ADMIN_NETWORK_TYPES_API_URL--}: - + {--ADMIN_NETWORK_TYPES_CLICK_URL--}: - + {--ADMIN_NETWORK_TYPES_BANNER_URL--}: - + diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl index ac2b81fc20..457adc1d7e 100644 --- a/templates/de/html/admin/admin_edit_networks.tpl +++ b/templates/de/html/admin/admin_edit_networks.tpl @@ -1,22 +1,22 @@
    - +
    - $content -
    + {--ADMIN_NETWORK_EDIT_TITLE--}
    -
    +
    {--ADMIN_NETWORK_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl index fe42015942..c8177f3998 100644 --- a/templates/de/html/admin/admin_edit_networks_row.tpl +++ b/templates/de/html/admin/admin_edit_networks_row.tpl @@ -2,39 +2,39 @@ {--ADMIN_NETWORK_TITLE--}: - + {--ADMIN_NETWORK_SHORT_NAME--}: - + {--ADMIN_NETWORK_REFERAL_LINK--}: - + {--ADMIN_NETWORK_DATA_SEPERATOR--}: - + {--ADMIN_NETWORK_REQUEST_TYPE--}: - $content[network_request_type] {--ADMIN_NETWORK_ROW_SEPERATOR--}: - + {--ADMIN_NETWORK_CHARSET--}: - +   diff --git a/templates/de/html/admin/admin_edit_payments.tpl b/templates/de/html/admin/admin_edit_payments.tpl index 2d2749e0b2..35efa94098 100644 --- a/templates/de/html/admin/admin_edit_payments.tpl +++ b/templates/de/html/admin/admin_edit_payments.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_EDIT_PAYMENT_TITLE--}:
    diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index 27687c9cb0..433eca1f82 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -1,30 +1,30 @@ - + {--ADMIN_PAYMENT_ID--} $content[id]: {--ADMIN_PAYMENT_TIME--}: - {--_SECONDS--} + {--_SECONDS--} {--ADMIN_PAYMENT_PAYMENT--}: - {?POINTS?} + {?POINTS?} {--ADMIN_PAYMENT_PRICE--}: - + ({?POINTS?}) {--ADMIN_PAYMENT_TITLE--}: - + diff --git a/templates/de/html/admin/admin_edit_rallyes.tpl b/templates/de/html/admin/admin_edit_rallyes.tpl index f6bcf23513..c3c44524d7 100644 --- a/templates/de/html/admin/admin_edit_rallyes.tpl +++ b/templates/de/html/admin/admin_edit_rallyes.tpl @@ -1,14 +1,14 @@ - +
    - $content -
    + {--RALLYE_EDIT_RALLYES--}:
    diff --git a/templates/de/html/admin/admin_edit_rallyes_row.tpl b/templates/de/html/admin/admin_edit_rallyes_row.tpl index 5c58eedac1..e35fcfb270 100644 --- a/templates/de/html/admin/admin_edit_rallyes_row.tpl +++ b/templates/de/html/admin/admin_edit_rallyes_row.tpl @@ -1,13 +1,13 @@ {--RALLYE_TITLE--}: - + {--RALLYE_DESCR--}: - + @@ -31,12 +31,12 @@ {--RALLYE_MIN_USERS_MINI--}: - + {--RALLYE_MIN_PRICES_MINI--}: - + diff --git a/templates/de/html/admin/admin_edit_refbanner.tpl b/templates/de/html/admin/admin_edit_refbanner.tpl index 430e26e0e6..6c94287dbf 100644 --- a/templates/de/html/admin/admin_edit_refbanner.tpl +++ b/templates/de/html/admin/admin_edit_refbanner.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_EDIT_REFERAL_BANNER_TITLE--}
    diff --git a/templates/de/html/admin/admin_edit_refbanner_row.tpl b/templates/de/html/admin/admin_edit_refbanner_row.tpl index d3c74c9283..390fa535f3 100644 --- a/templates/de/html/admin/admin_edit_refbanner_row.tpl +++ b/templates/de/html/admin/admin_edit_refbanner_row.tpl @@ -2,13 +2,13 @@ {--ADMIN_EDIT_REFERAL_BANNER_URL--}: - + {--ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT--}: - + diff --git a/templates/de/html/admin/admin_edit_reflevel.tpl b/templates/de/html/admin/admin_edit_reflevel.tpl index cc4d43271e..41d220b5f4 100644 --- a/templates/de/html/admin/admin_edit_reflevel.tpl +++ b/templates/de/html/admin/admin_edit_reflevel.tpl @@ -1,16 +1,16 @@
    - +
    - $content -
    + {--ADMIN_EDIT_REFERAL_DEPTHS_TITLE--}:
    diff --git a/templates/de/html/admin/admin_edit_reflevel_row.tpl b/templates/de/html/admin/admin_edit_reflevel_row.tpl index dd2aac2661..8ef6e91de9 100644 --- a/templates/de/html/admin/admin_edit_reflevel_row.tpl +++ b/templates/de/html/admin/admin_edit_reflevel_row.tpl @@ -1,17 +1,17 @@ - + {--ADMIN_REFERAL_DEPTHS_ID--} $content[id]: {--REFERAL_LEVEL--}:  - + {--REFERAL_PERCENT--}:  - % + % diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl index 1c3671922a..8298fa58ce 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -1,24 +1,24 @@
    - +
    - - + - + -
    +
    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
    $content[contact]
    {--ADMIN_SUM_SPONSOR_POINTS--}:
    {--ENTER_ADD_REASON--}:
    diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index 5cf4eb7740..6ac2316767 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -1,14 +1,14 @@
    - +
    - @@ -16,7 +16,7 @@ {--SPONSOR_ENTER_COMPANY_TITLE--}:  @@ -24,7 +24,7 @@ {--SPONSOR_ENTER_COMPANY_POSITION--}:  @@ -32,11 +32,11 @@ {--SPONSOR_ENTER_TAX_IDENT--}:  - @@ -45,7 +45,7 @@ {--GENDER--}: @@ -66,7 +66,7 @@ {--SPONSOR_ENTER_STREET_NR1--}: @@ -74,7 +74,7 @@ {--SPONSOR_ENTER_STREET_NR2--}: @@ -82,8 +82,8 @@ {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: @@ -91,7 +91,7 @@ {--SPONSOR_ENTER_PHONE--}:  @@ -99,7 +99,7 @@ {--SPONSOR_ENTER_FAX--}:  @@ -107,7 +107,7 @@ {--SPONSOR_ENTER_CELL--}:  @@ -115,7 +115,7 @@ {--EMAIL--}: @@ -123,11 +123,11 @@ {--SPONSOR_ENTER_URL--}:  - @@ -136,8 +136,8 @@ {--SPONSOR_ENTER_PASSWORDS--}:  @@ -146,7 +146,7 @@ - @@ -167,9 +167,9 @@ -
    + {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ($content[id])
    - {--ADMIN_SPONSOR_COMPANY_NOTE--} + {--ADMIN_SPONSOR_COMPANY_NOTE--}
    - +
    - +
    - +
    + {--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}
    - @@ -57,8 +57,8 @@ {--SURNAME_FAMILY--}: - - + +
    - +
    - +
    - - - + - +
    - +
    - +
    - +
    - +
    - +
    + {--ADMIN_SPONSOR_ENTER_PASSWORDS--}
    - - + +
    + {--ADMIN_SPONSOR_WARNINGS_POINTS--}
    diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl index c7c116f79c..bddaabdb0a 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -1,24 +1,24 @@
    - +
    - - + - + -
    +
    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
    $content[contact]
    {--ADMIN_SUM_SPONSOR_POINTS--}:
    {--ENTER_SUB_REASON--}:
    diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index 532d6c1ff0..ca84a12f0f 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -12,9 +12,9 @@ $content -
    + {--ADMIN_SURFBAR_EDIT_URLS_TITLE--}
    diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index b07b8ad9e3..ef1a060a21 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -1,15 +1,15 @@
    - +
    - - -
    + {--ADMIN_EDIT_USER_PROFILE--}: ($content)
    {--GENDER--}: - @@ -19,66 +19,66 @@
    {--SURNAME--}: - +
    {--FAMILY--}: - +
    {--STREET_NR--}: - +
    {--COUNTRY--}: - +
    {--ZIP--}: - +
    {--CITY--}: - +
    {--EMAIL--}: - +
    {--ADMIN_PASS1--}: - +
    {--ADMIN_PASS2--}: - +
    diff --git a/templates/de/html/admin/admin_email_archiv.tpl b/templates/de/html/admin/admin_email_archiv.tpl index 1962170fff..cdaca9f0e5 100644 --- a/templates/de/html/admin/admin_email_archiv.tpl +++ b/templates/de/html/admin/admin_email_archiv.tpl @@ -1,8 +1,8 @@ + class="table dashed" width="99%"> - + $content[top_email_nav] $content[rows] diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 962b67230e..da80c83edc 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -1,65 +1,65 @@ diff --git a/templates/de/html/admin/admin_email_nav_row.tpl b/templates/de/html/admin/admin_email_nav_row.tpl index 0832a84809..ef5749085d 100644 --- a/templates/de/html/admin/admin_email_nav_row.tpl +++ b/templates/de/html/admin/admin_email_nav_row.tpl @@ -1,5 +1,5 @@ -
    {--ADMIN_POOL_CONTENT--}{--ADMIN_POOL_CONTENT--}
    {--EMAIL_SENDER--}:
    - {%pipe,generateUserProfileLink=$content[sender]%} + {%pipe,generateUserProfileLink=$content[sender]%}
    {--EMAIL_SUBJECT--}:
    - {%pipe,encodeEntities=$content[subject]%} + {%pipe,encodeEntities=$content[subject]%}
    {--EMAIL_TEXT--}:
    - $content[text] + $content[text]
    {--EMAIL_PAYMENT--}:
    - {%pipe,getPaymentTitlePrice,translateComma=$content[payment_id]%} + {%pipe,getPaymentTitlePrice,translateComma=$content[payment_id]%}
    {--EMAIL_CATEGORY--}:
    - {%pipe,getCategory=$content[cat_id]%} + {%pipe,getCategory=$content[cat_id]%}
    {--EMAIL_RECEIVERS--}:
    - {%pipe,translateComma=$content[target_send]%} ({--EMAIL_RUIDS--}: - {%pipe,convertReceivers=$content[receivers]%}) + {%pipe,translateComma=$content[target_send]%} ({--EMAIL_RUIDS--}: + {%pipe,convertReceivers=$content[receivers]%})
    {--USERS_LINKS--}:
    - $content[unconfirmed] + $content[unconfirmed]
    {--EMAIL_POOL_TYPE--}:
    - {%pipe,translatePoolType=$content[data_type]%} + {%pipe,translatePoolType=$content[data_type]%}
    {--EMAIL_TSEND--}:
    - $content[target_send] + $content[target_send]
    {--EMAIL_URL--}:
    - {--ADMIN_TEST_URL--}
    {--EMAIL_TIMESTAMP--}:
    - $content[timestamp] + $content[timestamp]
    {--EMAIL_URL--}:
    -
    $content[url]
    +
    $content[url]
    {--_UNUSED--}:
    - --- + ---
    + $content[rows] -
    diff --git a/templates/de/html/admin/admin_expert_settings_form.tpl b/templates/de/html/admin/admin_expert_settings_form.tpl index 7198f2b13e..f01f9e561a 100644 --- a/templates/de/html/admin/admin_expert_settings_form.tpl +++ b/templates/de/html/admin/admin_expert_settings_form.tpl @@ -1,27 +1,27 @@ - +
    - -
    + {--ADMIN_EXPERT_SETTINGS_TITLE--}:
    -
    {--ADMIN_EXPERT_SETTINGS_NOTE--}
    +
    {--ADMIN_EXPERT_SETTINGS_NOTE--}
    - + {--ADMIN_EXPERT_SETTINGS_MAKE_PERMANENT--}
    diff --git a/templates/de/html/admin/admin_extension_reg_form.tpl b/templates/de/html/admin/admin_extension_reg_form.tpl index 7d981c2758..e6bdadff17 100644 --- a/templates/de/html/admin/admin_extension_reg_form.tpl +++ b/templates/de/html/admin/admin_extension_reg_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_extension_sql_table.tpl b/templates/de/html/admin/admin_extension_sql_table.tpl index e7dd9b54bd..7f8d59baf1 100644 --- a/templates/de/html/admin/admin_extension_sql_table.tpl +++ b/templates/de/html/admin/admin_extension_sql_table.tpl @@ -1,7 +1,7 @@
    - diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl index 447dc68b02..f4ee2651f2 100644 --- a/templates/de/html/admin/admin_extensions.tpl +++ b/templates/de/html/admin/admin_extensions.tpl @@ -1,8 +1,8 @@
    -
    + $content[title]:
    +
    - @@ -15,11 +15,11 @@ $content -
    + {--ADMIN_REGISTERED_EXTENSIONS--}
    diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl index 6636ee893a..73b3d44690 100644 --- a/templates/de/html/admin/admin_extensions_delete.tpl +++ b/templates/de/html/admin/admin_extensions_delete.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,8 +13,8 @@ $content -
    + {--ADMIN_REMOVING_THESE_EXTENSIONS--}
    diff --git a/templates/de/html/admin/admin_extensions_edit.tpl b/templates/de/html/admin/admin_extensions_edit.tpl index ff4bb97098..6ba10a944c 100644 --- a/templates/de/html/admin/admin_extensions_edit.tpl +++ b/templates/de/html/admin/admin_extensions_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -14,9 +14,9 @@ $content -
    + {--ADMIN_EDIT_EXTENSIONS--}:
    diff --git a/templates/de/html/admin/admin_extensions_text.tpl b/templates/de/html/admin/admin_extensions_text.tpl index 530961ba01..a7e37d237a 100644 --- a/templates/de/html/admin/admin_extensions_text.tpl +++ b/templates/de/html/admin/admin_extensions_text.tpl @@ -1,3 +1,3 @@ -
    +
    $content
    diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl index 97278ae648..0bb1e260bf 100644 --- a/templates/de/html/admin/admin_footer.tpl +++ b/templates/de/html/admin/admin_footer.tpl @@ -1,5 +1,5 @@
    -
    +
      diff --git a/templates/de/html/admin/admin_guest_menu_status.tpl b/templates/de/html/admin/admin_guest_menu_status.tpl index 2ed91b5a16..13dcf4bdaa 100644 --- a/templates/de/html/admin/admin_guest_menu_status.tpl +++ b/templates/de/html/admin/admin_guest_menu_status.tpl @@ -1,8 +1,8 @@
      - +
      - $content[rows] -
      +
      {--ADMIN_CHANGE_GUEST_MENU_TITLE--}
      @@ -13,11 +13,11 @@
      diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index bf83baecfb..04001d03e9 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -15,10 +15,10 @@ $content -
      + {--ADMIN_ADMINS_EDIT_ACCOUNTS--}
      diff --git a/templates/de/html/admin/admin_list_admins_row.tpl b/templates/de/html/admin/admin_list_admins_row.tpl index 9dc2e10ec9..3654267f2f 100644 --- a/templates/de/html/admin/admin_list_admins_row.tpl +++ b/templates/de/html/admin/admin_list_admins_row.tpl @@ -1,6 +1,6 @@
    - +   $content[login] diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl index 488400de41..e22f568426 100644 --- a/templates/de/html/admin/admin_list_autopurge.tpl +++ b/templates/de/html/admin/admin_list_autopurge.tpl @@ -1,4 +1,4 @@ - +
    @@ -12,7 +12,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl index 31b61028ab..51e79d68bc 100644 --- a/templates/de/html/admin/admin_list_bank_package.tpl +++ b/templates/de/html/admin/admin_list_bank_package.tpl @@ -1,8 +1,8 @@
    -
    {--_UID--}
    +
    - @@ -17,11 +17,11 @@ $content -
    + {--ADMIN_LIST_BANK_PACKAGES--}:
    diff --git a/templates/de/html/admin/admin_list_bank_package_row.tpl b/templates/de/html/admin/admin_list_bank_package_row.tpl index dad944014f..2f581268f7 100644 --- a/templates/de/html/admin/admin_list_bank_package_row.tpl +++ b/templates/de/html/admin/admin_list_bank_package_row.tpl @@ -1,6 +1,6 @@
    - + $content[id] diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index 1932d95dbe..1c83d181c5 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -1,5 +1,5 @@
    - +
    @@ -37,7 +37,7 @@
    -
    +
    {--ADMIN_BEG_WINNER_HIGLIGHTED--}
    diff --git a/templates/de/html/admin/admin_list_beg_form.tpl b/templates/de/html/admin/admin_list_beg_form.tpl index dcb2c9fef7..c2ad57dbae 100644 --- a/templates/de/html/admin/admin_list_beg_form.tpl +++ b/templates/de/html/admin/admin_list_beg_form.tpl @@ -1,7 +1,7 @@ - + -
    +
    ({--ADMIN_BEG_WITHDRAW_NOTE--})
    diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index c62d6097b3..f11b2a4508 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -1,5 +1,5 @@
    - +
    @@ -35,7 +35,7 @@
    -
    +
    {--ADMIN_BONUS_WINNER_HIGLIGHTED--}
    diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl index d69a67904c..25bda6b9dd 100644 --- a/templates/de/html/admin/admin_list_bonus_emails.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails.tpl @@ -1,8 +1,8 @@
    - +
    - $content[nav] diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl index 7b283b95e4..51fff301dc 100644 --- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -1,64 +1,64 @@ diff --git a/templates/de/html/admin/admin_list_bonus_form.tpl b/templates/de/html/admin/admin_list_bonus_form.tpl index c66a2672f7..6eae287481 100644 --- a/templates/de/html/admin/admin_list_bonus_form.tpl +++ b/templates/de/html/admin/admin_list_bonus_form.tpl @@ -1,7 +1,7 @@ - + -
    +
    ({--ADMIN_BONUS_WITHDRAW_NOTE--})
    diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index ce601b671b..52e6650b0b 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -1,14 +1,14 @@
    -
    -
    {--ADMIN_BONUS_CONTENT--}
    +
    +
    {--ADMIN_BONUS_CONTENT--}
    {--EMAIL_SUBJECT--}:
    -
    $content[subject]
    +
    $content[subject]
    {--EMAIL_TEXT--}:
    -
    $content[text]
    +
    $content[text]
    {--EMAIL_POINTS--}:
    -
    {%pipe,translateComma=$content[points]%} {?POINTS?}
    +
    {%pipe,translateComma=$content[points]%} {?POINTS?}
    {--EMAIL_SECONDS--}:
    -
    {%pipe,createFancyTime=$content[time]%}
    +
    {%pipe,createFancyTime=$content[time]%}
    {--EMAIL_CATEGORY--}:
    -
    {%pipe,getCategory=$content[cat_id]%}
    +
    {%pipe,getCategory=$content[cat_id]%}
    {--EMAIL_RECEIVERS--}:
    -
    {%pipe,translateComma=$content[mails_sent]%} - ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%})
    +
    {%pipe,translateComma=$content[mails_sent]%} + ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%})
    {--USERS_LINKS--}:
    -
    $content[unconfirmed]
    +
    $content[unconfirmed]
    {--EMAIL_POOL_TYPE--}:
    -
    {%pipe,translatePoolType=$content[data_type]%}
    +
    {%pipe,translatePoolType=$content[data_type]%}
    {--EMAIL_TSEND--}:
    -
    $content[target_send]
    +
    $content[target_send]
    {--EMAIL_URL--}:
    - +
    {--EMAIL_TIMESTAMP--}:
    -
    $content[timestamp]
    +
    $content[timestamp]
    {--EMAIL_URL--}:
    -
    $content[url]
    +
    $content[url]
    {--_UNUSED--}:
    - --- + ---
    +
    - $content[rows] - diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index 273439a699..0af056194e 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -1,7 +1,7 @@ -
    + {--USER_ID--}: $content[userid] ($content[email])
    - + - + - $content[status]
    +
    - @@ -13,7 +13,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_country_row.tpl b/templates/de/html/admin/admin_list_country_row.tpl index 5d5464eded..b59480986e 100644 --- a/templates/de/html/admin/admin_list_country_row.tpl +++ b/templates/de/html/admin/admin_list_country_row.tpl @@ -1,6 +1,6 @@ - diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 91743a68f8..575458ffbf 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -1,8 +1,8 @@
    -
    + $content[title]:
    - + $content[code] diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl index 89b1a20984..4b9b686a5d 100644 --- a/templates/de/html/admin/admin_list_doubler_already.tpl +++ b/templates/de/html/admin/admin_list_doubler_already.tpl @@ -1,7 +1,7 @@
    - +
    - @@ -21,7 +21,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_doubler_overview.tpl b/templates/de/html/admin/admin_list_doubler_overview.tpl index 0766dedd93..a2594c58f1 100644 --- a/templates/de/html/admin/admin_list_doubler_overview.tpl +++ b/templates/de/html/admin/admin_list_doubler_overview.tpl @@ -1,7 +1,7 @@
    -
    +
    $content[list_already]
    +
    - diff --git a/templates/de/html/admin/admin_list_doubler_waiting.tpl b/templates/de/html/admin/admin_list_doubler_waiting.tpl index 92f8cfff6f..a69921ebc1 100644 --- a/templates/de/html/admin/admin_list_doubler_waiting.tpl +++ b/templates/de/html/admin/admin_list_doubler_waiting.tpl @@ -1,7 +1,7 @@
    -
    +
    {--ADMIN_DOUBLER_LIST_OVERVIEW--}
    +
    - @@ -13,7 +13,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_emails.tpl b/templates/de/html/admin/admin_list_emails.tpl index a2bc034e31..17ef4e2f9e 100644 --- a/templates/de/html/admin/admin_list_emails.tpl +++ b/templates/de/html/admin/admin_list_emails.tpl @@ -1,8 +1,8 @@
    -
    + $content[list_waiting]
    +
    - $content[nav] diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl index cc7fb364bb..0c3dab8a2b 100644 --- a/templates/de/html/admin/admin_list_emails_row.tpl +++ b/templates/de/html/admin/admin_list_emails_row.tpl @@ -1,58 +1,59 @@ - - - + + + - - + + - - - + + + - - - + + + - + diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index 967f644048..7047e83e7e 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -1,6 +1,6 @@
    -
    -
    {--ADMIN_POOL_CONTENT--} ($content[who])
    +
    +
    {--ADMIN_POOL_CONTENT--} ($content[who])
    - {--EMAIL_SENDER--}:
    -
    {%pipe,generateUserProfileLink=$content[sender]%}
    -
    - {--EMAIL_SUBJECT--}:
    -
    $content[subject]
    -
    - {--EMAIL_TEXT--}:
    -
    $content[text]
    -
    + {--EMAIL_SENDER--}:
    + {%pipe,generateUserProfileLink=$content[sender]%} +
    + {--EMAIL_SUBJECT--}:
    + $content[subject] +
    + {--EMAIL_TEXT--}:
    + $content[text] +
    - {--EMAIL_PAYMENT--}:
    -
    {%pipe,getPaymentTitlePrice=$content[payment_id]%}
    -
    - {--EMAIL_CATEGORY--}:
    -
    {%pipe,getCategory=$content[cat_id]%}
    -
    + {--EMAIL_PAYMENT--}:
    + {%pipe,getPaymentTitlePrice=$content[payment_id]%} +
    + {--EMAIL_CATEGORY--}:
    + {%pipe,getCategory=$content[cat_id]%} +
    - {--EMAIL_RECEIVERS--}:
    -
    {%pipe,translateComma=$content[sent_email]%}
    - ({--EMAIL_RUIDS--}:
    {%pipe,convertReceivers=$content[receivers]%}
    ) -
    - {--USERS_LINKS--}:
    -
    $content[unconfirmed]
    -
    - {--EMAIL_POOL_TYPE--}:
    -
    {%pipe,translatePoolType=$content[data_type]%}
    -
    + {--EMAIL_RECEIVERS--}:
    +
    {%pipe,translateComma=$content[sent_email]%}
    + ({--EMAIL_RUIDS--}: +
    {%pipe,convertReceivers=$content[receivers]%}
    ) +
    + {--USERS_LINKS--}:
    + $content[unconfirmed] +
    + {--EMAIL_POOL_TYPE--}:
    + {%pipe,translatePoolType=$content[data_type]%} +
    - {--EMAIL_TSEND--}:
    -
    {%pipe,translateComma=$content[target_send]%}
    -
    - {--EMAIL_URL--}:
    - -
    - {--EMAIL_TIMESTAMP--}:
    -
    $content[timestamp]
    -
    + {--EMAIL_TSEND--}:
    + {%pipe,translateComma=$content[target_send]%} +
    + {--EMAIL_URL--}:
    + {--ADMIN_TEST_URL--} +
    + {--EMAIL_TIMESTAMP--}:
    + $content[timestamp] +
    +
    @@ -12,9 +12,9 @@ $content -
    {--ID_SELECT--} {--_UID--}:
    diff --git a/templates/de/html/admin/admin_list_holiday_row.tpl b/templates/de/html/admin/admin_list_holiday_row.tpl index 89d6a68b6a..87e9714f73 100644 --- a/templates/de/html/admin/admin_list_holiday_row.tpl +++ b/templates/de/html/admin/admin_list_holiday_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,generateUserProfileLink=$content[userid]%} diff --git a/templates/de/html/admin/admin_list_imprint.tpl b/templates/de/html/admin/admin_list_imprint.tpl index a7bb487486..cda5bc644e 100644 --- a/templates/de/html/admin/admin_list_imprint.tpl +++ b/templates/de/html/admin/admin_list_imprint.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,10 +13,10 @@ $content -
    + {--ADMIN_CONFIG_IMPRINT--}:
    diff --git a/templates/de/html/admin/admin_list_imprint_row.tpl b/templates/de/html/admin/admin_list_imprint_row.tpl index a46e8727ea..631d63ed0b 100644 --- a/templates/de/html/admin/admin_list_imprint_row.tpl +++ b/templates/de/html/admin/admin_list_imprint_row.tpl @@ -1,6 +1,6 @@
    - + $content[imprint_key] diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index 28cd990ba0..c3eff5fc82 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -1,12 +1,12 @@ - +
    - $content[rows] - diff --git a/templates/de/html/admin/admin_list_links_problem.tpl b/templates/de/html/admin/admin_list_links_problem.tpl index 032d6f84ff..26da1cd9e8 100644 --- a/templates/de/html/admin/admin_list_links_problem.tpl +++ b/templates/de/html/admin/admin_list_links_problem.tpl @@ -1,5 +1,6 @@ diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index 8f619b654b..bec46b2325 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -1,6 +1,6 @@
    -
    + $content[surname] $content[family] ($content[email]):
    + {%message,MEMBER_TOTAL_LINKS=$content[nums]%}
    {--ADMIN_DELETE_UNCONFIRMED_LINKS--}
    - $content[problem]: $content[data] + $content[problem]: + $content[data]
    +
    @@ -13,15 +13,15 @@ $content -
    {--ID_SELECT--}
    -
    +
    {--ADMIN_MODS_EDIT_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_mods_row.tpl b/templates/de/html/admin/admin_list_mods_row.tpl index b9c051b4c5..1dc0b3cf00 100644 --- a/templates/de/html/admin/admin_list_mods_row.tpl +++ b/templates/de/html/admin/admin_list_mods_row.tpl @@ -1,6 +1,6 @@
    - + $content[module] diff --git a/templates/de/html/admin/admin_list_network_api_translation.tpl b/templates/de/html/admin/admin_list_network_api_translation.tpl index 686cb06da3..78d513c1a1 100644 --- a/templates/de/html/admin/admin_list_network_api_translation.tpl +++ b/templates/de/html/admin/admin_list_network_api_translation.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_API_TRANSLATION_LIST_TITLE--}
    @@ -19,16 +19,16 @@
    -
    +
    {--ADMIN_NETWORK_API_TRANSLATION_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_network_api_translation_row.tpl b/templates/de/html/admin/admin_list_network_api_translation_row.tpl index 37643bddbe..9aa47268fe 100644 --- a/templates/de/html/admin/admin_list_network_api_translation_row.tpl +++ b/templates/de/html/admin/admin_list_network_api_translation_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl index 9f8faac97c..aa863ef276 100644 --- a/templates/de/html/admin/admin_list_network_params.tpl +++ b/templates/de/html/admin/admin_list_network_params.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE--}
    @@ -20,16 +20,16 @@
    -
    +
    {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_network_params_row.tpl b/templates/de/html/admin/admin_list_network_params_row.tpl index 11d261cec0..564fe7135d 100644 --- a/templates/de/html/admin/admin_list_network_params_row.tpl +++ b/templates/de/html/admin/admin_list_network_params_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl index 4b0f4291f2..4f425aa25b 100644 --- a/templates/de/html/admin/admin_list_network_types.tpl +++ b/templates/de/html/admin/admin_list_network_types.tpl @@ -1,8 +1,8 @@
    - +
    - $content -
    +
    {--ADMIN_NETWORK_TYPES_LIST_TITLE--}
    @@ -20,16 +20,16 @@
    -
    +
    {--ADMIN_NETWORK_TYPES_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_network_types_row.tpl b/templates/de/html/admin/admin_list_network_types_row.tpl index 26c9fe3286..576617a82e 100644 --- a/templates/de/html/admin/admin_list_network_types_row.tpl +++ b/templates/de/html/admin/admin_list_network_types_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl index bcc2ef100f..36f6923209 100644 --- a/templates/de/html/admin/admin_list_networks.tpl +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -1,6 +1,6 @@
    - +
    $content -
      @@ -19,16 +19,16 @@
    -
    +
    {--ADMIN_NETWORK_LIST_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 824172eef4..718887e4d5 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -1,6 +1,6 @@
    - + $content[network_short_name]:
    diff --git a/templates/de/html/admin/admin_list_notify_emails.tpl b/templates/de/html/admin/admin_list_notify_emails.tpl index 0d99d4a8fe..e949cb1a6b 100644 --- a/templates/de/html/admin/admin_list_notify_emails.tpl +++ b/templates/de/html/admin/admin_list_notify_emails.tpl @@ -1,8 +1,8 @@
    - +
    - $content[nav] 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 23f3902d7f..9335b468f7 100644 --- a/templates/de/html/admin/admin_list_notify_emails_row.tpl +++ b/templates/de/html/admin/admin_list_notify_emails_row.tpl @@ -1,64 +1,64 @@ diff --git a/templates/de/html/admin/admin_list_online.tpl b/templates/de/html/admin/admin_list_online.tpl index e1007e4bee..24dcf2164f 100644 --- a/templates/de/html/admin/admin_list_online.tpl +++ b/templates/de/html/admin/admin_list_online.tpl @@ -1,7 +1,7 @@
    -
    - {--ADMIN_NOTIFCATION_TITLE--} + + {--ADMIN_NOTIFCATION_TITLE--}
    {--EMAIL_SUBJECT--}:
    - $content[subject] + $content[subject]
    {--EMAIL_TEXT--}:
    - $content[text] + $content[text]
    {--EMAIL_POINTS--}:
    - {%pipe,translateComma=$content[points]%} {?POINTS?} + {%pipe,translateComma=$content[points]%} {?POINTS?}
    {--EMAIL_SECONDS--}:
    - {%pipe,createFancyTime=$content[time]%} + {%pipe,createFancyTime=$content[time]%}
    {--EMAIL_CATEGORY--}:
    - {%pipe,getCategory=$content[cat_id]%} + {%pipe,getCategory=$content[cat_id]%}
    {--EMAIL_RECEIVERS--}:
    - {%pipe,translateComma=$content[mails_sent]%} - ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%}) + {%pipe,translateComma=$content[mails_sent]%} + ({--EMAIL_RUIDS--}: {%pipe,convertReceivers=$content[receivers]%})
    {--USERS_LINKS--}:
    - $content[unconfirmed_content] + $content[unconfirmed_content]
    {--EMAIL_POOL_TYPE--}:
    - {%pipe,translatePoolType=$content[data_type]%} + {%pipe,translatePoolType=$content[data_type]%}
    {--EMAIL_TSEND--}:
    - {%pipe,translateComma=$content[target_send]%} + {%pipe,translateComma=$content[target_send]%}
    {--EMAIL_URL--}:
    - {--ADMIN_TEST_URL--} + {--ADMIN_TEST_URL--}
    {--EMAIL_TIMESTAMP--}:
    - $content[timestamp] + $content[timestamp]
    {--EMAIL_URL--}:
    -
    $content[url]
    +
    $content[url]
    {--_UNUSED--}:
    - --- + ---
    +
    - @@ -17,7 +17,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index c3d6c08146..6080b13b22 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -1,8 +1,8 @@
    -
    + {--ADMIN_ONLINE_DETAILS--}
    +
    - @@ -15,10 +15,10 @@ $content -
    + {--ADMIN_EDIT_DELETE_PAYMENT_TITLE--}
    diff --git a/templates/de/html/admin/admin_list_payments_row.tpl b/templates/de/html/admin/admin_list_payments_row.tpl index 9c9376966e..fec54b2384 100644 --- a/templates/de/html/admin/admin_list_payments_row.tpl +++ b/templates/de/html/admin/admin_list_payments_row.tpl @@ -1,6 +1,6 @@
    - + $content[time] {--_SECONDS--} diff --git a/templates/de/html/admin/admin_list_payouts.tpl b/templates/de/html/admin/admin_list_payouts.tpl index ab760718e6..864e6c9c5c 100644 --- a/templates/de/html/admin/admin_list_payouts.tpl +++ b/templates/de/html/admin/admin_list_payouts.tpl @@ -1,7 +1,7 @@ - +
    - @@ -15,7 +15,7 @@ $content - diff --git a/templates/de/html/admin/admin_list_primera_main.tpl b/templates/de/html/admin/admin_list_primera_main.tpl index 8ec0435004..5f7dcc726f 100644 --- a/templates/de/html/admin/admin_list_primera_main.tpl +++ b/templates/de/html/admin/admin_list_primera_main.tpl @@ -1,5 +1,5 @@
    -
    + {--ADMIN_LIST_PAYOUTS--}:
    +
    @@ -13,7 +13,7 @@ $content - diff --git a/templates/de/html/admin/admin_list_rallye_prices.tpl b/templates/de/html/admin/admin_list_rallye_prices.tpl index 4e3bdf650c..3b0ef7e457 100644 --- a/templates/de/html/admin/admin_list_rallye_prices.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices.tpl @@ -1,7 +1,7 @@
    -
    {--ID_SELECT--}
    +
    - @@ -13,7 +13,7 @@ $content - diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl index 9a17443f60..3e2fdf1987 100644 --- a/templates/de/html/admin/admin_list_rallye_usr.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr.tpl @@ -1,6 +1,6 @@ -
    + {--ADMIN_LIST_RALLYES_PRICING--}:
    +
    - @@ -12,8 +12,8 @@ $content[rows] -
    + {%message,RALLYE_LIST_USERS=$content[rallye]%}:
    diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl index eb99ae8885..7d36011908 100644 --- a/templates/de/html/admin/admin_list_rallyes.tpl +++ b/templates/de/html/admin/admin_list_rallyes.tpl @@ -1,7 +1,7 @@ - +
    - @@ -11,15 +11,15 @@ $content[rows] -
    + {--RALLYE_EDIT_DELETE_RALLYES--}:
    -
    +
    {--RALLYE_EDIT_ONLY_INACTIVE_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl index 327562ecba..eadf0922d2 100644 --- a/templates/de/html/admin/admin_list_rallyes_row.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row.tpl @@ -54,7 +54,7 @@
    + {--RALLYE_LIMITATIONS--}:
    +
    - @@ -16,10 +16,10 @@ $content -
    + {--ADMIN_EDIT_DELETE_REFERAL_BANNER_TITLE--}
    diff --git a/templates/de/html/admin/admin_list_refbanner_row.tpl b/templates/de/html/admin/admin_list_refbanner_row.tpl index 26911f4654..a381d86dcd 100644 --- a/templates/de/html/admin/admin_list_refbanner_row.tpl +++ b/templates/de/html/admin/admin_list_refbanner_row.tpl @@ -1,6 +1,6 @@
    - + $content[alternate] diff --git a/templates/de/html/admin/admin_list_reflevel.tpl b/templates/de/html/admin/admin_list_reflevel.tpl index 53f555b44d..ccd6209281 100644 --- a/templates/de/html/admin/admin_list_reflevel.tpl +++ b/templates/de/html/admin/admin_list_reflevel.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -13,16 +13,16 @@ $content -
    + {--ADMIN_EDIT_DELETE_REFERAL_DEPTH_TITLE--}
    -
    +
    {--ADMIN_REFERAL_LEVEL_ZERO_NOTICE--}
    diff --git a/templates/de/html/admin/admin_list_reflevel_row.tpl b/templates/de/html/admin/admin_list_reflevel_row.tpl index 5dc0ff022c..e9cf154107 100644 --- a/templates/de/html/admin/admin_list_reflevel_row.tpl +++ b/templates/de/html/admin/admin_list_reflevel_row.tpl @@ -1,6 +1,6 @@
    - + $content[level] diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index 3828f7a880..947fd18d40 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -1,7 +1,7 @@
    - +
    - @@ -15,8 +15,8 @@ $content[rows] -
    + {%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}
    diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl index 788378e3c7..db883bb9ab 100644 --- a/templates/de/html/admin/admin_list_refs2.tpl +++ b/templates/de/html/admin/admin_list_refs2.tpl @@ -1,14 +1,14 @@
    - +
    - $content[rows] -
    + {%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}
    diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl index dd3050aab8..dd97103b41 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -17,7 +17,7 @@ $content[rows] - diff --git a/templates/de/html/admin/admin_list_refs_nodata.tpl b/templates/de/html/admin/admin_list_refs_nodata.tpl index b1229a2cec..90c55ebb0c 100644 --- a/templates/de/html/admin/admin_list_refs_nodata.tpl +++ b/templates/de/html/admin/admin_list_refs_nodata.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/admin/admin_list_refs_norefs.tpl b/templates/de/html/admin/admin_list_refs_norefs.tpl index adb747d3cb..82f80081bc 100644 --- a/templates/de/html/admin/admin_list_refs_norefs.tpl +++ b/templates/de/html/admin/admin_list_refs_norefs.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/admin/admin_list_sponsor.tpl b/templates/de/html/admin/admin_list_sponsor.tpl index ca46e83b1e..88eb02ea09 100644 --- a/templates/de/html/admin/admin_list_sponsor.tpl +++ b/templates/de/html/admin/admin_list_sponsor.tpl @@ -1,15 +1,15 @@
    -
    + {%message,ADMIN_LIST_REFERALS_LEVEL=$content[level]%}
    $content[info]
    + {%message,ADMIN_LIST_USER_NODATA=$content[refid]%}
    + {%message,ADMIN_LIST_USER_NOREFS=$content[userid]%}
    +
    - $content -
    + {--ADMIN_LIST_SPONSOR_ACCOUNTS--}
    diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 88d05decae..6cf3893687 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -1,7 +1,7 @@
    - +
    - @@ -10,7 +10,7 @@ - @@ -27,7 +27,7 @@ - @@ -68,7 +68,7 @@ - @@ -89,7 +89,7 @@ - @@ -118,7 +118,7 @@ - diff --git a/templates/de/html/admin/admin_list_sponsor_pay_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_row.tpl index 56edab981a..7f8c5b1261 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_row.tpl @@ -1,6 +1,6 @@ $content[rows] -
    +
    {--ADMIN_SPONSOR_DETAILS--}:
    $content[id] [{%pipe,sponsorTranslateUserStatus=$content[status]%}]
    + {--ADMIN_SPONSOR_COMPANY_DATA--}:
    $content[tax_ident]
    + {--ADMIN_SPONSOR_PERSONA_DATA--}:
    [{--ADMIN_TEST_URL--}]
    + {--ADMIN_SPONSOR_WARNINGS_POINTS--}:
    [{%pipe,translateComma=$content[points_used]%}]
    + {--ADMIN_SPONSOR_OTHER_DETAILS--}:
    [$content[ref_count]]
    - + {%pipe,encodeEntities=$content[pay_name]%} diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl index a6e38ee348..191ce1b763 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,9 +15,9 @@ $content -
    + {--SPONSOR_EDIT_PAY_ENTRIES--}
    diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl index 34f58226f1..9de0c64bb0 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl @@ -1,18 +1,18 @@
    $content[id] - + -   +   -   +   -   +   -   +  
    - + {%pipe,encodeEntities=$content[pay_name]%} diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl index aae61cd7b9..9d27f4d123 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -22,15 +22,15 @@ $content -
    + {--ADMIN_LIST_SURFBAR_ACTIONS_TITLE--}
    -
    +
    {--ADMIN_LIST_SURFBAR_ACTIONS_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl index 41b85c6f3c..f2dead389e 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,translateSurfbarUrlStatus=$content[actions_status]%} diff --git a/templates/de/html/admin/admin_list_surfbar_urls.tpl b/templates/de/html/admin/admin_list_surfbar_urls.tpl index 58a7b65167..ced7af5067 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -18,12 +18,12 @@ $content -
    + {--ADMIN_SURFBAR_LIST_URLS_TITLE--}
    diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl index 8981a85fc7..b5b90d9ccd 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,generateUserProfileLink=$content[url_userid]%} diff --git a/templates/de/html/admin/admin_list_task.tpl b/templates/de/html/admin/admin_list_task.tpl index b9fbc9232b..0dd9502891 100644 --- a/templates/de/html/admin/admin_list_task.tpl +++ b/templates/de/html/admin/admin_list_task.tpl @@ -17,12 +17,12 @@
    diff --git a/templates/de/html/admin/admin_list_task_delete.tpl b/templates/de/html/admin/admin_list_task_delete.tpl index 843f510e70..884347bd44 100644 --- a/templates/de/html/admin/admin_list_task_delete.tpl +++ b/templates/de/html/admin/admin_list_task_delete.tpl @@ -17,18 +17,18 @@
    -
    +
    {--ADMIN_TASK_DELETE_MODE_NOTE--}
    diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl index fcc88cf5a6..2743c81314 100644 --- a/templates/de/html/admin/admin_list_task_ext_rows.tpl +++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl @@ -1,6 +1,6 @@
    - + {%pipe,generateAdminLink=$content[assigned_admin]%} diff --git a/templates/de/html/admin/admin_list_task_rows.tpl b/templates/de/html/admin/admin_list_task_rows.tpl index 585ca460fc..8a46935ec6 100644 --- a/templates/de/html/admin/admin_list_task_rows.tpl +++ b/templates/de/html/admin/admin_list_task_rows.tpl @@ -1,6 +1,6 @@
    - + {%pipe,generateAdminLink=$content[assigned_admin]%} diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl index 7ceeb06585..5cc95e0f32 100644 --- a/templates/de/html/admin/admin_list_transfer.tpl +++ b/templates/de/html/admin/admin_list_transfer.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -28,7 +28,7 @@ $content[rows] - - diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index 4871eb20cc..8a95d176b3 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -1,5 +1,5 @@
    -
    + $content[title]
    @@ -36,7 +36,7 @@
    +
    - diff --git a/templates/de/html/admin/admin_logout.tpl b/templates/de/html/admin/admin_logout.tpl index 2ecae6e872..37fa2126a1 100644 --- a/templates/de/html/admin/admin_logout.tpl +++ b/templates/de/html/admin/admin_logout.tpl @@ -1,5 +1,5 @@
    -
    +
    {--ADMIN_LOGOUT_DONE--}
    diff --git a/templates/de/html/admin/admin_logout_form.tpl b/templates/de/html/admin/admin_logout_form.tpl index 71a911475b..120cf5f583 100644 --- a/templates/de/html/admin/admin_logout_form.tpl +++ b/templates/de/html/admin/admin_logout_form.tpl @@ -1,8 +1,8 @@
    -
    {--EMAIL_SENDER--}:
    diff --git a/templates/de/html/admin/admin_list_unconfirmed_list.tpl b/templates/de/html/admin/admin_list_unconfirmed_list.tpl index efa1473a4e..d4daba540e 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_list.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_list.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_user.tpl b/templates/de/html/admin/admin_list_user.tpl index d44e5acbb0..acccecfcf0 100644 --- a/templates/de/html/admin/admin_list_user.tpl +++ b/templates/de/html/admin/admin_list_user.tpl @@ -1,7 +1,7 @@
    -
    {--ID_SELECT--}
    +
    - diff --git a/templates/de/html/admin/admin_list_user_pagenav.tpl b/templates/de/html/admin/admin_list_user_pagenav.tpl index 159565d74d..d823cc8cb1 100644 --- a/templates/de/html/admin/admin_list_user_pagenav.tpl +++ b/templates/de/html/admin/admin_list_user_pagenav.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl index 381337dea8..5058fa0260 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -14,8 +14,8 @@
    + $content[title]:
    + - diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl index 20e9bffc75..cdfc31143e 100644 --- a/templates/de/html/admin/admin_list_wernis_main.tpl +++ b/templates/de/html/admin/admin_list_wernis_main.tpl @@ -1,4 +1,4 @@ -
    diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 9d90f3c9a9..ecc921e4ec 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -55,7 +55,7 @@ ---
    + {%pipe,generateMemberAdminActionLinks=$content[userid]%}
    +
    @@ -12,7 +12,7 @@ $content - diff --git a/templates/de/html/admin/admin_list_yoomedia_tm.tpl b/templates/de/html/admin/admin_list_yoomedia_tm.tpl index c885a409dc..922637f0b6 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm.tpl @@ -1,6 +1,6 @@ -
    {--ID_SELECT--}
    +
    - @@ -15,8 +15,8 @@ $content -
    + {--ADMIN_LIST_YOOMEDIA_TITLE--}
    diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl index e9a64b12e4..c6ad4e0f33 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -13,7 +13,7 @@ - +
    - - + +
    diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index b286be992f..fe953aeace 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -1,8 +1,8 @@
    -
    +
    -
    -
    $content[header_message]
    +
    +
    $content[header_message]
    @@ -14,12 +14,12 @@
    - +
    - diff --git a/templates/de/html/admin/admin_lock_surfbar_urls.tpl b/templates/de/html/admin/admin_lock_surfbar_urls.tpl index cccc67d3b5..238f98ed72 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -15,8 +15,8 @@ $content - diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index 2c095109a1..106256f33b 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,9 +1,9 @@
    -
    + {--ADMIN_SURFBAR_LOCK_URLS_TITLE--}
    +
    - @@ -16,13 +16,13 @@ -
    -
    $content[header]
    +
    +
    $content[header]
    - +
    diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index ec3fdf9ebf..ad5e1775aa 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -1,8 +1,8 @@
    - +
    - @@ -14,7 +14,7 @@ $content[login_message] @@ -26,7 +26,7 @@ $content[pass_message] @@ -36,7 +36,7 @@ @TODO Try to move the select box to our generic functions //--> -
    + {--ADMIN_LOGIN_TITLE--}
    {--ENTER_ADMIN_LOGIN--}: - +
    - +
    {--SELECT_TIMEOUT--}: - @@ -50,10 +50,10 @@
    diff --git a/templates/de/html/admin/admin_login_msg.tpl b/templates/de/html/admin/admin_login_msg.tpl index e85bdfbc97..8a7a59bf6b 100644 --- a/templates/de/html/admin/admin_login_msg.tpl +++ b/templates/de/html/admin/admin_login_msg.tpl @@ -1,5 +1,5 @@
    + $content
    +
    - @@ -17,9 +17,9 @@ -
    + {--ADMIN_LOGOUT_NOW--}
    diff --git a/templates/de/html/admin/admin_main_footer.tpl b/templates/de/html/admin/admin_main_footer.tpl index 0d9b462ad2..d386e824f8 100644 --- a/templates/de/html/admin/admin_main_footer.tpl +++ b/templates/de/html/admin/admin_main_footer.tpl @@ -10,3 +10,4 @@
    +
    diff --git a/templates/de/html/admin/admin_main_header.tpl b/templates/de/html/admin/admin_main_header.tpl index c5a800700d..09324a42f8 100644 --- a/templates/de/html/admin/admin_main_header.tpl +++ b/templates/de/html/admin/admin_main_header.tpl @@ -1,6 +1,7 @@ - +
    +
    - @@ -8,4 +9,4 @@ - -
    + $content[welcome]
    $content[menu] \ No newline at end of file + diff --git a/templates/de/html/admin/admin_maintenance_form.tpl b/templates/de/html/admin/admin_maintenance_form.tpl index 8e4f19b955..fec723f063 100644 --- a/templates/de/html/admin/admin_maintenance_form.tpl +++ b/templates/de/html/admin/admin_maintenance_form.tpl @@ -1,7 +1,7 @@ -
    +
    -
    +
    {--ADMIN_MAINTENANCE_MODE_INTRO--}
    @@ -9,8 +9,8 @@ $content
    - diff --git a/templates/de/html/admin/admin_member_menu_overview.tpl b/templates/de/html/admin/admin_member_menu_overview.tpl index b938421d8d..3877dbd7a8 100644 --- a/templates/de/html/admin/admin_member_menu_overview.tpl +++ b/templates/de/html/admin/admin_member_menu_overview.tpl @@ -1,6 +1,6 @@
    - +
    @@ -10,11 +10,11 @@ $content[rows] -
    {--ID_SELECT--} {--DISPLAY_ACTION--}
    diff --git a/templates/de/html/admin/admin_member_menu_status.tpl b/templates/de/html/admin/admin_member_menu_status.tpl index 7fdcc8d23e..17199c13e1 100644 --- a/templates/de/html/admin/admin_member_menu_status.tpl +++ b/templates/de/html/admin/admin_member_menu_status.tpl @@ -1,8 +1,8 @@
    - +
    - $content[rows] -
    + {--ADMIN_CHANGE_MEMBER_MENU_TITLE--}

    {%message,ADMIN_CHANGE_MENU=$content[chk]%} @@ -10,11 +10,11 @@
    diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl index eb03c87875..ff85013754 100644 --- a/templates/de/html/admin/admin_member_selection_box.tpl +++ b/templates/de/html/admin/admin_member_selection_box.tpl @@ -2,19 +2,19 @@ -
    -
    +
    +
    {--ADMIN_SELECTION_BOX_TITLE--}
    {--ADMIN_SELECT_USER--}: - + $content[form_selection]
    - diff --git a/templates/de/html/admin/admin_menu_failed.tpl b/templates/de/html/admin/admin_menu_failed.tpl index db9e1bec95..13f5bae1f1 100644 --- a/templates/de/html/admin/admin_menu_failed.tpl +++ b/templates/de/html/admin/admin_menu_failed.tpl @@ -1,8 +1,8 @@ -
    -
    +
    +
    {--ADMIN_MENU_PROBLEM_TITLE--}:
    -
    +
    $content
    diff --git a/templates/de/html/admin/admin_menu_hints_row.tpl b/templates/de/html/admin/admin_menu_hints_row.tpl index 0cee1ebc1c..c6c2cf504a 100644 --- a/templates/de/html/admin/admin_menu_hints_row.tpl +++ b/templates/de/html/admin/admin_menu_hints_row.tpl @@ -1,7 +1,7 @@ -
    +
    $content[title]:
    -
    +
    $content[text]
    diff --git a/templates/de/html/admin/admin_menu_overview_row.tpl b/templates/de/html/admin/admin_menu_overview_row.tpl index 68e89c22fa..3ccb779e45 100644 --- a/templates/de/html/admin/admin_menu_overview_row.tpl +++ b/templates/de/html/admin/admin_menu_overview_row.tpl @@ -1,6 +1,6 @@
    - + {%pipe,fixEmptyContentToDashes=$content[action]%} diff --git a/templates/de/html/admin/admin_mini_online.tpl b/templates/de/html/admin/admin_mini_online.tpl index dcbdbcf455..2fe701ba81 100644 --- a/templates/de/html/admin/admin_mini_online.tpl +++ b/templates/de/html/admin/admin_mini_online.tpl @@ -1,8 +1,8 @@
    - +
    - diff --git a/templates/de/html/admin/admin_mods_edit.tpl b/templates/de/html/admin/admin_mods_edit.tpl index 9e1b02140d..5ded225a4a 100644 --- a/templates/de/html/admin/admin_mods_edit.tpl +++ b/templates/de/html/admin/admin_mods_edit.tpl @@ -1,5 +1,5 @@ -
    + {--USER_NOW_ONLINE--}
    +
    @@ -11,9 +11,9 @@ $content -
    {--ADMIN_MODS_NAME--}
    diff --git a/templates/de/html/admin/admin_mods_edit_row.tpl b/templates/de/html/admin/admin_mods_edit_row.tpl index 425ed1e97c..4a81d102c4 100644 --- a/templates/de/html/admin/admin_mods_edit_row.tpl +++ b/templates/de/html/admin/admin_mods_edit_row.tpl @@ -3,7 +3,7 @@  $content[mod]
    - + $content[locked] diff --git a/templates/de/html/admin/admin_mods_stats.tpl b/templates/de/html/admin/admin_mods_stats.tpl index 188edb1f2b..bb5a210d75 100644 --- a/templates/de/html/admin/admin_mods_stats.tpl +++ b/templates/de/html/admin/admin_mods_stats.tpl @@ -1,11 +1,11 @@ + class="table dashed"> - - + + $content - +
    {--ADMIN_MODS_TITLE--}{--ADMIN_MODS_CLICKS--}{--ADMIN_MODS_TITLE--}{--ADMIN_MODS_CLICKS--}
    diff --git a/templates/de/html/admin/admin_mods_stats2.tpl b/templates/de/html/admin/admin_mods_stats2.tpl index 396118ecbb..fadb0d881c 100644 --- a/templates/de/html/admin/admin_mods_stats2.tpl +++ b/templates/de/html/admin/admin_mods_stats2.tpl @@ -1,12 +1,12 @@
    - +
    - - + + $content - diff --git a/templates/de/html/admin/admin_mods_stats_row.tpl b/templates/de/html/admin/admin_mods_stats_row.tpl index 0c1ba4ba09..3a55187f94 100644 --- a/templates/de/html/admin/admin_mods_stats_row.tpl +++ b/templates/de/html/admin/admin_mods_stats_row.tpl @@ -1,6 +1,6 @@
    {--ADMIN_MODS_WHAT_ACTION--}{--ADMIN_MODS_CLICKS--}{--ADMIN_MODS_WHAT_ACTION--}{--ADMIN_MODS_CLICKS--}
    - {%pipe,fixEmptyContentToDashes=$content[title]%} ($content[module]) + {%pipe,fixEmptyContentToDashes=$content[title]%} ($content[module]) $content[clicks] diff --git a/templates/de/html/admin/admin_network_added.tpl b/templates/de/html/admin/admin_network_added.tpl index b8ae153a12..b3e62792c0 100644 --- a/templates/de/html/admin/admin_network_added.tpl +++ b/templates/de/html/admin/admin_network_added.tpl @@ -1,10 +1,10 @@
    -
    -
    +
    +
    {--ADMIN_NETWORK_ADDED_TITLE--}
    -
    +
    Das Werbenetzwerk $content[network_title] wurde soeben hinzugefügt. Sie sollten nun als nächstes die Werbearten hinzufügen.
    diff --git a/templates/de/html/admin/admin_network_api_translation_added.tpl b/templates/de/html/admin/admin_network_api_translation_added.tpl index 9db451caaf..b79f81d2e1 100644 --- a/templates/de/html/admin/admin_network_api_translation_added.tpl +++ b/templates/de/html/admin/admin_network_api_translation_added.tpl @@ -1,10 +1,10 @@
    -
    -
    +
    +
    {--ADMIN_NETWORK_API_TRANSLATION_ADDED_TITLE--}
    -
    +
    Die Array-Element-Übersetzung $content[network_api_index] wurde soeben hinzugefügt. Sie sollten nun als nächstes die Fehlercodes hinzufügen.
    diff --git a/templates/de/html/admin/admin_network_request_param_added.tpl b/templates/de/html/admin/admin_network_request_param_added.tpl index abd814f191..aa56d9da7b 100644 --- a/templates/de/html/admin/admin_network_request_param_added.tpl +++ b/templates/de/html/admin/admin_network_request_param_added.tpl @@ -1,10 +1,10 @@
    -
    -
    +
    +
    {--ADMIN_NETWORK_REQUEST_PARAM_ADDED_TITLE--}
    -
    +
    Der API-Abfrageparameter $content[request_param_key]/$content[request_param_value] wurde soeben hinzugefügt. Sie sollten nun als nächstes die API-Arrayelemente hinzufügen. diff --git a/templates/de/html/admin/admin_network_type_added.tpl b/templates/de/html/admin/admin_network_type_added.tpl index 9a31a6b9a5..dfc2249d7f 100644 --- a/templates/de/html/admin/admin_network_type_added.tpl +++ b/templates/de/html/admin/admin_network_type_added.tpl @@ -1,10 +1,10 @@
    -
    -
    +
    +
    {--ADMIN_NETWORK_TYPES_ADDED_TITLE--}
    -
    +
    Der Werbeart-Handler $content[network_type_handle] wurde soeben hinzugefügt. Sie sollten nun als nächstes die Abfrageparameter hinzufügen.
    diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index 5c585f5d77..4ad1a83694 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -19,13 +19,13 @@
    + {--ADMIN_NL_TITLE--}
    {--ENTER_NL_SUBJECT--}: - +
    {--NL_MODE_TEXT--} - +
    {--NL_MODE_HTML--} - +
    @@ -38,11 +38,11 @@
    {--YES--} - + {--NO--} - +
    @@ -51,19 +51,19 @@
    {--ENTER_NL_TEXT--}: - +
    -
    +
    {--ADMIN_NEWSLETTER_NOTE--}
    diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index dcb3a2ed1a..2675a7a770 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -1,15 +1,15 @@
    - +
    - @@ -19,11 +19,11 @@
    + {--ADMIN_NL_TITLE--}
    {--ENTER_NL_SUBJECT--}: - +
    {--YES--} - + {--NO--} - +
    @@ -32,20 +32,20 @@ {--ENTER_NL_TEXT--}: - + - - - - + + + +
    -
    +
    {--ADMIN_NEWSLETTER_NOTE--}
    diff --git a/templates/de/html/admin/admin_next_link.tpl b/templates/de/html/admin/admin_next_link.tpl index 58521af6c7..2f88f2052b 100644 --- a/templates/de/html/admin/admin_next_link.tpl +++ b/templates/de/html/admin/admin_next_link.tpl @@ -1,5 +1,5 @@
    -
    +
    diff --git a/templates/de/html/admin/admin_optimize.tpl b/templates/de/html/admin/admin_optimize.tpl index 082091c7cc..b05fdc7bd8 100644 --- a/templates/de/html/admin/admin_optimize.tpl +++ b/templates/de/html/admin/admin_optimize.tpl @@ -1,5 +1,5 @@
    - +
    @@ -10,7 +10,7 @@ $content[rows] -
    {--ADMIN_OPTIMIZE_DBNAME--}:
    -
    +
    Auflösung der Zahlen in Klammern:
    1. Tabellen mit dem Typ "InnoDB" brauchen nicht optimiert diff --git a/templates/de/html/admin/admin_overview_list.tpl b/templates/de/html/admin/admin_overview_list.tpl index 55d9c33cc1..3b981579df 100644 --- a/templates/de/html/admin/admin_overview_list.tpl +++ b/templates/de/html/admin/admin_overview_list.tpl @@ -1,4 +1,4 @@ - +
      $content - diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl index 543ddae0be..caa2805281 100644 --- a/templates/de/html/admin/admin_overview_list_ext_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl @@ -1,6 +1,6 @@ - - - - - - diff --git a/templates/de/html/admin/admin_unlock_sponsor.tpl b/templates/de/html/admin/admin_unlock_sponsor.tpl index accc963d8f..425a677dab 100644 --- a/templates/de/html/admin/admin_unlock_sponsor.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor.tpl @@ -1,8 +1,8 @@
      -
      {--ADMIN_SELECTED_TASKS_ASSIGN--}: @@ -6,7 +6,7 @@
      - + {%pipe,generateAdminLink=$content[assigned_admin]%} diff --git a/templates/de/html/admin/admin_overview_list_rows.tpl b/templates/de/html/admin/admin_overview_list_rows.tpl index ebfdd204a3..21697ba33b 100644 --- a/templates/de/html/admin/admin_overview_list_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_rows.tpl @@ -1,6 +1,6 @@
      - + {%pipe,generateAdminLink=$content[assigned_admin]%} diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index 8e84b2b932..23ba7adbc8 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -1,6 +1,6 @@
      - +
      $content -
      {--ADMIN_TASK_SYSTEM_WELCOME--} @@ -17,12 +17,12 @@
      diff --git a/templates/de/html/admin/admin_overview_task.tpl b/templates/de/html/admin/admin_overview_task.tpl index 2f17b803b4..65f9f25676 100644 --- a/templates/de/html/admin/admin_overview_task.tpl +++ b/templates/de/html/admin/admin_overview_task.tpl @@ -1,5 +1,5 @@
      - +
      - + - + - + - +
      {--ADMIN_TASK_OVERVIEW_HEADER--} @@ -71,27 +71,27 @@
      {--ADMIN_TASK_CLOSED_TASKS--}:{--ADMIN_TASK_YOUR_TASKS--}: - $content[closed_tasks] + $content[your_tasks]
      {--ADMIN_TASK_YOUR_TASKS--}:{--ADMIN_TASK_SOLVED_TASKS--}: - $content[your_tasks] + $content[solved_tasks]
      {--ADMIN_TASK_DELETED_TASKS--}:{--ADMIN_TASK_CLOSED_TASKS--}: - $content[deleted_tasks] + $content[closed_tasks]
      {--ADMIN_TASK_SOLVED_TASKS--}:{--ADMIN_TASK_DELETED_TASKS--}: - $content[solved_tasks] + $content[deleted_tasks]
      diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl index 1ada73d8a2..6355e3330f 100644 --- a/templates/de/html/admin/admin_payout_accept_form.tpl +++ b/templates/de/html/admin/admin_payout_accept_form.tpl @@ -1,7 +1,7 @@ -
      +
      -
      +
      {--ADMIN_PAYOUT_ACCEPT_PAYOUT_INTRO--}
      @@ -12,12 +12,12 @@
      {--ADMIN_PAYOUT_OPTIONAL_TEXT--}:
      - +
      - diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl index cbc2ef395a..777cd1d792 100644 --- a/templates/de/html/admin/admin_payout_add_new.tpl +++ b/templates/de/html/admin/admin_payout_add_new.tpl @@ -1,80 +1,80 @@
      - +
      - - -
      + {--ADMIN_PAYOUT_ADD_NEW_TITLE--}: -
      ({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
      +
      ({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
      {--ADMIN_PAYOUT_TITLE--}: - +
      {--ADMIN_PAYOUT_RATE--} - - ({--ADMIN_PAYOUT_VALUE_NOTE--}) + + ({--ADMIN_PAYOUT_VALUE_NOTE--})
      {--ADMIN_PAYOUT_MIN_POINTS--}: - - ({--ADMIN_PAYOUT_VALUE_NOTE--}) + + ({--ADMIN_PAYOUT_VALUE_NOTE--})
      {--ADMIN_PAYOUT_ALLOW_URLS--}: -
      + {--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:
      {--ADMIN_PAYOUT_YOUR_ACCOUNT--}: - +
      {--ADMIN_PAYOUT_YOUR_PASSWORD--}: - +
      {--ADMIN_PAYOUT_YOUR_URL--}: - +
      {--ADMIN_PAYOUT_YOUR_RET_DONE--}: - +
      {--ADMIN_PAYOUT_YOUR_RET_FAILED--}: - +
      {--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}: - @@ -82,15 +82,15 @@
      -
      +
      {--ADMIN_PAYOUT_YOUR_URL_NOTE--}
      diff --git a/templates/de/html/admin/admin_payout_failed_transfer.tpl b/templates/de/html/admin/admin_payout_failed_transfer.tpl index aae8a8a49d..1d57cd3c75 100644 --- a/templates/de/html/admin/admin_payout_failed_transfer.tpl +++ b/templates/de/html/admin/admin_payout_failed_transfer.tpl @@ -1,6 +1,6 @@ - +
      - diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl index 2ad78ccd7d..473a1d05c5 100644 --- a/templates/de/html/admin/admin_payout_overview_form.tpl +++ b/templates/de/html/admin/admin_payout_overview_form.tpl @@ -1,7 +1,7 @@ - +
      - + diff --git a/templates/de/html/admin/admin_payout_reject_form.tpl b/templates/de/html/admin/admin_payout_reject_form.tpl index 42f20937c4..f34ef9872d 100644 --- a/templates/de/html/admin/admin_payout_reject_form.tpl +++ b/templates/de/html/admin/admin_payout_reject_form.tpl @@ -1,8 +1,8 @@
      -
      + {--ADMIN_PAYOUT_TRANSFER_FAILED--}:
      +
      - @@ -13,13 +13,13 @@ -
      + {--ADMIN_PAYOUT_REJECT_PAYOUT_INTRO--}
      {--ADMIN_PAYOUT_OPTIONAL_TEXT--}:
      - +
      diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index ecc5adce39..ac9e2b78e2 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -1,36 +1,36 @@
      - +
      - $content[login_message] $content[pass1_message] $content[pass2_message] -
      + {--CREATE_FIRST_ADMIN_ACCOUNT--}
      {--ADMIN_ACCOUNT_FIRST_CREATION_LOGIN--}: - +
      {--ADMIN_ACCOUNT_FIRST_CREATION_PASS1--}: - +
      {--ADMIN_ACCOUNT_FIRST_CREATION_PASS2--}: - +
      diff --git a/templates/de/html/admin/admin_repair_lang.tpl b/templates/de/html/admin/admin_repair_lang.tpl index 0bd4d88edf..ac9d3f1705 100644 --- a/templates/de/html/admin/admin_repair_lang.tpl +++ b/templates/de/html/admin/admin_repair_lang.tpl @@ -1,12 +1,12 @@
      -
      -
      +
      +
      {--ADMIN_REPAIR_LANGUAGE_TITLE--}
      $content[rows]
      -
      - + diff --git a/templates/de/html/admin/admin_theme_import.tpl b/templates/de/html/admin/admin_theme_import.tpl index 93dca5e61d..5babe98489 100644 --- a/templates/de/html/admin/admin_theme_import.tpl +++ b/templates/de/html/admin/admin_theme_import.tpl @@ -1,5 +1,5 @@
      - +
      @@ -10,8 +10,8 @@ $content -
      {--THEME_UNIX--} {--THEME_NAME--}
      diff --git a/templates/de/html/admin/admin_theme_import_form.tpl b/templates/de/html/admin/admin_theme_import_form.tpl index 26e7d7b834..6d613d41c5 100644 --- a/templates/de/html/admin/admin_theme_import_form.tpl +++ b/templates/de/html/admin/admin_theme_import_form.tpl @@ -1,4 +1,4 @@
      - +
      diff --git a/templates/de/html/admin/admin_theme_installed.tpl b/templates/de/html/admin/admin_theme_installed.tpl index a28e202044..1b01cd7342 100644 --- a/templates/de/html/admin/admin_theme_installed.tpl +++ b/templates/de/html/admin/admin_theme_installed.tpl @@ -1,4 +1,4 @@ -
      +
      Alle $content ist/sind bereits installiert.
      diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl index 266dd2be83..00bf7b2b55 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -14,8 +14,8 @@ $content - diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index 228806e4b6..4b4d391467 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -1,8 +1,8 @@ -
      + {--ADMIN_SURFBAR_UNDELETE_URLS_TITLE--}
      +
      - @@ -17,15 +17,15 @@ $content[rows] - -
      -
      {--ADMIN_UNLOCK_EMAILS--}
      +
      + {--ADMIN_UNLOCK_EMAILS--}
      diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl index 1f54a5d4d8..ec8fcf785a 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl @@ -1,15 +1,15 @@ - +
      - $content -
      {--ADMIN_REJECTED_URLS--}
      +
      + {--ADMIN_REJECTED_URLS--}
      - - + + +
      diff --git a/templates/de/html/admin/admin_unlock_emails_row.tpl b/templates/de/html/admin/admin_unlock_emails_row.tpl index 2bf955045f..f97d080f8a 100644 --- a/templates/de/html/admin/admin_unlock_emails_row.tpl +++ b/templates/de/html/admin/admin_unlock_emails_row.tpl @@ -1,28 +1,28 @@
      - + + {%pipe,generateUserProfileLink=$content[sender]%} + $content[subject] {--ADMIN_TEST_URL--} - $content[cat_link] + + $content[cat_link] - $content[pay_link] + + $content[pay_link] + $content[timestamp] + {%pipe,translateComma=$content[target_send]%}
      +
      - @@ -14,15 +14,15 @@ $content -
      + {--ADMIN_SPONSOR_UNLOCK_TITLE--}
      -
      +
      {--ADMIN_SPONSOR_UNLOCK_NOTES--}
      diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl index 1bdad4a1a9..91e727b2ba 100644 --- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl @@ -1,6 +1,6 @@ - + {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index e21e87b4e9..795627465a 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -15,10 +15,10 @@ $content -
      + {--ADMIN_SURFBAR_UNLOCK_URLS_TITLE--}
      diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl index b3d7b757f8..caf0c61bfe 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl @@ -1,6 +1,6 @@ - + {%pipe,generateUserProfileLink=$content[url_userid]%} diff --git a/templates/de/html/admin/admin_update_download.tpl b/templates/de/html/admin/admin_update_download.tpl index 73b7ef9cfa..1533c887c3 100644 --- a/templates/de/html/admin/admin_update_download.tpl +++ b/templates/de/html/admin/admin_update_download.tpl @@ -1,7 +1,7 @@
      -
      +
      -
      +
      {--ADMIN_NEW_VERSION_AVAILABLE--}
      @@ -21,7 +21,7 @@
      -
      +
      {--ADMIN_DOWNLOAD_NEW_VERSION--}
      diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 43b32c969d..c8ee13497c 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -188,7 +188,7 @@ //--> - -
      - {--_UID--} $content[userid] + + {--_UID--} $content[userid]
      {--GUEST_ENTER_LOGIN--}: - + {--_OR--}
      {--GUEST_ENTER_EMAIL--}: - +
      diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl index b32915f947..d0267b8e09 100644 --- a/templates/de/html/guest/guest_nickname_login.tpl +++ b/templates/de/html/guest/guest_nickname_login.tpl @@ -9,11 +9,11 @@ {--GUEST_ENTER_LOGIN_NICKNAME--}: - + {--GUEST_ENTER_PASSWORD--}: - + $content[message] @@ -22,7 +22,7 @@ {--GUEST_SELECT_LIFETIME--}: - + + + @@ -60,20 +60,20 @@ {--GUEST_ENTER_LOGIN_NICKNAME--}: - + {--_OR--} {--GUEST_ENTER_EMAIL--}: - + - - - + + + diff --git a/templates/de/html/guest/guest_no_rallyes.tpl b/templates/de/html/guest/guest_no_rallyes.tpl index d88d0b6996..4fb4b299df 100644 --- a/templates/de/html/guest/guest_no_rallyes.tpl +++ b/templates/de/html/guest/guest_no_rallyes.tpl @@ -1,7 +1,7 @@
      - +
      - diff --git a/templates/de/html/guest/guest_rallye.tpl b/templates/de/html/guest/guest_rallye.tpl index 04665ea694..09548ab4b0 100644 --- a/templates/de/html/guest/guest_rallye.tpl +++ b/templates/de/html/guest/guest_rallye.tpl @@ -1,5 +1,5 @@
      -
      + Keine Referal-Rallyes aktiv!
      +
      @@ -7,12 +7,12 @@ $content[rows] - diff --git a/templates/de/html/guest/guest_rallye_show.tpl b/templates/de/html/guest/guest_rallye_show.tpl index 99468313ee..a71b6a3152 100644 --- a/templates/de/html/guest/guest_rallye_show.tpl +++ b/templates/de/html/guest/guest_rallye_show.tpl @@ -1,6 +1,6 @@ -
      {--_RALLYE_PRICE--} {--_UID--}
      +
      - @@ -14,7 +14,7 @@ - @@ -26,7 +26,7 @@ - @@ -38,7 +38,7 @@ - @@ -50,7 +50,7 @@ - - - @@ -91,7 +91,7 @@ - @@ -100,8 +100,8 @@ {--PASS_1--}, {--PASS_2--}: @@ -109,9 +109,9 @@ $content[refid_content] - @@ -119,14 +119,14 @@ {--AGREE_TO_THIS--}: -
      + Referal-Rallye gestartet!
      + ...:: $content[title] ::...
      + $content[can_win_this]:
      + Aktueller Stand der Rallye:
      +
      ...:: $content[extras] ::...
      diff --git a/templates/de/html/guest/guest_receive_table.tpl b/templates/de/html/guest/guest_receive_table.tpl index e161b57d4d..404739aca7 100644 --- a/templates/de/html/guest/guest_receive_table.tpl +++ b/templates/de/html/guest/guest_receive_table.tpl @@ -1,11 +1,11 @@
      - +
      diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index df03a11b46..c48fab3ad1 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -1,13 +1,13 @@
      -
      {--MAX_PER_DAY--}: - $content
      +
      - - @@ -19,7 +19,7 @@ {--GENDER--}$content[must_fillout_gender]: @@ -39,7 +39,7 @@ {--STREET_NR--}$content[must_fillout_street_nr]: @@ -49,8 +49,8 @@ @@ -58,7 +58,7 @@ {--EMAIL--}$content[must_fillout_email]:   @@ -71,19 +71,19 @@
      + $content[header_content]
      + {--REGISTER_PERSONAL_DATA--}:
      - - + +
      - +
      $content[country] - - + +
      - +
      -
      $content[must_fillout_marker] : {--GUEST_REGISTER_MUST_SET_NOTE--}
      +
      $content[must_fillout_marker] : {--GUEST_REGISTER_MUST_SET_NOTE--}
      + {--REGISTER_CATEGORIES--}:
      + {--GUEST_SELECT_LEAST_CATEGORIES--}
      $content[category_selection]
      + {--REGISTER_MISC--}:
      - - + +
      +
      {--TERMS_OF_USAGE--}:
      -
      {--YOU_FINALIZE--}
      +
      {--YOU_FINALIZE--}
      - {--YES--}
      - {--NO--} + {--YES--}
      + {--NO--}
      diff --git a/templates/de/html/guest/guest_register_refid.tpl b/templates/de/html/guest/guest_register_refid.tpl index da2bf81af8..15d3634bf7 100644 --- a/templates/de/html/guest/guest_register_refid.tpl +++ b/templates/de/html/guest/guest_register_refid.tpl @@ -3,6 +3,6 @@ {--REFID_BY--}: - + diff --git a/templates/de/html/guest/guest_sponsor_act_row.tpl b/templates/de/html/guest/guest_sponsor_act_row.tpl index f93df27dbe..7df5ca25b8 100644 --- a/templates/de/html/guest/guest_sponsor_act_row.tpl +++ b/templates/de/html/guest/guest_sponsor_act_row.tpl @@ -1,6 +1,6 @@ $content[conv_title]: - +
      1 {?POINTS?} = $content[conv_rate] $content[conv_name]
      diff --git a/templates/de/html/guest/guest_sponsor_activate.tpl b/templates/de/html/guest/guest_sponsor_activate.tpl index 2796510eab..1b693f9892 100644 --- a/templates/de/html/guest/guest_sponsor_activate.tpl +++ b/templates/de/html/guest/guest_sponsor_activate.tpl @@ -1,9 +1,9 @@
      - +
      - @@ -12,13 +12,13 @@ {--SPONSOR_ENTER_EMAIL--}: -
      + {--SPONSOR_SEND_ACTIVATION_LINK--}
      - +
      @@ -28,13 +28,13 @@
      -
      {--SPONSOR_HOWTO_GET_ACTIVATION_LINK--}
      +
      {--SPONSOR_HOWTO_GET_ACTIVATION_LINK--}
      - +
      »»{--SPONSOR_BACK_TO_LOGIN--} diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl index 95ef6a181a..4adfcde550 100644 --- a/templates/de/html/guest/guest_sponsor_infos.tpl +++ b/templates/de/html/guest/guest_sponsor_infos.tpl @@ -1,7 +1,7 @@
      - +
      - diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl index a12e2beb62..2da45f7a96 100644 --- a/templates/de/html/member/member_surfbar_start_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl @@ -1,5 +1,5 @@ -
      -
      +
      +
      Dynamisch vergütete Surfbar ist aktiv
      diff --git a/templates/de/html/member/member_surfbar_start_static.tpl b/templates/de/html/member/member_surfbar_start_static.tpl index cb84124c58..3bedea1733 100644 --- a/templates/de/html/member/member_surfbar_start_static.tpl +++ b/templates/de/html/member/member_surfbar_start_static.tpl @@ -1,5 +1,5 @@ -
      -
      +
      +
      Statisch vergütete Surfbar ist aktiv
      diff --git a/templates/de/html/member/member_themes.tpl b/templates/de/html/member/member_themes.tpl index 4e6b87dda0..ae65b53100 100644 --- a/templates/de/html/member/member_themes.tpl +++ b/templates/de/html/member/member_themes.tpl @@ -2,7 +2,7 @@ {--MEMBER_THEME_LIST_USAGE--}
      -
      +
      {--GUEST_SPONSOR_WANT_BECOME_HEADER--}
      @@ -16,10 +16,10 @@ {--GUEST_SPONSOR_PRICING_HEADER--}
      - +
      $content[paytypes] - @@ -29,15 +29,15 @@ $content[paytypes] - diff --git a/templates/de/html/member/member_order-zip1.tpl b/templates/de/html/member/member_order-zip1.tpl index 44966aafd7..a95729ea59 100644 --- a/templates/de/html/member/member_order-zip1.tpl +++ b/templates/de/html/member/member_order-zip1.tpl @@ -1,5 +1,5 @@ - @@ -27,6 +27,6 @@ diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl index 346ca1214e..bdac9fdb88 100644 --- a/templates/de/html/member/member_order-zip2.tpl +++ b/templates/de/html/member/member_order-zip2.tpl @@ -1,15 +1,15 @@ - diff --git a/templates/de/html/member/member_receive_table.tpl b/templates/de/html/member/member_receive_table.tpl index 82016fec90..83e7ee24b0 100644 --- a/templates/de/html/member/member_receive_table.tpl +++ b/templates/de/html/member/member_receive_table.tpl @@ -1,11 +1,11 @@
      -
      - +
      - $content[actions] - diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl index d7b6baadcb..88dab62b4b 100644 --- a/templates/de/html/guest/guest_sponsor_login.tpl +++ b/templates/de/html/guest/guest_sponsor_login.tpl @@ -1,9 +1,9 @@
      -
      + {--GUEST_SPONSOR_ACTIONS_HEADER--}
      +
      - @@ -12,7 +12,7 @@ {--SPONSOR_ENTER_ID--}: @@ -20,13 +20,13 @@ {--SPONSOR_ENTER_PASSWORD--}: -
      + {--SPONSOR_LOGIN_WELCOME--}
      - +
      - +
      @@ -36,7 +36,7 @@
      - +
      + {--INSTALLER_TEXT_PAGE_5--} +
      [{--SPONSOR_PASSWORD_LOST--}] diff --git a/templates/de/html/guest/guest_sponsor_lost.tpl b/templates/de/html/guest/guest_sponsor_lost.tpl index 4e8ff9f6ae..3a83de53a1 100644 --- a/templates/de/html/guest/guest_sponsor_lost.tpl +++ b/templates/de/html/guest/guest_sponsor_lost.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -11,7 +11,7 @@ {--SPONSOR_ENTER_ID--}: @@ -19,13 +19,13 @@ {--SPONSOR_ENTER_EMAIL--}: -
      + {--SPONSOR_SEND_LOST_PASSWORD--}
      - +
      - +
      @@ -33,11 +33,11 @@
      -
      {--SPONSOR_HOWTO_GET_LOST_PASSWORD--}
      +
      {--SPONSOR_HOWTO_GET_LOST_PASSWORD--}
      - +
      - - - diff --git a/templates/de/html/guest/guest_sponsor_payment.tpl b/templates/de/html/guest/guest_sponsor_payment.tpl index f8c65a1f3f..b5723bf3f9 100644 --- a/templates/de/html/guest/guest_sponsor_payment.tpl +++ b/templates/de/html/guest/guest_sponsor_payment.tpl @@ -1,8 +1,8 @@
      -
      »» {--SPONSOR_BACK_TO_LOGIN--}
      diff --git a/templates/de/html/guest/guest_sponsor_pay_row.tpl b/templates/de/html/guest/guest_sponsor_pay_row.tpl index 954c11e8c3..7e2d249e8f 100644 --- a/templates/de/html/guest/guest_sponsor_pay_row.tpl +++ b/templates/de/html/guest/guest_sponsor_pay_row.tpl @@ -1,17 +1,17 @@
      + $content[pay_name]:
      {--SPONSOR_PAYTYPE_COUNT--}: +
      {%pipe,translateComma=$content[pay_rate]%} {?POINTS?}
      {--SPONSOR_PAYTYPE_VALUE--}: +
      {%pipe,translateComma=$content[pay_min_count]%} $content[pay_currency]
      +
      $content - diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl index 0d01504540..c2fe03cf14 100644 --- a/templates/de/html/guest/guest_sponsor_payment_row.tpl +++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl @@ -1,6 +1,6 @@ - + diff --git a/templates/de/html/guest/guest_stats_table.tpl b/templates/de/html/guest/guest_stats_table.tpl index 8858bd7780..3a26780323 100644 --- a/templates/de/html/guest/guest_stats_table.tpl +++ b/templates/de/html/guest/guest_stats_table.tpl @@ -1,4 +1,4 @@ -
      - + $content[pay_name]
      ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?}) diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 046eb87cb9..dccdb2d347 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -12,15 +12,15 @@
      - +
      - @@ -28,7 +28,7 @@ {--SPONSOR_ENTER_COMPANY_TITLE--}: @@ -36,7 +36,7 @@ {--SPONSOR_ENTER_COMPANY_POSITION--}: @@ -44,11 +44,11 @@ {--SPONSOR_ENTER_TAX_IDENT--}: - @@ -57,7 +57,7 @@ {--GENDER--}: @@ -77,11 +77,11 @@ {--GUEST_FAMILY--}: - @@ -90,7 +90,7 @@ {--SPONSOR_ENTER_STREET_NR1--}: @@ -98,7 +98,7 @@ {--SPONSOR_ENTER_STREET_NR2--}: @@ -106,8 +106,8 @@ {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: @@ -115,7 +115,7 @@ {--SPONSOR_ENTER_PHONE--}: @@ -123,7 +123,7 @@ {--SPONSOR_ENTER_FAX--}: @@ -131,7 +131,7 @@ {--SPONSOR_ENTER_CELL--}: @@ -139,7 +139,7 @@ {--SPONSOR_ENTER_EMAIL--}: @@ -147,11 +147,11 @@ {--SPONSOR_ENTER_URL--}: - @@ -160,12 +160,12 @@ {--SPONSOR_ENTER_PASSWORDS--}: - @@ -178,7 +178,7 @@ - @@ -187,7 +187,7 @@ {--GUEST_SPONSOR_RECEIVE_WARNINGS--} - @@ -221,23 +221,23 @@ - -
      + {--SPONSOR_ENTER_COMPANY_DATA--}
      -
      {--SPONSOR_COMPANY_NOTE--}
      +
      {--SPONSOR_COMPANY_NOTE--}
      - +
      - +
      - +
      + {--SPONSOR_ENTER_PERSONA_DATA--}
      - @@ -69,7 +69,7 @@ {--GUEST_SURNAME--}: - +
      - +
      + {--SPONSOR_ENTER_CONTACT_DATA--}
      - +
      - +
      - - - + - +
      - +
      - +
      - +
      - +
      - +
      + {--SPONSOR_ENTER_PASSWORDS--}
      - - + +
      + {--SPONSOR_REFERAL--}
      + {--SPONSOR_WARNINGS--}
      - @@ -198,7 +198,7 @@ {--SPONSOR_WARNING_INTERVAL--}: - @@ -210,7 +210,7 @@
      + {--SPONSOR_PAYMENTS--}
      + {--SPONSOR_TERMS_HEADER--}
      - + {--SPONSOR_ACCEPT_TERMS--}
      diff --git a/templates/de/html/guest/guest_stats_header.tpl b/templates/de/html/guest/guest_stats_header.tpl index a0e135f016..9d4abb0273 100644 --- a/templates/de/html/guest/guest_stats_header.tpl +++ b/templates/de/html/guest/guest_stats_header.tpl @@ -1,3 +1,3 @@
      $content$content
      +
      diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl index 547b647b60..07e31b2789 100644 --- a/templates/de/html/guest/guest_top10.tpl +++ b/templates/de/html/guest/guest_top10.tpl @@ -1,8 +1,8 @@
      {--GUEST_TOPTEN_STATS--}
      + class="table dashed"> - @@ -25,8 +25,8 @@ $content[logins_out] -
      + TOP{?top10_max?} - Logins
      @@ -36,9 +36,9 @@
      + class="table dashed"> - @@ -58,8 +58,8 @@ $content[points_out] -
      + TOP{?top10_max?} - {?POINTS?}-Verdiener
      @@ -69,9 +69,9 @@
      + class="table dashed"> - @@ -94,8 +94,8 @@ $content[referals_out] -
      + TOP{?top10_max?} - Werber
      diff --git a/templates/de/html/index.tpl b/templates/de/html/index.tpl index 5bc2be083f..e9ca35f785 100644 --- a/templates/de/html/index.tpl +++ b/templates/de/html/index.tpl @@ -1,6 +1,6 @@
      - +
      - + - + - + - + - +
      diff --git a/templates/de/html/install/install_fatal_errors.tpl b/templates/de/html/install/install_fatal_errors.tpl index e631447f80..b6cb5a958a 100644 --- a/templates/de/html/install/install_fatal_errors.tpl +++ b/templates/de/html/install/install_fatal_errors.tpl @@ -1,26 +1,26 @@
      - + - + - +
      -
      {--INSTALLER_HEADER_MYSQL_ERRORS--}
      -
      +
      {--INSTALLER_HEADER_MYSQL_ERRORS--}
      +
      - {--INSTALLER_TEXT_MYSQL_ERRORS--} -
      + {--INSTALLER_TEXT_MYSQL_ERRORS--} +
      -
        -$content[fatal_errors] -
      -$content[mysql_hidden] - - - - -
      +
        + $content[fatal_errors] +
      + $content[mysql_hidden] + + + + +
      diff --git a/templates/de/html/install/install_fatal_row.tpl b/templates/de/html/install/install_fatal_row.tpl index b03ae84a9a..8558799748 100644 --- a/templates/de/html/install/install_fatal_row.tpl +++ b/templates/de/html/install/install_fatal_row.tpl @@ -1,4 +1,8 @@
      - {--INSTALLER_FATAL_NO--}$content[key]:
      - · $content[value] +
      + {--INSTALLER_FATAL_NO--}$content[key]: +
      +
      + · $content[value] +
      diff --git a/templates/de/html/install/install_fatal_table.tpl b/templates/de/html/install/install_fatal_table.tpl index fea8185b08..15d2ee3c76 100644 --- a/templates/de/html/install/install_fatal_table.tpl +++ b/templates/de/html/install/install_fatal_table.tpl @@ -1,5 +1,13 @@
      -
      -
      {--INSTALLER_PROBLEMS_DETECTED--}
      -$content
      +
      + +
      + {--INSTALLER_PROBLEMS_DETECTED--} +
      + +
      + $content +
      + +
      diff --git a/templates/de/html/install/install_finished.tpl b/templates/de/html/install/install_finished.tpl index 7fa542443e..68ace2d737 100644 --- a/templates/de/html/install/install_finished.tpl +++ b/templates/de/html/install/install_finished.tpl @@ -3,12 +3,12 @@ {--INSTALLER_FINISHED--} -
      +
      {--INSTALLER_FIN_SECU--}
      - +
      diff --git a/templates/de/html/install/install_main.tpl b/templates/de/html/install/install_main.tpl index 8a9ddf53b1..2b8e38531f 100644 --- a/templates/de/html/install/install_main.tpl +++ b/templates/de/html/install/install_main.tpl @@ -3,5 +3,5 @@
      -$content + $content
      diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index a47328d48b..51469b7c61 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -8,32 +8,32 @@
      - {--INSTALLER_TEXT_PAGE_1--} + {--INSTALLER_TEXT_PAGE_1--}
      {--INSTALLER_SERVER_PATH--}:
      {--INSTALLER_BASE_URL--} ({--BASE_URL_NOTE--}):
      {--INSTALLER_HP_TITLE--}:
      {--INSTALLER_HP_SLOGAN--}:
      {--INSTALLER_HP_EMAIL--}:
      - +
      diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index b5a09e0abf..3c54ae4843 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -1,6 +1,6 @@
      - +
      @@ -41,19 +41,19 @@ @@ -63,7 +63,7 @@ - +
      {--INSTALLER_HEADER_TEXT_PAGE2--}
      @@ -8,25 +8,25 @@
      - {--INSTALLER_TEXT_PAGE_2--} + {--INSTALLER_TEXT_PAGE_2--}
      {--INSTALLER_MYSQL_HOST--}: - +
      {--INSTALLER_MYSQL_DBASE--}: - +
      {--INSTALLER_MYSQL_PREFIX--}: - +
      {--INSTALLER_MYSQL_LOGIN--}: - +
      {--INSTALLER_MYSQL_PASS1--}: - +
      {--INSTALLER_MYSQL_PASS2--}: - +
      diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 6816022d02..bd6a4f229a 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -1,5 +1,5 @@ - +
      @@ -48,7 +48,7 @@ - +
      {--INSTALLER_HEADER_TEXT_PAGE3--}
      @@ -7,31 +7,31 @@
      - {--INSTALLER_TEXT_PAGE_3--} + {--INSTALLER_TEXT_PAGE_3--}
      {--INSTALLER_TEXT_SMTP_HOST--}: - +
      {--INSTALLER_TEXT_SMTP_USER--}: - +
      {--INSTALLER_TEXT_SMTP_PASS1--}: - +
      {--INSTALLER_TEXT_SMTP_PASS2--}: - +
      diff --git a/templates/de/html/install/install_page5.tpl b/templates/de/html/install/install_page5.tpl index 6a4edf0442..b1d79bd425 100644 --- a/templates/de/html/install/install_page5.tpl +++ b/templates/de/html/install/install_page5.tpl @@ -8,12 +8,13 @@
      - {--INSTALLER_TEXT_PAGE_5--}
      {--INSTALLER_OUTPUT_MODE--}: - @@ -22,7 +23,7 @@
      {--INSTALLER_WARN_NO_PASSWORD--}: - @@ -31,7 +32,7 @@
      {--INSTALLER_CONFIG_WRITE_FOOTER--}: - @@ -40,7 +41,7 @@
      {--INSTALLER_ENABLE_BACKLINK--}: - @@ -57,7 +58,7 @@ - +
      diff --git a/templates/de/html/install/install_welcome.tpl b/templates/de/html/install/install_welcome.tpl index 670fee91d2..d8ca575f5c 100644 --- a/templates/de/html/install/install_welcome.tpl +++ b/templates/de/html/install/install_welcome.tpl @@ -3,25 +3,25 @@ freien {?mt_word?}-Script!
      -
      +
      Dieses Script wird Ihnen dabei helfen, den {?mt_word?} zu installieren, die Datenbank einzurichten und den {?mt_word?} vorzukonfigurieren.
      -
      +
      Sie werden während der Installation Schritt-Für-Schritt durch die einzelnen Installationsschritte gebracht. Sie brauchen dazu weder Programmiererkenntnisse noch ein abgschlossenes Informatikstudium. Bitte halten Sie die MySQL-Daten von Ihrem Hoster bereit.
      -
      +
      Nach erfolgreicher Installation sollten Sie als nächstes das erste Administrator-Login einrichten. Anschliessend können Sie sich einloggen und weitere Einstellungen verfeinern.
      -
      +
      Das Entwickler-Team empfiehlt Ihnen, dann alle Installationsdateien von Ihrem Server zu löschen.
      @@ -29,6 +29,6 @@ diff --git a/templates/de/html/js/js_surfbar_member_book.tpl b/templates/de/html/js/js_surfbar_member_book.tpl index ee0f270cc7..7f742fc783 100644 --- a/templates/de/html/js/js_surfbar_member_book.tpl +++ b/templates/de/html/js/js_surfbar_member_book.tpl @@ -14,7 +14,7 @@ function FocusLimitedNo () { function FocusLimitedYes () { limit.disabled = false; - limit.setAttribute('class', 'member_normal'); + limit.setAttribute('class', 'form_field'); limit.style.textAlign = 'left'; if (old_limit > 0) { limit.value = old_limit; diff --git a/templates/de/html/js/js_surfbar_member_edit.tpl b/templates/de/html/js/js_surfbar_member_edit.tpl index 9785b04341..b8e754ee13 100644 --- a/templates/de/html/js/js_surfbar_member_edit.tpl +++ b/templates/de/html/js/js_surfbar_member_edit.tpl @@ -14,7 +14,7 @@ function FocusLimitedNo () { function FocusLimitedYes () { limit.disabled = false; - limit.setAttribute('class', 'member_normal'); + limit.setAttribute('class', 'form_field'); limit.style.textAlign = 'left'; if (old_limit > 0) { limit.value = old_limit; diff --git a/templates/de/html/js/js_surfbar_stopped.tpl b/templates/de/html/js/js_surfbar_stopped.tpl index 2ca1f60618..f8255405ea 100644 --- a/templates/de/html/js/js_surfbar_stopped.tpl +++ b/templates/de/html/js/js_surfbar_stopped.tpl @@ -8,7 +8,7 @@ function restart () { } function showButton () { - buttonDiv.innerHTML = "
      "; + buttonDiv.innerHTML = "
      "; } function counter () { diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl index 56da1d97bd..4e97b365ea 100644 --- a/templates/de/html/mailid/mailid_confirm_buttom.tpl +++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl @@ -1,15 +1,15 @@
      - +
      diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl index aa76a1a981..00c20895bf 100644 --- a/templates/de/html/mailid/mailid_enter_code.tpl +++ b/templates/de/html/mailid/mailid_enter_code.tpl @@ -1,5 +1,5 @@
      -
      {--MEMBER_MAILID_CLICK_BUTTON--}:
      - +
      -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl index b71349e52f..c44562bc4c 100644 --- a/templates/de/html/mailid/mailid_points_done.tpl +++ b/templates/de/html/mailid/mailid_points_done.tpl @@ -1,12 +1,12 @@
      -
      {--MEMBER_ENTER_CODE--}: $content[image]
      - - + +
      -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl index 824e2b999c..196e90bb68 100644 --- a/templates/de/html/mailid/mailid_points_done2.tpl +++ b/templates/de/html/mailid/mailid_points_done2.tpl @@ -1,5 +1,5 @@
      -
      {%message,MEMBER_THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}
      {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}
      -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl index 73d9461abc..a0900ed719 100644 --- a/templates/de/html/mailid/mailid_points_failed.tpl +++ b/templates/de/html/mailid/mailid_points_failed.tpl @@ -1,11 +1,11 @@
      -
      @@ -10,7 +10,7 @@
      -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl index 519448a7f0..14a839c2dc 100644 --- a/templates/de/html/mailid/mailid_points_locked.tpl +++ b/templates/de/html/mailid/mailid_points_locked.tpl @@ -1,11 +1,11 @@
      -
      {%message,POINTS_NOT_ADDED={%pipe,translateComma=$content[points]%}%} -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl index ed1fd8ef5d..689d42af81 100644 --- a/templates/de/html/mailid/mailid_points_locked2.tpl +++ b/templates/de/html/mailid/mailid_points_locked2.tpl @@ -1,5 +1,5 @@
      -
      {%message,MEMBER_THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%} -
      +
      +
      diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl index 4fad723ad9..26ea4de4f1 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -20,21 +20,21 @@ function startCounter() { } //--> -
      @@ -9,7 +9,7 @@
      -
      +
      +
      diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl index 46baf279c6..1d43b75a30 100644 --- a/templates/de/html/member/member_beg.tpl +++ b/templates/de/html/member/member_beg.tpl @@ -1,5 +1,5 @@
      -
      +
      {--MEMBER_BEG_YOUR_LINK--}:
      @@ -7,11 +7,11 @@ {?URL?}/beg.php?userid=$content[userid]
      -
      +
      {--MEMBER_BEG_CLICKS_TOTAL--}: {%user,beg_clicks,translateComma%}
      -
      +
      {--MEMBER_BEG_EARN_1--} {%config,translateComma=beg_points%} {?POINTS?} {--MEMBER_BEG_EARN_2--} {%config,translateComma=beg_points_max%} {?POINTS?} diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl index b31149f752..f3c21ca232 100644 --- a/templates/de/html/member/member_bonus.tpl +++ b/templates/de/html/member/member_bonus.tpl @@ -5,7 +5,7 @@
      -
      - +
      - {%message,MEMBER_TIME_COUNTER,%} + {%message,MEMBER_TIME_COUNTER,%}
      -
      +
      +
      @@ -15,15 +15,15 @@ $content[rows] - +
      {--MEMBER_BONUS_RALLYE_NOTE--}
      {--BONUS_RANK--}: {--_UID--}:
      - +
      - - diff --git a/templates/de/html/member/member_bonus_turbo_row.tpl b/templates/de/html/member/member_bonus_turbo_row.tpl index bab00e61f7..855c1c6f8a 100644 --- a/templates/de/html/member/member_bonus_turbo_row.tpl +++ b/templates/de/html/member/member_bonus_turbo_row.tpl @@ -1,5 +1,5 @@ - - - + + + diff --git a/templates/de/html/member/member_cat_row.tpl b/templates/de/html/member/member_cat_row.tpl index 1e7ca5ecea..23f16203f6 100644 --- a/templates/de/html/member/member_cat_row.tpl +++ b/templates/de/html/member/member_cat_row.tpl @@ -1,7 +1,7 @@ diff --git a/templates/de/html/member/member_cats_footer.tpl b/templates/de/html/member/member_cats_footer.tpl index ccdc228807..5d8c72d3ba 100644 --- a/templates/de/html/member/member_cats_footer.tpl +++ b/templates/de/html/member/member_cats_footer.tpl @@ -1,7 +1,7 @@ -
      +
      1. Es werden nur aktive und freigeschaltete Mitglieder berücksichtig.
      2. Der Login-Bonus wird bei der Auswertung nicht beachtet, aber dem Mitglied gutgeschrieben.
      3. @@ -42,7 +42,7 @@
      {%pipe,translateComma=$content[rank]%}.$content[userid]{%pipe,translateComma=$content[points]%}{%pipe,translateComma=$content[rank]%}.$content[userid]{%pipe,translateComma=$content[points]%}
      $content[cat] - {--YES--} - {--NO--} + {--YES--} + {--NO--}
      diff --git a/templates/de/html/member/member_cats_header.tpl b/templates/de/html/member/member_cats_header.tpl index ddb25fe923..a1a7036d32 100644 --- a/templates/de/html/member/member_cats_header.tpl +++ b/templates/de/html/member/member_cats_header.tpl @@ -1,6 +1,6 @@
      - +
      diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index 0e13cd3e79..2edfb852f7 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -21,11 +21,11 @@ $content[payout_ref] -
      -
      +
      +
      {--DOUBLER_GENERAL_INFOS--}:
      -
      +
      • {--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
      • Es wurden bereits {%config,translateComma=doubler_points%} {?POINTS?} ausgezahlt.
      • @@ -42,10 +42,10 @@
      • {--DOUBLER_HAVE_FUN--}
      -
      +
      {--DOUBLER_REGISTER_ADVERT--}:
      -
      +
      {--DOUBLER_YOUR_ADVERTISING_HERE--} {--DOUBLER_CONTACT_US--}
      diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl index 9dca7ecab6..45d6145759 100644 --- a/templates/de/html/member/member_doubler_list.tpl +++ b/templates/de/html/member/member_doubler_list.tpl @@ -15,7 +15,7 @@
      $content - diff --git a/templates/de/html/member/member_holiday_deactivate.tpl b/templates/de/html/member/member_holiday_deactivate.tpl index 5b7d9df053..1ab89edf57 100644 --- a/templates/de/html/member/member_holiday_deactivate.tpl +++ b/templates/de/html/member/member_holiday_deactivate.tpl @@ -1,8 +1,8 @@
      -
      {--CATEGORY_NAME--} {--SELECT_CAT--}
      +
      - @@ -20,13 +20,13 @@ -
      {--MEMBER_HOLIDAY_DEACTIVATE_TITLE--}
      -
      {--MEMBER_HOLIDAY_DEACTIVATE_NOTES--}
      +
      {--MEMBER_HOLIDAY_DEACTIVATE_NOTES--}
      diff --git a/templates/de/html/member/member_holiday_form.tpl b/templates/de/html/member/member_holiday_form.tpl index 759d00afab..7f2a01d193 100644 --- a/templates/de/html/member/member_holiday_form.tpl +++ b/templates/de/html/member/member_holiday_form.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -20,24 +20,24 @@ -
      + {--MEMBER_HOLIDAY_TITLE--}
      - {%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}%} + {%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}%}
      {--HOLIDAY_COMMENTS--}:
      - +
      - {--MEMBER_HOLIDAY_NOTES--} + {--MEMBER_HOLIDAY_NOTES--}
      diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index ec9f6cd4b6..8f33bb0c60 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -11,14 +11,14 @@ {--MEMBER_HTML_TEXT--} -
      + {--MEMBER_HTML_INTRO--}
      - {--YES--}
      - {--NO--} + {--YES--}
      + {--NO--}
      diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl index fe30668aae..fc63d01168 100644 --- a/templates/de/html/member/member_list_beg.tpl +++ b/templates/de/html/member/member_list_beg.tpl @@ -1,6 +1,6 @@
      {--MEMBER_BEG_HERE_IS_THE_LIST--}

      - +
      @@ -9,22 +9,22 @@ $content[rows] - +
      {--BEG_RALLYE_NOTE--}
      {--BEG_RANK--}: {--_UID--}:

      + class="table dashed"> - - diff --git a/templates/de/html/member/member_mail_bonus_deleted.tpl b/templates/de/html/member/member_mail_bonus_deleted.tpl index 2971de1ef2..304189033c 100644 --- a/templates/de/html/member/member_mail_bonus_deleted.tpl +++ b/templates/de/html/member/member_mail_bonus_deleted.tpl @@ -1,4 +1,4 @@ -
      {--BEG_RALLYE_CONDITIONS--}:
      1. {--BEG_RALLYE_CONDITION_1--}
      2. @@ -35,7 +35,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_bonus_new.tpl b/templates/de/html/member/member_mail_bonus_new.tpl index 14291d0ed6..73b24057a4 100644 --- a/templates/de/html/member/member_mail_bonus_new.tpl +++ b/templates/de/html/member/member_mail_bonus_new.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%} @@ -57,7 +57,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_bonus_queue.tpl b/templates/de/html/member/member_mail_bonus_queue.tpl index ffc99c582e..45105f0cdb 100644 --- a/templates/de/html/member/member_mail_bonus_queue.tpl +++ b/templates/de/html/member/member_mail_bonus_queue.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%} @@ -57,7 +57,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_bonus_send.tpl b/templates/de/html/member/member_mail_bonus_send.tpl index 1d717e5a0c..c230f69dc0 100644 --- a/templates/de/html/member/member_mail_bonus_send.tpl +++ b/templates/de/html/member/member_mail_bonus_send.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%} @@ -57,7 +57,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_active.tpl b/templates/de/html/member/member_mail_normal_active.tpl index d83d82be74..e9a1d76729 100644 --- a/templates/de/html/member/member_mail_normal_active.tpl +++ b/templates/de/html/member/member_mail_normal_active.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_BONUS_DETAILS_TITLE=$content[id]%} @@ -59,7 +59,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_admin.tpl b/templates/de/html/member/member_mail_normal_admin.tpl index bc9e5f6b6d..8f1dcb711a 100644 --- a/templates/de/html/member/member_mail_normal_admin.tpl +++ b/templates/de/html/member/member_mail_normal_admin.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -51,7 +51,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_deleted.tpl b/templates/de/html/member/member_mail_normal_deleted.tpl index c10affed6c..bb3ed41be9 100644 --- a/templates/de/html/member/member_mail_normal_deleted.tpl +++ b/templates/de/html/member/member_mail_normal_deleted.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -51,7 +51,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_new.tpl b/templates/de/html/member/member_mail_normal_new.tpl index c5a787294d..6615768709 100644 --- a/templates/de/html/member/member_mail_normal_new.tpl +++ b/templates/de/html/member/member_mail_normal_new.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -51,7 +51,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_send.tpl b/templates/de/html/member/member_mail_normal_send.tpl index 6b281a2fe0..4c07de5d69 100644 --- a/templates/de/html/member/member_mail_normal_send.tpl +++ b/templates/de/html/member/member_mail_normal_send.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -51,7 +51,7 @@
      +
      - diff --git a/templates/de/html/member/member_mail_normal_temp.tpl b/templates/de/html/member/member_mail_normal_temp.tpl index 9050f3b1e1..26e73c935e 100644 --- a/templates/de/html/member/member_mail_normal_temp.tpl +++ b/templates/de/html/member/member_mail_normal_temp.tpl @@ -1,4 +1,4 @@ -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -53,7 +53,7 @@
      +
      - diff --git a/templates/de/html/member/member_mydata_button.tpl b/templates/de/html/member/member_mydata_button.tpl index a75a960e06..1cec8dc17f 100644 --- a/templates/de/html/member/member_mydata_button.tpl +++ b/templates/de/html/member/member_mydata_button.tpl @@ -1,3 +1,3 @@ - + diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 01fbfe41bb..fa1c7db378 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -1,6 +1,6 @@
      -
      {%message,MEMBER_MAIL_NORMAL_DETAILS_TITLE=$content[id]%} @@ -51,7 +51,7 @@
      +
      @@ -52,25 +52,25 @@ -
      {--YOUR_LOGIN--}: {%pipe,getMemberId%} @@ -9,7 +9,7 @@
      {--GENDER--}: - @@ -19,28 +19,28 @@
      {--SURNAME--}, {--FAMILY--}: - - + +
      {--STREET_NR--}: - +
      {--COUNTRY--}, {--ZIP--}, {--CITY--}: {%user,country,determineCountry%} - - + +
      {--EMAIL--}: - +
      - {--MEMBER_MYDATA_NOTE--} + {--MEMBER_MYDATA_NOTE--}
      {--PASS_1--}: - +
      {--PASS_2--}: - +
      diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index e56b3cf5af..8211f1d8db 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -1,7 +1,7 @@
      - +
      - @@ -53,8 +53,8 @@ - - + +
      + $content[change]
      diff --git a/templates/de/html/member/member_newsletter.tpl b/templates/de/html/member/member_newsletter.tpl index b37f6dee10..79c7cb8d85 100644 --- a/templates/de/html/member/member_newsletter.tpl +++ b/templates/de/html/member/member_newsletter.tpl @@ -1,6 +1,6 @@
      - +
      @@ -16,13 +16,13 @@ -
      {--NL_MEMBER_TITLE--}:
      -
      $content[note]
      +
      $content[note]
      diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index 54f92d7419..bec815a4a5 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -16,7 +16,7 @@ {--MEMBER_NICKNAME_ENTER_NICKNAME--}: @@ -26,9 +26,9 @@ -
      + {--MEMBER_NICKNAME_CHANGE_NICKNAME_TITLE--}
      - +
      diff --git a/templates/de/html/member/member_order-back.tpl b/templates/de/html/member/member_order-back.tpl index 681b76e202..9cd07ff573 100644 --- a/templates/de/html/member/member_order-back.tpl +++ b/templates/de/html/member/member_order-back.tpl @@ -1,10 +1,10 @@
      -
      +
      {--MEMBER_THANX_ORDER--}
      - +
      diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl index 20f40ddb7f..aa945910d2 100644 --- a/templates/de/html/member/member_order-html_intro.tpl +++ b/templates/de/html/member/member_order-html_intro.tpl @@ -1,15 +1,15 @@
      + {--MEMBER_HTML_ORDER_INTRO--}
      {--MEMBER_HTML_MSG--}: - + {--MEMBER_NORMAL_MSG--}: - +
      + {--MEMBER_ORDER_PAGE1_INTRO--}
      {--MEMBER_ENTER_ZIP_CODE--}: - +
      + {--MEMBER_ORDER_PAGE2_INTRO--}
      - +
      {--MEMBER_ENTER_ZIP_CODE--} - +
      diff --git a/templates/de/html/member/member_order_back.tpl b/templates/de/html/member/member_order_back.tpl index 45cf3eab3c..d720f4a9c9 100644 --- a/templates/de/html/member/member_order_back.tpl +++ b/templates/de/html/member/member_order_back.tpl @@ -3,6 +3,6 @@ - + diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl index 3ecb1864f3..bfd76d3d17 100644 --- a/templates/de/html/member/member_order_page1.tpl +++ b/templates/de/html/member/member_order_page1.tpl @@ -1,12 +1,12 @@
      - +
      $content[zip_content] $content[html_extension] -
      diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index fdbf2e28c6..aa817a9d9c 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -1,17 +1,17 @@
      - +
      $content[zip_content] - - @@ -20,24 +20,24 @@ - + - + $content[html_extension] - + - - - - + -
      {--SELECT_MAIL_TYPE--}:
      {--SELECT_CATEGORY--}: {--ENTER_RECEIVER--}: Minimum: {?order_min?}
      {--ENTER_SUBJECT--}:
      {--ENTER_TEXT--}:
      + {--MEMBER_PLEASE_NOTE--}
      +
      1. Bitte prüfen Sie unbedingt vor dem Absenden die Verfügbarkeit und Framekiller-Freiheit ihrer beworbenen Adresse!
      2. @@ -51,15 +51,15 @@
      diff --git a/templates/de/html/member/member_order_points.tpl b/templates/de/html/member/member_order_points.tpl index 8972f35e10..01b50220f1 100644 --- a/templates/de/html/member/member_order_points.tpl +++ b/templates/de/html/member/member_order_points.tpl @@ -1,6 +1,6 @@
      -
      +
      {--MEMBER_POINTS_LEFT--}: $content[total] {?POINTS?} diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl index a33c205404..effb4183d7 100644 --- a/templates/de/html/member/member_order_send.tpl +++ b/templates/de/html/member/member_order_send.tpl @@ -4,7 +4,7 @@ {--MEMBER_ORDER_PLEASE_WAIT_1--}10{--MEMBER_ORDER_PLEASE_WAIT_2--}
      - +
      diff --git a/templates/de/html/member/member_payout.tpl b/templates/de/html/member/member_payout.tpl index da2f8cc857..1511f0e005 100644 --- a/templates/de/html/member/member_payout.tpl +++ b/templates/de/html/member/member_payout.tpl @@ -1,6 +1,6 @@ - +
      - @@ -13,7 +13,7 @@ $content - diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl index 8af20888f7..0b49b84afb 100644 --- a/templates/de/html/member/member_payout_form.tpl +++ b/templates/de/html/member/member_payout_form.tpl @@ -1,7 +1,7 @@ -
      + {--MEMBER_PAYOUT_LIST_TITLE--}:
      +
      - @@ -16,37 +16,37 @@ -
      + {--MEMBER_PAYOUT_NOW_TITLE--}
      {--MEMBER_PAYOUT_REQUESTED_AMOUNT--}: - +
      {--MEMBER_PAYOUT_TARGET_ACCOUNT--}: - +
      {--MEMBER_PAYOUT_TARGET_BANK--}: - +
      {--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}: - +
      -
      +
      {--MEMBER_PAYOUT_MEMBER_NOTE--}
      diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl index af20d93995..e06685f07f 100644 --- a/templates/de/html/member/member_payout_form_banner.tpl +++ b/templates/de/html/member/member_payout_form_banner.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -17,37 +17,37 @@ -
      + {--MEMBER_PAYOUT_NOW_TITLE--}
      {--MEMBER_PAYOUT_REQUESTED_AMOUNT--}: - +
      {--PAYOUT_TARGET_URL--}: - +
      {--PAYOUT_LINK_TEXT--}: - +
      {--PAYOUT_OPTIONAL_BANNER--}: - (*) + (*)
      -
      (*): {--PAYOUT_BANNER_NOTE--}
      +
      (*): {--PAYOUT_BANNER_NOTE--}
      diff --git a/templates/de/html/member/member_payout_list.tpl b/templates/de/html/member/member_payout_list.tpl index 733bf9c6b0..0b6cd56791 100644 --- a/templates/de/html/member/member_payout_list.tpl +++ b/templates/de/html/member/member_payout_list.tpl @@ -1,5 +1,5 @@
      -
      +
      {--MEMBER_PAYOUT_NOW--}:
        diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index d435034821..321f8a4477 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -1,5 +1,5 @@
        - +
        diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl index 35ed22891b..0a042ab257 100644 --- a/templates/de/html/member/member_points_bonus_rows.tpl +++ b/templates/de/html/member/member_points_bonus_rows.tpl @@ -5,7 +5,7 @@ diff --git a/templates/de/html/member/member_points_upgrade.tpl b/templates/de/html/member/member_points_upgrade.tpl index f217502047..9601adf3eb 100644 --- a/templates/de/html/member/member_points_upgrade.tpl +++ b/templates/de/html/member/member_points_upgrade.tpl @@ -1,5 +1,5 @@ diff --git a/templates/de/html/member/member_pool_table.tpl b/templates/de/html/member/member_pool_table.tpl index 75bc7e634b..6042dd2f52 100644 --- a/templates/de/html/member/member_pool_table.tpl +++ b/templates/de/html/member/member_pool_table.tpl @@ -1,8 +1,8 @@
        -
        {--REFERAL_LEVEL--} {?POINTS?}
        -
        {--MEMBER_BONUS_LOGIN_TURBO_NOTE--}
        +
        {--MEMBER_BONUS_LOGIN_TURBO_NOTE--}
        - {--BONUS_EXTENSION_UPGRADE--} + {--BONUS_EXTENSION_UPGRADE--}
        +
        $content diff --git a/templates/de/html/member/member_primera_mode_list.tpl b/templates/de/html/member/member_primera_mode_list.tpl index fd2a5ddcb6..84eaf863e1 100644 --- a/templates/de/html/member/member_primera_mode_list.tpl +++ b/templates/de/html/member/member_primera_mode_list.tpl @@ -1,6 +1,6 @@ -
        -
        {--MEMBER_POOL_CONTENT--}
        +
        {--MEMBER_POOL_CONTENT--}
        +
        - @@ -12,7 +12,7 @@ $content[rows] - diff --git a/templates/de/html/member/member_primera_mode_pay.tpl b/templates/de/html/member/member_primera_mode_pay.tpl index 1bda8e58a4..e60b02ea2c 100644 --- a/templates/de/html/member/member_primera_mode_pay.tpl +++ b/templates/de/html/member/member_primera_mode_pay.tpl @@ -1,8 +1,8 @@
        -
        + {--MEMBER_PRIMERA_LIST_PRIMERA--}
        +
        - @@ -27,15 +27,15 @@ -
        + {--MEMBER_PRIMERA_PAYOUT_TITLE--}
        -
        +
        {--MEMBER_PRIMERA_PAYOUT_NOTE--}
        diff --git a/templates/de/html/member/member_profile_outdated.tpl b/templates/de/html/member/member_profile_outdated.tpl index 55b9e0060f..e23eb522a3 100644 --- a/templates/de/html/member/member_profile_outdated.tpl +++ b/templates/de/html/member/member_profile_outdated.tpl @@ -27,12 +27,12 @@
      - +
      - +
      +
      diff --git a/templates/de/html/member/member_ref_list.tpl b/templates/de/html/member/member_ref_list.tpl index c63a9ad669..b17b537301 100644 --- a/templates/de/html/member/member_ref_list.tpl +++ b/templates/de/html/member/member_ref_list.tpl @@ -1,4 +1,4 @@ -
      {--MAX_PER_DAY--}:   - $content
      +
      diff --git a/templates/de/html/member/member_refback_list_row_deleted.tpl b/templates/de/html/member/member_refback_list_row_deleted.tpl index 2066f3cfff..b6c724862a 100644 --- a/templates/de/html/member/member_refback_list_row_deleted.tpl +++ b/templates/de/html/member/member_refback_list_row_deleted.tpl @@ -16,7 +16,7 @@ diff --git a/templates/de/html/member/member_reflink_no_nickname.tpl b/templates/de/html/member/member_reflink_no_nickname.tpl index 5338c549f6..c13473b33e 100644 --- a/templates/de/html/member/member_reflink_no_nickname.tpl +++ b/templates/de/html/member/member_reflink_no_nickname.tpl @@ -1,4 +1,4 @@ -
      +
      {--MEMBER_NO_NICKNAME_SET--} {--MEMBER_PLEASE_CLICK_NICKNAME_FORM--}
      diff --git a/templates/de/html/member/member_reflinks_table.tpl b/templates/de/html/member/member_reflinks_table.tpl index 00652d8f57..69f1e70ae9 100644 --- a/templates/de/html/member/member_reflinks_table.tpl +++ b/templates/de/html/member/member_reflinks_table.tpl @@ -1,8 +1,8 @@
      -
      {--MEMBER_REFLIST_TITLE--} diff --git a/templates/de/html/member/member_ref_list_level.tpl b/templates/de/html/member/member_ref_list_level.tpl index 8c1b3d797c..11d4c67d29 100644 --- a/templates/de/html/member/member_ref_list_level.tpl +++ b/templates/de/html/member/member_ref_list_level.tpl @@ -1,6 +1,6 @@
      - +
      $content[rows] -
      {--MEMBER_REFLIST_LIST_TITLE_1--}$content[level]{--MEMBER_REFLIST_LIST_TITLE_2--}$content[percents]{--MEMBER_REFLIST_LIST_TITLE_3--} @@ -28,8 +28,8 @@
      diff --git a/templates/de/html/member/member_refback_edit.tpl b/templates/de/html/member/member_refback_edit.tpl index 1d6959067d..1c7ca48776 100644 --- a/templates/de/html/member/member_refback_edit.tpl +++ b/templates/de/html/member/member_refback_edit.tpl @@ -1,23 +1,23 @@
      -
      +
      {--MEMBER_REFBACK_EDIT_TITLE--}
      - {--MEMBER_REFBACK_REFID--}: $content[refid] + {--MEMBER_REFBACK_REFID--}: $content[refid]
      {--MEMBER_REFBACK_PERCENTS--}: - % + %
      -
      -
      +
      {--MEMBER_REFBACK_MIN_MAX_NOTE--}
      diff --git a/templates/de/html/member/member_refback_list.tpl b/templates/de/html/member/member_refback_list.tpl index 02ae307a4f..c76109b3e8 100644 --- a/templates/de/html/member/member_refback_list.tpl +++ b/templates/de/html/member/member_refback_list.tpl @@ -1,10 +1,10 @@ -
      +
      {--MEMBER_REFBACK_TITLE--}
      $content
      -
      {--MEMBER_REFBACK_NOTE--}
      -
      {--MEMBER_REFBACK_EXAMPLE--}
      +
      {--MEMBER_REFBACK_NOTE--}
      +
      {--MEMBER_REFBACK_EXAMPLE--}
      diff --git a/templates/de/html/member/member_refback_list_level.tpl b/templates/de/html/member/member_refback_list_level.tpl index e4f04530c4..cd7abfd7cb 100644 --- a/templates/de/html/member/member_refback_list_level.tpl +++ b/templates/de/html/member/member_refback_list_level.tpl @@ -1,5 +1,5 @@
      - +
      $content[rows] -
      {--MEMBER_REFBACK_LIST_TITLE_1--}$content[level]{--MEMBER_REFBACK_LIST_TITLE_2--}{%pipe,translateComma=$content[percents]%}{--MEMBER_REFBACK_LIST_TITLE_3--} @@ -27,8 +27,8 @@
      diff --git a/templates/de/html/member/member_refback_list_row.tpl b/templates/de/html/member/member_refback_list_row.tpl index e3bb26d99e..ac650fccce 100644 --- a/templates/de/html/member/member_refback_list_row.tpl +++ b/templates/de/html/member/member_refback_list_row.tpl @@ -17,7 +17,7 @@
      - +
      -
      +
      $content - diff --git a/templates/de/html/member/member_stats_table.tpl b/templates/de/html/member/member_stats_table.tpl index 94f3f0c100..864b67b260 100644 --- a/templates/de/html/member/member_stats_table.tpl +++ b/templates/de/html/member/member_stats_table.tpl @@ -1,7 +1,7 @@ -
      +
      $content diff --git a/templates/de/html/member/member_support_contcted.tpl b/templates/de/html/member/member_support_contcted.tpl index fa345caa14..13124aa09e 100644 --- a/templates/de/html/member/member_support_contcted.tpl +++ b/templates/de/html/member/member_support_contcted.tpl @@ -1,5 +1,5 @@ -
      -
      +
      +
      Vielen Dank, dass Sie uns kontaktiert haben!
      diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl index 9194b7544f..3ede863853 100644 --- a/templates/de/html/member/member_support_form.tpl +++ b/templates/de/html/member/member_support_form.tpl @@ -1,6 +1,6 @@
      -
      +
      Sie haben eine Frage an unseren Support? @@ -15,7 +15,7 @@
      Ich habe eine Frage zu folgendem:
      - @@ -25,8 +25,8 @@
      Ich möchte es genauer beschreiben:
      -
      -
      (Bitte halten Sie den Text kurz +
      +
      (Bitte halten Sie den Text kurz und knapp, damit Ihre
      Support-Anfrage schnell beantwortet werden kann!)
      @@ -38,9 +38,9 @@
      - diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl index 8e94c98910..a3d28c04c6 100644 --- a/templates/de/html/member/member_surfbar_book_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl @@ -1,11 +1,11 @@ -
      -
      +
      +
      URL in Surfbar buchen - Dynamisch:
      - URL eingeben: + URL eingeben:
      @@ -15,7 +15,7 @@
      - Aufrufe begrenzen auf: + Aufrufe begrenzen auf:
      @@ -35,9 +35,9 @@
      -
      - - +
      + +
      @@ -45,7 +45,7 @@ type="text/javascript"> - + Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach verschiedenen Faktoren. Schauen Sie unter Surfbar starten diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl index a3ff48073c..21d6983d84 100644 --- a/templates/de/html/member/member_surfbar_book_static.tpl +++ b/templates/de/html/member/member_surfbar_book_static.tpl @@ -1,6 +1,6 @@
      -
      -
      +
      +
      URL in Surfbar buchen - Statisch:
      @@ -15,7 +15,7 @@
      - Aufrufe begrenzen auf: + Aufrufe begrenzen auf:
      @@ -28,9 +28,9 @@ $content[max_order] erlaubten URLs gebucht.
      -
      - - +
      + +
      diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl index 939f608c71..0e20597259 100644 --- a/templates/de/html/member/member_surfbar_delete_action_form.tpl +++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl @@ -1,6 +1,6 @@ -
      -
      +
      +
      URL in Surfbar löschen:
      @@ -20,17 +20,17 @@ Aufrufe begrenzt auf: {%pipe,translateComma=$content[url_views_max]%} (0=Unbegrenzt)
      -
      - +
      + - +
      -
      +
      Hinweis: Irtümlich gelöschte URLs können nur durch unsere Administratoren wiederhergestellt werden.
      diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index c05251e184..37382bef1c 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -1,12 +1,12 @@
      -
      -
      +
      +
      URL in Surfbar editieren:
      - URL eingeben: + URL eingeben:
      @@ -16,15 +16,15 @@
      - Aufrufe begrenzen auf: + Aufrufe begrenzen auf:
      -
      - +
      + - +
      diff --git a/templates/de/html/member/member_surfbar_link.tpl b/templates/de/html/member/member_surfbar_link.tpl index 0da2183867..bf3dc2eb32 100644 --- a/templates/de/html/member/member_surfbar_link.tpl +++ b/templates/de/html/member/member_surfbar_link.tpl @@ -1,3 +1,3 @@ -
      + diff --git a/templates/de/html/member/member_surfbar_list.tpl b/templates/de/html/member/member_surfbar_list.tpl index d47662edb3..646e780539 100644 --- a/templates/de/html/member/member_surfbar_list.tpl +++ b/templates/de/html/member/member_surfbar_list.tpl @@ -1,4 +1,4 @@ -
      -
      {--MEMBER_STATS_CONTENT--}
      +
      {--MEMBER_STATS_CONTENT--}
      +
      $content -
      {--MEMBER_SURFBAR_LIST_TITLE--} @@ -26,8 +26,8 @@
      diff --git a/templates/de/html/member/member_surfbar_list_form.tpl b/templates/de/html/member/member_surfbar_list_form.tpl index d95cf40b2e..2cbde22a43 100644 --- a/templates/de/html/member/member_surfbar_list_form.tpl +++ b/templates/de/html/member/member_surfbar_list_form.tpl @@ -2,6 +2,6 @@ - +
      +
      @@ -12,15 +12,15 @@ $content -
      {--THEME_UNIX--} {--THEME_NAME--}
      -
      +
      {--MEMBER_THEME_LIST_NOTE--}
      diff --git a/templates/de/html/member/member_themes_row.tpl b/templates/de/html/member/member_themes_row.tpl index f9bb0af252..146c883ada 100644 --- a/templates/de/html/member/member_themes_row.tpl +++ b/templates/de/html/member/member_themes_row.tpl @@ -1,6 +1,6 @@
      - + $content[theme_name] diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl index a7e091ab0d..d8c78c442d 100644 --- a/templates/de/html/member/member_transfer_list.tpl +++ b/templates/de/html/member/member_transfer_list.tpl @@ -1,7 +1,7 @@
      - +
      - @@ -24,10 +24,10 @@ $content[rows] - - diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 835ac0f977..f64f6c2fe4 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -1,6 +1,6 @@
      -
      + $content[title]
      +
      @@ -30,7 +30,7 @@ {--TRANSFER_POINTS_REASON--}: @@ -46,13 +46,13 @@ {--TRANSFER_ENTER_PASSWORD--}: -
      {--TRANSFER_SELECT_TARGET_UID--}: @@ -22,7 +22,7 @@ {--TRANSFER_POINTS_AMOUNT--}: - {?POINTS?} + {?POINTS?}
      - +
      - +
      diff --git a/templates/de/html/member/member_transfer_overview.tpl b/templates/de/html/member/member_transfer_overview.tpl index 40a6109d42..c3874e5166 100644 --- a/templates/de/html/member/member_transfer_overview.tpl +++ b/templates/de/html/member/member_transfer_overview.tpl @@ -1,5 +1,5 @@
      - +
      diff --git a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl index 1984a82637..c665906ac1 100644 --- a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl @@ -1,5 +1,5 @@ diff --git a/templates/de/html/member/member_unconfirmed_table.tpl b/templates/de/html/member/member_unconfirmed_table.tpl index 4ff1367da5..63bd7e0e65 100644 --- a/templates/de/html/member/member_unconfirmed_table.tpl +++ b/templates/de/html/member/member_unconfirmed_table.tpl @@ -1,4 +1,4 @@ -
      {--TRANSFER_LIST_INCOMING--}:
      diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl index a209a9d8a9..15cce82397 100644 --- a/templates/de/html/member/member_transfer_settings.tpl +++ b/templates/de/html/member/member_transfer_settings.tpl @@ -1,18 +1,18 @@ - +
      -
      {--TRANSFER_ALLOW_OPT_IN--} - {--YES--}
      - {--NO--} + {--YES--}
      + {--NO--}
      diff --git a/templates/de/html/member/member_unconfirmed_404.tpl b/templates/de/html/member/member_unconfirmed_404.tpl index ad57317118..b53aba1485 100644 --- a/templates/de/html/member/member_unconfirmed_404.tpl +++ b/templates/de/html/member/member_unconfirmed_404.tpl @@ -1,5 +1,5 @@
      - $content[probl]: $content[data] + $content[probl]: $content[data]
      - $content[probl]: $content[data] + $content[probl]: $content[data]
      +
      @@ -8,10 +8,10 @@ $content[rows] - - diff --git a/templates/de/html/member/member_unconfirmed_table_nopoints.tpl b/templates/de/html/member/member_unconfirmed_table_nopoints.tpl index 4450297e53..10c0fbca38 100644 --- a/templates/de/html/member/member_unconfirmed_table_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_table_nopoints.tpl @@ -1,4 +1,4 @@ -
      {--CONFIRM_LINK2--}: {--EMAIL_SENDER--}:
      +
      @@ -7,7 +7,7 @@ $content[rows] - diff --git a/templates/de/html/member/member_wernis_mode_choose.tpl b/templates/de/html/member/member_wernis_mode_choose.tpl index 7b8d2ad4b6..fb08a87c99 100644 --- a/templates/de/html/member/member_wernis_mode_choose.tpl +++ b/templates/de/html/member/member_wernis_mode_choose.tpl @@ -1,7 +1,7 @@
      -
      {--CONFIRM_LINK2--}: {--EMAIL_SENDER--}:
      +
      - diff --git a/templates/de/html/member/member_wernis_mode_list.tpl b/templates/de/html/member/member_wernis_mode_list.tpl index 469ced9804..8577578323 100644 --- a/templates/de/html/member/member_wernis_mode_list.tpl +++ b/templates/de/html/member/member_wernis_mode_list.tpl @@ -1,6 +1,6 @@ -
      + {--MEMBER_WERNIS_MODE_CHOOSE--}
      +
      - @@ -12,7 +12,7 @@ $content[rows] - diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index 32904d6ed3..044c2402ab 100644 --- a/templates/de/html/member/member_wernis_mode_payout.tpl +++ b/templates/de/html/member/member_wernis_mode_payout.tpl @@ -1,8 +1,8 @@
      -
      + {--MEMBER_WERNIS_LIST_WERNIS--}
      +
      - @@ -27,19 +27,19 @@ -
      + {--MEMBER_WERNIS_PAYOUT_TITLE--}
      - {--MEMBER_WERNIS_PAYOUT_NOTE--} + {--MEMBER_WERNIS_PAYOUT_NOTE--}
      -
      +
      Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit {%config,translateComma=wernis_payout_factor%}:1. Das auszahlungsfähige {?POINTS?}-Guthaben ist entweder um eine prozentuale Gebühr von {%config,translateComma=wernis_payout_fee_percent%}% diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index 009a66fa31..d045af57ad 100644 --- a/templates/de/html/member/member_wernis_mode_withdraw.tpl +++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl @@ -1,8 +1,8 @@
      - +
      - @@ -27,15 +27,15 @@ -
      + {--MEMBER_WERNIS_WITHDRAW_TITLE--}
      -
      - {--MEMBER_WERNIS_WITHDRAW_NOTE--} +
      + {--MEMBER_WERNIS_WITHDRAW_NOTE--}
      diff --git a/templates/de/html/message.tpl b/templates/de/html/message.tpl index 18aa0fd1de..a72f269ac7 100644 --- a/templates/de/html/message.tpl +++ b/templates/de/html/message.tpl @@ -1,11 +1,11 @@
      -
      -
      +
      +
      {--MESSAGE_HEADER--}
      -
      +
      $content
      diff --git a/templates/de/html/removeip_level.tpl b/templates/de/html/removeip_level.tpl index 1960812895..8c5ac429de 100644 --- a/templates/de/html/removeip_level.tpl +++ b/templates/de/html/removeip_level.tpl @@ -1,5 +1,5 @@ -
      -
      +
      +
      Anonymitätslevel in diesem {?mt_word?}:
      diff --git a/templates/de/html/runtime_fatal_table.tpl b/templates/de/html/runtime_fatal_table.tpl index 8962f796c2..677f8f83c2 100644 --- a/templates/de/html/runtime_fatal_table.tpl +++ b/templates/de/html/runtime_fatal_table.tpl @@ -1,5 +1,13 @@
      -
      -
      {--RUNTIME_PROBLEMS_DETECTED--}
      -$content
      +
      + +
      + {--RUNTIME_PROBLEMS_DETECTED--} +
      + +
      + $content +
      + +
      diff --git a/templates/de/html/select/select_network_box.tpl b/templates/de/html/select/select_network_box.tpl index 2f67a1a5a3..21e802b089 100644 --- a/templates/de/html/select/select_network_box.tpl +++ b/templates/de/html/select/select_network_box.tpl @@ -2,8 +2,8 @@
      -
      -
      +
      +
      {--ADMIN_NETWORK_SELECT_TITLE--}
      @@ -11,8 +11,8 @@ $content[selection_box]
      - diff --git a/templates/de/html/select/select_network_type_box.tpl b/templates/de/html/select/select_network_type_box.tpl index 4a975983cc..69ce42bdad 100644 --- a/templates/de/html/select/select_network_type_box.tpl +++ b/templates/de/html/select/select_network_type_box.tpl @@ -3,8 +3,8 @@ -
      -
      +
      +
      {--ADMIN_NETWORK_TYPE_SELECT_TITLE--}
      @@ -20,8 +20,8 @@ $content[selection_box]
      - diff --git a/templates/de/html/select/select_network_type_title_box.tpl b/templates/de/html/select/select_network_type_title_box.tpl index 67d84a3fd2..85cfb87330 100644 --- a/templates/de/html/select/select_network_type_title_box.tpl +++ b/templates/de/html/select/select_network_type_title_box.tpl @@ -2,8 +2,8 @@
      -
      -
      +
      +
      {--ADMIN_NETWORK_TYPE_SELECT_TITLE--}
      @@ -13,8 +13,8 @@ $content[selection_box]
      - diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl index 2e325ca260..f9d9cee972 100644 --- a/templates/de/html/show_bonus_msg.tpl +++ b/templates/de/html/show_bonus_msg.tpl @@ -4,7 +4,7 @@
      {%message,MEMBER_BONUS_SHOW_TITLE=$content[mailid]%}:
      - +
      @@ -12,7 +12,7 @@ $content[rows] - @@ -22,7 +22,7 @@ $content[rankings] -
      +
      Wir wünschen allen Gewinnern viel Glück bei der monatlichen Aktiv-Rallye!
      diff --git a/templates/de/html/show_bonus_yr.tpl b/templates/de/html/show_bonus_yr.tpl index b067908c82..491f223741 100644 --- a/templates/de/html/show_bonus_yr.tpl +++ b/templates/de/html/show_bonus_yr.tpl @@ -1,4 +1,4 @@ -
      {--BONUS_RANK--}: {--_UID--}:
      +
      @@ -19,7 +19,7 @@ {--SPONSOR_ENTER_COMPANY_POSITION--}: @@ -27,7 +27,7 @@ {--SPONSOR_ENTER_TAX_IDENT--}: @@ -40,7 +40,7 @@ {--GENDER--}: @@ -60,7 +60,7 @@ {--GUEST_FAMILY--}: @@ -73,7 +73,7 @@ {--SPONSOR_ENTER_STREET_NR1--}: @@ -81,7 +81,7 @@ {--SPONSOR_ENTER_STREET_NR2--}: @@ -89,8 +89,8 @@ {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: @@ -98,7 +98,7 @@ {--SPONSOR_ENTER_PHONE--}: @@ -106,7 +106,7 @@ {--SPONSOR_ENTER_FAX--}: @@ -114,7 +114,7 @@ {--SPONSOR_ENTER_CELL--}: @@ -122,7 +122,7 @@ {--SPONSOR_ENTER_EMAIL--}: @@ -130,7 +130,7 @@ {--SPONSOR_ENTER_URL--}: @@ -143,7 +143,7 @@ {--SPONSOR_ENTER_PASSWORD--}: @@ -156,19 +156,19 @@ {--SPONSOR_ENTER_PASSWORDS--}:
      {--MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED--} diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl index 70086d026b..9c0a2732f7 100644 --- a/templates/de/html/sponsor/sponsor_account_form.tpl +++ b/templates/de/html/sponsor/sponsor_account_form.tpl @@ -11,7 +11,7 @@ {--SPONSOR_ENTER_COMPANY_TITLE--}: - +
      - +
      - +
      - @@ -52,7 +52,7 @@ {--GUEST_SURNAME--}: - +
      - +
      - +
      - +
      - - - + - +
      - +
      - +
      - +
      - +
      - +
      - +
      - - + +
      -
      {--SPONSOR_PASSWORD_NOTE--}
      +
      {--SPONSOR_PASSWORD_NOTE--}
      diff --git a/templates/de/html/sponsor/sponsor_fillup_form.tpl b/templates/de/html/sponsor/sponsor_fillup_form.tpl index f1025e4892..f2f1637f3d 100644 --- a/templates/de/html/sponsor/sponsor_fillup_form.tpl +++ b/templates/de/html/sponsor/sponsor_fillup_form.tpl @@ -32,8 +32,8 @@
      diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index 32d0a9949e..60247d2c21 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -11,8 +11,8 @@ {--GUEST_SPONSOR_RECEIVE_WARNINGS--} - {--YES--} - {--NO--} + {--YES--} + {--NO--} @@ -20,7 +20,7 @@ {--SPONSOR_WARNING_INTERVAL--} - @@ -36,13 +36,13 @@ {--SPONSOR_ENTER_PASSWORD--}: - + - - + + diff --git a/templates/de/html/surfbar/surfbar_frame_start.tpl b/templates/de/html/surfbar/surfbar_frame_start.tpl index d3a7126747..2134ec4829 100644 --- a/templates/de/html/surfbar/surfbar_frame_start.tpl +++ b/templates/de/html/surfbar/surfbar_frame_start.tpl @@ -1,6 +1,6 @@
      -
      -
      +
      +
      {?POINTS?}-Surfbar von {?MAIN_TITLE?}
      @@ -12,8 +12,8 @@
      -
      -
      +
      +
      Tipp von uns:
      diff --git a/templates/de/html/surfbar/surfbar_login_form.tpl b/templates/de/html/surfbar/surfbar_login_form.tpl index dc2ce879f3..2dff1ec3b8 100644 --- a/templates/de/html/surfbar/surfbar_login_form.tpl +++ b/templates/de/html/surfbar/surfbar_login_form.tpl @@ -9,17 +9,17 @@ {--GUEST_ENTER_LOGIN--}: - + {--GUEST_ENTER_PASSWORD--}: - + - - - + + + diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl index 199a1443d6..0604da88e8 100644 --- a/templates/de/html/surfbar/surfbar_stopped.tpl +++ b/templates/de/html/surfbar/surfbar_stopped.tpl @@ -1,6 +1,6 @@
      -
      -
      +
      +
      Surfbar angehalten!
      diff --git a/templates/de/html/theme/theme_select_form.tpl b/templates/de/html/theme/theme_select_form.tpl index 691b7bfae4..c06cd063b7 100644 --- a/templates/de/html/theme/theme_select_form.tpl +++ b/templates/de/html/theme/theme_select_form.tpl @@ -1,7 +1,7 @@
      - $content[selection]
      - +
      diff --git a/theme/business/css/active.css b/theme/business/css/active.css deleted file mode 100644 index 0d6facc245..0000000000 --- a/theme/business/css/active.css +++ /dev/null @@ -1,9 +0,0 @@ -.active_row1, .active_row2, .active_row3 { - text-align: center; - padding-left: 5px; - padding-right: 5px; -} - -.active_row2 { - text-align: left; -} diff --git a/theme/business/css/beg.css b/theme/business/css/beg.css index 807629b63b..6d959d4528 100644 --- a/theme/business/css/beg.css +++ b/theme/business/css/beg.css @@ -1,9 +1,3 @@ .beg_table { background-color: #FFFFFF; } - -.beg_msg { - background-color: #EEEEFF; - padding-left: 10px; - padding-right: 10px; -} diff --git a/theme/business/css/bonus.css b/theme/business/css/bonus.css deleted file mode 100644 index 269913ecbd..0000000000 --- a/theme/business/css/bonus.css +++ /dev/null @@ -1,13 +0,0 @@ -.bonus_rank_1 { - font-weight: bold; - font-size: 22px; -} - -.bonus_rank_2 { - font-weight: bold; - font-size: 18px; -} - -.bonus_rank_3 { - font-weight: bold; -} diff --git a/theme/business/css/doubler.css b/theme/business/css/doubler.css index 2efc253e73..f7d00145ba 100644 --- a/theme/business/css/doubler.css +++ b/theme/business/css/doubler.css @@ -1,27 +1,5 @@ -.doubler_table { - -} - -.doubler_main { - -} - -.doubler_error { - font-weight: bold; - color: #AA0000; -} - -.doubler_big_row { - height: 70px; -} - .doubler_header { text-align: center; height: 24px; background-color: #EEEEFF; } - -.doubler_footer { - height: 24px; - background-color: #EEEEFF; -} diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 89d502112c..b3c51e357d 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -39,7 +39,7 @@ A:hover { background-color: transparent; } -input,textarea,select,option { +input, textarea, select, option { color: #000000; background-color: #ffffff; border: 1px solid #000000; @@ -51,34 +51,27 @@ ul,ol { margin-bottom: 0px; } -.admin_reset, .guest_reset, .member_reset { +.form_reset { border: groove 1px #000000; color: #000000; cursor: pointer; } -.admin_submit, .guest_submit, .member_submit { +.form_submit { color: #000000; border-color: #000000; cursor: pointer; } -.admin_submit_reject { +.form_delete { border: 1px groove #000000; color: #000000; cursor: pointer; } -.runtime_fatal, .runtime_fatalcontent { +.runtime_fatalcontent { color: #000000; background-color: #ffffff; -} - -.runtime_fatal { - color: #000000; -} - -.runtime_fatalcontent { text-align: left; font-size: 12px; } @@ -88,64 +81,37 @@ ul,ol { background-color: #ffffff; } -.admin_note { +.notice { color: #000000; font-size: 12px; } -DIV.admin_note { - padding-top: 10px; - padding-right: 10px; - padding-left: 10px; -} - -.admin_fatal { - color: #000000; - font-size: 18px; -} - -.admin_edit, .member_confirm { +.form_submit { background-color: #ffffff; } -.member_banner { +.banner { background-color: #ffffff; width: 488px; } -.admin_error { +.fatal_error { background-color: #ffffff; - color: #000000; + color: #aa0000; font-size: 10px; } -.admin_select, .guest_select, .member_select { +.form_select { border: solid 1px #000000; background-color: #eeeeff; } -.admin_register, .admin_desc_header, .admin_done, .admin_title, .admin_message { +.description_header, .table_header, .message { background-color: #eeeeff; color: #000000; text-align: center; } -.member_done, .guest_done, .admin_misc, .member_misc, .admin_done2, .admin_green, .admin_no { - color: #000000; -} - -.member_misc { - background-color: #ffffff; -} - -.admin_welcome { - background-color: #eeeeff; - color: #000000; - vertical-align: middle; - font-size: 18px; - height: 50px; -} - .admin_menu { background-color: #eeeeff; color: #000000; @@ -153,49 +119,42 @@ DIV.admin_note { height: 25px; } -.admin_logout { +.logout_box { background-color: #ddddff; color: #000000; } -a.admin_logout { +a.logout_box { display: block; } -.admin_logout:hover { +.logout_box:hover { background-color: #bbbbdd; color: #222222; } -.admin_desc_cont { +.description_text { text-align: left; background-color: #ffffff; } -.admin_table, .member_table { +.table { background-color: #ffffff; width: 660px; margin: 5px; } -.admin_warning_table { +.warning_table { background-color: #ff8888; width: 660px; margin: 5px; } -.admin_editmenu { +.form_submitmenu { min-width: 500px; max-width: 90%; } -.admin_form_header { - text-align: center; - height: 36px; - background-color: #eeeeff; - color: #000000; -} - .member_header { text-align: center; color: #000000; @@ -204,25 +163,13 @@ a.admin_logout { height: 60px; } -.admin_failed, .guest_failed, .member_failed, .member_note { - color: #000000; -} - -.member_note_bg { - background-color: #ffffff; -} - .member_data { background-color: #ffffff; color: #000000; height: 20px; } -.admin_snote { - font-size: 12px; -} - -.admin_normal, .guest_normal, .member_normal { +.form_field { border: solid 1px #000000; background-color: #eeeeff; } @@ -239,20 +186,6 @@ a.admin_logout { vertical-align: middle; } -.member_stats { - vertical-align: top; - font-weight: bold; - height: 23px; - font-size: 16px; - border-style: none; - border: 0px; - background: #ffffff; - color: #000000; - margin-top: -4px; - margin-bottom: 1px; - cursor: default; -} - .normal { border-style: groove; } @@ -261,7 +194,7 @@ a.admin_logout { background-color: #ffffff; } -.guest_title, .member_title { +.table_header { text-align: center; color: #000000; vertical-align: middle; @@ -316,7 +249,7 @@ a.admin_logout { margin-top: 10px; } -.guest_footer { +.table_footer { height: 30px; background-color: #eeeeff; } @@ -361,11 +294,11 @@ ul.copyright_box { border: solid 1px #000000; } -.switch_sw1, .switch_mem1 { +.switch_sw1 { background-color: #ffffff; } -.switch_sw2, .switch_mem2 { +.switch_sw2 { background-color: #ffffff; } @@ -412,16 +345,16 @@ ul.copyright_box { font-size: 1px; } -.admin_footer, .member_refbanner, .member_update, .admin_del_link { +.table_footer, .member_refbanner, .member_update, .admin_del_link { background-color: #eeeeff; } -.member_footer { +.table_footer { height: 30px; background-color: #eeeeff; } -.admin_footer { +.table_footer { text-align: center; height: 30px; padding-left: 5px; @@ -444,7 +377,7 @@ ul.copyright_box { text-align: center } -.admin_delete, .admin_yes { +.form_delete, .form_delete { border: groove 1px #000000; background-color: #000000; color: #ffffff; @@ -508,7 +441,7 @@ ul.copyright_box { vertical-align: top; } -.list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub { +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { text-align: left; width: 100%; } @@ -558,10 +491,6 @@ ul.copyright_box { white-space: nowrap; } -.guest_table { - background-color: #ffffff; -} - .main { height: 99%; vertical-align: top; @@ -613,17 +542,6 @@ ul.copyright_box { width: 100%; } -.agb_box { - text-align: left; -} - -.agb_title, .fatal_title { - font-size: 16px; - text-align: center; - height: 40px; - font-weight: bold; -} - .para { text-indent: 8px; text-align: left; @@ -632,13 +550,7 @@ ul.copyright_box { margin-bottom: 12px; } -.fatal_box { - text-align: center; - width: 100%; - margin-top: 10px; -} - -.admin_message { +.message { padding-bottom: 15px; } @@ -719,3 +631,16 @@ strong.menu_invisible, strong.sub_menu_invisible { .menu_locked, .sub_menu_locked { color: #ffeeee; } +.rank_1 { + font-weight: bold; + font-size: 22px; +} + +.rank_2 { + font-weight: bold; + font-size: 18px; +} + +.rank_3 { + font-weight: bold; +} diff --git a/theme/business/css/install.css b/theme/business/css/install.css index 0381cb9406..6d5ecf411c 100644 --- a/theme/business/css/install.css +++ b/theme/business/css/install.css @@ -1,25 +1,3 @@ -.install_fatal { - text-align: left; - color: #000000; -} - -.install_select { - border: groove 1px #000000; - background-color: #EEEEFF; -} - -.install_normal { - border: groove 1px #000000; -} - -.install_submit { - border-style: groove; -} - -.install { - -} - .install_main { color: #000000; background-color: #FFFFFF; @@ -37,11 +15,6 @@ padding-bottom: 5px; } -.install_fatal { - background-color: #FFFFFF; - color: #000000; -} - .install_fatalcontent { text-align: left; background-color: #FFFFFF; @@ -52,24 +25,8 @@ color: #000000; } -.install_security, .install_welcome, .install_text { - color: #000000; -} - -.install_text { - padding-bottom: 10px; - text-align: left; - margin-left: 20px; - margin-right: 20px; -} - -.install_security { - width: 350px; - padding-top: 10px; - padding-bottom: 10px; -} - .install_welcome { + color: #000000; padding-top: 5px; padding-bottom: 10px; } diff --git a/theme/business/css/mailid.css b/theme/business/css/mailid.css index 2cb32f8345..d421cfc1c8 100644 --- a/theme/business/css/mailid.css +++ b/theme/business/css/mailid.css @@ -1,4 +1,4 @@ -.member_mailidtop { +.mailid_table { background-color: #ffffff; width: 100%; height: 100%; diff --git a/theme/default/css/active.css b/theme/default/css/active.css deleted file mode 100644 index 0d6facc245..0000000000 --- a/theme/default/css/active.css +++ /dev/null @@ -1,9 +0,0 @@ -.active_row1, .active_row2, .active_row3 { - text-align: center; - padding-left: 5px; - padding-right: 5px; -} - -.active_row2 { - text-align: left; -} diff --git a/theme/default/css/beg.css b/theme/default/css/beg.css index c63f55b6ed..d654a003fb 100644 --- a/theme/default/css/beg.css +++ b/theme/default/css/beg.css @@ -1,9 +1,3 @@ .beg_table { background-color: #ddeedd } - -.beg_msg { - background-color: #e5f6e5; - padding-left: 10px; - padding-right: 10px; -} diff --git a/theme/default/css/bonus.css b/theme/default/css/bonus.css deleted file mode 100644 index 269913ecbd..0000000000 --- a/theme/default/css/bonus.css +++ /dev/null @@ -1,13 +0,0 @@ -.bonus_rank_1 { - font-weight: bold; - font-size: 22px; -} - -.bonus_rank_2 { - font-weight: bold; - font-size: 18px; -} - -.bonus_rank_3 { - font-weight: bold; -} diff --git a/theme/default/css/doubler.css b/theme/default/css/doubler.css index 1ff505e1a6..2a0d88def7 100644 --- a/theme/default/css/doubler.css +++ b/theme/default/css/doubler.css @@ -1,27 +1,5 @@ -.doubler_table { - -} - -.doubler_main { - -} - -.doubler_error { - font-weight: bold; - color: #AA0000; -} - -.doubler_big_row { - height: 70px; -} - .doubler_header { background-color: #ddeedd; text-align: center; height: 24px; } - -.doubler_footer { - height: 24px; - background-color: #ddeedd; -} diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 4fe26ebf77..e4a5b8ba3d 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -66,7 +66,7 @@ input:hover, textarea:hover { color: #007700; } -input.admin_delete:hover { +input.form_delete:hover { background-color: #770044; color: #aabbaa; } @@ -81,36 +81,29 @@ ul,ol { margin-bottom: 0px; } -.admin_reset, .guest_reset, .member_reset { +.form_reset { border: groove 1px #009900; color: #00aa44; cursor: pointer; } -.admin_submit, .guest_submit, .member_submit { +.form_submit { color: #00aa44; border-color: #009900; cursor: pointer; } -.admin_submit_reject { +.form_delete { border-style: groove; color: #881111; border-color: #009900; cursor: pointer; } -.runtime_fatal, .runtime_fatalcontent { +.runtime_fatalcontent { width: 700px; color: #118811; background-color: #ddeedd; -} - -.runtime_fatal { - color: #00aa00; -} - -.runtime_fatalcontent { text-align: left; font-size: 12px; } @@ -120,76 +113,37 @@ ul,ol { background-color: #ddeedd; } -.admin_note { - color: #ff0000; +.notice { + color: #aa0000; font-size: 12px; } -DIV.admin_note { - padding-top: 10px; - padding-right: 10px; - padding-left: 10px; -} - -.admin_fatal { - font-size: 18px; - color: #00aa00; -} - -.admin_edit, .member_confirm { +.form_submit { background-color: #eeffee; } -.member_banner { +.banner { background-color: #eeffee; width: 488px; } -.admin_error { +.fatal_error { background-color: #eeffee; - color: #00aa00; + color: #aa0000; font-size: 10px; } -.admin_select, .guest_select, .member_select { +.form_select { border: groove 1px #009900; background-color: #eeffee; } -.admin_register, .admin_desc_header, .admin_done, .admin_title, .admin_message { +.description_header, .table_header, .message { background-color: #ddeedd; color: #009900; text-align: center; } -.member_done, .guest_done { - color: #009900; -} - -.member_misc { - background-color: #ddeedd; -} - -.admin_misc, .member_misc { - color: #000000; -} - -.admin_done2 { - color: #00aa44; -} - -.admin_green, .admin_no { - color: #009900; -} - -.admin_welcome { - background-color: #ddeedd; - color: #009900; - vertical-align: middle; - font-size: 18px; - height: 50px; -} - .admin_menu { background-color: #ddeedd; color: #000077; @@ -197,49 +151,42 @@ DIV.admin_note { height: 25px; } -.admin_logout { +.logout_box { background-color: #aaffaa; color: #00aa00; } -a.admin_logout { +a.logout_box { display: block; } -.admin_logout:hover { +.logout_box:hover { background-color: #88dd88; color: #00cc00; } -.admin_desc_cont { +.description_text { text-align: left; background-color: #eeffee; } -.admin_table, .member_table { +.table { background-color: #eeffee; width: 660px; margin: 5px; } -.admin_warning_table { +.warning_table { background-color: #ff8888; width: 660px; margin: 5px; } -.admin_editmenu { +.form_submitmenu { min-width: 500px; max-width: 90%; } -.admin_form_header { - text-align: center; - height: 36px; - background-color: #ddeedd; - color: #009900; -} - .member_header { text-align: center; color: #009900; @@ -248,42 +195,16 @@ a.admin_logout { height: 60px; } -.admin_failed, .guest_failed, .member_failed, .member_note { - color: #00aa00; -} - -.member_note_bg { - background-color: #eeffee; -} - .member_data { background-color: #eeffee; color: #009900; height: 20px; } -.admin_snote { - font-size: 12px; -} - -.admin_normal, .guest_normal, .member_normal { +.form_field { border: groove 1px #009900; } -.member_stats { - vertical-align: top; - font-weight: bold; - height: 23px; - font-size: 16px; - border-style: none; - border: 0px; - background: #ddeedd; - color: #000000; - margin-top: -4px; - margin-bottom: 1px; - cursor: default; -} - .normal { border-style: groove; } @@ -292,7 +213,7 @@ a.admin_logout { background-color: #ddeedd; } -.guest_title, .member_title { +.table_header { text-align: center; color: #009900; vertical-align: middle; @@ -397,11 +318,11 @@ ul.copyright_box { border: solid 1px #00aa44; } -.switch_sw1, .switch_mem1 { +.switch_sw1 { background-color: #b8efc1; } -.switch_sw2, .switch_mem2 { +.switch_sw2 { background-color: #b8fccb; } @@ -448,16 +369,16 @@ ul.copyright_box { font-size: 1px; } -.admin_footer, .member_refbanner, .member_update, .admin_del_link { +.table_footer, .member_refbanner, .member_update, .admin_del_link { background-color: #ddeedd; } -.member_footer { +.table_footer { height: 30px; background-color: #ddeedd; } -.admin_footer { +.table_footer { text-align: center; height: 30px; padding-left: 5px; @@ -480,7 +401,7 @@ ul.copyright_box { text-align: center } -.admin_delete, .admin_yes { +.form_delete, .form_delete { border: groove 1px #00aa00; background-color: #aa0044; color: #ddeedd; @@ -544,7 +465,7 @@ ul.copyright_box { vertical-align: top; } -.list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub { +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { text-align: left; width: 100%; } @@ -606,10 +527,6 @@ ul.copyright_box { white-space: nowrap; } -.guest_table { - background-color: #eeffee; -} - .main { height: 99% } @@ -627,7 +544,7 @@ ul.copyright_box { background-color: #deefac; } -.guest_footer { +.table_footer { height: 30px; background-color: #ddeedd; } @@ -661,17 +578,6 @@ ul.copyright_box { color: #009900; } -.agb_box { - text-align: left; -} - -.agb_title, .fatal_title { - font-size: 16px; - text-align: center; - height: 40px; - font-weight: bold; -} - .para { text-indent: 8px; text-align: left; @@ -680,13 +586,7 @@ ul.copyright_box { margin-bottom: 12px; } -.fatal_box { - text-align: center; - width: 100%; - margin-top: 10px; -} - -.admin_message { +.message { padding-top: 5px; padding-bottom: 5px; } @@ -777,3 +677,16 @@ strong.menu_invisible, strong.sub_menu_invisible { .menu_locked, .sub_menu_locked { color: #ffeeee; } +.rank_1 { + font-weight: bold; + font-size: 22px; +} + +.rank_2 { + font-weight: bold; + font-size: 18px; +} + +.rank_3 { + font-weight: bold; +} diff --git a/theme/default/css/install.css b/theme/default/css/install.css index 5a5230e6b5..b0e6234cd8 100644 --- a/theme/default/css/install.css +++ b/theme/default/css/install.css @@ -1,25 +1,3 @@ -.install_fatal { - text-align: left; - color: #00AA00; -} - -.install_select { - border: groove 1px #00AA00; - background-color: #F0F0F5; -} - -.install_normal { - border: groove 1px #00AA00; -} - -.install_submit { - border-style: groove; -} - -.install { - -} - .install_main { color: #111188; background-color: #DDEEDD; @@ -36,11 +14,6 @@ padding-bottom: 5px; } -.install_fatal { - background-color: #DDEEDD; - color: #AA0000; -} - .install_fatalcontent { text-align: left; background-color: #DDEEDD; @@ -56,13 +29,6 @@ color: #00AA00; } -.install_security { - color: #AA0000; - width: 350px; - padding-top: 10px; - padding-bottom: 10px; -} - .install_welcome { color: #0000CC; padding-top: 5px; @@ -70,14 +36,6 @@ font-size: 16px; } -.install_text { - color: #000000; - padding-bottom: 10px; - text-align: left; - margin-left: 20px; - margin-right: 20px; -} - .install_footer { padding-bottom: 10px; } diff --git a/theme/default/css/mailid.css b/theme/default/css/mailid.css index f54ace5185..a528ee0618 100644 --- a/theme/default/css/mailid.css +++ b/theme/default/css/mailid.css @@ -1,4 +1,4 @@ -.member_mailidtop { +.mailid_table { background-color: #ddeedd; width: 100%; height: 100%; diff --git a/theme/desert/css/active.css b/theme/desert/css/active.css deleted file mode 100644 index 8558324969..0000000000 --- a/theme/desert/css/active.css +++ /dev/null @@ -1,9 +0,0 @@ -.active_row1, .active_row2, .active_row3 { - text-align: center; - padding-left: 5px; - padding-right: 5px; -} - -.active_row2 { - text-align: left; -} \ No newline at end of file diff --git a/theme/desert/css/beg.css b/theme/desert/css/beg.css index c76606a314..8f570aeecb 100644 --- a/theme/desert/css/beg.css +++ b/theme/desert/css/beg.css @@ -1,9 +1,3 @@ .beg_table { background-color: #FFFFCC; } - -.beg_msg { - background-color: #DDDDAA; - padding-left: 10px; - padding-right: 10px; -} \ No newline at end of file diff --git a/theme/desert/css/bonus.css b/theme/desert/css/bonus.css deleted file mode 100644 index 9ad71cef33..0000000000 --- a/theme/desert/css/bonus.css +++ /dev/null @@ -1,13 +0,0 @@ -.bonus_rank_1 { - font-weight: bold; - font-size: 22px; -} - -.bonus_rank_2 { - font-weight: bold; - font-size: 18px; -} - -.bonus_rank_3 { - font-weight: bold; -} \ No newline at end of file diff --git a/theme/desert/css/doubler.css b/theme/desert/css/doubler.css index 299f71be33..8de6bf351e 100644 --- a/theme/desert/css/doubler.css +++ b/theme/desert/css/doubler.css @@ -1,27 +1,5 @@ -.doubler_table { - -} - -.doubler_main { - -} - -.doubler_error { - font-weight: bold; - color: #AA0000; -} - -.doubler_big_row { - height: 70px; -} - .doubler_header { text-align: center; height: 24px; background-color: #DDDDAA; } - -.doubler_footer { - height: 24px; - background-color: #DDDDAA; -} \ No newline at end of file diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 9cbafe382d..db91cde5bc 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -51,35 +51,28 @@ ul,ol { margin-bottom: 0px; } -.admin_reset, .guest_reset, .member_reset { +.form_reset { border: groove 1px #880000; color: #880000; cursor: pointer; } -.admin_submit, .guest_submit, .member_submit { +.form_submit { color: #880000; border-color: #880000; cursor: pointer; } -.admin_submit_reject { +.form_delete { border-style: groove; color: #880000; border-color: #880000; cursor: pointer; } -.runtime_fatal, .runtime_fatalcontent { +.runtime_fatalcontent { color: #880000; background-color: #ffffcc; -} - -.runtime_fatal { - color: #880000; -} - -.runtime_fatalcontent { text-align: left; font-size: 12px; } @@ -89,64 +82,37 @@ ul,ol { background-color: #ffffcc; } -.admin_note { +.notice { color: #880000; font-size: 12px; } -DIV.admin_note { - padding-top: 10px; - padding-right: 10px; - padding-left: 10px; -} - -.admin_fatal { - color: #880000; - font-size: 18px; -} - -.admin_edit, .member_confirm { +.form_submit { background-color: #ffffcc; } -.member_banner { +.banner { background-color: #ffffcc; width: 488px; } -.admin_error { +.fatal_error { background-color: #ffffcc; color: #880000; font-size: 10px; } -.admin_select, .guest_select, .member_select { +.form_select { border: solid 1px #880000; background-color: #ddddaa; } -.admin_register, .admin_desc_header, .admin_done, .admin_title, .admin_message { +.description_header, .table_header, .message { background-color: #ddddaa; color: #880000; text-align: center; } -.member_done, .guest_done, .admin_misc, .member_misc, .admin_done2, .admin_green, .admin_no { - color: #880000; -} - -.member_misc { - background-color: #ffffcc; -} - -.admin_welcome { - background-color: #ddddaa; - color: #880000; - vertical-align: middle; - font-size: 18px; - height: 50px; -} - .admin_menu { background-color: #ddddaa; color: #880000; @@ -154,49 +120,42 @@ DIV.admin_note { height: 25px; } -.admin_logout { +.logout_box { background-color: #ccccaa; color: #880000; } -a.admin_logout { +a.logout_box { display: block; } -.admin_logout:hover { +.logout_box:hover { background-color: #aaaa88; color: #aa0000; } -.admin_desc_cont { +.description_text { text-align: left; background-color: #ffffcc; } -.admin_table, .member_table { +.table { background-color: #ffffcc; width: 660px; margin: 5px; } -.admin_warning_table { +.warning_table { background-color: #ff8888; width: 660px; margin: 5px; } -.admin_editmenu { +.form_submitmenu { min-width: 500px; max-width: 90%; } -.admin_form_header { - text-align: center; - height: 36px; - background-color: #ddddaa; - color: #880000; -} - .member_header { text-align: center; color: #880000; @@ -205,43 +164,17 @@ a.admin_logout { height: 60px; } -.admin_failed, .guest_failed, .member_failed, .member_note { - color: #880000; -} - -.member_note_bg { - background-color: #ffffcc; -} - .member_data { background-color: #ffffcc; color: #880000; height: 20px; } -.admin_snote { - font-size: 12px; -} - -.admin_normal, .guest_normal, .member_normal { +.form_field { border: solid 1px #880000; background-color: #ddddaa; } -.member_stats { - vertical-align: top; - font-weight: bold; - height: 23px; - font-size: 16px; - border-style: none; - border: 0px; - background: #ffffcc; - color: #880000; - margin-top: -4px; - margin-bottom: 1px; - cursor: default; -} - .normal { border-style: groove; } @@ -250,7 +183,7 @@ a.admin_logout { background-color: #ffffcc; } -.guest_title, .member_title { +.table_header { text-align: center; color: #880000; vertical-align: middle; @@ -345,11 +278,11 @@ ul.copyright_box { border: solid 1px #880000; } -.switch_sw1, .switch_mem1 { +.switch_sw1 { background-color: #ffffcc; } -.switch_sw2, .switch_mem2 { +.switch_sw2 { background-color: #ffffcc; } @@ -357,7 +290,7 @@ ul.copyright_box { background-color: #ffffcc; } -.media_header, { +.media_header { background-color: #ddddaa; text-align: center; color: #880000; @@ -388,16 +321,16 @@ ul.copyright_box { font-size: 1px; } -.admin_footer, .member_refbanner, .member_update, .admin_del_link { +.table_footer, .member_refbanner, .member_update, .admin_del_link { background-color: #ddddaa; } -.member_footer { +.table_footer { height: 30px; background-color: #ddddaa; } -.admin_footer { +.table_footer { text-align: center; height: 30px; padding-left: 5px; @@ -420,7 +353,7 @@ ul.copyright_box { text-align: center } -.admin_delete, .admin_yes { +.form_delete, .form_delete { border: groove 1px #880000; background-color: #880000; color: #ffffcc; @@ -480,7 +413,7 @@ ul.copyright_box { vertical-align: top; } -.list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub { +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { text-align: left; width: 100%; } @@ -530,10 +463,6 @@ ul.copyright_box { white-space: nowrap; } -.guest_table { - background-color: #ffffcc; -} - .main { height: 99%; vertical-align: top; @@ -552,7 +481,7 @@ ul.copyright_box { background-color: #ddddaa; } -.guest_footer { +.table_footer { height: 30px; background-color: #ddddaa; } @@ -598,17 +527,6 @@ ul.copyright_box { color: #880000; } -.agb_box { - text-align: left; -} - -.agb_title, .fatal_title { - font-size: 16px; - text-align: center; - height: 40px; - font-weight: bold; -} - .para { text-indent: 8px; text-align: left; @@ -617,13 +535,7 @@ ul.copyright_box { margin-bottom: 12px; } -.fatal_box { - text-align: center; - width: 100%; - margin-top: 10px; -} - -.admin_message { +.message { margin-bottom: 15px; } @@ -705,3 +617,16 @@ strong.menu_invisible, strong.sub_menu_invisible { .menu_locked, .sub_menu_locked { color: #ffeeee; } +.rank_1 { + font-weight: bold; + font-size: 22px; +} + +.rank_2 { + font-weight: bold; + font-size: 18px; +} + +.rank_3 { + font-weight: bold; +} diff --git a/theme/desert/css/install.css b/theme/desert/css/install.css index c9fea853cf..641b6bfe6c 100644 --- a/theme/desert/css/install.css +++ b/theme/desert/css/install.css @@ -1,29 +1,3 @@ -.install_table { - background-color: #F5F5C5; -} - -.install_msg { - color: #880000; - background-color: #EDEDBA; -} - -.install_fatal { - color: #880000; -} - -.install_select { - border: groove 1px #880000; - background-color: #DDDDAA; -} - -.install_normal { - border: groove 1px #880000; -} - -.install_submit { - border-style: groove; -} - .install_main { color: #880000; background-color: #FFFFCC; @@ -41,11 +15,6 @@ padding-bottom: 5px; } -.install_fatal { - background-color: #FFFFCC; - color: #880000; -} - .install_fatalcontent { text-align: left; background-color: #FFFFCC; @@ -56,24 +25,8 @@ color: #880000; } -.install_security, .install_welcome, .install_text { - color: #880000; -} - -.install_text { - padding-bottom: 10px; - text-align: left; - margin-left: 20px; - margin-right: 20px; -} - -.install_security { - width: 350px; - padding-top: 10px; - padding-bottom: 10px; -} - .install_welcome { + color: #880000; padding-top: 5px; padding-bottom: 10px; } diff --git a/theme/desert/css/mailid.css b/theme/desert/css/mailid.css index 549446ed39..8b4f0bf88b 100644 --- a/theme/desert/css/mailid.css +++ b/theme/desert/css/mailid.css @@ -1,4 +1,4 @@ -.member_mailidtop { +.mailid_table { background-color: #ffffcc; width: 100%; height: 100%; diff --git a/theme/org/css/active.css b/theme/org/css/active.css deleted file mode 100644 index 478e711f42..0000000000 --- a/theme/org/css/active.css +++ /dev/null @@ -1,9 +0,0 @@ -.active_row1, .active_row2, .active_row3 { - text-align : center; - padding-left : 5px; - padding-right : 5px; -} - -.active_row2 { - text-align : left; -} diff --git a/theme/org/css/beg.css b/theme/org/css/beg.css index c63f55b6ed..d654a003fb 100644 --- a/theme/org/css/beg.css +++ b/theme/org/css/beg.css @@ -1,9 +1,3 @@ .beg_table { background-color: #ddeedd } - -.beg_msg { - background-color: #e5f6e5; - padding-left: 10px; - padding-right: 10px; -} diff --git a/theme/org/css/bonus.css b/theme/org/css/bonus.css deleted file mode 100644 index 66f7b6f258..0000000000 --- a/theme/org/css/bonus.css +++ /dev/null @@ -1,13 +0,0 @@ -.bonus_rank_1 { - font-weight : bold; - font-size : 22px; -} - -.bonus_rank_2 { - font-weight : bold; - font-size : 18px; -} - -.bonus_rank_3 { - font-weight : bold; -} diff --git a/theme/org/css/doubler.css b/theme/org/css/doubler.css index 4202c05f34..d9b5742cb6 100644 --- a/theme/org/css/doubler.css +++ b/theme/org/css/doubler.css @@ -1,25 +1,5 @@ -.doubler_table { -} - -.doubler_main { -} - -.doubler_error { - font-weight : bold; - color : #AA0000; -} - -.doubler_big_row { - height : 70px; -} - .doubler_header { background-color : #ddeedd; align : center; height : 24px; } - -.doubler_footer { - height : 24px; - background-color : #ddeedd; -} diff --git a/theme/org/css/general.css b/theme/org/css/general.css index 85e8dafbba..38bffa8e2c 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -82,88 +82,55 @@ ul, ol { font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } -.admin_note { - color : #FF0000; +.notice { + color : #ff0000; font-size : 11px; } -.admin_reset, .guest_reset, .member_reset { +.form_reset { border : groove 1px #000000; color : #0000AA; } -.admin_submit, .guest_submit, .member_submit { +.form_submit { color : #0000AA; border-color : #000000; } -.admin_submit_reject { +.form_delete { border-style : groove; color : #881111; border-color : #000000; } -.admin_fatal { - font-size : 18px; - color : #ddeedd; -} - -.admin_edit, .member_confirm { +.form_submit { background-color : #ddeedd; } -.member_banner { +.banner { background-color : #ddeedd; width : 488px; } -.admin_error { +.fatal_error { background-color : #ddeedd; - color : #ddeedd; + color : #eedddd; font-size : 11px; } -.admin_select, .guest_select, .member_select { +.form_select { border : solid 1px; border-color : #000000; background-color : #EEFFEE; } -.admin.register, .admin_desc_header, .admin_done, .admin_title, .member_title2, .guest_title2 { +.admin.register, .description_header, .table_header { background-color : #ddeedd; color : #000000; } -.member_done, .guest_done { - color : #009900; -} - -.member_misc, .code { - background-color : #DDEEDD; -} - -.admin_misc, .member_misc { - color : #000000; -} - -.admin_done2 { - color : #0000AA; -} - -.admin_green, .admin_no { - color : #000000; -} - -.admin_welcome { +.code { background-color : #DDEEDD; - color : #000000; - vertical-align : middle; - font-size : 18px; - height : 50px; -} - -.admin_header { - background-color : #ddeedd; } .admin_menu { @@ -172,80 +139,37 @@ ul, ol { width : 230px; } -.admin_logout { +.logout_box { background-color : #AAFFAA; color : #ddeedd; } -.admin_desc_cont, .admin_table, .member_table { +.description_text, .table { background-color : #ddeedd; } -.guest_table { - font-size : 14px; -} - -.admin_editmenu { +.form_submitmenu { min-width : 500px; max-width : 90%; } -.admin_form_header { - text-align : center; - height : 36px; - background-color : #ddeedd; - color : #000000; -} - .member_header { text-align : center; height : 28px; background-color : #ddeedd; } -.admin_failed, .guest_failed, .member_failed, .member_note { - color : #0000AA; -} - -.member_note_bg { - background-color : #ddeedd; -} - .member_data { background-color : #ddeedd; color : #000000; height : 20px; } -.admin_header_b1 { - border-bottom : 1px solid #ddeedd; - background-color : #ddeedd; - height : 22px; -} - -.admin_snote { - font-size : 11px; -} - -.admin_normal, .guest_normal, .member_normal { +.form_field { border : solid 1px; border-color : #000000; } -.member_stats { - vertical-align : top; - font-weight : bold; - height : 23px; - font-size : 16px; - border-style : none; - border : 0px; - background : #DDEEDD; - color : #000000; - margin-top : -4px; - margin-bottom : 1px; - cursor : default; -} - .normal { border-style : groove; } @@ -254,7 +178,7 @@ ul, ol { background-color : #DDEEDD; } -.guest_title, .member_title { +.table_header { color : #000000; vertical-align : middle; background-color : #DDEEDD; @@ -360,11 +284,11 @@ ul, ol { border-color : #0000aa; } -.switch_sw1, .switch_mem1 { +.switch_sw1 { background-color : #b8efc1; } -.switch_sw2, .switch_mem2 { +.switch_sw2 { background-color : #b8fccb; } @@ -411,16 +335,16 @@ ul, ol { font-size : 1px; } -.admin_footer, .member_refbanner, .member_update, .admin_del_link, .guest_footer { +.table_footer, .member_refbanner, .member_update, .admin_del_link, .table_footer { background-color : #DDEEDD; } -.member_footer { +.table_footer { height : 30px; background-color : #DDEEDD; } -.admin_footer { +.table_footer { height : 30px } @@ -440,7 +364,7 @@ ul, ol { text-align : center } -.admin_delete, .admin_yes { +.form_delete, .form_delete { border : groove 1px #ddeedd; background-color : #0000AA; color : #DDEEDD; @@ -503,13 +427,7 @@ ul, ol { vertical-align : top; } -.member_mailidtop { - background-color : #DDEEDD; - width : 100%; - height : 100%; -} - -.list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub { +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { width : 100%; } @@ -592,3 +510,16 @@ strong.menu_invisible, strong.sub_menu_invisible { .menu_locked, .sub_menu_locked { color: #ffeeee; } +.rank_1 { + font-weight : bold; + font-size : 22px; +} + +.rank_2 { + font-weight : bold; + font-size : 18px; +} + +.rank_3 { + font-weight : bold; +} diff --git a/theme/org/css/install.css b/theme/org/css/install.css index d59ec21b5f..5137d6c724 100644 --- a/theme/org/css/install.css +++ b/theme/org/css/install.css @@ -1,25 +1,3 @@ -.install_fatal { - text-align: left; - color: #000000; -} - -.install_select { - border: groove 1px #000000; - background-color: #EEEEFF; -} - -.install_normal { - border: groove 1px #000000; -} - -.install_submit { - border-style: groove; -} - -.install { - -} - .install_main { color: #000000; background-color: #FFFFFF; @@ -37,11 +15,6 @@ padding-bottom: 5px; } -.install_fatal { - background-color: #FFFFFF; - color: #000000; -} - .install_fatalcontent { text-align: left; background-color: #FFFFFF; @@ -52,24 +25,8 @@ color: #000000; } -.install_security,.install_welcome,.install_text { - color: #000000; -} - -.install_text { - padding-bottom: 10px; - text-align: left; - margin-left: 20px; - margin-right: 20px; -} - -.install_security { - width: 350px; - padding-top: 10px; - padding-bottom: 10px; -} - .install_welcome { + color: #000000; padding-top: 5px; padding-bottom: 10px; } diff --git a/theme/org/css/mailid.css b/theme/org/css/mailid.css new file mode 100644 index 0000000000..607a764963 --- /dev/null +++ b/theme/org/css/mailid.css @@ -0,0 +1,5 @@ +.mailid_table { + background-color : #DDEEDD; + width : 100%; + height : 100%; +} diff --git a/theme/org/css/nickname.css b/theme/org/css/nickname.css index 1106ccd885..bd725163ef 100644 --- a/theme/org/css/nickname.css +++ b/theme/org/css/nickname.css @@ -1,4 +1,4 @@ -.guest_footer { +.table_footer { height : 30px; background-color : #DDEEDD; } diff --git a/theme/org/css/task.css b/theme/org/css/task.css index ea54d828e3..6ca9846c41 100644 --- a/theme/org/css/task.css +++ b/theme/org/css/task.css @@ -1,4 +1,4 @@ -.admin_title2 { +.table_header { background-color : #e9f9e9; color : #009900; text-align : center; diff --git a/theme/org/theme.php b/theme/org/theme.php index 001b8de7a5..ff1255d2b2 100644 --- a/theme/org/theme.php +++ b/theme/org/theme.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009, 2010 by Mailer Developer Team * @@ -35,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // // Theme definitions diff --git a/theme/schleuder/css/beg.css b/theme/schleuder/css/beg.css new file mode 100644 index 0000000000..95f02241ed --- /dev/null +++ b/theme/schleuder/css/beg.css @@ -0,0 +1,3 @@ +.beg_table { + background-color: #0571cc; +} diff --git a/theme/schleuder/css/doubler.css b/theme/schleuder/css/doubler.css new file mode 100644 index 0000000000..c26838c8a0 --- /dev/null +++ b/theme/schleuder/css/doubler.css @@ -0,0 +1,5 @@ +.doubler_header { + text-align : center; + height : 24px; + background-color : #69b2ff; +} diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css new file mode 100644 index 0000000000..6fa7feb536 --- /dev/null +++ b/theme/schleuder/css/general.css @@ -0,0 +1,578 @@ +body { + background-color : #0571cc; + color : #FFFFFF; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size : 12px; + letter-spacing : 1px; + + margin : 0px; + margin-left : 0px; + margin-right : 0px; + margin-top : 0px; + margin-bottom : 0px; +} + +table { + table-layout : auto; + border-spacing : 0px; + overflow : auto; +} + +A { + font-style : normal; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + text-decoration : none; +} + +A:link, .online_text { + color : #000000; +} + +A:visited { + color : #000000; +} + +A:active { + color : #000088; + background-color : transparent; +} + +A:hover { + color : #000088; + background-color : transparent; +} + +input, textarea, select, option { + color : #FFFFFF; + background-color : #0571cc; + border-color : #69b2ff; + text-decoration : none; +} + +ul, ol { + margin-top : 0px; + margin-bottom : 0px; +} + +.form_reset { + border-style : groove; + border : solid 1px #FFFFFF; + color : #FFFFFF; +} + +.form_submit { + color : #FFFFFF; + border-color : #FFFFFF; +} + +.form_delete { + border-style : groove; + color : #FFFFFF; + border-color : #FFFFFF; +} + +.runtime { + color : #FFFFFF; + background-color : #0571cc; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.runtime.fatal { + color : #FFFFFF; +} + +.runtime.fatalcontent { + font-size : 20px; +} + +.admin { + color : #FFFFFF; + background-color : #0571cc; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.notice { + color : #FFFFFF; + font-size : 12px; +} + +.form_submit { + background-color : #0571cc; +} + +.banner { + background-color : #0571cc; + width : 488px; +} + +.fatal_error { + background-color : #0571cc; + color : #FF0000; + font-size : 10px; +} + +.form_select { + border : solid 1px; + border-color : #FFFFFF; + background-color : #69b2ff; +} + +.admin.register, .table_header { + background-color : #69b2ff; + color : #FFFFFF; + text-align : center; + align : center; +} + +.table_header { + background-color : #69b2ff; + color : #FFFFFF; + text-align : center; + align : center; + height : 25px; + font-size : 14px; +} + +.admin_menu { + background-color : #69b2ff; + color : #FFFFFF; + width : 230px; + text-align : left; +} + +.logout_box { + background-color : #DDDDFF; + color : #FFFFFF; +} + +.description_text, .table { + text-align : center; + align : center; + background-color : #0571cc; +} + +.form_submitmenu { + min-width : 500px; + max-width : 90%; +} + +.member_header { + text-align : center; + height : 28px; + background-color : #69b2ff; +} + +.member_data { + background-color : #0571cc; + color : #FFFFFF; + height : 20px; +} + +.form_field { + border-style : solid; + border : solid 1px; + border-color : #FFFFFF; + background-color : #69b2ff; +} + +.admin_alpha { + text-align : center; + height : 40px; + vertical-align : middle; +} + +.admin_sortlinks { + text-align : center; + height : 20px; + vertical-align : middle; +} + +.normal { + border-style : groove; +} + +.member_main { + background-color : #0571cc; +} + +.table_header { + text-align : left; + align : left; + color : #FFFFFF; + vertical-align : middle; + background-color : #a3bdcc; + height : 100px; +} + +.guest_login_header { + color : #FFFFFF; + vertical-align : middle; + background-color : #69b2ff; +} + +.guest_menu, .member_menu { + width : 200px; + background-color : #a3bdcc; + vertical-align : top; +} + +.guest_menu_title, .member_menu_title { + background-color : #a3bdcc; + height : 46px; + width : 200px; +} + +#guest_menu_action_main, #member_menu_action_main { + background-image : url(theme/schleuder/images/menu/menu_title_main.jpg); + height : 36px; +} + +#member_menu_action_order { + background-image : url(theme/schleuder/images/menu/menu_title_order.jpg); + height : 36px; +} + +#member_menu_action_logout { + background-image : url(theme/schleuder/images/menu/menu_title_logout.jpg); + height : 36px; +} + +#member_menu_action_account { + background-image : url(theme/schleuder/images/menu/menu_title_account.jpg); + height : 36px; +} + +#member_menu_action_rals { + background-image : url(theme/schleuder/images/menu/menu_title_rals.jpg); + height : 36px; +} + +#member_menu_action_extras { + background-image : url(theme/schleuder/images/menu/menu_title_extras.jpg); + height : 36px; +} + +#member_menu_action_stats { + background-image : url(theme/schleuder/images/menu/menu_title_stats.jpg); + height : 36px; +} + +#guest_menu_action_themes, #member_menu_action_themes { + background-image : url(theme/schleuder/images/menu/menu_title_themes.jpg); + height : 36px; +} + +#guest_menu_action_online, #member_menu_action_online { + background-image : url(theme/schleuder/images/menu/menu_title_online.jpg); + height : 36px; +} + +#guest_menu_action_members { + background-image : url(theme/schleuder/images/menu/menu_title_member.jpg); + height : 36px; +} + +.guest_menu_row, .member_menu_row { + background-image : url(theme/schleuder/images/menu/menu_row.jpg); + background-color : #a3bdcc; + border-top : 0px; + height : 28px; + padding-left : 20px; + padding-bottom : 5px; + font-color : #000000; +} + +.guest_menu_bottom, .member_menu_bottom { + background-image : url(theme/schleuder/images/menu/menu_bottom.jpg); + background-color : #a3bdcc; + border-top : 0px; + height : 33px; + padding-left : 20px; + padding-bottom : 7px; + font-color : #000000; +} + +.guest_menu_seperator, .member_menu_seperator { + height : 0px; +} + +.guest_content, .member_content { + background-color : #94abb8; + padding-left: : 10px; + padding-right: : 10px; + margin-left : 5px; + margin-right : 5px; +} + +.guest_advert, .guest_login, .member_advert, .member_login { + background-color : #0571cc; + vertical-align : top; + margin-top : 10px; +} + +.table_footer { + height : 30px; + background-color : #69b2ff; +} + +#master, .masterbox { + width : 100%; + height : 100%; + min-height : 90%; + max-height : 100%; + vertical-align : top; + text-align : center; + align : center; +} + +.footer_lines { + vertical-align : bottom; + font-size : 10px; + width : 640px; + vertical-align : middle; + background-color : #0571cc; + height : 40px; +} + +.dashed { + border : solid 1px; + border-color : #FFFFFF; +} + +.switch_sw1 { + background-color : #0571cc; +} + +.switch_sw2 { + background-color : #0571cc; +} + +.impressum { + font-size : 12px; + width : 320px; + vertical-align : middle; + background-color : #0571cc; + height : 70px; +} + +.mediadata { + background-color : #0571cc; +} + +.media_header, .impressum_header { + background-color : #69b2ff; + align : center; + text-align : center; + color : #FFFFFF; + height : 26px; + font-weight : bold; + font-size : 20px; +} + +.media_left { + font-size : 14px; + width : 200px; +} + +.media_right { + color : #FFFFFF; + font-weight : bold; + font-size : 14px; + width : 70px; +} + +.admin_sep_footer { + background-color : #69b2ff; + font-size : 1px; +} + +.admin_sep_footer2 { + background-color : #69b2ff; + font-size : 1px; +} + +.table_footer, .member_refbanner, .member_update, .admin_del_link { + background-color : #69b2ff; +} + +.table_footer { + height : 30px; + background-color : #69b2ff; +} + +.table_footer { + height : 30px +} + +.admin_task_header { + background-color : #69b2ff; + color : #FFFFFF; + vertical-align : middle; + font-size : 18px; + height : 35px; +} + +.seperator { + font-size : 1px +} + +.tab1 { + align : center +} + +.form_delete, .form_delete { + border-style : groove; + border : solid 1px #FFFFFF; + background-color : #FFFFFF; + color : #0571cc; +} + +.guest_stats { + background-color : #0571cc; + width : 460px; +} + +.guest_stats_title { + color : #FFFFFF; + vertical-align : middle; + background-color : #69b2ff; + height : 30px; +} + +.guest_stats_l { + width : 344px; + text-align : right; +} + +.guest_stats_m { + width : 2px; +} + +.guest_stats_r, .guest_stats_lr, .guest_stats_rr { + color : #FFFFFF; + width : 28px; + font-weight : bold; + text-align : center; +} + +.guest_stats_ll, .guest_stats_rl { + width : 192px; + text-align : right; +} + +.guest_stats_footer { + color : #FFFFFF; + vertical-align : middle; + background-color : #69b2ff; + height : 20px; +} + +.task_pre { + font-weight : bold; + margin-left : 0px; + margin-right : 0px; + margin-top : 10px; + margin-bottom : 10px; +} + +.impressum_body { + background-color : #0571cc; +} + +.guest_content_align, .member_content_align, .admin_content_align { + align : center; + text-align : center; + vertical-align : top; +} + +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { + width : 100%; +} + +.member_unconfirmed { + background-color : #0571cc; + width : 100%; + align : center; + text-align : center; +} + +.you_are_here { + text-align : left; + align : left; + white-space : nowrap; + font-size : 14px; +} + +.tiny { font-size : 12px; } +.medium { font-size : 14px; } +.big { font-size : 20px; } + +.top { border-top : 1px solid #FFFFFF; } +.bottom { border-bottom : 1px solid #FFFFFF; } +.left { border-left : 1px solid #FFFFFF; } +.right { border-right : 1px solid #FFFFFF; } + +.top2 { border-top : 1px solid #FFFFFF; } +.bottom2 { border-bottom : 1px solid #FFFFFF; } +.left2 { border-left : 1px solid #FFFFFF; } +.right2 { border-right : 1px solid #FFFFFF; } + +.nobr { + white-space : nowrap; +} + +.main { + height : 99%; + vertical-align : top; +} + +.footer { + height : 1% +} + +.disabled { + border-style: groove; + background-color: #660000; + color: #0571cc; +} + +.mini_select { + border : solid 1px; + border-color : #FFFFFF; + background-color : #69b2ff; + font-size : 10px; +} + +.theme_box { + border : 1px solid #FFFFFF; + border-top : 0px; + width : 100%; + height : 70px; + background-color : #0571cc; +} + +.theme_note { + font-size : 12px; + font-weight : bold; +} + +.theme_content { + color : #FFFFFF; +} + +.guest, .member { + width : 100%; +} +.rank_1 { + font-weight : bold; + font-size : 22px; +} + +.rank_2 { + font-weight : bold; + font-size : 18px; +} + +.rank_3 { + font-weight : bold; +} diff --git a/theme/schleuder/css/install.css b/theme/schleuder/css/install.css new file mode 100644 index 0000000000..a7cd7db9b1 --- /dev/null +++ b/theme/schleuder/css/install.css @@ -0,0 +1,32 @@ +.install_main { + color: #000000; + background-color: #FFFFFF; + text-decoration: none; +} + +.install_header { + color: #000000; + background-color: #EEEEFF; + font-size: 20px; + text-decoration: underline; + heigth: 30px; + vertical-align: middle; + padding-top: 5px; + padding-bottom: 5px; +} + +.install_fatalcontent { + text-align: left; + background-color: #FFFFFF; +} + +.install_error, .install_finished { + font-size: 20px; + color: #000000; +} + +.install_welcome { + color: #000000; + padding-top: 5px; + padding-bottom: 10px; +} diff --git a/theme/schleuder/css/mailid.css b/theme/schleuder/css/mailid.css new file mode 100644 index 0000000000..44ff7d7ec8 --- /dev/null +++ b/theme/schleuder/css/mailid.css @@ -0,0 +1,5 @@ +.mailid_table { + background-color : #0571cc; + width : 100%; + height : 100%; +} diff --git a/theme/schleuder/css/register.css b/theme/schleuder/css/register.css new file mode 100644 index 0000000000..fa2facec37 --- /dev/null +++ b/theme/schleuder/css/register.css @@ -0,0 +1,91 @@ +.register_submit { + border-style : outset; +} + +.register_reset { + border-style : groove; + border : solid 1px #FFFFFF; + color : #FFFFFF; +} +.register_submit { + color : #FFFFFF; + border-color : #FFFFFF; +} + +.register_select { + border : solid 1px; + border-color : #FFFFFF; + background-color : #69b2ff; +} + +.register_failed { + color : #FFFFFF; +} + +.register_snote { + font-size : 12px; +} + +.register_normal { + border-style : solid; + border : solid 1px; + border-color : #FFFFFF; + padding-right : 5px; +} + +.register_main { + background-color : #0571cc; + width : 540px; +} + +.register_done2 { + height : 40px; + color : #FFFFFF; + background-color : #0571cc; + width : 500px; +} + +.register_title { + background-color : #69b2ff; + text-align : center; + align : center; + font-size : 18px; + padding-left : 5px; + padding-right : 5px; +} + +.register_seperator { + height : 7px; + font-size : 1px; +} + +.register_left { + text-align : right; + align : right; + margin-right : 2px; + color : #FFFFFF; + font-weight : bold; + font-size : 14px; + padding-left : 5px; +} + +.register_right { + padding-right : 5px; +} + +.register_header { + text-align : center; + align : center; + background-color : #69b2ff; + color : #FFFFFF; + font-weight : bold; + border-top : 1px solid #FFFFFF; + border-bottom : 1px solid #FFFFFF; + height : 25px; +} + +A:hover.register_term { + background-color : #69b2ff; + border-top : 1px solid #FFFFFF; + border-bottom : 1px solid #FFFFFF; +} diff --git a/theme/schleuder/css/sponsor.css b/theme/schleuder/css/sponsor.css new file mode 100644 index 0000000000..c607c94c54 --- /dev/null +++ b/theme/schleuder/css/sponsor.css @@ -0,0 +1,25 @@ +.sponsor_table { + + background-color : #0571cc; +} + +.sponsor_what { + height : 24px; +} + +.sponsor_header, .sponsor_footer { + background-color : #69b2ff; +} + +.sponsor_action { + background-color : #69b2ff; + height : 25px; +} + +TR.sponsor_row_blur:hover { + background-color : #69b2ff; +} + +A.sponsor_blur { + display : block; +} diff --git a/theme/schleuder/css/surfbar.css b/theme/schleuder/css/surfbar.css new file mode 100644 index 0000000000..bcf9250285 --- /dev/null +++ b/theme/schleuder/css/surfbar.css @@ -0,0 +1,35 @@ +#surfbar_banner { + +} + +#surfbar_table { + +} + +#surfbar_td { + +} + +#surfbar_counter { + +} + +#surfbar_restart { + +} + +#surfbar_counter_word { + +} + +#surfbar_reload { + font-weight: bold; +} + +#surfbar_max { + font-weight: bold; +} + +#surfbar_points { + font-weight: bold; +} \ No newline at end of file diff --git a/theme/schleuder/css/top10.css b/theme/schleuder/css/top10.css new file mode 100644 index 0000000000..d50e0ae12b --- /dev/null +++ b/theme/schleuder/css/top10.css @@ -0,0 +1,9 @@ +.top10_row1, .top10_row2, .top10_row3, .top10_row4, .top10_row5 { + text-align : center; + padding-left : 5px; + padding-right : 5px; +} + +.top10_row2, .top10_row4 { + text-align : left; +} diff --git a/theme/schleuder/css/transfer.css b/theme/schleuder/css/transfer.css new file mode 100644 index 0000000000..3707b5d21a --- /dev/null +++ b/theme/schleuder/css/transfer.css @@ -0,0 +1,12 @@ +.transfer_row1, .transfer_row3 { + text-align : center; + font-weight : bold; +} + +.transfer_row2 { + text-align : center; +} + +.transfer_row4, .transfer_row5 { + padding-left: 2px; +} diff --git a/theme/schleuder/css/uberwach.css b/theme/schleuder/css/uberwach.css new file mode 100644 index 0000000000..35b79f2c93 --- /dev/null +++ b/theme/schleuder/css/uberwach.css @@ -0,0 +1,54 @@ +#au_hi { + position:absolute; + z-index:1234; + top:0; + right:0; + left:0; + padding:0; + margin:0; + border-left:none; + border-right:none; + border-top:1px solid #FFFFFF; + border-bottom:1px solid #ACA899; + height:27px; + display:block; + width:100%; + overflow:hidden; + float:none; +} +#au_hi p { + border:none; + width:auto; + background:none; + margin:0; + padding:0 7px; + font-size:11px; + color:#003366; + float:none; + text-align:left; +} +#au_hi img { + border:none; + background:none; + margin:0; + padding:0 7px; + width:19px; + height:19px; +} +#au_hi a, #au_hi a:hover { + border:none; + background:none; + margin:0; + padding:0; + font-size:11px; + color:#003366; + text-decoration:underline; +} +.au_hi_r { + background:none; + background-color:#FFCCAA; +} +.au_hi_g { + background:none; + background-color:#D5FFAA; +} diff --git a/theme/schleuder/images/code_bg.jpg b/theme/schleuder/images/code_bg.jpg new file mode 100644 index 0000000000..79d72a277b Binary files /dev/null and b/theme/schleuder/images/code_bg.jpg differ diff --git a/theme/schleuder/images/code_bg.png b/theme/schleuder/images/code_bg.png new file mode 100644 index 0000000000..d7c5071e09 Binary files /dev/null and b/theme/schleuder/images/code_bg.png differ diff --git a/theme/schleuder/images/help/bullet.png b/theme/schleuder/images/help/bullet.png new file mode 100644 index 0000000000..8452736398 Binary files /dev/null and b/theme/schleuder/images/help/bullet.png differ diff --git a/theme/schleuder/images/help/down.jpg b/theme/schleuder/images/help/down.jpg new file mode 100644 index 0000000000..6d4ea6afbd Binary files /dev/null and b/theme/schleuder/images/help/down.jpg differ diff --git a/theme/schleuder/images/help/left.jpg b/theme/schleuder/images/help/left.jpg new file mode 100644 index 0000000000..b3684749ff Binary files /dev/null and b/theme/schleuder/images/help/left.jpg differ diff --git a/theme/schleuder/images/help/right.jpg b/theme/schleuder/images/help/right.jpg new file mode 100644 index 0000000000..6847f62712 Binary files /dev/null and b/theme/schleuder/images/help/right.jpg differ diff --git a/theme/schleuder/images/help/up.jpg b/theme/schleuder/images/help/up.jpg new file mode 100644 index 0000000000..ecc9fb8bc2 Binary files /dev/null and b/theme/schleuder/images/help/up.jpg differ diff --git a/theme/schleuder/images/menu/menu_bottom.jpg b/theme/schleuder/images/menu/menu_bottom.jpg new file mode 100644 index 0000000000..25d0819444 Binary files /dev/null and b/theme/schleuder/images/menu/menu_bottom.jpg differ diff --git a/theme/schleuder/images/menu/menu_row.jpg b/theme/schleuder/images/menu/menu_row.jpg new file mode 100644 index 0000000000..178140a188 Binary files /dev/null and b/theme/schleuder/images/menu/menu_row.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_account.jpg b/theme/schleuder/images/menu/menu_title_account.jpg new file mode 100644 index 0000000000..875b4e6a80 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_account.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_extras.jpg b/theme/schleuder/images/menu/menu_title_extras.jpg new file mode 100644 index 0000000000..61b8315509 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_extras.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_logout.jpg b/theme/schleuder/images/menu/menu_title_logout.jpg new file mode 100644 index 0000000000..cc31127a64 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_logout.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_main.jpg b/theme/schleuder/images/menu/menu_title_main.jpg new file mode 100644 index 0000000000..eb347adead Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_main.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_member.jpg b/theme/schleuder/images/menu/menu_title_member.jpg new file mode 100644 index 0000000000..6a8083898b Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_member.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_online.jpg b/theme/schleuder/images/menu/menu_title_online.jpg new file mode 100644 index 0000000000..9a1c062dd6 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_online.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_order.jpg b/theme/schleuder/images/menu/menu_title_order.jpg new file mode 100644 index 0000000000..870ac2f00a Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_order.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_rals.jpg b/theme/schleuder/images/menu/menu_title_rals.jpg new file mode 100644 index 0000000000..b6b4eac820 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_rals.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_stats.jpg b/theme/schleuder/images/menu/menu_title_stats.jpg new file mode 100644 index 0000000000..2e3fa738e6 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_stats.jpg differ diff --git a/theme/schleuder/images/menu/menu_title_themes.jpg b/theme/schleuder/images/menu/menu_title_themes.jpg new file mode 100644 index 0000000000..5bba7ae624 Binary files /dev/null and b/theme/schleuder/images/menu/menu_title_themes.jpg differ diff --git a/theme/schleuder/theme.php b/theme/schleuder/theme.php new file mode 100644 index 0000000000..6d515edbf8 --- /dev/null +++ b/theme/schleuder/theme.php @@ -0,0 +1,75 @@ + diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css new file mode 100644 index 0000000000..b0ba3f8489 --- /dev/null +++ b/theme/ship-simu/css/general.css @@ -0,0 +1,1067 @@ +body { + background-color : #FFFFFF; + color : #000000; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size : 12px; + letter-spacing : 1px; + + margin : 0px; + margin-left : 0px; + margin-right : 0px; + margin-top : 0px; + margin-bottom : 0px; +} + +table { + table-layout : auto; + border-spacing : 0px; + overflow : auto; +} + +A { + font-style : normal; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + text-decoration : none; +} + +A:link { + color : #000000; +} + +A:visited { + color : #000000; +} + +A:active { + color : #000088; + background-color : transparent; +} + +A:hover { + background-color : transparent; +} + +input, textarea, select, option { + color : #000000; + background-color : #FFFFFF; + border-color : #EEEEFF; + text-decoration : none; +} + +ul, ol { + margin-top : 0px; + margin-bottom : 0px; +} + +.form_reset { + border-style : groove; + border : solid 1px #000000; + color : #000000; +} + +.form_submit { + color : #000000; + border-color : #000000; +} + +.form_delete { + border-style : groove; + color : #000000; + border-color : #000000; +} + +.runtime { + color : #000000; + background-color : #FFFFFF; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.runtime.fatal { + color : #000000; +} + +.runtime.fatalcontent { + font-size : 20px; +} + +.admin { + color : #000000; + background-color : #FFFFFF; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.notice { + color : #000000; + font-size : 12px; +} + +.form_submit { + background-color : #FFFFFF; +} + +.banner { + background-color : #FFFFFF; + width : 488px; +} + +.fatal_error { + background-color : #FFFFFF; + color : #aa0000; + font-size : 10px; +} + +.form_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.admin.register, .table_header { + background-color : #EEEEFF; + color : #000000; +} + +.table_header { + background-color : #EEEEFF; + color : #000000; + text-align : center; + align : center; + height : 25px; + font-size : 14px; +} + +.admin_menu { + background-color : #EEEEFF; + color : #000000; + width : 230px; +} + +.logout_box { + background-color : #EEEEFF; + color : #000000; +} + +.description_text, .table { + background-color : #FFFFFF; +} + +.form_submitmenu { + min-width : 500px; + max-width : 90%; +} + +.member_header { + text-align : center; + height : 28px; + background-color : #EEEEFF; +} + +.member_data { + background-color : #FFFFFF; + color : #000000; + height : 20px; +} + +.form_field { + border-style : solid; + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.admin_alpha { + text-align : center; + height : 40px; + vertical-align : middle; +} + +.admin_sortlinks { + text-align : center; + height : 20px; + vertical-align : middle; +} + +.normal { + border-style : groove; +} + +.member_main { + background-color : #FFFFFF; +} + +.table_header { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 60px; +} + +.guest_login_header { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; +} + +.guest_menu, .member_menu { + width : 190px; + background-color : #FFFFFF; + vertical-align : top; +} + +.guest_menu_title, .member_menu_title { + background-color : #EEEEFF; + color : #000000; + height : 25px; + width : 200px; + border : 1px solid #000000; +} + +.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom { + border : 1px solid #000000; + border-top : 0px; + background-color : #FFFFFF; + height : 22px; +} + +.guest_menu_seperator, .member_menu_seperator { + height : 15px; +} + +.guest_content, .member_content { + background-color : #FFFFFF; + width : 99%; + margin-left : 5px; + margin-right : 5px; +} + +.guest_advert, .guest_login, .member_advert, .member_login { + background-color : #FFFFFF; + vertical-align : top; + margin-top : 10px; +} + +.table_footer { + height : 30px; + background-color : #EEEEFF; +} + +.master { + width : 100%; + height : 100%; + min-height : 90%; + max-height : 100%; + vertical-align : top; +} + +.footer_lines { + vertical-align : bottom; + font-size : 10px; + width : 640px; + vertical-align : middle; + background-color : #FFFFFF; + height : 40px; +} + +.dashed { + border : solid 1px; + border-color : #000000; +} + +.switch_sw1 { + background-color : #FFFFFF; +} + +.switch_sw2 { + background-color : #FFFFFF; +} + +.impressum { + font-size : 12px; + width : 320px; + vertical-align : middle; + background-color : #FFFFFF; + height : 70px; +} + +.mediadata { + background-color : #FFFFFF; +} + +.media_header, .impressum_header { + background-color : #EEEEFF; + align : center; + text-align : center; + color : #000000; + height : 26px; + font-weight : bold; + font-size : 20px; +} + +.media_left { + font-size : 14px; + width : 200px; +} + +.media_right { + color : #000000; + font-weight : bold; + font-size : 14px; + width : 70px; +} + +.admin_sep_footer { + background-color : #EEEEFF; + font-size : 1px; +} + +.admin_sep_footer2 { + background-color : #EEEEFF; + font-size : 1px; +} + +.table_footer, .member_refbanner, .member_update, .admin_del_link { + background-color : #EEEEFF; +} + +.table_footer { + height : 30px; + background-color : #EEEEFF; +} + +.table_footer { + height : 30px +} + +.admin_task_header { + background-color : #EEEEFF; + color : #000000; + vertical-align : middle; + font-size : 18px; + height : 35px; +} + +.seperator { + font-size : 1px +} + +.tab1 { + align : center +} + +.form_delete, .form_delete { + border-style : groove; + border : solid 1px #000000; + background-color : #000000; + color : #FFFFFF; +} + +.guest_stats { + background-color : #FFFFFF; + width : 460px; +} + +.guest_stats_title { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 30px; +} + +.guest_stats_l { + width : 344px; + text-align : right; +} + +.guest_stats_m { + width : 2px; +} + +.guest_stats_r, .guest_stats_lr, .guest_stats_rr { + color : #000000; + width : 28px; + font-weight : bold; + text-align : center; +} + +.guest_stats_ll, .guest_stats_rl { + width : 192px; + text-align : right; +} + +.guest_stats_footer { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 20px; +} + +.task_pre { + font-weight : bold; + margin-left : 0px; + margin-right : 0px; + margin-top : 10px; + margin-bottom : 10px; +} + +.impressum_body { + background-color : #FFFFFF; +} + +.guest_content_align, .member_content_align, .admin_content_align { + align : center; + text-align : center; + vertical-align : top; +} + +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { + width : 100%; +} + +.member_unconfirmed { + background-color : #FFFFFF; + width : 100%; + align : center; + text-align : center; +} + +.you_are_here { + white-space : nowrap; + font-size : 14px; +} + +.tiny { font-size : 12px; } +.medium { font-size : 14px; } +.big { font-size : 20px; } + +.top { border-top : 1px solid #000000; } +.bottom { border-bottom : 1px solid #000000; } +.left { border-left : 1px solid #000000; } +.right { border-right : 1px solid #000000; } + +.top2 { border-top : 1px solid #000000; } +.bottom2 { border-bottom : 1px solid #000000; } +.left2 { border-left : 1px solid #000000; } +.right2 { border-right : 1px solid #000000; } + +.nobr { + white-space : nowrap; +} + +.main { + height : 99%; + vertical-align : top; +} + +.footer { + height : 1% +} + +.menu_blur { + display : block; +} + +.menu_blur:hover { + background-color : #EEEEFF; +} + +.disabled { + border-style: groove; + background-color: #660000; + color: #FFFFFF; +} + +.mini_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; + font-size : 10px; +} + +.theme_box { + border : 1px solid #000000; + border-top : 0px; + width : 100%; + height : 70px; + background-color : #FFFFFF; +} + +.theme_note { + font-size : 12px; + font-weight : bold; +} + +.theme_content { + color : #000000; +} + +.para { + text-align : left; + padding-top : 15px; + padding-left : 10px; + padding-right : 10px; +} + +.para_notes { + text-align : left; + padding-top : 15px; + padding-left : 10px; + padding-right : 10px; + bottom : 0px; + position : absolute; +} + +.para_title { + text-align : left; + margin-top : 15px; + margin-bottom : 15px; + margin-left : 10px; + margin-right : 10px; +} + +.para_block { + border : 1px solid #000033; + width : 500px; + margin-left : 10px; + margin-bottom : 15px; +} + +.para_header { + text-align : center; + margin-top : 10px; + margin-left : 10px; + margin-right : 10px; +} + +.para_content { + text-align : left; + margin-top : 15px; + margin-left : 10px; + margin-right : 10px; + margin-bottom : 10px; +} + +.para_footer { + text-align : left; + margin-top : 15px; + margin-left : 10px; + margin-right : 10px; +} +body { + background-color : #FFFFFF; + color : #000000; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size : 12px; + letter-spacing : 1px; + + margin : 0px; + margin-left : 0px; + margin-right : 0px; + margin-top : 0px; + margin-bottom : 0px; +} + +table { + table-layout : auto; + border-spacing : 0px; + overflow : auto; +} + +A { + font-style : normal; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + text-decoration : none; +} + +A:link { + color : #000000; +} + +A:visited { + color : #000000; +} + +A:active { + color : #000088; + background-color : transparent; +} + +A:hover { + background-color : transparent; +} + +input, textarea, select, option { + color : #000000; + background-color : #FFFFFF; + border-color : #EEEEFF; + text-decoration : none; +} + +ul, ol { + margin-top : 0px; + margin-bottom : 0px; +} + +.form_reset { + border-style : groove; + border : solid 1px #000000; + color : #000000; +} + +.form_submit { + color : #000000; + border-color : #000000; +} + +.form_delete { + border-style : groove; + color : #000000; + border-color : #000000; +} + +.runtime { + color : #000000; + background-color : #FFFFFF; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.runtime.fatal { + color : #000000; +} + +.runtime.fatalcontent { + font-size : 20px; +} + +.admin { + color : #000000; + background-color : #FFFFFF; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +.form_submit { + background-color : #FFFFFF; +} + +.banner { + background-color : #FFFFFF; + width : 488px; +} + +.form_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.admin.register, .table_header { + background-color : #EEEEFF; + color : #000000; +} + +.table_header { + background-color : #EEEEFF; + color : #000000; + text-align : center; + align : center; + height : 25px; + font-size : 14px; +} + +.admin_menu { + background-color : #EEEEFF; + color : #000000; + width : 230px; +} + +.logout_box { + background-color : #EEEEFF; + color : #000000; +} + +.form_submitmenu { + min-width : 500px; + max-width : 90%; +} + +.member_data { + background-color : #FFFFFF; + color : #000000; + height : 20px; +} + +.form_field { + border-style : solid; + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.admin_alpha { + text-align : center; + height : 40px; + vertical-align : middle; +} + +.admin_sortlinks { + text-align : center; + height : 20px; + vertical-align : middle; +} + +.normal { + border-style : groove; +} + +.member_main { + background-color : #FFFFFF; +} + +.table_header { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 60px; +} + +.guest_login_header { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; +} + +.guest_menu, .member_menu { + width : 190px; + background-color : #FFFFFF; + vertical-align : top; +} + +.guest_menu_title, .member_menu_title { + background-color : #EEEEFF; + color : #000000; + height : 25px; + width : 200px; + border : 1px solid #000000; +} + +.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom { + border : 1px solid #000000; + border-top : 0px; + background-color : #FFFFFF; + height : 22px; +} + +.guest_menu_seperator, .member_menu_seperator { + height : 15px; +} + +.guest_content, .member_content { + background-color : #FFFFFF; + width : 99%; + margin-left : 5px; + margin-right : 5px; +} + +.guest_advert, .guest_login, .member_advert, .member_login { + background-color : #FFFFFF; + vertical-align : top; + margin-top : 10px; +} + +.table_footer { + height : 30px; + background-color : #EEEEFF; +} + +.master { + width : 100%; + height : 100%; + min-height : 90%; + max-height : 100%; + vertical-align : top; +} + +.footer_lines { + vertical-align : bottom; + font-size : 10px; + width : 640px; + vertical-align : middle; + background-color : #FFFFFF; + height : 40px; +} + +.dashed { + border : solid 1px; + border-color : #000000; +} + +.impressum { + font-size : 12px; + width : 320px; + vertical-align : middle; + background-color : #FFFFFF; + height : 70px; +} + +.mediadata { + background-color : #FFFFFF; +} + +.media_header, .impressum_header { + background-color : #EEEEFF; + align : center; + text-align : center; + color : #000000; + height : 26px; + font-weight : bold; + font-size : 20px; +} + +.media_left { + font-size : 14px; + width : 200px; +} + +.media_right { + color : #000000; + font-weight : bold; + font-size : 14px; + width : 70px; +} + +.admin_sep_footer { + background-color : #EEEEFF; + font-size : 1px; +} + +.admin_sep_footer2 { + background-color : #EEEEFF; + font-size : 1px; +} + +.table_footer, .member_refbanner, .member_update, .admin_del_link { + background-color : #EEEEFF; +} + +.table_footer { + height : 30px; + background-color : #EEEEFF; +} + +.table_footer { + height : 30px +} + +.admin_task_header { + background-color : #EEEEFF; + color : #000000; + vertical-align : middle; + font-size : 18px; + height : 35px; +} + +.seperator { + font-size : 1px +} + +.tab1 { + align : center +} + +.form_delete, .form_delete { + border-style : groove; + border : solid 1px #000000; + background-color : #000000; + color : #FFFFFF; +} + +.guest_stats { + background-color : #FFFFFF; + width : 460px; +} + +.guest_stats_title { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 30px; +} + +.guest_stats_l { + width : 344px; + text-align : right; +} + +.guest_stats_m { + width : 2px; +} + +.guest_stats_r, .guest_stats_lr, .guest_stats_rr { + color : #000000; + width : 28px; + font-weight : bold; + text-align : center; +} + +.guest_stats_ll, .guest_stats_rl { + width : 192px; + text-align : right; +} + +.guest_stats_footer { + color : #000000; + vertical-align : middle; + background-color : #EEEEFF; + height : 20px; +} + +.task_pre { + font-weight : bold; + margin-left : 0px; + margin-right : 0px; + margin-top : 10px; + margin-bottom : 10px; +} + +.impressum_body { + background-color : #FFFFFF; +} + +.guest_content_align, .member_content_align, .admin_content_align { + align : center; + text-align : center; + vertical-align : top; +} + +.list_categories, .admin_action_header, .admin_menu_main, .admin_menu_sub { + width : 100%; +} + +.member_unconfirmed { + background-color : #FFFFFF; + width : 100%; + align : center; + text-align : center; +} + +.you_are_here { + white-space : nowrap; + font-size : 14px; +} + +.tiny { font-size : 12px; } +.medium { font-size : 14px; } +.big { font-size : 20px; } + +.top { border-top : 1px solid #000000; } +.bottom { border-bottom : 1px solid #000000; } +.left { border-left : 1px solid #000000; } +.right { border-right : 1px solid #000000; } + +.top2 { border-top : 1px solid #000000; } +.bottom2 { border-bottom : 1px solid #000000; } +.left2 { border-left : 1px solid #000000; } +.right2 { border-right : 1px solid #000000; } + +.nobr { + white-space : nowrap; +} + +.main { + height : 99%; + vertical-align : top; +} + +.footer { + height : 1% +} + +.menu_blur { + display : block; +} + +.menu_blur:hover { + background-color : #EEEEFF; +} + +.disabled { + border-style: groove; + background-color: #660000; + color: #FFFFFF; +} + +.mini_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; + font-size : 10px; +} + +.theme_box { + border : 1px solid #000000; + border-top : 0px; + width : 100%; + height : 70px; + background-color : #FFFFFF; +} + +.theme_note { + font-size : 12px; + font-weight : bold; +} + +.theme_content { + color : #000000; +} + +.para { + text-align : left; + padding-top : 15px; + padding-left : 10px; + padding-right : 10px; +} + +.para_notes { + text-align : left; + padding-top : 15px; + padding-left : 10px; + padding-right : 10px; + bottom : 0px; + position : absolute; +} + +.para_title { + text-align : left; + margin-top : 15px; + margin-bottom : 15px; + margin-left : 10px; + margin-right : 10px; +} + +.para_block { + border : 1px solid #000033; + width : 500px; + margin-left : 10px; + margin-bottom : 15px; +} + +.para_header { + text-align : center; + margin-top : 10px; + margin-left : 10px; + margin-right : 10px; +} + +.para_content { + text-align : left; + margin-top : 15px; + margin-left : 10px; + margin-right : 10px; + margin-bottom : 10px; +} + +.para_footer { + text-align : left; + margin-top : 15px; + margin-left : 10px; + margin-right : 10px; +} diff --git a/theme/ship-simu/css/register.css b/theme/ship-simu/css/register.css new file mode 100644 index 0000000000..72f4540bc7 --- /dev/null +++ b/theme/ship-simu/css/register.css @@ -0,0 +1,182 @@ +.register_submit { + border-style : outset; +} + +.register_reset { + border-style : groove; + border : solid 1px #000000; + color : #000000; +} +.register_submit { + color : #000000; + border-color : #000000; +} + +.register_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.register_failed { + color : #000000; +} + +.register_snote { + font-size : 12px; +} + +.register_normal { + border-style : solid; + border : solid 1px; + border-color : #000000; + padding-right : 5px; +} + +.register_main { + background-color : #FFFFFF; + width : 540px; +} + +.register_done2 { + height : 40px; + color : #000000; + background-color : #FFFFFF; + width : 500px; +} + +.register_title { + background-color : #EEEEFF; + text-align : center; + align : center; + font-size : 18px; + padding-left : 5px; + padding-right : 5px; +} + +.register_seperator { + height : 7px; + font-size : 1px; +} + +.register_left { + text-align : right; + align : right; + margin-right : 2px; + color : #000000; + font-weight : bold; + font-size : 14px; + padding-left : 5px; +} + +.register_right { + padding-right : 5px; +} + +.register_header { + text-align : center; + align : center; + background-color : #EEEEFF; + color : #000000; + font-weight : bold; + border-top : 1px solid #000000; + border-bottom : 1px solid #000000; + height : 25px; +} + +A:hover.register_term { + background-color : #EEEEFF; + border-top : 1px solid #000000; + border-bottom : 1px solid #000000; +} +.register_submit { + border-style : outset; +} + +.register_reset { + border-style : groove; + border : solid 1px #000000; + color : #000000; +} +.register_submit { + color : #000000; + border-color : #000000; +} + +.register_select { + border : solid 1px; + border-color : #000000; + background-color : #EEEEFF; +} + +.register_failed { + color : #000000; +} + +.register_snote { + font-size : 12px; +} + +.register_normal { + border-style : solid; + border : solid 1px; + border-color : #000000; + padding-right : 5px; +} + +.register_main { + background-color : #FFFFFF; + width : 540px; +} + +.register_done2 { + height : 40px; + color : #000000; + background-color : #FFFFFF; + width : 500px; +} + +.register_title { + background-color : #EEEEFF; + text-align : center; + align : center; + font-size : 18px; + padding-left : 5px; + padding-right : 5px; +} + +.register_seperator { + height : 7px; + font-size : 1px; +} + +.register_left { + text-align : right; + align : right; + margin-right : 2px; + color : #000000; + font-weight : bold; + font-size : 14px; + padding-left : 5px; +} + +.register_right { + padding-right : 5px; +} + +.register_header { + text-align : center; + align : center; + background-color : #EEEEFF; + color : #000000; + font-weight : bold; + border-top : 1px solid #000000; + border-bottom : 1px solid #000000; + height : 25px; +} + +A:hover.register_term { + background-color : #EEEEFF; + border-top : 1px solid #000000; + border-bottom : 1px solid #000000; +} diff --git a/theme/ship-simu/images/code_bg.jpg b/theme/ship-simu/images/code_bg.jpg new file mode 100644 index 0000000000..79d72a277b Binary files /dev/null and b/theme/ship-simu/images/code_bg.jpg differ diff --git a/theme/ship-simu/images/code_bg.png b/theme/ship-simu/images/code_bg.png new file mode 100644 index 0000000000..3fd11af919 Binary files /dev/null and b/theme/ship-simu/images/code_bg.png differ diff --git a/theme/ship-simu/theme.php b/theme/ship-simu/theme.php new file mode 100644 index 0000000000..4438b428c0 --- /dev/null +++ b/theme/ship-simu/theme.php @@ -0,0 +1,76 @@ +