More HTML improvements

diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php
index 275175993db62582be2ebe570f48f316b6d26803..ec0b11bc3a05e52bc9ea9ea8ee8d5c4d78e18ddd 100644 (file)
--- 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
                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
                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
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/filters.php b/inc/filters.php
index c28d8fb3b01214bb93070408ad9ff854ed0c3ec8..4159a10796d6ae23825e59f2f4df2958d6f0b0a4 100644 (file)
--- 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! :-)
                // 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
                } else {
                        // No backlink in Copyright note

-                       loadTemplate('copyright');
+                       $GLOBALS['page_footer'] .= loadTemplate('copyright', true);

                }
        } // END - if
 }
                }
        } // END - if
 }

diff --git a/inc/footer.php b/inc/footer.php
index 72f500281c32ca384f1d1ecb01f50ab859eee467..058eb4f6ae43ab30cc504c3c7492e61fe41028e4 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -41,6 +41,9 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
        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))) {
 // 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
        runFilterChain('page_footer');
 
        // Load page footer

-       loadTemplate('page_footer');
+       $GLOBALS['page_footer'] .= loadTemplate('page_footer', true);

 } // END - if
 
 // Footer has been reached
 } // END - if
 
 // Footer has been reached

diff --git a/inc/functions.php b/inc/functions.php
index 9bf6d0f47d418cc270b6d41fd4f82332c3ffc7c2..62aa009248af7c6c1c1b9d9140043c9aeb2ff6be 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -150,6 +150,9 @@ function compileFinalOutput () {
        // Init counter
        $cnt = '0';
 
        // 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
        // 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
        );
 
        // Load the template

-       loadTemplate('show_timings', false, $content);
+       $GLOBALS['page_footer'] .= loadTemplate('show_timings', true, $content);

 }
 
 // Check wether a boolean constant is set
 }
 
 // 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));
 }
 
        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'] .= '</head>';
+}
+
+// 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 //
 //////////////////////////////////////////////////
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////

diff --git a/inc/header.php b/inc/header.php
index 58ba602bd7c6755206155cb56d793d218a0d4a73..d87acc2edd4c7cec0b34a2d2d8c9132e16364fa8 100644 (file)
--- 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) {
 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
        } // END - if
 
        // Closing HEAD tag

-       if (getOutputMode() != 1) outputHtml('</head>');

        if ($GLOBALS['header_sent'] == '0') $GLOBALS['header_sent'] = 1;
 } // END - if
 
        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 5ef70180ffcafd17e350eb517153c8c62783591b..42f6b03a91e36d99721e1d27557cdb7302f8a722 100644 (file)
--- a/inc/libs/other_functions.php
+++ b/inc/libs/other_functions.php
@@ -62,7 +62,7 @@ function displayDebugSqls () {
        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('admin_other_sqls', false, $OUT);
+       $GLOBALS['page_footer'] .= loadTemplate('admin_other_sqls', true, $OUT);

 }
 
 // Filter for debugging SQLs
 }
 
 // Filter for debugging SQLs

diff --git a/inc/libs/uberwach_functions.php b/inc/libs/uberwach_functions.php
index 7d6b3420ecd4a44c3e9714328abf62eac3775804..62c765800a89ca88b4dfcc9c9f9e534f5e23e85a 100644 (file)
--- 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
        $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
 }
 
 // Filter for displaying uberwach snippet

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 0372884fd5ff33c41b9bb025f59b13c2d9bf7bce..bd3f764c40bfc2045d29b492af174258c99fb9c3 100644 (file)
--- 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
        foreach ($RANKS as $k => $rate) {
                if (!empty($rate))      {
                        // Print only when something is in

-                       $OUT .= "  <li><input type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\">&nbsp;<div class=\"admin_notes\">({?POINTS?})</div?</li>\n";
+                       $OUT .= "  <li><input type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\" /> <div class=\"admin_notes\">({?POINTS?})</div?</li>\n";

                } // END - if
                $cnt++;
        } // END - foreach
                } // END - if
                $cnt++;
        } // END - foreach


@@ -108,7 +108,7 @@ if (isFormSent()) {
 
        // Add more empty fields
        for ($i = $cnt; $i < $max; $i++) {
 
        // Add more empty fields
        for ($i = $cnt; $i < $max; $i++) {

-               $OUT .= "  <li><input type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" />&nbsp;<div class=\"admin_notes\">({?POINTS?})</div></li>\n";
+               $OUT .= "  <li><input type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" /> <div class=\"admin_notes\">({?POINTS?})</div></li>\n";

        } // END - for
        $OUT .= "</ol>\n";
        $content['trates_list'] = $OUT;
        } // END - for
        $OUT .= "</ol>\n";
        $content['trates_list'] = $OUT;

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 9a0a10ef2cdd2ce225213007ed5f9468f5aa2e11..74d517baae03b30874aee20dcd40599f266a9e00 100644 (file)
--- 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');
                        $class  = 'admin_submit';
                        $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW');
                        $title  = getMessage('ADMIN_COUNTRY_EDIT_TITLE');

-                       $reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />&nbsp;*';
+                       $reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';

                } else {
                        // Delete template
                        $row    = 'admin_list_country_del_row';
                } 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",
                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);
                        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 96785ed9d3b7b746b68c3822398bfd1e27ea0204..f6d0955d578bcc4b8714357797cb9d3ed2ec8d48 100644 (file)
--- 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) {
 
 // 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
                // Construct dynamic description
                $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what);
 
                // Output it directly

-               outputHtml('<meta name="description" content="' . $DESCR . '" />');
+               $GLOBALS['page_header'] .= '<meta name="description" content="' . $DESCR . '" />';

        } // END - if
 
        // Remove depth
        } // END - if
 
        // Remove depth

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 392ea5a4a5d5ac275cee46c60ca6b87efd5e9926..d77e9c93318db48f5d54adb9bd93d9bb55541c01 100644 (file)
--- 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)
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
                        switch (getConfig('css_php')) {
                                case 'DIRECT': // Just link them (unsupported)

-                                       outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
+                                       $GLOBALS['page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';

                                        break;
 
                                case 'FILE': // Output contents
                                        break;
 
                                case 'FILE': // Output contents

-                                       outputHtml(readFromFile($FQFN));
+                                       $GLOBALS['page_header'] .= readFromFile($FQFN);

                                        break;
 
                                default: // Invalid mode!
                                        break;
 
                                default: // Invalid mode!


@@ -103,7 +103,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        } // END - foreach
 
        // Load template
        } // 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 = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';


@@ -119,7 +119,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        }
 
        // Close tag
        }
 
        // Close tag

-       outputHtml($OUT . '%}" />');
+       $GLOBALS['page_header'] .= $OUT . '%}" />';

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl
index 699883ac478269a00e6d4be4489d842041efa73a..07bb7183c68ffd452b19a84e27b7d817f64d4b4e 100644 (file)
--- 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--}
                </td>
                <td>
                        {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}
                </td>
                <td>

-                       <input type="text" class="admin_normal" name="account_fee" size="8" maxlength="20" value="0,00000" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" class="admin_normal" name="account_fee" size="8" maxlength="20" value="0,00000" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -66,13 +67,15 @@
        <tr>
                <td align="right">{--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--}</td>
                <td>
        <tr>
                <td align="right">{--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--}</td>
                <td>

-                       <input type="text" class="admin_normal" name="first_payment" size="4" maxlength="20" value="1,00" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" class="admin_normal" name="first_payment" size="4" maxlength="20" value="1,00" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}</td>
                <td>
                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}</td>
                <td>

-                       <input type="text" class="admin_normal" name="free_account_income" size="4" maxlength="20" value="0,00" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" class="admin_normal" name="free_account_income" size="4" maxlength="20" value="0,00" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl
index 8c5cc7709f9df01b11dcc19d504662c208468a3e..53e17a4ac48b1d1951f4265b631e3ae319dd0115 100644 (file)
--- a/templates/de/html/admin/admin_config_holiday.tpl
+++ b/templates/de/html/admin/admin_config_holiday.tpl
@@ -2,35 +2,24 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_holiday%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_holiday%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td colspan="3" align="center" class="admin_title bottom">
-               <strong>{--HOLIDAY_ADMIN_CONFIG_HEADER--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--HOLIDAY_ADMIN_CONFIG_HEADER--}</strong>
+               </td>

        </tr>
        <tr>
                <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MAX_HOLIDAY--}:</td>
        </tr>
        <tr>
                <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MAX_HOLIDAY--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td width="270">
                        <input type="text" name="holiday_max" class="admin_normal" value="{?holiday_max?}" size="4" maxlength="6" />
                        <div class="tiny">({--DAYS--})</div>
                </td>
        </tr>
                <td width="270">
                        <input type="text" name="holiday_max" class="admin_normal" value="{?holiday_max?}" size="4" maxlength="6" />
                        <div class="tiny">({--DAYS--})</div>
                </td>
        </tr>

-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>

        <tr>
                <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_LOCKED--}:</td>
        <tr>
                <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_LOCKED--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td width="270">$content[locked]</td>
        </tr>
        <tr>
                <td width="270">$content[locked]</td>
        </tr>
        <tr>

-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MODE--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270">
+               <td class="bottom" width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MODE--}:</td>
+               <td class="bottom" width="270">

                        <input type="radio" name="holiday_mode" class="admin_normal" value="RESET"$content[holidy_mode_reset] />
                        {--HOLIDAY_ADMIN_MODE_RESET--}<br />
                        <input type="radio" name="holiday_mode" class="admin_normal" value="DIRECT"$content[holidy_mode_direct] />
                        <input type="radio" name="holiday_mode" class="admin_normal" value="RESET"$content[holidy_mode_reset] />
                        {--HOLIDAY_ADMIN_MODE_RESET--}<br />
                        <input type="radio" name="holiday_mode" class="admin_normal" value="DIRECT"$content[holidy_mode_direct] />


@@ -38,13 +27,10 @@
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

-               <td colspan="3" class="bottom seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="ok" class="admin_submit"
-                       value="{--SAVE_SETTINGS--}" /></td>
+               <td colspan="2" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+               </td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl
index 10a85a00de47d99c0a1e93b4cf2829386b2d7a1a..5875a02bd9ab8dab63a11b27cd6dd72aa2c9f8c0 100644 (file)
--- a/templates/de/html/admin/admin_config_order.tpl
+++ b/templates/de/html/admin/admin_config_order.tpl
@@ -15,10 +15,10 @@
 
        <tr>
                <td class="bottom" align="center">
 
        <tr>
                <td class="bottom" align="center">

-                       {--ADMIN_ORDER_MAX--}:&nbsp;<input type="radio" name="order_max_full" class="admin_normal" value="MAX"$content[order_max_full_max] />
+                       {--ADMIN_ORDER_MAX--}: <input type="radio" name="order_max_full" class="admin_normal" value="MAX"$content[order_max_full_max] />

                </td>
                <td class="bottom" align="center">
                </td>
                <td class="bottom" align="center">

-                       {--ADMIN_ORDER_ORDER--}:&nbsp;<input type="radio" name="order_max_full" class="admin_normal" value="ORDER"$content[order_max_full_order] />
+                       {--ADMIN_ORDER_ORDER--}: <input type="radio" name="order_max_full" class="admin_normal" value="ORDER"$content[order_max_full_order] />

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -39,30 +39,24 @@
        <tr>
                <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_TEXT--}:</td>
                <td>
        <tr>
                <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_TEXT--}:</td>
                <td>

-                       <span class="nobr">
-                               {--YES--}:&nbsp;<input type="radio" name="allow_url_in_text" value="Y"$content[allow_url_in_text_y] />&nbsp;
-                               {--NO--}:&nbsp;<input type="radio" name="allow_url_in_text" value="N"$content[allow_url_in_text_n] />
-                       </span>
+                       {--YES--}: <input type="radio" name="allow_url_in_text" value="Y"$content[allow_url_in_text_y] />
+                       {--NO--}: <input type="radio" name="allow_url_in_text" value="N"$content[allow_url_in_text_n] />

                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}:</td>
                <td>
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}:</td>
                <td>

-                       <span class="nobr">
-                               {--YES--}:&nbsp;<input type="radio" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] />&nbsp;
-                               {--NO--}:&nbsp;<input type="radio" name="allow_url_in_subject" value="N"$content[allow_url_in_subject_n] />
-                       </span>
+                       {--YES--}: <input type="radio" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] />
+                       {--NO--}: <input type="radio" name="allow_url_in_subject" value="N"$content[allow_url_in_subject_n] />

                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_URL_BLACKLIST--}:</td>
                <td>
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_URL_BLACKLIST--}:</td>
                <td>

-                       <span class="nobr">
-                               {--YES--}:&nbsp;<input type="radio" name="url_blacklist" value="Y"$content[url_blacklist_y] />&nbsp;
-                               {--NO--}:&nbsp;<input type="radio" name="url_blacklist" value="N"$content[url_blacklist_n] />
-                       </span>
+                       {--YES--}: <input type="radio" name="url_blacklist" value="Y"$content[url_blacklist_y] />
+                       {--NO--}: <input type="radio" name="url_blacklist" value="N"$content[url_blacklist_n] />

                </td>
        </tr>
 
                </td>
        </tr>
 

diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index 58a2b3db4610624adecbff0ef7eef410b9a4e44a..25c64a8e10ff2495eba58516fad9f701bdf267f6 100644 (file)
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -163,8 +163,8 @@
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</td>
                <td class="bottom" align="center">
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</td>
                <td class="bottom" align="center">

-                       {--YES--}:&nbsp;<input type="radio" name="autosend_active" value="Y"$content[autosend_active_y] />
-                       {--NO--}:&nbsp;<input type="radio" name="autosend_active" value="N"$content[autosend_active_n] />
+                       {--YES--}: <input type="radio" name="autosend_active" value="Y"$content[autosend_active_y] />
+                       {--NO--}: <input type="radio" name="autosend_active" value="N"$content[autosend_active_n] />

                </td>
        </tr>
 
                </td>
        </tr>
 


@@ -177,16 +177,16 @@
        <tr>
                <td align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</td>
                <td align="center">
        <tr>
                <td align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</td>
                <td align="center">

-                       {--YES--}:&nbsp;<input type="radio" name="send_prof_update" value="Y"$content[send_prof_update_y] />&nbsp;
-                       {--NO--}:&nbsp;<input type="radio" name="send_prof_update" value="N"$content[send_prof_update_n] />
+                       {--YES--}: <input type="radio" name="send_prof_update" value="Y"$content[send_prof_update_y] />
+                       {--NO--}: <input type="radio" name="send_prof_update" value="N"$content[send_prof_update_n] />

                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</td>
                <td class="bottom" align="center">
                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</td>
                <td class="bottom" align="center">

-                       {--YES--}:&nbsp;<input type="radio" name="admin_notify" value="Y"$content[admin_notify_y] />&nbsp;
-                       {--NO--}:&nbsp;<input type="radio" name="admin_notify" value="N"$content[admin_notify_n] />
+                       {--YES--}: <input type="radio" name="admin_notify" value="Y"$content[admin_notify_y] />
+                       {--NO--}: <input type="radio" name="admin_notify" value="N"$content[admin_notify_n] />

                </td>
        </tr>
 
                </td>
        </tr>
 

diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl
index b1464cce5a327fbfe7e79f04ee7d11d4b347a5f1..af4cc5a4cd49c0d2c5ea05d9df29a22f9739935c 100644 (file)
--- a/templates/de/html/admin/admin_config_primera.tpl
+++ b/templates/de/html/admin/admin_config_primera.tpl
@@ -2,77 +2,54 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_primera%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_primera%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td colspan="3" align="center" class="admin_title bottom">
-               <strong>{--PRIMERA_ADMIN_CONFIG_TITLE--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--PRIMERA_ADMIN_CONFIG_TITLE--}</strong>
+               </td>

        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_API_NAME--}:</td>
        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_API_NAME--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270"><input type="text" name="primera_api_name"
-                       class="admin_normal" value="{?primera_api_name?}" size="10"
-                       maxlength="255" /></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
+               <td width="270">
+                       <input type="text" name="primera_api_name" class="admin_normal" value="{?primera_api_name?}" size="10" maxlength="255" />
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="300" align="right">{--PRIMERA_ADMIN_API_MD5--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270"><input type="password" name="pass"
+               <td class="bottom" width="300" align="right">{--PRIMERA_ADMIN_API_MD5--}:</td>
+               <td class="bottom" width="270"><input type="password" name="pass"

                        class="admin_normal" size="20"
                        maxlength="255" /><br />
                </td>
        </tr>
        <tr>
                        class="admin_normal" size="20"
                        maxlength="255" /><br />
                </td>
        </tr>
        <tr>

-               <td colspan="3" class="seperator bottom" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="admin_title bottom" align="center">
+               <td colspan="2" class="admin_title bottom" align="center">

                        Gespeicherter Hash:<br />
                        &raquo;<em>{?primera_api_md5]</em>&laquo;
                </td>
        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_REFID--}:</td>
                        Gespeicherter Hash:<br />
                        &raquo;<em>{?primera_api_md5]</em>&laquo;
                </td>
        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_REFID--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270"><input type="text" name="primera_refid"
-                       class="admin_normal" value="{?primera_refid?}" size="10"
-                       maxlength="255" /></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
+               <td width="270">
+                       <input type="text" name="primera_refid" class="admin_normal" value="{?primera_refid?}" size="10" maxlength="255" />
+               </td>

        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_MIN_PAYOUT--}:</td>
        </tr>
        <tr>
                <td width="300" align="right">{--PRIMERA_ADMIN_MIN_PAYOUT--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270"><input type="text" name="primera_min_payout"
-                       class="admin_normal" value="{?primera_min_payout?}" size="5"
-                       maxlength="20" /> Wernis</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="300" align="right">{--PRIMERA_ADMIN_MIN_WITHDRAW--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="270"><input type="text" name="primera_min_withdraw"
-                       class="admin_normal" value="{?primera_min_withdraw?}" size="5"
-                       maxlength="20" /> Wernis</td>
+               <td width="270">
+                       <input type="text" name="primera_min_payout" class="admin_normal" value="{?primera_min_payout?}" size="5" maxlength="20" />
+                       Wernis
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="3" class="seperator bottom" height="5">&nbsp;</td>
+               <td class="bottom" width="300" align="right">{--PRIMERA_ADMIN_MIN_WITHDRAW--}:</td>
+               <td class="bottom" width="270">
+                       <input type="text" name="primera_min_withdraw" class="admin_normal" value="{?primera_min_withdraw?}" size="5" maxlength="20" />
+                       Wernis
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="3" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="ok" class="admin_submit"
-                       value="{--SAVE_SETTINGS--}" /></td>
+               <td colspan="2" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+               </td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index 037ebaa43a4aecb766197c7441c2e10cea48fc22..3875da01a22f94c682cc7dba2f541e9b870d6912 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -1,3 +1,4 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_surfbar%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_surfbar%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>


@@ -5,25 +6,24 @@
                        <strong>{--ADMIN_CONFIG_SURFBAR_TITLE--}</strong>
                </td>
        </tr>
                        <strong>{--ADMIN_CONFIG_SURFBAR_TITLE--}</strong>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td width="60%" align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--}
                </td>
                <td width="40%">
        <tr>
                <td width="60%" align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--}
                </td>
                <td width="40%">

-                       <input type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_COSTS--}
                </td>
                <td style="padding-left:5px">
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_COSTS--}
                </td>
                <td style="padding-left:5px">

-                       <input type="text" name="surfbar_static_costs" size="6" maxlength="20" value="$content[surfbar_static_costs]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="surfbar_static_costs" size="6" maxlength="20" value="$content[surfbar_static_costs]" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--}


@@ -32,7 +32,6 @@
                        $content[surfbar_static_time]
                </td>
        </tr>
                        $content[surfbar_static_time]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_LOCK--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_LOCK--}


@@ -41,7 +40,6 @@
                        $content[surfbar_static_lock]
                </td>
        </tr>
                        $content[surfbar_static_lock]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--}


@@ -50,7 +48,6 @@
                        <input type="text" name="surfbar_dynamic_percent" size="6" maxlength="20" value="$content[surfbar_dynamic_percent]" />&#37;
                </td>
        </tr>
                        <input type="text" name="surfbar_dynamic_percent" size="6" maxlength="20" value="$content[surfbar_dynamic_percent]" />&#37;
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_MAX_ORDER--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_MAX_ORDER--}


@@ -59,7 +56,6 @@
                        <input type="text" name="surfbar_max_order" size="6" maxlength="20" value="$content[surfbar_max_order]" />
                </td>
        </tr>
                        <input type="text" name="surfbar_max_order" size="6" maxlength="20" value="$content[surfbar_max_order]" />
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--}


@@ -68,7 +64,6 @@
                        $content[surfbar_restart_time]
                </td>
        </tr>
                        $content[surfbar_restart_time]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATS_RELOAD--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATS_RELOAD--}


@@ -77,7 +72,6 @@
                        $content[surfbar_stats_reload]
                </td>
        </tr>
                        $content[surfbar_stats_reload]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PURGE_DELETED--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PURGE_DELETED--}


@@ -86,22 +80,19 @@
                        $content[surfbar_purge_deleted]
                </td>
        </tr>
                        $content[surfbar_purge_deleted]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED--}
                </td>

-               <td style="padding-left:5px">
+               <td class="bottom" style="padding-left:5px">

                        $content[surfbar_purge_migrated]
                </td>
        </tr>
                        $content[surfbar_purge_migrated]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>

        <tr>
                <td align="center" colspan="2" class="admin_footer bottom">
                        <strong>{--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}</strong>
                </td>
        </tr>
        <tr>
                <td align="center" colspan="2" class="admin_footer bottom">
                        <strong>{--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}</strong>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}


@@ -111,14 +102,13 @@
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--}
                </td>

-               <td style="padding-left:5px">
+               <td class="bottom" style="padding-left:5px">

                        <input type="radio" name="surfbar_pay_model" value="DYNAMIC"$content[surfbar_pay_model_dynamic] />
                </td>
        </tr>
                        <input type="radio" name="surfbar_pay_model" value="DYNAMIC"$content[surfbar_pay_model_dynamic] />
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>

        <tr>
                <td align="center" colspan="2" class="admin_footer bottom">
                        {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--}
        <tr>
                <td align="center" colspan="2" class="admin_footer bottom">
                        {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--}


@@ -141,103 +131,87 @@
                        <input type="radio" name="surfbar_pause_mode" value="EXTERNAL"$content[surfbar_pause_mode_external] />
                </td>
        </tr>
                        <input type="radio" name="surfbar_pause_mode" value="EXTERNAL"$content[surfbar_pause_mode_external] />
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_PAUSE_URL--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_PAUSE_URL--}
                </td>

-               <td style="padding-left:5px">
+               <td class="bottom" style="padding-left:5px">

                        <input type="text" name="surfbar_pause_url" size="15" maxlength="255" value="$content[surfbar_pause_url]" />
                </td>
        </tr>
                        <input type="text" name="surfbar_pause_url" size="15" maxlength="255" value="$content[surfbar_pause_url]" />
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </td>

-               <td align="center">
+               <td class="bottom" align="center">

                        <input type="radio" name="surfbar_autostart" value="Y"$content[surfbar_autostart_y] /> {--YES--}
                        <input type="radio" name="surfbar_autostart" value="N"$content[surfbar_autostart_n] /> {--NO--}
                </td>
        </tr>
                        <input type="radio" name="surfbar_autostart" value="Y"$content[surfbar_autostart_y] /> {--YES--}
                        <input type="radio" name="surfbar_autostart" value="N"$content[surfbar_autostart_n] /> {--NO--}
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
                </td>

-               <td align="center">
+               <td class="bottom" align="center">

                        <input type="radio" name="surfbar_notify_limits" value="Y"$content[surfbar_notify_limits_y] /> {--YES--}
                        <input type="radio" name="surfbar_notify_limits" value="N"$content[surfbar_notify_limits_n] /> {--NO--}
                </td>
        </tr>
                        <input type="radio" name="surfbar_notify_limits" value="Y"$content[surfbar_notify_limits_y] /> {--YES--}
                        <input type="radio" name="surfbar_notify_limits" value="N"$content[surfbar_notify_limits_n] /> {--NO--}
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--}
                </td>

-               <td align="center">
+               <td class="bottom" align="center">

                        <input type="radio" name="surfbar_notify_admin_unlock" value="Y"$content[surfbar_notify_admin_unlock_y] /> {--YES--}
                        <input type="radio" name="surfbar_notify_admin_unlock" value="N"$content[surfbar_notify_admin_unlock_n] /> {--NO--}
                </td>
        </tr>
                        <input type="radio" name="surfbar_notify_admin_unlock" value="Y"$content[surfbar_notify_admin_unlock_y] /> {--YES--}
                        <input type="radio" name="surfbar_notify_admin_unlock" value="N"$content[surfbar_notify_admin_unlock_n] /> {--NO--}
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE--}
                </td>

-               <td align="center">
+               <td class="bottom" align="center">

                        <select name="surfbar_notification_mode" class="admin_select" size="1">
                                <option value="INSTANT"$content[surfbar_notification_mode_instant]>{--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT--}</option>
                                <option value="RESET"$content[surfbar_notification_mode_reset]>{--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_RESET--}</option>
                        </select>
                </td>
        </tr>
                        <select name="surfbar_notification_mode" class="admin_select" size="1">
                                <option value="INSTANT"$content[surfbar_notification_mode_instant]>{--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT--}</option>
                                <option value="RESET"$content[surfbar_notification_mode_reset]>{--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE_RESET--}</option>
                        </select>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS--}
                </td>
                <td style="padding-left:5px">
        <tr>
                <td align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS--}
                </td>
                <td style="padding-left:5px">

-                       <input type="text" name="surfbar_warn_low_points" size="5" maxlength="20" value="$content[surfbar_warn_low_points]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="surfbar_warn_low_points" size="5" maxlength="20" value="$content[surfbar_warn_low_points]" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="right" style="padding-right:5px">
+               <td class="bottom" align="right" style="padding-right:5px">

                        {--ADMIN_CONFIG_SURFBAR_LOW_INTERVAL--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_LOW_INTERVAL--}
                </td>

-               <td style="padding-left:5px">
+               <td class="bottom" style="padding-left:5px">

                        $content[surfbar_low_interval]
                </td>
        </tr>
                        $content[surfbar_low_interval]
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="center">
+               <td class="bottom" align="center">

                        {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
                </td>

-               <td align="center">
+               <td class="bottom" align="center">

                        <input type="radio" name="surfbar_migrate_order" value="Y"$content[surfbar_migrate_order_y] /> {--YES--}
                        <input type="radio" name="surfbar_migrate_order" value="N"$content[surfbar_migrate_order_n] /> {--NO--}
                </td>
        </tr>
                        <input type="radio" name="surfbar_migrate_order" value="Y"$content[surfbar_migrate_order_y] /> {--YES--}
                        <input type="radio" name="surfbar_migrate_order" value="N"$content[surfbar_migrate_order_n] /> {--NO--}
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>
-       <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

        <tr>
        <tr>

-               <td align="center">
+               <td class="bottom" align="center">

                        {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--}
                </td>
                        {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--}
                </td>

-               <td align="left" style="padding-left: 5px">
+               <td class="bottom" align="left" style="padding-left: 5px">

                        <input type="radio" name="surfbar_guest_login_form" value="Y"$content[surfbar_guest_login_form_y] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y--}<br />
                        <input type="radio" name="surfbar_guest_login_form" value="N"$content[surfbar_guest_login_form_n] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N--}
                </td>
        </tr>
                        <input type="radio" name="surfbar_guest_login_form" value="Y"$content[surfbar_guest_login_form_y] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y--}<br />
                        <input type="radio" name="surfbar_guest_login_form" value="N"$content[surfbar_guest_login_form_n] /> {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N--}
                </td>
        </tr>

-       <tr><td height="3" colspan="2" class="seperator bottom">&nbsp;</td></tr>

        <tr>
                <td colspan="2" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
        <tr>
                <td colspan="2" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />


@@ -250,3 +224,4 @@
 <div class="admin_note">
        {--ADMIN_CONFIG_SURFBAR_NOTE--}
 </div>
 <div class="admin_note">
        {--ADMIN_CONFIG_SURFBAR_NOTE--}
 </div>

+</div>

diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl
index 6d3edbeaeaf6110e5618e23df84cc511b0b5500d..9b5d5e0fdf24f5e33658d02d935f86a6cc2efb60 100644 (file)
--- a/templates/de/html/admin/admin_config_top10.tpl
+++ b/templates/de/html/admin/admin_config_top10.tpl
@@ -2,26 +2,21 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_top10%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_top10%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td colspan="3" align="center" class="admin_title bottom">
-               <strong>{--TOP10_ADMIN_CONFIG_HEADER--}</strong></td>
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--TOP10_ADMIN_CONFIG_HEADER--}</strong>
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
+               <td class="bottom" align="right">{--TOP10_ADMIN_MAX_TOP10--}:</td>
+               <td class="bottom">
+                       <input type="text" name="top10_max" class="admin_normal" value="$content[max]" size="4" maxlength="6" />
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="400" align="right">{--TOP10_ADMIN_MAX_TOP10--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="170"><input type="text" name="top10_max"
-                       class="admin_normal" value="$content[max]" size="4" maxlength="6" /></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="bottom seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="ok" class="admin_submit"
-                       value="{--SAVE_SETTINGS--}" /></td>
+               <td colspan="2" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+               </td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl
index 55dc011857327e07e31896e687013367254f0355..98633a7c22df0d7bf784620d6b35e4425d1ac3bc 100644 (file)
--- a/templates/de/html/admin/admin_config_transfer.tpl
+++ b/templates/de/html/admin/admin_config_transfer.tpl
@@ -39,7 +39,8 @@
                <td align="right">{--ADMIN_TRANSFER_BALANCE--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td>
                <td align="right">{--ADMIN_TRANSFER_BALANCE--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td>

-                       <input type="text" name="transfer_balance" class="admin_normal" value="{?transfer_balance?}" size="4" maxlength="6" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="transfer_balance" class="admin_normal" value="{?transfer_balance?}" size="4" maxlength="6" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl
index a1557dc950e8d092ca79c533972acf4032177124..12f3659a56a24b6b595df82ee0eca4761f010cd6 100644 (file)
--- a/templates/de/html/admin/admin_config_wernis.tpl
+++ b/templates/de/html/admin/admin_config_wernis.tpl
@@ -123,7 +123,8 @@
                <td width="300" align="right">{--WERNIS_ADMIN_PAYOUT_FEE_FIX--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">
                <td width="300" align="right">{--WERNIS_ADMIN_PAYOUT_FEE_FIX--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">

-                       <input type="text" name="wernis_payout_fee_fix" class="admin_normal" value="{?wernis_payout_fee_fix?}" size="5" maxlength="20" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="wernis_payout_fee_fix" class="admin_normal" value="{?wernis_payout_fee_fix?}" size="5" maxlength="20" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -133,7 +134,8 @@
                <td width="300" align="right">{--WERNIS_ADMIN_WITHDRAW_FEE_FIX--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">
                <td width="300" align="right">{--WERNIS_ADMIN_WITHDRAW_FEE_FIX--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">

-                       <input type="text" name="wernis_withdraw_fee_fix" class="admin_normal" value="{?wernis_withdraw_fee_fix?}" size="5" maxlength="20" />&nbsp;<span class="tiny">({?POINTS?})</span>
+                       <input type="text" name="wernis_withdraw_fee_fix" class="admin_normal" value="{?wernis_withdraw_fee_fix?}" size="5" maxlength="20" />
+                       <span class="tiny">({?POINTS?})</span>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

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 4a16d28c2303603bd2c564b82e2df45b5b4c93a0..e99e3d830533e6a3a42037ed5c173f70e84530a1 100644 (file)
--- 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 @@
        </td>
        <td width="33%" align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:<br />
        </td>
        <td width="33%" align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:<br />

-               <input type="text" name="account_fee[$content[id]]" size="5" maxlength="10" value="$content[account_fee]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+               <input type="text" name="account_fee[$content[id]]" size="5" maxlength="10" value="$content[account_fee]" />
+               <span class="tiny">({?POINTS?})</span>

        </td>
 </tr>
 <tr>
        </td>
 </tr>
 <tr>


@@ -19,7 +20,8 @@
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom right">
                {--ADMIN_BANK_PACKAGE_TRANSFER_FEE--}:<br />
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom right">
                {--ADMIN_BANK_PACKAGE_TRANSFER_FEE--}:<br />

-               <input type="text" name="transfer_fee[$content[id]]" size="5" maxlength="10" value="$content[transfer_fee]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+               <input type="text" name="transfer_fee[$content[id]]" size="5" maxlength="10" value="$content[transfer_fee]" />
+               <span class="tiny">({?POINTS?})</span>

        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_OUTPUT_MODE--}:<br />
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_OUTPUT_MODE--}:<br />


@@ -51,7 +53,8 @@
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}:<br />
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}:<br />

-               <input type="text" name="free_account_income[$content[id]]" size="10" maxlength="20" value="$content[free_account_income]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+               <input type="text" name="free_account_income[$content[id]]" size="10" maxlength="20" value="$content[free_account_income]" />
+               <span class="tiny">({?POINTS?})</span>

        </td>
 </tr>
 <tr>
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl
index 3c5fb22304c4542153b77c61247c4bbc65ac730d..6581122dfbe712271edb978feb28277d3a29e496 100644 (file)
--- a/templates/de/html/admin/admin_edit_payments_row.tpl
+++ b/templates/de/html/admin/admin_edit_payments_row.tpl
@@ -28,7 +28,8 @@
 <tr>
        <td class="switch_sw$content[sw]" align="right">{--PAY_PRICE--}:&nbsp;</td>
        <td class="switch_sw$content[sw]">
 <tr>
        <td class="switch_sw$content[sw]" align="right">{--PAY_PRICE--}:&nbsp;</td>
        <td class="switch_sw$content[sw]">

-               <input type="text" name="price[$content[id]]" class="admin_normal" value="$content[price]" size="5" maxlength="8" />&nbsp;<span class="tiny">({?POINTS?})</span>
+               <input type="text" name="price[$content[id]]" class="admin_normal" value="$content[price]" size="5" maxlength="8" />
+               <span class="tiny">({?POINTS?})</span>

        </td>
 </tr>
 <tr>
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl
index f8e4c97089150d386860d1b3b36cc36c1faf4975..57aaa848754615c320649c121ff090fe706abf9d 100644 (file)
--- a/templates/de/html/admin/admin_send_yoomedia.tpl
+++ b/templates/de/html/admin/admin_send_yoomedia.tpl
@@ -5,7 +5,6 @@
                <strong>{--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--}</strong>
        </td>
 </tr>
                <strong>{--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--}</strong>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="10">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px">{--SELECT_CATEGORY--}:</td>
        <td>
 <tr>
        <td align="right" style="padding-right:5px">{--SELECT_CATEGORY--}:</td>
        <td>


@@ -16,42 +15,37 @@
                </select>
        </td>
 </tr>
                </select>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>

 <tr>
        <td width="150" align="right" style="padding-right:5px" valign="top">{--ENTER_RECEIVER--}:</td>
        <td width="530">
                <span class="admin_note"><em>{--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--}</em></span>
        </td>
 </tr>
 <tr>
        <td width="150" align="right" style="padding-right:5px" valign="top">{--ENTER_RECEIVER--}:</td>
        <td width="530">
                <span class="admin_note"><em>{--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--}</em></span>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_POINTS--}:</td>
        <td>
 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_POINTS--}:</td>
        <td>

-               <input type="text" name="points" class="admin_normal" size="4" maxlength="5" value="$content[reward]" />&nbsp;<span class="tiny">({?POINTS?})</span>
+               <input type="text" name="points" class="admin_normal" size="4" maxlength="5" value="$content[reward]" />
+               <span class="tiny">({?POINTS?})</span>

        </td>
 </tr>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_SECONDS--}:</td>
        <td>
                <input type="text" name="seconds" class="admin_normal" size="4" maxlength="5" value="$content[wait]" /> {--_SECONDS--}
        </td>
 </tr>
 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_SECONDS--}:</td>
        <td>
                <input type="text" name="seconds" class="admin_normal" size="4" maxlength="5" value="$content[wait]" /> {--_SECONDS--}
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_SUBJECT--}:</td>
        <td>
                <input type="text" name="subject" class="admin_normal" size="30" maxlength="150" value="{--ADMIN_YOOMEDIA_SUBJECT_PREFIX--} $content[name]" />
        </td>
 </tr>
 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_SUBJECT--}:</td>
        <td>
                <input type="text" name="subject" class="admin_normal" size="30" maxlength="150" value="{--ADMIN_YOOMEDIA_SUBJECT_PREFIX--} $content[name]" />
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px" valign="top">{--ENTER_TEXT--}:</td>
        <td>
                <textarea name="text" class="admin_normal" rows="8" cols="60">$content[text]</textarea>
        </td>
 </tr>
 <tr>
        <td align="right" style="padding-right:5px" valign="top">{--ENTER_TEXT--}:</td>
        <td>
                <textarea name="text" class="admin_normal" rows="8" cols="60">$content[text]</textarea>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator" height="10">&nbsp;</td></tr>

 <tr>
        <td align="right" style="padding-right:5px">{--MEMBER_ENTER_URL--}:</td>
        <td>
 <tr>
        <td align="right" style="padding-right:5px">{--MEMBER_ENTER_URL--}:</td>
        <td>


@@ -62,11 +56,10 @@
        </td>
 </tr>
 <tr>
        </td>
 </tr>
 <tr>

-       <td colspan="2" align="center">
+       <td colspan="2" align="center" class="bottom">

                <span class="admin_note"><em>{--ADMIN_YOOMEDIA_ENTER_URL_NOTE--}</em></span>
        </td>
 </tr>
                <span class="admin_note"><em>{--ADMIN_YOOMEDIA_ENTER_URL_NOTE--}</em></span>
        </td>
 </tr>

-<tr><td colspan="2" class="seperator bottom" height="10">&nbsp;</td></tr>

 <tr>
        <td colspan="2" align="center" class="admin_footer">
                <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
 <tr>
        <td colspan="2" align="center" class="admin_footer">
                <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />

diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl
index 3bcbff7e77540a1e8ff0aadd959617f0d1e8fa95..67d3aaff7cf8a264e666e4e1dcd594e880b59951 100644 (file)
--- a/templates/de/html/guest/guest_login.tpl
+++ b/templates/de/html/guest/guest_login.tpl
@@ -60,7 +60,8 @@
        <tr>
                <td align="right">{--GUEST_ENTER_LOGIN--}:</td>
                <td>
        <tr>
                <td align="right">{--GUEST_ENTER_LOGIN--}:</td>
                <td>

-                       <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />&nbsp;&nbsp;<strong>{--_OR--}</strong>
+                       <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />
+                       <strong>{--_OR--}</strong>

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 344e3ef08764f189b07d0171b71cef549ea20c76..9f08f4d693ccc007801ffd1b5c615135ce63a185 100644 (file)
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -12,14 +12,12 @@
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

-               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="2" align="center">
+               <td class="bottom" colspan="2" align="center">

                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td width="50%" class="register_left">
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td width="50%" class="register_left">

-                               {--GUEST_GENDER--}$content[must_fillout_gender]:&nbsp;&nbsp;</td>
+                                       {--GUEST_GENDER--}$content[must_fillout_gender]:
+                               </td>

                                <td width="50%" class="register_right"><select name="gender"
                                        size="1" class="guest_select">
                                        <option value="M">{--GENDER_M--}</option>
                                <td width="50%" class="register_right"><select name="gender"
                                        size="1" class="guest_select">
                                        <option value="M">{--GENDER_M--}</option>


@@ -27,42 +25,33 @@
                                        <option value="C">{--GENDER_C--}</option>
                                </select></td>
                        </tr>
                                        <option value="C">{--GENDER_C--}</option>
                                </select></td>
                        </tr>

-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-                       </tr>

                        <tr>
                                <td class="register_left">{--SURNAME--}$content[must_fillout_surname],
                        <tr>
                                <td class="register_left">{--SURNAME--}$content[must_fillout_surname],

-                               {--FAMILY--}$content[must_fillout_family]:&nbsp;&nbsp;</td>
+                                       {--FAMILY--}$content[must_fillout_family]:
+                               </td>

                                <td class="register_right">
                                        <input type="text" name="surname" lass="guest_normal" size="15" maxlength="255" value="$content[surname]" />
                                        <input type="text" name="family" class="guest_normal" size="15" maxlength="255" value="$content[family]" />
                                </td>
                        </tr>
                                <td class="register_right">
                                        <input type="text" name="surname" lass="guest_normal" size="15" maxlength="255" value="$content[surname]" />
                                        <input type="text" name="family" class="guest_normal" size="15" maxlength="255" value="$content[family]" />
                                </td>
                        </tr>

-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-                       </tr>

                        <tr>
                                <td class="register_left">
                        <tr>
                                <td class="register_left">

-                               {--STREET_NR--}$content[must_fillout_street_nr]:&nbsp;&nbsp;</td>
+                                       {--STREET_NR--}$content[must_fillout_street_nr]:
+                               </td>

                                <td class="register_right">
                                        <input type="text" name="street_nr" class="guest_normal" size="25" maxlength="255" value="$content[street_nr]" />
                                </td>
                        </tr>
                                <td class="register_right">
                                        <input type="text" name="street_nr" class="guest_normal" size="25" maxlength="255" value="$content[street_nr]" />
                                </td>
                        </tr>

-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-                       </tr>

                        <tr>
                                <td align="right" width="50%" class="register_left">
                        <tr>
                                <td align="right" width="50%" class="register_left">

-                               {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip],
-                               {--CITY--}$content[must_fillout_city]:&nbsp;&nbsp;</td>
+                                       {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip],
+                                       {--CITY--}$content[must_fillout_city]:
+                               </td>

                                <td width="50%" class="register_right">
                                <td width="50%" class="register_right">

-                               $content[country]&nbsp; <input type="text" name="zip"
-                                       class="guest_normal" size="5" maxlength="10" value="$content[zip]" />&nbsp;
-                               <input type="text" name="city" class="guest_normal" size="20"
-                                       maxlength="255" value="$content[city]" /></td>
-                       </tr>
-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
+                                       $content[country]
+                                       <input type="text" name="zip" class="guest_normal" size="5" maxlength="10" value="$content[zip]" />
+                                       <input type="text" name="city" class="guest_normal" size="20" maxlength="255" value="$content[city]" />
+                               </td>

                        </tr>
                        <tr>
                                <td align="right" width="50%" class="register_left">
                        </tr>
                        <tr>
                                <td align="right" width="50%" class="register_left">


@@ -72,16 +61,13 @@
                                        <input type="text" name="email" class="guest_normal" size="30" maxlength="255" value="$content[email]" />
                                </td>
                        </tr>
                                        <input type="text" name="email" class="guest_normal" size="30" maxlength="255" value="$content[email]" />
                                </td>
                        </tr>

-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-                       </tr>

                        <tr>
                                <td align="right" width="50%" class="register_left">
                        <tr>
                                <td align="right" width="50%" class="register_left">

-                               {--BIRTHDAY--}$content[must_fillout_birthday]:&nbsp;&nbsp;</td>
-                               <td width="50%" class="register_right">$content[birthday_selection]</td>
-                       </tr>
-                       <tr>
-                               <td colspan="2" height="7" class="seperator">&nbsp;</td>
+                                       {--BIRTHDAY--}$content[must_fillout_birthday]:
+                               </td>
+                               <td width="50%" class="register_right">
+                                       $content[birthday_selection]
+                               </td>

                        </tr>
                        <tr>
                                <td colspan="2" align="center">
                        </tr>
                        <tr>
                                <td colspan="2" align="center">


@@ -91,9 +77,6 @@
                </table>
                </td>
        </tr>
                </table>
                </td>
        </tr>

-       <tr>
-               <td colspan="2" height="7" class="seperator bottom">&nbsp;</td>
-       </tr>

        <tr>
                <td colspan="2" class="guest_title2 bottom">
                        {--REGISTER_CATEGORIES--}:
        <tr>
                <td colspan="2" class="guest_title2 bottom">
                        {--REGISTER_CATEGORIES--}:


@@ -112,9 +95,6 @@
                        {--REGISTER_MISC--}:
                </td>
        </tr>
                        {--REGISTER_MISC--}:
                </td>
        </tr>

-       <tr>
-               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-       </tr>

        <tr>
                <td align="right" width="60%" class="register_left">
                        {--PASS_1--}, {--PASS_2--}:
        <tr>
                <td align="right" width="60%" class="register_left">
                        {--PASS_1--}, {--PASS_2--}:


@@ -124,40 +104,25 @@
                        <input type="password" name="pass2" class="guest_normal" size="10" maxlength="100" />
                </td>
        </tr>
                        <input type="password" name="pass2" class="guest_normal" size="10" maxlength="100" />
                </td>
        </tr>

-       <tr>
-               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-       </tr>

        <tr>
                <td colspan="2" align="center">$content[max_receive_list]</td>
        </tr>
        <tr>
                <td colspan="2" align="center">$content[max_receive_list]</td>
        </tr>

-       <tr>
-               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-       </tr>

        $content[refid_content]
        <tr>
        $content[refid_content]
        <tr>

-               <td colspan="2" height="7" class="seperator bottom">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="2" class="guest_title2 bottom">
+               <td colspan="2" class="guest_title2 bottom top">

                        {--TERMS_OF_USAGE--}:<br />
                        <span class="guest_failed">{--YOU_FINALIZE--}</span>
                </td>
        </tr>
        <tr>
                        {--TERMS_OF_USAGE--}:<br />
                        <span class="guest_failed">{--YOU_FINALIZE--}</span>
                </td>
        </tr>
        <tr>

-               <td colspan="2" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" width="60%" class="register_left">
+               <td class="bottom" align="right" width="60%" class="register_left">

                        {--AGREE_TO_THIS--}:
                </td>
                        {--AGREE_TO_THIS--}:
                </td>

-               <td width="40%" class="register_right">
+               <td class="bottom" width="40%" class="register_right">

                        {--YES--}: <input type="radio" name="agree" class="guest_normal" value="Y" />
                        {--NO--}: <input type="radio" name="agree" class="guest_normal" value="N" checked="checked" />
                </td>
        </tr>
                        {--YES--}: <input type="radio" name="agree" class="guest_normal" value="Y" />
                        {--NO--}: <input type="radio" name="agree" class="guest_normal" value="N" checked="checked" />
                </td>
        </tr>

-       <tr>
-               <td colspan="2" height="7" class="seperator bottom">&nbsp;</td>
-       </tr>

        <tr>
                <td colspan="2" class="guest_footer">
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
        <tr>
                <td colspan="2" class="guest_footer">
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />

diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl
index 75fdedab01c4128af6bbee45d721f379e8c54902..ee0fab337cf70f578331a5055baecb12db87a5ba 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_payment_row.tpl
+++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl
@@ -1,6 +1,7 @@
 <tr>
   <td class="bottom switch_sw$content[sw]" height="50" style="padding-left: 2px; padding-right: 2px">
 <tr>
   <td class="bottom switch_sw$content[sw]" height="50" style="padding-left: 2px; padding-right: 2px">

-    <input type="radio" name="pay_type" class="guest_normal" value="$content[id]" />&nbsp;$content[pay_name]<br />
+    <input type="radio" name="pay_type" class="guest_normal" value="$content[id]" />
+    $content[pay_name]

     <div align="right">($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})</div>
   </td>
 </tr>
     <div align="right">($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})</div>
   </td>
 </tr>

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 97126affa929a133b2182acd010aa5e23e23d86f..d787d576881abfa5b38c7032a99fe47d04d84adf 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -1,84 +1,61 @@
 <div align="center">
        <div class="big">{--GUEST_SPONSOR_TITLE--}</div>
 <div align="center">
        <div class="big">{--GUEST_SPONSOR_TITLE--}</div>

-</div>
-<div class="errors">
-       $content[form_errors]
-</div>
-<div>
-       <ul>
-       <li>Melden Sie sich als Sponsor von <strong>{?MAIN_TITLE?}</strong> an! Hier bekommen Sie f&uuml;r Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!</li>
-       <li>Alles inklusiv: Ausf&uuml;hrliche Statistiken (auch per Mail im gew&uuml;nschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!</li>
-       <li>Werden Sie Sponsor und melden Sie sich noch heute an!</li>
-       </ul>
-</div>
+       <div class="errors">
+               $content[form_errors]
+       </div>
+       <div>
+               <ul>
+               <li>Melden Sie sich als Sponsor von <strong>{?MAIN_TITLE?}</strong> an! Hier bekommen Sie f&uuml;r Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!</li>
+               <li>Alles inklusiv: Ausf&uuml;hrliche Statistiken (auch per Mail im gew&uuml;nschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!</li>
+               <li>Werden Sie Sponsor und melden Sie sich noch heute an!</li>
+               </ul>
+       </div>

 
 <form accept-charset="utf-8" action="{%url=modules.php?module=index&amp;what=sponsor_reg%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="530">
 <tr>
 
 <form accept-charset="utf-8" action="{%url=modules.php?module=index&amp;what=sponsor_reg%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="530">
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_ENTER_COMPANY_DATA--}</strong>
   </td>
     <strong>{--SPONSOR_ENTER_COMPANY_DATA--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 <tr>
 </tr>
 <tr>

-  <td class="bottom" width="10" height="40">&nbsp;</td>
-  <td class="bottom" colspan="3" align="center">
+  <td class="bottom" colspan="2" align="center">

     <div class="guest_note">{--SPONSOR_COMPANY_NOTE--}</div>
   </td>
     <div class="guest_note">{--SPONSOR_COMPANY_NOTE--}</div>
   </td>

-  <td class="bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" width="200">
     {--SPONSOR_ENTER_COMPANY_TITLE--}:&nbsp;
   </td>
   <td align="right" width="200">
     {--SPONSOR_ENTER_COMPANY_TITLE--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td width="300">
     <input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="$content[company]" />
   </td>
   <td width="300">
     <input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="$content[company]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--SPONSOR_ENTER_COMPANY_POSITION--}:&nbsp;
   </td>
   <td align="right">
     {--SPONSOR_ENTER_COMPANY_POSITION--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="$content[position]" />
   </td>
   <td>
     <input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="$content[position]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_TAX_IDENT--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_TAX_IDENT--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="$content[tax_ident]" />
   </td>
   <td>
     <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="$content[tax_ident]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_ENTER_PERSONA_DATA--}</strong>
   </td>
     <strong>{--SPONSOR_ENTER_PERSONA_DATA--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--GUEST_GENDER--}:&nbsp;
   </td>
   <td align="right">
     {--GUEST_GENDER--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <select name="gender" class="guest_select" size="1">
       <option value="M"$content[gender_m]>{--GENDER_M--}</option>
   <td>
     <select name="gender" class="guest_select" size="1">
       <option value="M"$content[gender_m]>{--GENDER_M--}</option>


@@ -86,208 +63,140 @@
       <option value="C"$content[gender_c]>{--GENDER_C--}</option>
     </select>
   </td>
       <option value="C"$content[gender_c]>{--GENDER_C--}</option>
     </select>
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--GUEST_SURNAME--}:&nbsp;
   </td>
   <td align="right">
     {--GUEST_SURNAME--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="$content[surname]" />
   </td>
   <td>
     <input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="$content[surname]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--GUEST_FAMILY--}:&nbsp;
   </td>
   <td align="right">
     {--GUEST_FAMILY--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="$content[family]" />
   </td>
   <td>
     <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="$content[family]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_ENTER_CONTACT_DATA--}</strong>
   </td>
     <strong>{--SPONSOR_ENTER_CONTACT_DATA--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_STREET_NR1--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_STREET_NR1--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="$content[street_nr1]" />
   </td>
   <td>
     <input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="$content[street_nr1]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_STREET_NR2--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_STREET_NR2--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="$content[street_nr2]" />
   </td>
   <td>
     <input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="$content[street_nr2]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="$content[country]" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="$content[zip]" />
     <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="$content[city]" />
   </td>
   <td>
     <input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="$content[country]" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="$content[zip]" />
     <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="$content[city]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_PHONE--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_PHONE--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="phone" class="guest_normal" size="20" maxlength="255" value="$content[phone]" />
   </td>
   <td>
     <input type="text" name="phone" class="guest_normal" size="20" maxlength="255" value="$content[phone]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_FAX--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_FAX--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="fax" class="guest_normal" size="20" maxlength="255" value="$content[fax]" />
   </td>
   <td>
     <input type="text" name="fax" class="guest_normal" size="20" maxlength="255" value="$content[fax]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_CELL--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_CELL--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="cell" class="guest_normal" size="20" maxlength="255" value="$content[cell]" />
   </td>
   <td>
     <input type="text" name="cell" class="guest_normal" size="20" maxlength="255" value="$content[cell]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_EMAIL--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_EMAIL--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="email" class="guest_normal" size="20" maxlength="255" value="$content[email]" />
   </td>
   <td>
     <input type="text" name="email" class="guest_normal" size="20" maxlength="255" value="$content[email]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_URL--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_URL--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="text" name="url" class="guest_normal" size="20" maxlength="255" value="$content[url]" />
   </td>
   <td>
     <input type="text" name="url" class="guest_normal" size="20" maxlength="255" value="$content[url]" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_ENTER_PASSWORDS--}</strong>
   </td>
     <strong>{--SPONSOR_ENTER_PASSWORDS--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_ENTER_PASSWORDS--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_ENTER_PASSWORDS--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <input type="password" name="pass1" class="guest_normal" size="10" maxlength="255" />
     <input type="password" name="pass2" class="guest_normal" size="10" maxlength="255" />
   </td>
   <td>
     <input type="password" name="pass1" class="guest_normal" size="10" maxlength="255" />
     <input type="password" name="pass2" class="guest_normal" size="10" maxlength="255" />
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_REFERAL--}</strong>
   </td>
     <strong>{--SPONSOR_REFERAL--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_REFID_WAS--}:&nbsp;
   </td>
   <td align="right" valign="top">
     {--SPONSOR_REFID_WAS--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <strong>$content[refid]</strong>
   </td>
   <td>
     <strong>$content[refid]</strong>
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_WARNINGS--}</strong>
   </td>
     <strong>{--SPONSOR_WARNINGS--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--GUEST_SPONSOR_RECEIVE_WARNINGS--}&nbsp;
   </td>
   <td align="right">
     {--GUEST_SPONSOR_RECEIVE_WARNINGS--}&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <select name="receive_warnings" class="guest_select" size="1">
       <option value="Y"$content[rec_y]>{--YES--}</option>
       <option value="N"$content[rec_n]>{--NO--}</option>
     </select>
   </td>
   <td>
     <select name="receive_warnings" class="guest_select" size="1">
       <option value="Y"$content[rec_y]>{--YES--}</option>
       <option value="N"$content[rec_n]>{--NO--}</option>
     </select>
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right">
     {--SPONSOR_WARNING_INTERVAL--}:&nbsp;
   </td>
   <td align="right">
     {--SPONSOR_WARNING_INTERVAL--}:&nbsp;
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     <select name="warning_interval" class="guest_select" size="1">
       <option value="0">{--SELECT_NONE--}</option>
   <td>
     <select name="warning_interval" class="guest_select" size="1">
       <option value="0">{--SELECT_NONE--}</option>


@@ -299,57 +208,40 @@
       <option value="{--({?ONE_DAY?}*56)--}">8 {--LIFE_WEEKS--}</option>
     </select>
   </td>
       <option value="{--({?ONE_DAY?}*56)--}">8 {--LIFE_WEEKS--}</option>
     </select>
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_PAYMENTS--}</strong>
   </td>
     <strong>{--SPONSOR_PAYMENTS--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="right" valign="top">
     {--SPONSOR_SELECT_PAYMENT--}:
   </td>
   <td align="right" valign="top">
     {--SPONSOR_SELECT_PAYMENT--}:
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     $content[payment_list]
   </td>
   <td>
     $content[payment_list]
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>
-  <td class="guest_title2 bottom" colspan="3" align="center">
+  <td class="guest_title2 bottom" colspan="2" align="center">

     <strong>{--SPONSOR_TERMS_HEADER--}</strong>
   </td>
     <strong>{--SPONSOR_TERMS_HEADER--}</strong>
   </td>

-  <td class="guest_title2 bottom" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="seperator" width="10">&nbsp;</td>

   <td align="center" valign="top">
   <td align="center" valign="top">

-    <input type="checkbox" name="terms" class="guest_normal" value="1" />&nbsp;
+    <input type="checkbox" name="terms" class="guest_normal" value="1" />

   </td>
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

   <td>
     {--SPONSOR_ACCEPT_TERMS--}
   </td>
   <td>
     {--SPONSOR_ACCEPT_TERMS--}
   </td>

-  <td class="seperator" width="10">&nbsp;</td>

 </tr>
 </tr>

-<tr><td class="seperator bottom" colspan="5" height="5">&nbsp;</td></tr>

 <tr>
 <tr>

-  <td class="guest_footer seperator" width="10">&nbsp;</td>
-  <td class="guest_footer" colspan="3" align="center">
+  <td class="guest_footer" colspan="2" align="center">

     <input type="hidden" name="refid" value="$content[refid]" />
     <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
     <input type="submit" name="ok" class="guest_submit" value="{--REGISTER_SPONSOR--}" />
   </td>
     <input type="hidden" name="refid" value="$content[refid]" />
     <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
     <input type="submit" name="ok" class="guest_submit" value="{--REGISTER_SPONSOR--}" />
   </td>

-  <td class="guest_footer seperator" width="10">&nbsp;</td>

 </tr>
 </table>
 </form>
 </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl
index 1650b57fc68b3692bbe0f10fadcb2e22db4af07e..60173f76ae1a61dbbe398fb8a5fdf75406a2a5ae 100644 (file)
--- a/templates/de/html/member/member_html_mail_settings.tpl
+++ b/templates/de/html/member/member_html_mail_settings.tpl
@@ -1,3 +1,4 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=html_mail%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=html_mail%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>


@@ -10,10 +11,10 @@
        </tr>
        <tr>
                <td class="bottom" width="50%" align="right">
        </tr>
        <tr>
                <td class="bottom" width="50%" align="right">

-                       {--YES--}:&nbsp;<input type="radio" name="html" class="member_normal" value="Y"$content[html_y] />&nbsp;&nbsp;
+                       {--YES--}:&nbsp;<input type="radio" name="html" class="member_normal" value="Y"$content[html_y] />

                </td>
                <td class="bottom" width="50%" align="left">
                </td>
                <td class="bottom" width="50%" align="left">

-                       &nbsp;&nbsp;{--NO--}:&nbsp;<input type="radio" name="html" class="member_normal" value="N"$content[html_n] />
+                       {--NO--}:&nbsp;<input type="radio" name="html" class="member_normal" value="N"$content[html_n] />

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -24,3 +25,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl
index c3159db4bdbb4cc65fdad2a8c3b9acb296edaa8b..af9785762582df1749358f6b14fc9b304eaacccd 100644 (file)
--- a/templates/de/html/member/member_nickname_form.tpl
+++ b/templates/de/html/member/member_nickname_form.tpl
@@ -1,48 +1,29 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=nickname%}" method="post">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=nickname%}" method="post">

-<table border="0" cellspacing="0" cellpadding="0" width="500"
-       class="member_table dashed">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">

        <tr>
        <tr>

-               <td colspan="5" align="center" class="member_title2 bottom"
-                       height="30"><strong>{--NICKNAME_CHANGE_NICKNAME_TITLE--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="5" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="5" class="seperator">&nbsp;</td>
-               <td colspan="3">{--NICKNAME_CHANGE_NICKNAME_INTRO--}</td>
-               <td width="5" class="seperator">&nbsp;</td>
+               <td colspan="5" align="center" class="member_title2 bottom" height="30">
+                       <strong>{--NICKNAME_CHANGE_NICKNAME_TITLE--}</strong>
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" class="seperator" height="5">&nbsp;</td>
+               <td colspan="2">{--NICKNAME_CHANGE_NICKNAME_INTRO--}</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="5" class="seperator">&nbsp;</td>

                <td align="right">{--NICKNAME_ENTER_NICKNAME--}:</td>
                <td align="right">{--NICKNAME_ENTER_NICKNAME--}:</td>

-               <td width="5" class="seperator">&nbsp;</td>

                <td>
                        <input type="text" name="nickname" class="member_normal" size="30" maxlength="30" value="$content" />
                </td>
                <td>
                        <input type="text" name="nickname" class="member_normal" size="30" maxlength="30" value="$content" />
                </td>

-               <td width="5" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" class="seperator" height="5">&nbsp;</td>
+               <td class="bottom" colspan="2" align="center">{--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?})</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="5" class="seperator">&nbsp;</td>
-               <td colspan="3" align="center">{--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?})</td>
-               <td width="5" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" class="seperator bottom" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="5" class="member_footer seperator">&nbsp;</td>
-               <td colspan="3" class="member_footer" align="center"><input
-                       type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="ok" class="member_submit"
-                       value="{--NICKNAME_SUBMIT--}" /></td>
-               <td width="5" class="member_footer seperator">&nbsp;</td>
+               <td colspan="2" class="member_footer" align="center">
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="member_submit" value="{--NICKNAME_SUBMIT--}" />
+               </td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl
index b04e5ab3b894efb82e7349111315a97a9a3629da..8f1c624220115ed340e89a7fbc45bfebc60d2ac6 100644 (file)
--- a/templates/de/html/member/member_order_page2.tpl
+++ b/templates/de/html/member/member_order_page2.tpl
@@ -1,113 +1,67 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="660" class="member_table dashed" align="center">
        $content[zip_content]
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="660" class="member_table dashed" align="center">
        $content[zip_content]
        <tr>

-               <td colspan="5" height="5" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>

                <td align="right">{--SELECT_MAIL_TYPE--}:</td>
                <td align="right">{--SELECT_MAIL_TYPE--}:</td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td><select name="type" size="1" class="member_select">
                        <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
                        $content[type_selection]
                </select></td>
                <td><select name="type" size="1" class="member_select">
                        <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
                        $content[type_selection]
                </select></td>

-               <td width="10" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" height="5" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>

                <td align="right">{--SELECT_CATEGORY--}:</td>
                <td align="right">{--SELECT_CATEGORY--}:</td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td><select name="cat" size="1" class="member_select">
                        <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
                        $content[category_selection]
                </select></td>
                <td><select name="cat" size="1" class="member_select">
                        <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
                        $content[category_selection]
                </select></td>

-               <td width="10" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" height="5" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>

                <td align="right">
                        {--ENTER_RECEIVER--}: Minimum: <strong>{?order_min?}</strong>
                </td>
                <td align="right">
                        {--ENTER_RECEIVER--}: Minimum: <strong>{?order_min?}</strong>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td><input type="text" name="receiver" class="member_normal" size="4" maxlength="5" value="$content[target_send]" /></td>
                <td><input type="text" name="receiver" class="member_normal" size="4" maxlength="5" value="$content[target_send]" /></td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>

                <td align="right">{--ENTER_SUBJECT--}:</td>
                <td align="right">{--ENTER_SUBJECT--}:</td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td><input type="text" name="subject" class="member_normal" size="30" maxlength="150" value="$content[subject]" /></td>
                <td><input type="text" name="subject" class="member_normal" size="30" maxlength="150" value="$content[subject]" /></td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>

        </tr>
        $content[html_extension]
        <tr>
        </tr>
        $content[html_extension]
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>

                <td align="right">{--ENTER_TEXT--}:</td>
                <td align="right">{--ENTER_TEXT--}:</td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td><textarea name="text" class="member_normal" rows="10" cols="50">$content[text]</textarea></td>
                <td><textarea name="text" class="member_normal" rows="10" cols="50">$content[text]</textarea></td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3" align="center" class="member_note">
+               <td colspan="2" align="center" class="member_note">

                        <strong>{--MEMBER_PLEASE_NOTE--}</strong>
                </td>
                        <strong>{--MEMBER_PLEASE_NOTE--}</strong>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3" align="center" class="member_note">
-               <div align="left">
-               <ol>
-                       <li>Bitte pr&uuml;fen Sie <strong>unbedingt vor</strong> dem Absenden die Verf&uuml;gbarkeit und <strong><u>Framekiller-Freiheit</u></strong> ihrer beworbenen Adresse!</li>
-                       <li>Unsere AGBs vergessen? <strong>[<a href="{%url=agb.php%}" target="_blank">Hier sind sie nochmal</a>]</strong>.</li>
-                       <li>Gesperrte URLs k&ouml;nnen nicht ein zweites Mal beworben werden.</li>
-                       <li>Ihre Seite wird vor dem entg&uuml;ltigem Absenden auf Framekiller hin automatisch <u>doppelt</u> gepr&uuml;ft. Sollten Sie also nur Ihre beworbene Seite sehen, enth&auml;lt diese einen Frame-Killer.</li>
-                       <li>Ist Sponsor-Mail ausgew&auml;hlt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!</li>
-                       <li>Fremde {?mt_word3?} d&uuml;rfen w&auml;hrend der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!</li>
-               </ol>
-               </div>
+               <td colspan="2" align="center" class="member_note bottom">
+                       <div align="left">
+                       <ol>
+                               <li>Bitte pr&uuml;fen Sie <strong>unbedingt vor</strong> dem Absenden die Verf&uuml;gbarkeit und <strong><u>Framekiller-Freiheit</u></strong> ihrer beworbenen Adresse!</li>
+                               <li>Unsere AGBs vergessen? <strong>[<a href="{%url=agb.php%}" target="_blank">Hier sind sie nochmal</a>]</strong>.</li>
+                               <li>Gesperrte URLs k&ouml;nnen nicht ein zweites Mal beworben werden.</li>
+                               <li>Ihre Seite wird vor dem entg&uuml;ltigem Absenden auf Framekiller hin automatisch <u>doppelt</u> gepr&uuml;ft. Sollten Sie also nur Ihre beworbene Seite sehen, enth&auml;lt diese einen Frame-Killer.</li>
+                               <li>Ist Sponsor-Mail ausgew&auml;hlt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!</li>
+                               <li>Fremde {?mt_word3?} d&uuml;rfen w&auml;hrend der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!</li>
+                       </ol>
+                       </div>

                </td>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="5" class="seperator bottom">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator member_footer">&nbsp;</td>

                <td class="member_footer" align="right">{--MEMBER_ENTER_URL--}:</td>
                <td class="member_footer" align="right">{--MEMBER_ENTER_URL--}:</td>

-               <td width="10" class="seperator member_footer">&nbsp;</td>

                <td class="member_footer">
                        <input type="text" name="url" class="member_normal" size="60" maxlength="350" value="$content[url]" />
                </td>
                <td class="member_footer">
                        <input type="text" name="url" class="member_normal" size="60" maxlength="350" value="$content[url]" />
                </td>

-               <td width="10" class="seperator member_footer">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator member_footer">&nbsp;</td>
-               <td class="member_footer" colspan="3" align="center"><input
-                       type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="frametester" class="member_submit"
-                       value="{--CONTINUE_FRAMETESTER--}" /></td>
-               <td width="10" class="seperator member_footer">&nbsp;</td>
+               <td class="member_footer" colspan="2" align="center">
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="frametester" class="member_submit" value="{--CONTINUE_FRAMETESTER--}" />
+               </td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl
index cdc75c103a89e513e2cf0ecff434518228c11dcd..a0c9b0d48b64bcb10514325f5653a2b618fa541e 100644 (file)
--- a/templates/de/html/member/member_payout_form_banner.tpl
+++ b/templates/de/html/member/member_payout_form_banner.tpl
@@ -1,56 +1,45 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="member_table dashed">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="member_table dashed">
        <tr>

-               <td colspan="3" align="center" class="member_title2 bottom">
+               <td colspan="2" align="center" class="member_title2 bottom">

                        <strong>{--PAYOUT_NOW_TITLE--}</strong>
                </td>
        </tr>
                        <strong>{--PAYOUT_NOW_TITLE--}</strong>
                </td>
        </tr>

-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>

        <tr>
                <td width="215" height="20" align="right">{--PAYOUT_SELECTED_TYPE--}:</td>
        <tr>
                <td width="215" height="20" align="right">{--PAYOUT_SELECTED_TYPE--}:</td>

-               <td width="10" class="seperator">&nbsp;</td>

                <td width="215"><strong>$content[type]</strong></td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_MAX_PAYOUT--}:</td>
                <td width="215"><strong>$content[type]</strong></td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_MAX_PAYOUT--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td><strong>$content[max]</strong></td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_WANT_PAYOUT--}:</td>
                <td><strong>$content[max]</strong></td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_WANT_PAYOUT--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td>
                        <input type="text" name="payout" class="member_normal" size="10" maxlength="255" value="$content[max]" />
                </td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_TARGET_URL--}:</td>
                <td>
                        <input type="text" name="payout" class="member_normal" size="10" maxlength="255" value="$content[max]" />
                </td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_TARGET_URL--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td>
                        <input type="text" name="turl" class="member_normal" size="20" maxlength="500" value="http://" />
                </td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_ALTERNATE_TEXT--}:</td>
                <td>
                        <input type="text" name="turl" class="member_normal" size="20" maxlength="500" value="http://" />
                </td>
        </tr>
        <tr>
                <td height="25" align="right">{--PAYOUT_ALTERNATE_TEXT--}:</td>

-               <td class="seperator" width="10">&nbsp;</td>

                <td>
                        <input type="text" name="alt" class="member_normal" size="10" maxlength="30" />
                </td>
        </tr>
        <tr>
                <td>
                        <input type="text" name="alt" class="member_normal" size="10" maxlength="30" />
                </td>
        </tr>
        <tr>

-               <td height="25" align="right">{--PAYOUT_OPTIONAL_BANNER--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td>
-                       <input type="text" name="banner" class="member_normal" size="20" maxlength="500" />&nbsp;(*)
+               <td class="bottom" height="25" align="right">{--PAYOUT_OPTIONAL_BANNER--}:</td>
+               <td class="bottom">
+                       <input type="text" name="banner" class="member_normal" size="20" maxlength="500" />(*)

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

-               <td colspan="3" height="3" class="seperator bottom">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" align="center" class="member_footer">
+               <td colspan="2" align="center" class="member_footer">

                        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--PAYOUT_SEND_NOW--}" />
                </td>
                        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--PAYOUT_SEND_NOW--}" />
                </td>


@@ -61,3 +50,4 @@
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->
 <div class="member_note">(*):&nbsp;{--PAYOUT_BANNER_NOTE--}</div>
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->
 <div class="member_note">(*):&nbsp;{--PAYOUT_BANNER_NOTE--}</div>
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->

+</div>