From ccf34a2a92d80d01debd84b4b6e1f294d8f90cce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Nov 2009 10:49:02 +0000 Subject: [PATCH] More HTML improvements --- inc/extensions/ext-politician-stop.php | 4 +- inc/filters.php | 4 +- inc/footer.php | 5 +- inc/functions.php | 41 ++++- inc/header.php | 26 +-- inc/libs/other_functions.php | 2 +- inc/libs/uberwach_functions.php | 2 +- inc/modules/admin/what-config_bonus.php | 4 +- inc/modules/admin/what-list_country.php | 4 +- inc/mysql-manager.php | 6 +- inc/stylesheet.php | 8 +- .../de/html/admin/admin_add_bank_package.tpl | 9 +- .../de/html/admin/admin_config_holiday.tpl | 32 ++-- .../de/html/admin/admin_config_order.tpl | 22 +-- .../de/html/admin/admin_config_other.tpl | 12 +- .../de/html/admin/admin_config_primera.tpl | 73 +++------ .../de/html/admin/admin_config_surfbar.tpl | 81 ++++------ .../de/html/admin/admin_config_top10.tpl | 27 ++-- .../de/html/admin/admin_config_transfer.tpl | 3 +- .../de/html/admin/admin_config_wernis.tpl | 6 +- .../admin/admin_edit_bank_packages_row.tpl | 9 +- .../de/html/admin/admin_edit_payments_row.tpl | 3 +- .../de/html/admin/admin_send_yoomedia.tpl | 13 +- templates/de/html/guest/guest_login.tpl | 3 +- templates/de/html/guest/guest_register.tpl | 79 +++------ .../html/guest/guest_sponsor_payment_row.tpl | 3 +- templates/de/html/guest/guest_sponsor_reg.tpl | 152 +++--------------- .../html/member/member_html_mail_settings.tpl | 6 +- .../de/html/member/member_nickname_form.tpl | 43 ++--- .../de/html/member/member_order_page2.tpl | 82 +++------- .../html/member/member_payout_form_banner.tpl | 24 +-- 31 files changed, 262 insertions(+), 526 deletions(-) diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php index 275175993d..ec0b11bc3a 100644 --- a/inc/extensions/ext-politician-stop.php +++ b/inc/extensions/ext-politician-stop.php @@ -54,12 +54,12 @@ switch (getExtensionMode()) { addExtensionAdminMenuSql('config','config_politician_stop','Politiker-Stopp-Aktion','Einstellungen zur Satire-Aktion "Politiker-Stopp - Jetzt wird zurück zensiert."', 7); // Register filter - registerFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + registerFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'remove': // Do stuff when removing extension // Unregister filter - unregisterFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + unregisterFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/filters.php b/inc/filters.php index c28d8fb3b0..4159a10796 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -928,10 +928,10 @@ function FILTER_DISPLAY_COPYRIGHT () { // Backlink enabled? if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) { // Copyright with backlink, thanks! :-) - loadTemplate('copyright_backlink'); + $GLOBALS['page_footer'] .= loadTemplate('copyright_backlink', true); } else { // No backlink in Copyright note - loadTemplate('copyright'); + $GLOBALS['page_footer'] .= loadTemplate('copyright', true); } } // END - if } diff --git a/inc/footer.php b/inc/footer.php index 72f500281c..058eb4f6ae 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -41,6 +41,9 @@ if (!defined('__SECURITY')) { die(); } // END - if +// Init page footer +$GLOBALS['page_footer'] = ''; + // Footer disabled or already sent? // 1234 5 54 45 5 5 543 3 321 if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (getOutputMode() != 1))) { @@ -48,7 +51,7 @@ if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($ runFilterChain('page_footer'); // Load page footer - loadTemplate('page_footer'); + $GLOBALS['page_footer'] .= loadTemplate('page_footer', true); } // END - if // Footer has been reached diff --git a/inc/functions.php b/inc/functions.php index 9bf6d0f47d..62aa009248 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -150,6 +150,9 @@ function compileFinalOutput () { // Init counter $cnt = '0'; + // Add page header and footer + addPageHeaderFooter(); + // Compile all out while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { // Init common variables @@ -2311,7 +2314,7 @@ function displayParsingTime() { ); // Load the template - loadTemplate('show_timings', false, $content); + $GLOBALS['page_footer'] .= loadTemplate('show_timings', true, $content); } // Check wether a boolean constant is set @@ -3928,6 +3931,42 @@ function isSpider () { return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false)); } +// Prepares the header for HTML output +function loadHtmlHeader () { + // Determine the page title + $content['header_title'] = determinePageTitle(); + + // Output page header code + $GLOBALS['page_header'] = loadTemplate('page_header', true, $content); + + // Include meta data in 'guest' module + if (getModule() == 'index') { + // Load meta data template + $GLOBALS['page_header'] .= loadTemplate('metadata', true); + + // Add meta description to header + if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { + // Add meta description not in admin and login module and when the script is installed + generateMetaDescriptionCode(getModule(), getWhat()); + } // END - if + } // END - if + + // Include more header data here + $GLOBALS['page_header'] .= loadTemplate('header', true); + + // Include stylesheet + loadIncludeOnce('inc/stylesheet.php'); + + // Closing HEAD tag + $GLOBALS['page_header'] .= ''; +} + +// Adds page header and footer to output array element +function addPageHeaderFooter () { + // Add them all together. This is maybe to simple + $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer']; +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// diff --git a/inc/header.php b/inc/header.php index 58ba602bd7..d87acc2edd 100644 --- a/inc/header.php +++ b/inc/header.php @@ -47,33 +47,11 @@ if (!defined('__SECURITY')) { if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) { // If not in CSS mode generate the header if (getOutputMode() != 1) { - // Determine the page title - $content['header_title'] = determinePageTitle(); - - // Output page header code - loadTemplate('page_header', false, $content); - - // Include meta data in 'guest' module - if (getModule() == 'index') { - // Load meta data template - loadTemplate('metadata'); - - // Add meta description to header - if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { - // Add meta description not in admin and login module and when the script is installed - generateMetaDescriptionCode(getModule(), getWhat()); - } // END - if - } // END - if - - // Include more header data here - loadTemplate('header'); - - // Include stylesheet - loadIncludeOnce('inc/stylesheet.php'); + // Prepare the header for HTML output + loadHtmlHeader(); } // END - if // Closing HEAD tag - if (getOutputMode() != 1) outputHtml(''); if ($GLOBALS['header_sent'] == '0') $GLOBALS['header_sent'] = 1; } // END - if diff --git a/inc/libs/other_functions.php b/inc/libs/other_functions.php index 5ef70180ff..42f6b03a91 100644 --- a/inc/libs/other_functions.php +++ b/inc/libs/other_functions.php @@ -62,7 +62,7 @@ function displayDebugSqls () { } // END - foreach // Load main template - loadTemplate('admin_other_sqls', false, $OUT); + $GLOBALS['page_footer'] .= loadTemplate('admin_other_sqls', true, $OUT); } // Filter for debugging SQLs diff --git a/inc/libs/uberwach_functions.php b/inc/libs/uberwach_functions.php index 7d6b3420ec..62c765800a 100644 --- a/inc/libs/uberwach_functions.php +++ b/inc/libs/uberwach_functions.php @@ -47,7 +47,7 @@ function loadUberwachSnippet () { $content['REMOTE_ADDR'] = detectRemoteAddr(); // Simply load the template here - loadTemplate('uberwach_snippet', false, $content); + $GLOBALS['page_footer'] .= loadTemplate('uberwach_snippet', true, $content); } // Filter for displaying uberwach snippet diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 0372884fd5..bd3f764c40 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -97,7 +97,7 @@ if (isFormSent()) { foreach ($RANKS as $k => $rate) { if (!empty($rate)) { // Print only when something is in - $OUT .= "
  •  
    ({?POINTS?})\n"; + $OUT .= "
  • ({?POINTS?})\n"; } // END - if $cnt++; } // END - foreach @@ -108,7 +108,7 @@ if (isFormSent()) { // Add more empty fields for ($i = $cnt; $i < $max; $i++) { - $OUT .= "
  •  
    ({?POINTS?})
    • \n"; + $OUT .= "
  • ({?POINTS?})
    • \n"; } // END - for $OUT .= "\n"; $content['trates_list'] = $OUT; diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 9a0a10ef2c..74d517baae 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -88,7 +88,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code'))) $class = 'admin_submit'; $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW'); $title = getMessage('ADMIN_COUNTRY_EDIT_TITLE'); - $reset = ' *'; + $reset = ' '; } else { // Delete template $row = 'admin_list_country_del_row'; @@ -104,7 +104,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code'))) foreach (postRequestParameter('id') as $id => $status) { // Load data from DB $result = SQL_QUERY_ESC("SELECT code, descr FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); + array(bigintval($id)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data list($code, $descr) = SQL_FETCHROW($result); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 96785ed9d3..f6d0955d57 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1675,13 +1675,13 @@ WHERE // Generates meta description for given module and 'what' value function generateMetaDescriptionCode ($module, $what) { - // Exclude admin and member's area - if (($module != 'admin') && ($module != 'login')) { + // Only include from guest area + if ($module == 'index') { // Construct dynamic description $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what); // Output it directly - outputHtml(''); + $GLOBALS['page_header'] .= ''; } // END - if // Remove depth diff --git a/inc/stylesheet.php b/inc/stylesheet.php index 392ea5a4a5..d77e9c9331 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -69,11 +69,11 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) { switch (getConfig('css_php')) { case 'DIRECT': // Just link them (unsupported) - outputHtml(''); + $GLOBALS['page_header'] .= ''; break; case 'FILE': // Output contents - outputHtml(readFromFile($FQFN)); + $GLOBALS['page_header'] .= readFromFile($FQFN); break; default: // Invalid mode! @@ -103,7 +103,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { } // END - foreach // Load template - loadTemplate('css_inline', false, $OUT); + $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT); } else { // Now we load all CSS files from css.php! $OUT = ''); + $GLOBALS['page_header'] .= $OUT . '%}" />'; } // [EOF] diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index 699883ac47..07bb7183c6 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -25,7 +25,8 @@ {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--} -  ({?POINTS?}) + + ({?POINTS?}) @@ -66,13 +67,15 @@ {--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--} -  ({?POINTS?}) + + ({?POINTS?}) {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--} -  ({?POINTS?}) + + ({?POINTS?}) diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 8c5cc7709f..53e17a4ac4 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -2,35 +2,24 @@
    - - - - + - - - - - - - - - - - + - - - - +
    - {--HOLIDAY_ADMIN_CONFIG_HEADER--}
      + {--HOLIDAY_ADMIN_CONFIG_HEADER--} +
    {--HOLIDAY_ADMIN_MAX_HOLIDAY--}: 
    ({--DAYS--})
     
    {--HOLIDAY_ADMIN_LOCKED--}:  $content[locked]
     
    {--HOLIDAY_ADMIN_MODE--}:  + {--HOLIDAY_ADMIN_MODE--}: {--HOLIDAY_ADMIN_MODE_RESET--}
    @@ -38,13 +27,10 @@
     
      + + +
    diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 10a85a00de..5875a02bd9 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -15,10 +15,10 @@ - {--ADMIN_ORDER_MAX--}:  + {--ADMIN_ORDER_MAX--}: - {--ADMIN_ORDER_ORDER--}:  + {--ADMIN_ORDER_ORDER--}: @@ -39,30 +39,24 @@ {--ADMIN_OPTION_CHECK_EMAIL_TEXT--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: {--ADMIN_OPTION_URL_BLACKLIST--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 58a2b3db46..25c64a8e10 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -163,8 +163,8 @@ {--ADMIN_OPTION_AUTOSEND_ACTIVE--}: - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: @@ -177,16 +177,16 @@ {--ADMIN_OPTION_SEND_UPDATE--}: - {--YES--}:   - {--NO--}:  + {--YES--}: + {--NO--}: {--ADMIN_OPTION_NOTIFY_ADMIN--}: - {--YES--}:   - {--NO--}:  + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index b1464cce5a..af4cc5a4cd 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -2,77 +2,54 @@
    - - - - + - - - - - + - - - + - - - - - - - - - - - - + - - - - - - - - - - + - + + - +
    - {--PRIMERA_ADMIN_CONFIG_TITLE--}
      + {--PRIMERA_ADMIN_CONFIG_TITLE--} +
    {--PRIMERA_ADMIN_API_NAME--}: 
      + +
    {--PRIMERA_ADMIN_API_MD5--}: {--PRIMERA_ADMIN_API_MD5--}:
     
    + Gespeicherter Hash:
    »{?primera_api_md5]«
    {--PRIMERA_ADMIN_REFID--}: 
     
      + +
    {--PRIMERA_ADMIN_MIN_PAYOUT--}:  Wernis
     
    {--PRIMERA_ADMIN_MIN_WITHDRAW--}:  Wernis + + Wernis +
     {--PRIMERA_ADMIN_MIN_WITHDRAW--}: + + Wernis +
      + + +
    diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 037ebaa43a..3875da01a2 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -1,3 +1,4 @@ +
    @@ -5,25 +6,24 @@ {--ADMIN_CONFIG_SURFBAR_TITLE--} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index a1557dc950..12f3659a56 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -123,7 +123,8 @@ @@ -133,7 +134,8 @@ 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 4a16d28c23..e99e3d8305 100644 --- a/templates/de/html/admin/admin_edit_bank_packages_row.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages_row.tpl @@ -9,7 +9,8 @@ @@ -19,7 +20,8 @@ diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index 3c5fb22304..6581122dfb 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -28,7 +28,8 @@ diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index f8e4c97089..57aaa84875 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -5,7 +5,6 @@ {--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--} - - - - - - - - - diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 344e3ef087..9f08f4d693 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -12,14 +12,12 @@ - - - - - - - - - - - - - - - - $content[refid_content] - - - - - - - - - - - - diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 97126affa9..d787d57688 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -1,84 +1,61 @@
    {--GUEST_SPONSOR_TITLE--}
    -
    -
    - $content[form_errors] -
    -
    -
      -
    • Melden Sie sich als Sponsor von {?MAIN_TITLE?} an! Hier bekommen Sie für Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!
      • -
    • Alles inklusiv: Ausführliche Statistiken (auch per Mail im gewünschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!
      • -
    • Werden Sie Sponsor und melden Sie sich noch heute an!
      • -
    -
    +
    + $content[form_errors] +
    +
    +
      +
    • Melden Sie sich als Sponsor von {?MAIN_TITLE?} an! Hier bekommen Sie für Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!
      • +
    • Alles inklusiv: Ausführliche Statistiken (auch per Mail im gewünschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!
      • +
    • Werden Sie Sponsor und melden Sie sich noch heute an!
      • +
    +
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--} -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_COSTS--} -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--} @@ -32,7 +32,6 @@ $content[surfbar_static_time]
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_LOCK--} @@ -41,7 +40,6 @@ $content[surfbar_static_lock]
     
    {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--} @@ -50,7 +48,6 @@ %
     
    {--ADMIN_CONFIG_SURFBAR_MAX_ORDER--} @@ -59,7 +56,6 @@
     
    {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--} @@ -68,7 +64,6 @@ $content[surfbar_restart_time]
     
    {--ADMIN_CONFIG_SURFBAR_STATS_RELOAD--} @@ -77,7 +72,6 @@ $content[surfbar_stats_reload]
     
    {--ADMIN_CONFIG_SURFBAR_PURGE_DELETED--} @@ -86,22 +80,19 @@ $content[surfbar_purge_deleted]
     
    + {--ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED--} + $content[surfbar_purge_migrated]
     
    {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}
     
    {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--} @@ -111,14 +102,13 @@
    + {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--} +
     
    {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--} @@ -141,103 +131,87 @@
     
    + {--ADMIN_CONFIG_SURFBAR_PAUSE_URL--} +
     
     
    + {--ADMIN_CONFIG_SURFBAR_AUTOSTART--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE--} +
     
     
    {--ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS--} -  ({?POINTS?}) + + ({?POINTS?})
     
    + {--ADMIN_CONFIG_SURFBAR_LOW_INTERVAL--} + $content[surfbar_low_interval]
     
     
    + {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--} + {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y--}
    {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N--}
     
    @@ -250,3 +224,4 @@
    {--ADMIN_CONFIG_SURFBAR_NOTE--}
    + diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 6d3edbeaea..9b5d5e0fdf 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -2,26 +2,21 @@ - + - + + - - - - - - - - - +
    - {--TOP10_ADMIN_CONFIG_HEADER--} + {--TOP10_ADMIN_CONFIG_HEADER--} +
     {--TOP10_ADMIN_MAX_TOP10--}: + +
    {--TOP10_ADMIN_MAX_TOP10--}: 
     
      + + +
    diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 55dc011857..98633a7c22 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -39,7 +39,8 @@     		{--ADMIN_TRANSFER_BALANCE--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--WERNIS_ADMIN_PAYOUT_FEE_FIX--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--WERNIS_ADMIN_WITHDRAW_FEE_FIX--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:
    -  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_TRANSFER_FEE--}:
    -  ({?POINTS?}) + + ({?POINTS?})     		{--ADMIN_BANK_PACKAGE_OUTPUT_MODE--}:
    @@ -51,7 +53,8 @@     		{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}:
    -  ({?POINTS?}) + + ({?POINTS?})
    {--PAY_PRICE--}:  -  ({?POINTS?}) + + ({?POINTS?})
     
    {--SELECT_CATEGORY--}: @@ -16,42 +15,37 @@
     
    {--ENTER_RECEIVER--}: {--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--}
     
    {--ENTER_POINTS--}: -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ENTER_SECONDS--}: {--_SECONDS--}
     
    {--ENTER_SUBJECT--}:
     
    {--ENTER_TEXT--}:
     
    {--MEMBER_ENTER_URL--}: @@ -62,11 +56,10 @@
    + {--ADMIN_YOOMEDIA_ENTER_URL_NOTE--}
     
    diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index 3bcbff7e77..67d3aaff7c 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -60,7 +60,8 @@
    {--GUEST_ENTER_LOGIN--}: -   {--_OR--} + + {--_OR--}
     
    + + {--GUEST_GENDER--}$content[must_fillout_gender]: + - - - + {--FAMILY--}$content[must_fillout_family]: + - - - + {--STREET_NR--}$content[must_fillout_street_nr]: + - - - + {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], + {--CITY--}$content[must_fillout_city]: + - - - + $content[country] + + + - - - - - - - + {--BIRTHDAY--}$content[must_fillout_birthday]: + +
    - {--GUEST_GENDER--}$content[must_fillout_gender]:  
     
    {--SURNAME--}$content[must_fillout_surname], - {--FAMILY--}$content[must_fillout_family]:  
     
    - {--STREET_NR--}$content[must_fillout_street_nr]:  
     
    - {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], - {--CITY--}$content[must_fillout_city]:   - $content[country]    -
     
    @@ -72,16 +61,13 @@
     
    - {--BIRTHDAY--}$content[must_fillout_birthday]:  $content[birthday_selection]
      + $content[birthday_selection] +
    @@ -91,9 +77,6 @@
     
    {--REGISTER_CATEGORIES--}: @@ -112,9 +95,6 @@ {--REGISTER_MISC--}:
     
    {--PASS_1--}, {--PASS_2--}: @@ -124,40 +104,25 @@
     
    $content[max_receive_list]
     
     
    + {--TERMS_OF_USAGE--}:
    {--YOU_FINALIZE--}
     
    + {--AGREE_TO_THIS--}: + {--YES--}: {--NO--}:
     
    diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl index 75fdedab01..ee0fab337c 100644 --- a/templates/de/html/guest/guest_sponsor_payment_row.tpl +++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl @@ -1,6 +1,7 @@
    -  $content[pay_name]
    + + $content[pay_name]
    ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      + {--SPONSOR_ENTER_COMPANY_DATA--}  
      +
    {--SPONSOR_COMPANY_NOTE--}
    		 
     
      {--SPONSOR_ENTER_COMPANY_TITLE--}:     
     
      {--SPONSOR_ENTER_COMPANY_POSITION--}:     
     
      {--SPONSOR_ENTER_TAX_IDENT--}:     
     
      + {--SPONSOR_ENTER_PERSONA_DATA--}  
     
      {--GUEST_GENDER--}:     
     
      {--GUEST_SURNAME--}:     
     
      {--GUEST_FAMILY--}:     
     
      + {--SPONSOR_ENTER_CONTACT_DATA--}  
     
      {--SPONSOR_ENTER_STREET_NR1--}:     
     
      {--SPONSOR_ENTER_STREET_NR2--}:     
     
      {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:    -  
     
      {--SPONSOR_ENTER_PHONE--}:     
     
      {--SPONSOR_ENTER_FAX--}:     
     
      {--SPONSOR_ENTER_CELL--}:     
     
      {--SPONSOR_ENTER_EMAIL--}:     
     
      {--SPONSOR_ENTER_URL--}:     
     
      + {--SPONSOR_ENTER_PASSWORDS--}  
     
      {--SPONSOR_ENTER_PASSWORDS--}:     
     
      + {--SPONSOR_REFERAL--}  
     
      {--SPONSOR_REFID_WAS--}:    $content[refid]  
     
      + {--SPONSOR_WARNINGS--}  
     
      {--GUEST_SPONSOR_RECEIVE_WARNINGS--}     
     
      {--SPONSOR_WARNING_INTERVAL--}:     
     
      + {--SPONSOR_PAYMENTS--}  
     
      {--SPONSOR_SELECT_PAYMENT--}:   $content[payment_list]  
     
      + {--SPONSOR_TERMS_HEADER--}  
     
      -   +   {--SPONSOR_ACCEPT_TERMS--}  
     
      +  
    +
    diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index 1650b57fc6..60173f76ae 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -1,3 +1,4 @@ +
    @@ -10,10 +11,10 @@ @@ -24,3 +25,4 @@
    - {--YES--}:    + {--YES--}:  -   {--NO--}:  + {--NO--}: 
    +
    diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index c3159db4bd..af97857625 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -1,48 +1,29 @@ +
    - +
    - - - - - - - - - + - + - - - - + - - - - - - - - - - - +
    {--NICKNAME_CHANGE_NICKNAME_TITLE--}
     
     {--NICKNAME_CHANGE_NICKNAME_INTRO--}  + {--NICKNAME_CHANGE_NICKNAME_TITLE--} +
     {--NICKNAME_CHANGE_NICKNAME_INTRO--}
      {--NICKNAME_ENTER_NICKNAME--}:   
     {--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?})
     {--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?}) 
     
        + + +
    +
    diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index b04e5ab3b8..8f1c624220 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -1,113 +1,67 @@ +
    $content[zip_content] - - - - - - - - - - - - - - - - - - - - - - - - - - - $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. -
    2. Unsere AGBs vergessen? [Hier sind sie nochmal].
      3. -
    3. Gesperrte URLs können nicht ein zweites Mal beworben werden.
      4. -
    4. Ihre Seite wird vor dem entgültigem Absenden auf Framekiller hin automatisch doppelt geprüft. Sollten Sie also nur Ihre beworbene Seite sehen, enthält diese einen Frame-Killer.
      5. -
    5. Ist Sponsor-Mail ausgewählt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!
      6. -
    6. Fremde {?mt_word3?} dürfen während der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!
      7. -
    -
    +     		+
    +
      +
    1. Bitte prüfen Sie unbedingt vor dem Absenden die Verfügbarkeit und Framekiller-Freiheit ihrer beworbenen Adresse!
      2. +
    2. Unsere AGBs vergessen? [Hier sind sie nochmal].
      3. +
    3. Gesperrte URLs können nicht ein zweites Mal beworben werden.
      4. +
    4. Ihre Seite wird vor dem entgültigem Absenden auf Framekiller hin automatisch doppelt geprüft. Sollten Sie also nur Ihre beworbene Seite sehen, enthält diese einen Frame-Killer.
      5. +
    5. Ist Sponsor-Mail ausgewählt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!
      6. +
    6. Fremde {?mt_word3?} dürfen während der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!
      7. +
    +
    		 
     
      {--MEMBER_ENTER_URL--}:   
        + + +
    +
    diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl index cdc75c103a..a0c9b0d48b 100644 --- a/templates/de/html/member/member_payout_form_banner.tpl +++ b/templates/de/html/member/member_payout_form_banner.tpl @@ -1,56 +1,45 @@ +
    - - - - - - - - - - - - + - - - - @@ -61,3 +50,4 @@
    (*): {--PAYOUT_BANNER_NOTE--}
    + -- 2.30.2
    + {--PAYOUT_NOW_TITLE--}
     
    {--PAYOUT_SELECTED_TYPE--}:  $content[type]
    {--PAYOUT_MAX_PAYOUT--}:  $content[max]
    {--PAYOUT_WANT_PAYOUT--}: 
    {--PAYOUT_TARGET_URL--}: 
    {--PAYOUT_ALTERNATE_TEXT--}: 
    {--PAYOUT_OPTIONAL_BANNER--}:  -  (*) + {--PAYOUT_OPTIONAL_BANNER--}: + (*)
     
    +