More HTML rewrites

diff --git a/inc/language/de.php b/inc/language/de.php
index 64594a311f8ba105adc6e5b10003bd476d153faf..2f188169dc1086c78a14095fca2e09602ee14026 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1058,6 +1058,7 @@ addMessages(array(
        'ADMIN_DELETED_MAILS_COUNT' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge gel&ouml;scht.",
        'EMAIL_DELETE_COUNT' => "Buchungseintr&auml;ge gel&ouml;scht",
        'MXCHANGE_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folgender Meldung gestorben: <span class=\"data\">%s</span>",
        'ADMIN_DELETED_MAILS_COUNT' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge gel&ouml;scht.",
        'EMAIL_DELETE_COUNT' => "Buchungseintr&auml;ge gel&ouml;scht",
        'MXCHANGE_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folgender Meldung gestorben: <span class=\"data\">%s</span>",

+       'ADMIN_CONFIG_POINTS_TITLE' => "Einstellungen f&uuml;r {?POINTS?}",

 
        'ADMIN_SEND_RESET_LINK_TITLE' => "1/4: Administratorkennwort zur&uuml;cksetzen",
        'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten",
 
        'ADMIN_SEND_RESET_LINK_TITLE' => "1/4: Administratorkennwort zur&uuml;cksetzen",
        'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten",

diff --git a/inc/language/order_de.php b/inc/language/order_de.php
index 9f30b5fa4ddfd68b29f9cf54ef6f729db0ae7d79..ebac809a24db32e69a8982ceb375dcac126f0f38 100644 (file)
--- a/inc/language/order_de.php
+++ b/inc/language/order_de.php
@@ -46,7 +46,7 @@ addMessages(array(
        'ADMIN_ORDER_SETTINGS' => "Einstellungen - Mailbuchung",
        'ADMIN_ORDER_MISC_SETTINGS' => "Weitere Einstellungen",
        'ADMIN_ORDER_MAX_ORDER_SELECT' => "Wie viele Mailbuchungen sollen die Mitglieder maximal versenden können?",
        'ADMIN_ORDER_SETTINGS' => "Einstellungen - Mailbuchung",
        'ADMIN_ORDER_MISC_SETTINGS' => "Weitere Einstellungen",
        'ADMIN_ORDER_MAX_ORDER_SELECT' => "Wie viele Mailbuchungen sollen die Mitglieder maximal versenden können?",

-       'ADMIN_ORDER_MIN_RECEIVER_PER_ORDER' => "Minimale Empfänger pro Mailbuchung",
+       'ADMIN_ORDER_MIN_RECEIVER_PER_ORDER' => "Minimale Anzahl Empfänger pro Mailbuchung",

        'ADMIN_ORDER_MAX' => "So viele wie möglich.",
        'ADMIN_ORDER_ORDER' => "So viele wie auf Empfang eingestellt.",
        'MEMBER_ORDER_ALLOWED_RECEIVE' => "Sie k&ouml;nnen heute noch <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Mailbuchungen aufgeben.",
        'ADMIN_ORDER_MAX' => "So viele wie m&ouml;glich.",
        'ADMIN_ORDER_ORDER' => "So viele wie auf Empfang eingestellt.",
        'MEMBER_ORDER_ALLOWED_RECEIVE' => "Sie k&ouml;nnen heute noch <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Mailbuchungen aufgeben.",

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index e9008fb4e8647de4d7a6e29776cb6e51c19ac308..5b5d0156a89968336c630ee03384b76f94933109 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();

-}
+} // END - if

 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);


@@ -50,16 +50,20 @@ $CATS = '';
 
 if (isPostRequestElementSet('add')) {
        // Add a new category
 
 if (isPostRequestElementSet('add')) {
        // Add a new category

-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE cat='%s' LIMIT 1",
-       array(postRequestElement('catname')), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1",
+               array(postRequestElement('catname')), __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == '0') {
                // Category does not exists, we simply add it...
        if (SQL_NUMROWS($result) == '0') {
                // Category does not exists, we simply add it...

-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (cat, visible, sort) VALUES ('%s','%s','%s')",
-               array(postRequestElement('catname'), postRequestElement('visible'), bigintval(postRequestElement('parent') + 1)), __FILE__, __LINE__);
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('%s','%s','%s')",
+                       array(
+                               postRequestElement('catname'),
+                               postRequestElement('visible'),
+                               bigintval(postRequestElement('parent') + 1)
+                       ), __FILE__, __LINE__);

                $content = getMessage('CATEGORY_ADDED');
        } else {
                // Category does already exists
                $content = getMessage('CATEGORY_ADDED');
        } else {
                // Category does already exists

-               $content = "<span class=\"admin_failed\">{--CATEGORY_ALREADY_EXISTS--}</span>";
+               $content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';

        }
 
        // Free memory
        }
 
        // Free memory


@@ -76,37 +80,36 @@ if (isPostRequestElementSet('add')) {
 
                // Is the entry set?
                if (!empty($cat)) {
 
                // Is the entry set?
                if (!empty($cat)) {

-                       switch (getRequestElement('do'))
-                       {
+                       switch (getRequestElement('do')) {

                                case 'edit': // Change categories
                                case 'edit': // Change categories

-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET cat='%s', `visible`='%s', sort=%s WHERE `id`=%s LIMIT 1",
-                                       array(
-                                       $cat,
-                                       postRequestElement('vis', $id),
-                                       postRequestElement('sort', $id),
-                                       $id
-                                       ), __FILE__, __LINE__);
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s', `visible`='%s', `sort`=%s WHERE `id`=%s LIMIT 1",
+                                               array(
+                                                       $cat,
+                                                       postRequestElement('vis', $id),
+                                                       postRequestElement('sort', $id),
+                                                       $id
+                                               ), __FILE__, __LINE__);

                                        $TEXT = getMessage('CATEGORIES_SAVED');
                                        break;
 
                                case 'del': // Delete categories
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                                                array($id), __FILE__, __LINE__);
                                        $TEXT = getMessage('CATEGORIES_SAVED');
                                        break;
 
                                case 'del': // Delete categories
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                                                array($id), __FILE__, __LINE__);

-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE cat_id=%s",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",

                                                array($id), __FILE__, __LINE__);
                                        $TEXT = getMessage('CATEGORIES_DELETED');
                                        break;
                                                array($id), __FILE__, __LINE__);
                                        $TEXT = getMessage('CATEGORIES_DELETED');
                                        break;

-                       }
+                       } // END - switch

                } else {
                        // Entry not saved
                        $TEXT .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id);
                }
                } else {
                        // Entry not saved
                        $TEXT .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id);
                }

-       }
+       } // END - foreach

 
        if (isset($TEXT)) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
 
        if (isset($TEXT)) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);

-       }
+       } // END - if

 } elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
        // Delete categories
        $OUT = ''; $SW = 2;
 } elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
        // Delete categories
        $OUT = ''; $SW = 2;


@@ -129,15 +132,14 @@ if (isPostRequestElementSet('add')) {
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_del_cats_row', true, $content);
                $SW = 3 - $SW;
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_del_cats_row', true, $content);
                $SW = 3 - $SW;

-       }
+       } // END - foreach

 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
 } elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
        // Edit categories
        $OUT = ''; $SW = 2;
 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
 } elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
        // Edit categories
        $OUT = ''; $SW = 2;

-       foreach (postRequestElement('sel') as $id => $value)
-       {
+       foreach (postRequestElement('sel') as $id => $value) {

                // Load data from the category
                $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FILE__, __LINE__);
                // Load data from the category
                $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FILE__, __LINE__);


@@ -156,7 +158,7 @@ if (isPostRequestElementSet('add')) {
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
                $SW = 3 - $SW;
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
                $SW = 3 - $SW;

-       }
+       } // END - foreach

 
        // Load main template
        loadTemplate('admin_edit_cats', false, $OUT);
 
        // Load main template
        loadTemplate('admin_edit_cats', false, $OUT);


@@ -177,8 +179,9 @@ if (isPostRequestElementSet('add')) {
                        $content['vis'] = translateYesNo($content['visible']);
 
                        // Put cat descriptions into variable for the selection box
                        $content['vis'] = translateYesNo($content['visible']);
 
                        // Put cat descriptions into variable for the selection box

-                       if (strlen($content['cat']) > 20) $content['cat'] = substr($content['cat'], 0, 17)."...";
-                       $CATS .= "      <option value=\"".$content['sort']."\">".$content['cat']."</option>\n";
+                       $cat = $content['cat'];
+                       if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...';
+                       $CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';

 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_cats_row', true, $content);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_cats_row', true, $content);

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index d51f0d6ab6b7123d3efd2d827adf407539729408..2452427e2f6c03fc6b5cd1f60bf2640da1770c0d 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -50,7 +50,7 @@ if (!isExtensionActive('task')) {
 } // END - if
 
 $whereStatement = '';
 } // END - if
 
 $whereStatement = '';

-if (!isGetRequestElementSet(('type'))) setRequestGetElement('type', 'your');
+if (!isGetRequestElementSet('type')) setRequestGetElement('type', 'your');

 
 switch (getRequestElement('type')) {
        case 'your': // List only your own open (new) tasks
 
 switch (getRequestElement('type')) {
        case 'your': // List only your own open (new) tasks


@@ -81,12 +81,12 @@ switch (getRequestElement('type')) {
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
                loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), getRequestElement('type')));
                break;
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
                loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), getRequestElement('type')));
                break;

-}
+} // END - switch

 
 if (!empty($whereStatement)) {
        if ((isPostRequestElementSet('assign')) && (countPostSelection() > 0)) {
                // Assign / do tasks
 
 if (!empty($whereStatement)) {
        if ((isPostRequestElementSet('assign')) && (countPostSelection() > 0)) {
                // Assign / do tasks

-               loadIncludeOnce("inc/modules/admin/overview-inc.php");
+               loadIncludeOnce('inc/modules/admin/overview-inc.php');

                if (empty($dmy)) $dmy = '';
                outputSeletectedTasks(postRequestArray(), $dmy);
        } else {
                if (empty($dmy)) $dmy = '';
                outputSeletectedTasks(postRequestArray(), $dmy);
        } else {


@@ -110,7 +110,7 @@ ORDER BY
                                foreach (postRequestElement('sel') as $id => $sel) {
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
                                                array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
                                foreach (postRequestElement('sel') as $id => $sel) {
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
                                                array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);

-                               }
+                               } // END - foreach

                        } elseif (isPostRequestElementSet('del')) {
                                // Delete tasks
                                foreach (postRequestElement('sel') as $id => $sel) {
                        } elseif (isPostRequestElementSet('del')) {
                                // Delete tasks
                                foreach (postRequestElement('sel') as $id => $sel) {


@@ -122,7 +122,7 @@ ORDER BY
                                                // Mark task as to be deleted (purged by autopurge extension)
                                                adminDeleteTask($id);
                                        }
                                                // Mark task as to be deleted (purged by autopurge extension)
                                                adminDeleteTask($id);
                                        }

-                               }
+                               } // END - foreach

                        } else {
                                // Unknown action performed
                                debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
                        } else {
                                // Unknown action performed
                                debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));


@@ -198,7 +198,7 @@ ORDER BY
 
                        // Switch colors
                        $SW = 3 - $SW;
 
                        // Switch colors
                        $SW = 3 - $SW;

-               }
+               } // END - while

 
                // Free memory
                SQL_FREERESULT($result_tasks);
 
                // Free memory
                SQL_FREERESULT($result_tasks);


@@ -212,7 +212,7 @@ ORDER BY
                        loadTemplate('admin_overview_footer');
                }
        }
                        loadTemplate('admin_overview_footer');
                }
        }

-}
+} // END - if

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index b7d7f33b394a9eca55b64b98c3db1f7917c367d3..0c2925958cc37c59d83322ae2cd6f7fc1238fd5b 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -39,14 +39,14 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();

-}
+} // END - if

 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (((!isPostRequestElementSet(('t_wait'))) || (!isPostRequestElementSet(('payment')))) && (isGetRequestElementSet('do')) && (getRequestElement('do') == 'add')) {
        unsetPostRequestElement('ok');
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (((!isPostRequestElementSet(('t_wait'))) || (!isPostRequestElementSet(('payment')))) && (isGetRequestElementSet('do')) && (getRequestElement('do') == 'add')) {
        unsetPostRequestElement('ok');

-}
+} // END - if

 
 if (isFormSent()) {
        switch (getRequestElement('do')) {
 
 if (isFormSent()) {
        switch (getRequestElement('do')) {


@@ -74,13 +74,13 @@ if (isFormSent()) {
                                addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`='".$id."' LIMIT 1");
                        }
                        break;
                                addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`='".$id."' LIMIT 1");
                        }
                        break;

-       }
+       } // END - switch

 
        // Save settings
        if (countSqls() > 0) {
                // Run all queries
                runFilterChain('run_sqls');
 
        // Save settings
        if (countSqls() > 0) {
                // Run all queries
                runFilterChain('run_sqls');

-               $content = "<span class=\"admin_failed\">".SETTINGS_SAVED."</span>";
+               $content = "<span class=\"admin_failed\">{--SETTINGS_SAVED--}</span>";

        } else {
                // Nothing has changed!
                $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
        } else {
                // Nothing has changed!
                $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";


@@ -140,7 +140,7 @@ if (isFormSent()) {
        loadTemplate('admin_edit_payments', false, $OUT);
 } else {
        // Referal levels
        loadTemplate('admin_edit_payments', false, $OUT);
 } else {
        // Referal levels

-       $result = SQL_QUERY("SELECT id, time, payment, mail_title, price FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY time", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // Make referal levels editable and deletable
                $OUT = ''; $SW = 2;
        if (SQL_NUMROWS($result) > 0) {
                // Make referal levels editable and deletable
                $OUT = ''; $SW = 2;


@@ -161,14 +161,14 @@ if (isFormSent()) {
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_payments_list_row', true, $content);
                        $SW = 3 - $SW;
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_payments_list_row', true, $content);
                        $SW = 3 - $SW;

-               }
+               } // END - switch

 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                loadTemplate('admin_list_payments', false, $OUT);
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
                loadTemplate('admin_list_payments', false, $OUT);

-       }
+       } // END - if

 
        // Form for adding new referal levels
        loadTemplate('admin_add_payment');
 
        // Form for adding new referal levels
        loadTemplate('admin_add_payment');

diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl
index de66c264a6806985856471e2a6a0b14d400952f5..5ec6a81bdff5d0f23bf875e0d6b4e4da037c4950 100644 (file)
--- a/templates/de/html/admin/admin_add_bank_package.tpl
+++ b/templates/de/html/admin/admin_add_bank_package.tpl
@@ -81,7 +81,7 @@
                <td align="right">{--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td>
                <td align="right">{--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td>

-                       <input type="text" class="admin_normal" name="interest_plus" size="4" maxlength="10" value="0,00" /> %
+                       <input type="text" class="admin_normal" name="interest_plus" size="4" maxlength="10" value="0,00" />&#37;

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


@@ -91,7 +91,7 @@
                <td align="right">{--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td>
                <td align="right">{--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td>

-                       <input type="text" class="admin_normal" name="interest_minus" size="4" maxlength="10" value="0,00" /> %
+                       <input type="text" class="admin_normal" name="interest_minus" size="4" maxlength="10" value="0,00" />&#37;

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

diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl
index 2a74cf098c5e959aeb0b1efd6a5a00ff6684732b..4281b2c63df625ddf747ad755beddfe8b3c00e46 100644 (file)
--- a/templates/de/html/admin/admin_add_cat.tpl
+++ b/templates/de/html/admin/admin_add_cat.tpl
@@ -2,13 +2,13 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" 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_cats%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

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

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

-               <td align="right" width="200">
+               <td align="right">

                        <strong>{--ENTER_CATNAME--}:</strong>
                </td>
                <td>
                        <strong>{--ENTER_CATNAME--}:</strong>
                </td>
                <td>


@@ -17,7 +17,7 @@
        </tr>
 
        <tr>
        </tr>
 
        <tr>

-               <td align="right" width="200">
+               <td align="right">

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


@@ -29,7 +29,7 @@
        </tr>
 
        <tr>
        </tr>
 
        <tr>

-               <td class="bottom" align="right" width="200">
+               <td class="bottom" align="right">

                        <strong>{--CAT_IS_VISIBLE--}</strong>
                </td>
                <td class="bottom">
                        <strong>{--CAT_IS_VISIBLE--}</strong>
                </td>
                <td class="bottom">


@@ -39,7 +39,7 @@
        </tr>
 
        <tr>
        </tr>
 
        <tr>

-               <td class="admin_footer" colspan="3">
+               <td class="admin_footer" colspan="2">

                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="add" class="admin_submit" value="{--ADD_NEW_CAT--}" />
                </td>
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="add" class="admin_submit" value="{--ADD_NEW_CAT--}" />
                </td>

diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl
index a8c61046c034fd4b7346fbd6c515a7567095d1bb..62ceaa0bbfab4fdc69446183b05464392923129c 100644 (file)
--- a/templates/de/html/admin/admin_add_max.tpl
+++ b/templates/de/html/admin/admin_add_max.tpl
@@ -1,50 +1,32 @@
+<div align="center">

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

-<table border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_table dashed">
+<table border="0" cellspacing="0" cellpadding="0" width="500" class="admin_table dashed">

        <tr>
        <tr>

-               <td colspan="5" class="admin_title bottom" align="center" height="30">
-               <strong>{--ADMIN_ADD_MAX_VALUE--}</strong></td>
+               <td colspan="2" class="admin_title bottom" align="center">
+                       <strong>{--ADMIN_ADD_MAX_VALUE--}</strong>
+               </td>

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

-               <td class="seperator" colspan="5" height="3">&nbsp;</td>
+               <td colspan="2" align="center">{--MAX_RECEIVE--}</td>

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

-               <td class="seperator" width="10">&nbsp;</td>
-               <td colspan="3" align="center">{--MAX_RECEIVE--}</td>
-               <td class="seperator" width="10">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="seperator" colspan="5" height="7">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="seperator" width="10">&nbsp;</td>

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

-               <td class="seperator" width="10">&nbsp;</td>
-               <td><input type="text" name="max" class="admin_normal" size="5"
-                       maxlength="5" /></td>
-               <td class="seperator" width="10">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="seperator" colspan="5" height="7">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td align="right">{--ENTER_MAX_COMMENT--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td><input type="text" name="comment" class="admin_normal"
-                       size="10" maxlength="255" /></td>
-               <td class="seperator" width="10">&nbsp;</td>
+               <td>
+                       <input type="text" name="max" class="admin_normal" size="2" maxlength="2" />
+               </td>

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

-               <td class="seperator bottom" colspan="5" height="14">&nbsp;</td>
+               <td class="bottom" align="right">{--ENTER_MAX_COMMENT--}:</td>
+               <td class="bottom">
+                       <input type="text" name="comment" class="admin_normal" size="10" maxlength="255" />
+               </td>

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

-               <td class="admin_footer seperator" width="10">&nbsp;</td>
-               <td class="admin_footer" colspan="3" align="center"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="add_max" class="admin_submit"
-                       value="{--ADD_MAX_RECEIVE--}" /></td>
-               <td class="admin_footer seperator" width="10">&nbsp;</td>
+               <td class="admin_footer" colspan="2" align="center">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="add_max" class="admin_submit" value="{--ADD_MAX_RECEIVE--}" />
+               </td>

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

-</form>
\ No newline at end of file
+</form>
+</div>

diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl
index 92d187c9d3f1fa46b0d497637aea03b2be3ec52c..b9747d722e3e235da1f4b30a7d9f164c0f8ee21f 100644 (file)
--- a/templates/de/html/admin/admin_add_payment.tpl
+++ b/templates/de/html/admin/admin_add_payment.tpl
@@ -1,54 +1,43 @@
+<div align="center">

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

-               <td class="admin_title bottom" colspan="3" align="center" height="30">
-               <strong>{--ADD_NEW_PAYMENT--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" width="200">{--ENTER_PAY_TIME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="200"><input type="text" name="t_wait"
-                       class="admin_normal" size="3" maxlength="3">&nbsp;{--_SECONDS--}
+               <td class="admin_title bottom" colspan="2">
+                       <strong>{--ADD_NEW_PAYMENT--}</strong>

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

-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
+               <td align="right">{--ENTER_PAY_TIME--}:</td>
+               <td>
+                       <input type="text" name="t_wait" class="admin_normal" size="3" maxlength="3" /> {--_SECONDS--}
+               </td>

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

-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="text" name="payment" class="admin_normal"
-                       size="3" maxlength="3">&nbsp;<span class="tiny">({?POINTS?})</span></td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
+               <td>
+                       <input type="text" name="payment" class="admin_normal" size="3" maxlength="3" />
+                       <span class="tiny">({?POINTS?})</span>
+               </td>

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

-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="text" name="price" class="admin_normal" size="3"
-                       maxlength="3">&nbsp;<span class="tiny">({?POINTS?})</span></td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right">{--ENTER_PAY_TITLE--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="text" name="title" class="admin_normal"
-                       size="15" maxlength="255"></td>
+               <td>
+                       <input type="text" name="price" class="admin_normal" size="3" maxlength="3" />
+                       <span class="tiny">({?POINTS?})</span>
+               </td>

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

-               <td colspan="5" height="3" class="seperator bottom">&nbsp;</td>
+               <td class="bottom" align="right">{--ENTER_PAY_TITLE--}:</td>
+               <td class="bottom">
+                       <input type="text" name="title" class="admin_normal" size="15" maxlength="255" />
+               </td>

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

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

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

-</form>
\ No newline at end of file
+</form>
+</div>
\ No newline at end of file

diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl
index 2b8703e67978135f57257e1b7cd4746e338c28ae..f05b564ee2b98dedbd9272024023ce09c9ec0e80 100644 (file)
--- a/templates/de/html/admin/admin_add_reflevel.tpl
+++ b/templates/de/html/admin/admin_add_reflevel.tpl
@@ -14,7 +14,7 @@
        <tr>
                <td class="bottom" align="right" width="200">{--ENTER_REF_PERCENTS--}:</td>
                <td class="bottom">
        <tr>
                <td class="bottom" align="right" width="200">{--ENTER_REF_PERCENTS--}:</td>
                <td class="bottom">

-                       <input type="text" name="percents" class="admin_normal" size="3" maxlength="3" />%
+                       <input type="text" name="percents" class="admin_normal" size="3" maxlength="3" />&#37;

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

diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl
index 4fa593569bedd55adbfd818439a9c0bfefb6ca75..1416bdd6bc1931d5be6b66dce6fd9a27d9f5192b 100644 (file)
--- a/templates/de/html/admin/admin_config_cats.tpl
+++ b/templates/de/html/admin/admin_config_cats.tpl
@@ -2,15 +2,15 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" 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_cats%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td align="center" colspan="4" class="admin_title bottom" height="50">
+               <td align="center" colspan="4" class="admin_title bottom">

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

-               <td class="header_column bottom right" width="40" align="center"><strong>{--ID_SELECT--}</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>

                <td class="header_column bottom right" align="center"><strong>{--CATNAME--}</strong></td>
                <td class="header_column bottom right" align="center"><strong>{--CATNAME--}</strong></td>

-               <td class="header_column bottom right" width="120" align="center"><strong>{--IS_VISIBLE--}</strong></td>
-               <td class="header_column bottom" width="120" align="center"><strong>{--SORTING_KEY--}</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--IS_VISIBLE--}</strong></td>
+               <td class="header_column bottom" align="center"><strong>{--SORTING_KEY--}</strong></td>

        </tr>
        $content
        <tr>
        </tr>
        $content
        <tr>

diff --git a/templates/de/html/admin/admin_config_cats_row.tpl b/templates/de/html/admin/admin_config_cats_row.tpl
index 1c34145de89a11e2e0eda8a692338b0fe17766c9..0aecf5d0dbfe162543eb3211ca5af393fc71a8d5 100644 (file)
--- a/templates/de/html/admin/admin_config_cats_row.tpl
+++ b/templates/de/html/admin/admin_config_cats_row.tpl
@@ -3,7 +3,7 @@
                <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="bottom right switch_sw$content[sw]">
                <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="bottom right switch_sw$content[sw]">

-               &nbsp;$content[cat]&nbsp;
+               $content[cat]

        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $content[vis]
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $content[vis]

diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl
index f26ca5d336a366a8c5b4650efc4c192ed7c9b28c..e340434ff95a5128db086c2b66cec2cdf42f7717 100644 (file)
--- a/templates/de/html/admin/admin_config_extensions.tpl
+++ b/templates/de/html/admin/admin_config_extensions.tpl
@@ -1,12 +1,13 @@
+<div align="center">

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

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

        <tr>
        <tr>

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

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

-               <td class="bottom" align="right" width="350" height="20">
+               <td class="bottom" align="right" width="350">

                        {--ADMIN_VERBOSE_SQL--}:
                </td>
                <td class="bottom" width="150" align="right">
                        {--ADMIN_VERBOSE_SQL--}:
                </td>
                <td class="bottom" width="150" align="right">


@@ -22,3 +23,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl
index cceec2ddbc538137be317ace1b45e0b1e5fa0231..e4adf1d0edf71d12f9e77ee4046fe1448873e20b 100644 (file)
--- a/templates/de/html/admin/admin_config_home.tpl
+++ b/templates/de/html/admin/admin_config_home.tpl
@@ -1,7 +1,7 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td colspan="3" align="center" class="admin_title" height="30">
+               <td colspan="3" align="center" class="admin_title">

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

diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl
index 8e2fcc6f085a26fb7050168fc96a5d30c79cd37b..c6a03963776bf57b05c9ce7adfa5cfe16a43f0be 100644 (file)
--- a/templates/de/html/admin/admin_config_home_main.tpl
+++ b/templates/de/html/admin/admin_config_home_main.tpl
@@ -1,16 +1,19 @@
-<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="320">
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="admin_table">

        <tr>
        <tr>

-               <td align="center" class="admin_title top bottom left right"
-                       height="30"><strong>{--ADMIN_CONFIG_HOME_TITLE--}</strong></td>
+               <td align="center" class="admin_title bottom top left right"
+                       height="30"><strong>{--ADMIN_CONFIG_HOME_TITLE--}</strong>
+               </td>

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

-               <td class="guest_menu_row"><a class="menu_blur"
-                       href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</a>
+               <td class="guest_menu_row">
+                       <a class="menu_blur" href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</a>

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

-               <td class="guest_menu_bottom"><a class="menu_blur"
-                       href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</a>
+               <td class="guest_menu_bottom">
+                       <a class="menu_blur" href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</a>

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

+</div>

diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl
index 5271b4c7069ab7a8172dba30c89e0f8c2201fa06..9b786cca75bf8188485788a2be427d6de756e51b 100644 (file)
--- a/templates/de/html/admin/admin_config_home_settings.tpl
+++ b/templates/de/html/admin/admin_config_home_settings.tpl
@@ -1,18 +1,15 @@
+<div align="center">

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

-               <td colspan="3" align="center" class="admin_title bottom" height="30">
+               <td colspan="2" align="center" class="admin_title bottom">

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

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

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

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

                <td width="185" align="center">
                        <select name="index_delay" size="1" class="admin_select">
                                <option value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</option>
                <td width="185" align="center">
                        <select name="index_delay" size="1" class="admin_select">
                                <option value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</option>


@@ -31,21 +28,15 @@
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</td>
-               <td class="seperator" width="5">&nbsp;</td>
-               <td align="center">$content[cookie_selection]</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="bottom seperator" height="5">&nbsp;</td>
+               <td class="bottom" align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</td>
+               <td class="bottom" align="center">$content[cookie_selection]</td>

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

-               <td colspan="3" class="admin_footer">
+               <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>
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl
index 99a44d37ea3952af08c8356235b7130be0e14319..4a0ae835e7552cd61900a72ea346d95c41731729 100644 (file)
--- a/templates/de/html/admin/admin_config_order.tpl
+++ b/templates/de/html/admin/admin_config_order.tpl
@@ -1,13 +1,14 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_order%}" 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_order%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

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

                        <strong>{--ADMIN_ORDER_SETTINGS--}:</strong>
                </td>
        </tr>
 
        <tr>
                        <strong>{--ADMIN_ORDER_SETTINGS--}:</strong>
                </td>
        </tr>
 
        <tr>

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

                        {--ADMIN_ORDER_MAX_ORDER_SELECT--}
                </td>
        </tr>
                        {--ADMIN_ORDER_MAX_ORDER_SELECT--}
                </td>
        </tr>


@@ -77,7 +78,7 @@
        </tr>
 
        <tr>
        </tr>
 
        <tr>

-               <td colspan="5" height="30" class="admin_title bottom" align="center">
+               <td colspan="2" class="admin_title bottom" align="center">

                        <strong>{--ADMIN_ORDER_SELECTION_SETTINGS--}:</strong>
                </td>
        </tr>
                        <strong>{--ADMIN_ORDER_SELECTION_SETTINGS--}:</strong>
                </td>
        </tr>


@@ -104,7 +105,7 @@
        </tr>
 
        <tr>
        </tr>
 
        <tr>

-               <td colspan="5" height="30" class="admin_title bottom" align="center">
+               <td colspan="2" class="admin_title bottom" align="center">

                        <strong>{--ADMIN_ORDER_MISC_SETTINGS--}:</strong>
                </td>
        </tr>
                        <strong>{--ADMIN_ORDER_MISC_SETTINGS--}:</strong>
                </td>
        </tr>


@@ -126,3 +127,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl
index 20072dfae2c2b48eee9c38d5dd4401abe62da0ad..347012c28fbb1e00a8c938ca1345702cc133f43b 100644 (file)
--- a/templates/de/html/admin/admin_config_point_settings.tpl
+++ b/templates/de/html/admin/admin_config_point_settings.tpl
@@ -1,53 +1,38 @@
+<div align="center">

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

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

        <tr>
        <tr>

-               <td colspan="2" align="center" class="admin_title bottom" height="30">
-               <strong>{--ADMIN_EDIT_POINT_SETTINGS--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="2" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" width="250" height="20">
-               {--ADMIN_CONFIG_DIRECT_PAY--}</td>
-               <td width="240" align="right">
-               {--ADMIN_CONFIG_POINTS_DIRECT--}&nbsp;<input type="radio"
-                       name="allow_direct_pay" value="Y" class="admin_normal"$content[allow_direct_pay_y] /><br />
-               <hr noshade width="220">
-               {--ADMIN_CONFIG_POINTS_MAILS--}&nbsp;<input type="radio"
-                       name="allow_direct_pay" value="N" class="admin_normal"$content[allow_direct_pay_n] />
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--ADMIN_EDIT_POINT_SETTINGS--}</strong>

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

-               <td colspan="2" class="seperator bottom" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="2" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" height="20">{--ADMIN_CONFIG_REFMODE--}</td>
-               <td align="right" style="padding-right: 10px">
-               {--ADMIN_CONFIG_REFMODE_REF--}&nbsp;<input type="radio"
-                       name="reg_points_mode" value="ref" class="admin_normal"$content[reg_points_mode_ref] />
-               <hr noshade width="220">
-               {--ADMIN_CONFIG_REFMODE_DIRECT--}&nbsp;<input type="radio"
-                       name="reg_points_mode" value="direct" class="admin_normal"$content[reg_points_mode_direct] />
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_DIRECT_PAY--}
+               </td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_POINTS_DIRECT--}
+                       <input type="radio" name="allow_direct_pay" value="Y" class="admin_normal"$content[allow_direct_pay_y] /><br />
+                       <hr noshade width="220">
+                       {--ADMIN_CONFIG_POINTS_MAILS--}
+                       <input type="radio" name="allow_direct_pay" value="N" class="admin_normal"$content[allow_direct_pay_n] />

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

-               <td colspan="2" class="seperator bottom" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="2" class="seperator" height="7">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right">{--REF_PAYOUT--}</td>
-               <td align="center"><input type="text" name="ref_payout"
-                       class="admin_normal" size="3" maxlength="3"
-                       value="{?ref_payout?}" /></td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_REFMODE--}</td>
+               <td class="bottom" align="right" style="padding-right: 10px">
+                       {--ADMIN_CONFIG_REFMODE_REF--}
+                       <input type="radio" name="reg_points_mode" value="ref" class="admin_normal"$content[reg_points_mode_ref] />
+                       <hr noshade width="220">
+                       {--ADMIN_CONFIG_REFMODE_DIRECT--}
+                       <input type="radio" name="reg_points_mode" value="direct" class="admin_normal"$content[reg_points_mode_direct] />
+               </td>

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

-               <td colspan="2" class="bottom seperator" height="5">&nbsp;</td>
+               <td class="bottom" align="right">{--REF_PAYOUT--}</td>
+               <td class="bottom" align="center">
+                       <input type="text" name="ref_payout" class="admin_normal" size="3" maxlength="3" value="{?ref_payout?}" />
+               </td>

        </tr>
        <tr>
                <td colspan="2" class="admin_footer">
        </tr>
        <tr>
                <td colspan="2" class="admin_footer">


@@ -57,3 +42,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl
index 2fbf6c53a2b6ed917d40c62acbb1681eb6b9da8f..feb1f53011b298696622c6adc0118b1e2d4e11b9 100644 (file)
--- a/templates/de/html/admin/admin_config_points.tpl
+++ b/templates/de/html/admin/admin_config_points.tpl
@@ -1,19 +1,21 @@
 <div align="center">
 <div align="center">

-<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
-       <tr>
-               <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=points%}">{--ADMIN_EDIT_POINTS--}</a>
-               </td>
-       </tr>
-       <tr>
-               <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref%}">{--ADMIN_EDIT_REFDEPTHS--}</a>
-               </td>
-       </tr>
-       <tr>
-               <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}">{--ADMIN_EDIT_POINT_SETTINGS--}</a>
-               </td>
-       </tr>
-</table>
+<div class="admin_table dashed">
+
+<div class="header_column bottom">
+       <strong>{--ADMIN_CONFIG_POINTS_TITLE--}</strong>
+</div>
+
+<div align="left" style="padding-left:5px">
+       <strong><big>&middot;</big></strong>&nbsp;<a href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=points%}">{--ADMIN_EDIT_POINTS--}</a>
+</div>
+
+<div align="left" style="padding-left:5px">
+       <strong><big>&middot;</big></strong>&nbsp;<a href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref%}">{--ADMIN_EDIT_REFDEPTHS--}</a>
+</div>
+
+<div align="left" style="padding-left:5px">
+       <strong><big>&middot;</big></strong>&nbsp;<a href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}">{--ADMIN_EDIT_POINT_SETTINGS--}</a>
+</div>
+
+</div>

 </div>
 </div>

diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl
index 1df1347c5ca7fc185cfc0a2ff9350b48dc5427fb..e750c16158ec62335f5210bda6bfdbba6c5d2a7e 100644 (file)
--- a/templates/de/html/admin/admin_config_proxy.tpl
+++ b/templates/de/html/admin/admin_config_proxy.tpl
@@ -1,10 +1,11 @@
+<div align="center">

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

-               <td colspan="2" align="center" class="admin_title bottom" height="30">
-               <strong>{--ADMIN_EDIT_PROXY_SETTINGS--}</strong></td>
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--ADMIN_EDIT_PROXY_SETTINGS--}</strong>
+               </td>

        </tr>
        </tr>

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

        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_HOST--}
        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_HOST--}


@@ -13,7 +14,6 @@
                        <input type="text" name="proxy_host" value="$content[proxy_host]" />
                </td>
        </tr>
                        <input type="text" name="proxy_host" value="$content[proxy_host]" />
                </td>
        </tr>

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

        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_PORT--}
        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_PORT--}


@@ -22,7 +22,6 @@
                        <input type="text" name="proxy_port" value="$content[proxy_port]" />
                </td>
        </tr>
                        <input type="text" name="proxy_port" value="$content[proxy_port]" />
                </td>
        </tr>

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

        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_USERNAME--}
        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_PROXY_USERNAME--}


@@ -31,16 +30,14 @@
                        <input type="text" name="proxy_username" value="$content[proxy_username]" />
                </td>
        </tr>
                        <input type="text" name="proxy_username" value="$content[proxy_username]" />
                </td>
        </tr>

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

        <tr>
        <tr>

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

                        {--ADMIN_CONFIG_PROXY_PASSWORD--}
                </td>
                        {--ADMIN_CONFIG_PROXY_PASSWORD--}
                </td>

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

                        <input type="password" name="proxy_password" value="$content[proxy_password]" />
                </td>
        </tr>
                        <input type="password" name="proxy_password" value="$content[proxy_password]" />
                </td>
        </tr>

-       <tr><td colspan="2" class="bottom seperator" height="5">&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--}" />


@@ -49,3 +46,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl
index ab2bb4684026d0c2896d8feb10ebe973e1af2862..a2babb91319917f826266e24febd132e7fc6a41b 100644 (file)
--- a/templates/de/html/admin/admin_config_refback.tpl
+++ b/templates/de/html/admin/admin_config_refback.tpl
@@ -1,21 +1,20 @@
+<div align="center">

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

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

        <tr>
        <tr>

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

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

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

        <tr>
        <tr>

-               <td width="80%" align="right" style="padding-right:10px">
+               <td align="right" style="padding-right:10px">

                        {--ADMIN_CONFIG_REFBACK_ENABLED--}
                </td>
                        {--ADMIN_CONFIG_REFBACK_ENABLED--}
                </td>

-               <td width="20%">
+               <td>

                        <input type="radio" name="refback_enabled" value="Y"$content[refback_enabled_y] /> {--YES--}<br />
                        <input type="radio" name="refback_enabled" value="N"$content[refback_enabled_n] /> {--NO--}
                </td>
        </tr>
                        <input type="radio" name="refback_enabled" value="Y"$content[refback_enabled_y] /> {--YES--}<br />
                        <input type="radio" name="refback_enabled" value="N"$content[refback_enabled_n] /> {--NO--}
                </td>
        </tr>

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

        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_REFBACK_MIN_PERCENTS--}
        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_REFBACK_MIN_PERCENTS--}


@@ -24,16 +23,14 @@
                        <input type="text" name="refback_min_perc" size="3" maxlength="3" value="$content[refback_min_perc]" />&#37;
                </td>
        </tr>
                        <input type="text" name="refback_min_perc" size="3" maxlength="3" value="$content[refback_min_perc]" />&#37;
                </td>
        </tr>

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

        <tr>
        <tr>

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

                        {--ADMIN_CONFIG_REFBACK_MAX_PERCENTS--}
                </td>
                        {--ADMIN_CONFIG_REFBACK_MAX_PERCENTS--}
                </td>

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

                        <input type="text" name="refback_max_perc" size="3" maxlength="3" value="$content[refback_max_perc]" />&#37;
                </td>
        </tr>
                        <input type="text" name="refback_max_perc" size="3" maxlength="3" value="$content[refback_max_perc]" />&#37;
                </td>
        </tr>

-       <tr><td colspan="2" class="bottom seperator" height="5">&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--}" />


@@ -42,3 +39,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl
index 25f383b170f78bb201c834ef4f8f804f02260fcd..24910371976a80d2356ee51a8a08708bbb7b03b0 100644 (file)
--- a/templates/de/html/admin/admin_config_refid.tpl
+++ b/templates/de/html/admin/admin_config_refid.tpl
@@ -1,3 +1,4 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_refid%}" 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_refid%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>


@@ -6,8 +7,6 @@
                </td>
        </tr>
 
                </td>
        </tr>
 

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

        <tr>
                <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_DEF_REFID--}:</td>
                <td align="center">
        <tr>
                <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_DEF_REFID--}:</td>
                <td align="center">


@@ -15,11 +14,9 @@
                </td>
        </tr>
 
                </td>
        </tr>
 

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

        <tr>
        <tr>

-               <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_REFID_TARGRT--}:</td>
-               <td align="center">
+               <td class="bottom" align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_REFID_TARGRT--}:</td>
+               <td class="bottom" align="center">

                        <select name="refid_target" size="1" class="admin_select">
                                <option value="register"$content[refid_target_register]">{--ADMIN_REF_TARGET_REGISTER--}</option>
                                <option value="index"$content[refid_target_index]">{--ADMIN_REF_TARGET_INDEX--}</option>
                        <select name="refid_target" size="1" class="admin_select">
                                <option value="register"$content[refid_target_register]">{--ADMIN_REF_TARGET_REGISTER--}</option>
                                <option value="index"$content[refid_target_index]">{--ADMIN_REF_TARGET_INDEX--}</option>


@@ -27,9 +24,6 @@
                </td>
        </tr>
 
                </td>
        </tr>
 

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

        <tr>
                <td align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_ZERO_REFID--}:</td>
                <td align="center">
        <tr>
                <td align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_ZERO_REFID--}:</td>
                <td align="center">


@@ -40,17 +34,13 @@
                </td>
        </tr>
 
                </td>
        </tr>
 

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

        <tr>
        <tr>

-               <td align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_MIN_CONFIRMED--}:</td>
-               <td align="center">
+               <td class="bottom" align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_MIN_CONFIRMED--}:</td>
+               <td class="bottom" align="center">

                        <input type="text" name="user_min_confirmed" class="admin_normal" size="3" maxlength="3" value="{?user_min_confirmed?}" />
                </td>
        </tr>
 
                        <input type="text" name="user_min_confirmed" class="admin_normal" size="3" maxlength="3" value="{?user_min_confirmed?}" />
                </td>
        </tr>
 

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

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


@@ -59,3 +49,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl
index 2beb1d0dd80ea19a842e361d45ef0a28d3d584ed..630ea4b5c6a75cf3fd582e3413a082d26c342b82 100644 (file)
--- a/templates/de/html/admin/admin_config_session.tpl
+++ b/templates/de/html/admin/admin_config_session.tpl
@@ -1,11 +1,11 @@
+<div align="center">

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

-<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="700">
+<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">

        <tr>
        <tr>

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

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

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

        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_SESSION_SAVE_PATH--}:<br />
        <tr>
                <td align="right" style="padding-right:10px">
                        {--ADMIN_CONFIG_SESSION_SAVE_PATH--}:<br />


@@ -15,7 +15,7 @@
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>

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

                        <span class="admin_note">
                                {--ADMIN_BASE_PATH--}:<br />
                                <em>{?PATH?}</em><br />
                        <span class="admin_note">
                                {--ADMIN_BASE_PATH--}:<br />
                                <em>{?PATH?}</em><br />


@@ -23,7 +23,6 @@
                        </span>
                </td>
        </tr>
                        </span>
                </td>
        </tr>

-       <tr><td colspan="2" class="bottom seperator" height="5">&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--}" />


@@ -32,3 +31,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index 9b90122b2c063f2be599ad4a2cf01ed4a11945a5..2d37ee6a562f52d98fc023e0798beb8f8acd10f0 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -47,7 +47,7 @@
                        {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--}
                </td>
                <td style="padding-left:5px">
                        {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--}
                </td>
                <td style="padding-left:5px">

-                       <input type="text" name="surfbar_dynamic_percent" size="6" maxlength="20" value="$content[surfbar_dynamic_percent]" />%
+                       <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>
                </td>
        </tr>
        <tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>

diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl
index 9634cd636467f9e7ffa150909900ff825aadac96..9f63954164e02d2b5b78f79a13b120266f8dd4c9 100644 (file)
--- a/templates/de/html/admin/admin_config_user.tpl
+++ b/templates/de/html/admin/admin_config_user.tpl
@@ -2,35 +2,24 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_user%}" 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_user%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td colspan="3" align="center" class="admin_title bottom" height="30">
+               <td colspan="2" align="center" class="admin_title bottom">

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

-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="400" align="right">{--USER_ADMIN_LIMIT_USER--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="170">
+               <td align="right">{--USER_ADMIN_LIMIT_USER--}:</td>
+               <td>

                        <input type="text" name="user_limit" class="admin_normal" value="{?user_limit?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
                        <input type="text" name="user_limit" class="admin_normal" value="{?user_limit?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>

-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="400" align="right">{--USER_ADMIN_ALPHA_USER--}:</td>
-               <td class="seperator" width="10">&nbsp;</td>
-               <td width="170">
+               <td class="bottom" align="right">{--USER_ADMIN_ALPHA_USER--}:</td>
+               <td class="bottom">

                        <input type="text" name="user_alpha" class="admin_normal" value="{?user_alpha?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
                        <input type="text" name="user_alpha" class="admin_normal" value="{?user_alpha?}" 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">
+               <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>
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </td>

diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl
index 2d36131c878f369c0cf2b57fd048c70d4ac2a48f..8e3f0273b05087d2cc63a458200eb73772ab79a5 100644 (file)
--- a/templates/de/html/admin/admin_config_wernis.tpl
+++ b/templates/de/html/admin/admin_config_wernis.tpl
@@ -113,7 +113,7 @@
                <td width="300" height="30" align="right">{--WERNIS_ADMIN_WITHDRAW_FEE_PERCENT--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">
                <td width="300" height="30" align="right">{--WERNIS_ADMIN_WITHDRAW_FEE_PERCENT--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
                <td width="270">

-                       <input type="text" name="wernis_withdraw_fee_percent" class="admin_normal" value="{?wernis_withdraw_fee_percent?}" size="5" maxlength="20" />%
+                       <input type="text" name="wernis_withdraw_fee_percent" class="admin_normal" value="{?wernis_withdraw_fee_percent?}" size="5" maxlength="20" />&#37;

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

diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl
index 61787d9a2cb0c214b7f7060cf9cd94cbc042f95e..6765916b245a5ba72f627799b4b415792e55a755 100644 (file)
--- a/templates/de/html/admin/admin_config_yoomedia.tpl
+++ b/templates/de/html/admin/admin_config_yoomedia.tpl
@@ -1,79 +1,72 @@
+<div align="center">

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

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

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

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_ID--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_ID--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_id" value="{?yoomedia_id?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_id" value="{?yoomedia_id?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_SID--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_SID--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_sid" value="{?yoomedia_sid?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_sid" value="{?yoomedia_sid?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_PASSWD--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_PASSWD--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="20" maxlength="255" name="yoomedia_passwd" value="{?yoomedia_passwd?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="20" maxlength="255" name="yoomedia_passwd" value="{?yoomedia_passwd?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_max_reload" value="{?yoomedia_tm_max_reload?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_max_reload" value="{?yoomedia_tm_max_reload?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_wait" value="{?yoomedia_tm_min_wait?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_wait" value="{?yoomedia_tm_min_wait?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_tm_clicks_remain" value="{?yoomedia_tm_clicks_remain?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_tm_clicks_remain" value="{?yoomedia_tm_clicks_remain?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td align="right">

                {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td style="padding-left: 10px">

                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_pay" value="{?yoomedia_tm_min_pay?}" />
        </td>
 </tr>
                <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_pay" value="{?yoomedia_tm_min_pay?}" />
        </td>
 </tr>

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

 <tr>
 <tr>

-       <td align="right" width="300" height="30">
+       <td class="bottom" align="right">

                {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--}
        </td>
                {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--}
        </td>

-       <td width="200" style="padding-left: 10px">
+       <td class="bottom" style="padding-left: 10px">

                <select name="yoomedia_erotic_allowed" class="admin_select" size="1">
                        <option value="0"$content[yoomedia_erotic_allowed_0]>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_NONE--}</option>
                        <option value="1"$content[yoomedia_erotic_allowed_1]>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_INCLUDE--}</option>
                <select name="yoomedia_erotic_allowed" class="admin_select" size="1">
                        <option value="0"$content[yoomedia_erotic_allowed_0]>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_NONE--}</option>
                        <option value="1"$content[yoomedia_erotic_allowed_1]>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_INCLUDE--}</option>


@@ -81,7 +74,6 @@
                </select>
        </td>
 </tr>
                </select>
        </td>
 </tr>

-<tr><td colspan="2" class="bottom seperator" height="5">&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--}" />


@@ -90,6 +82,7 @@
 </tr>
 </table>
 </form>
 </tr>
 </table>
 </form>

+</div>

 
 <div class="admin_note">
        {--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--}
 
 <div class="admin_note">
        {--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--}

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 c2b3ce7f44c1401dd45358d7f0c51589f3d358e0..4a16d28c2303603bd2c564b82e2df45b5b4c93a0 100644 (file)
--- a/templates/de/html/admin/admin_edit_bank_packages_row.tpl
+++ b/templates/de/html/admin/admin_edit_bank_packages_row.tpl
@@ -37,13 +37,13 @@
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}:<br />
        </td>
        <td align="center" valign="top" class="switch_sw$content[sw] bottom">
                {--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}:<br />

-               <input type="text" name="interest_plus[$content[id]]" size="5" maxlength="10" value="$content[interest_plus]" /> %
+               <input type="text" name="interest_plus[$content[id]]" size="5" maxlength="10" value="$content[interest_plus]" />&#37;

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

-               <input type="text" name="interest_minus[$content[id]]" size="5" maxlength="10" value="$content[interest_minus]" /> %
+               <input type="text" name="interest_minus[$content[id]]" size="5" maxlength="10" value="$content[interest_minus]" />&#37;

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

diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl
index ca6dae2f5ed259f78201b4002be0a78d0c7ec4d0..04f99a4dc44fc77cbd35f682f05277600c6a4f27 100644 (file)
--- a/templates/de/html/admin/admin_list_payments.tpl
+++ b/templates/de/html/admin/admin_list_payments.tpl
@@ -2,7 +2,8 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=payments%}" 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=payments%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>

-               <td align="center" colspan="5" class="admin_title" height="30"><strong>{--EDIT_DEL_PAYMENT--}</strong>
+               <td align="center" colspan="5" class="admin_title">
+                       <strong>{--EDIT_DEL_PAYMENT--}</strong>

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

diff --git a/templates/de/html/admin/admin_points_edit_row.tpl b/templates/de/html/admin/admin_points_edit_row.tpl
index 49cdb62d486f131cd1c03bf249af19be1aea01bb..3593c73e1b55ece8ae0fd7d6272cff0697ace40b 100644 (file)
--- a/templates/de/html/admin/admin_points_edit_row.tpl
+++ b/templates/de/html/admin/admin_points_edit_row.tpl
@@ -1,26 +1,17 @@
 <tr>
 <tr>

-       <td colspan="2" align="center" class="bottom" height="30"><strong>{--REF_DEPTHS_ID--}
-       $content[id]:</strong></td>
-</tr>
-<tr>
-       <td colspan="2" height="5" class="switch_sw$content[sw]"></td>
+       <td colspan="2" align="center" class="bottom" height="30">
+               <strong>{--REF_DEPTHS_ID--} $content[id]:</strong>
+       </td>

 </tr>
 <tr>
        <td class="switch_sw$content[sw]" width="50%" align="right">{--REF_LEVEL--}:&nbsp;</td>
 </tr>
 <tr>
        <td class="switch_sw$content[sw]" width="50%" align="right">{--REF_LEVEL--}:&nbsp;</td>

-       <td class="switch_sw$content[sw]" align="left" width="50%"><input
-               type="text" name="level[$content[id]]" class="admin_normal"
-               value="$content[level]" size="3" maxlength="5"></td>
-</tr>
-<tr>
-       <td class="switch_sw$content[sw]" colspan="2" height="5"></td>
+       <td class="switch_sw$content[sw]" align="left" width="50%">
+               <input type="text" name="level[$content[id]]" class="admin_normal" value="$content[level]" size="3" maxlength="5" />
+       </td>

 </tr>
 <tr>
        <td class="switch_sw$content[sw]" align="right">{--REF_PERCENT--}:&nbsp;</td>
 </tr>
 <tr>
        <td class="switch_sw$content[sw]" align="right">{--REF_PERCENT--}:&nbsp;</td>

-       <td class="switch_sw$content[sw]" align="left"><input type="text"
-               name="perc[$content[id]]" class="admin_normal" value="$content[percents]"
-               size="3" maxlength="5">%</td>
-</tr>
-<tr>
-       <td class="switch_sw$content[sw] bottom seperator" colspan="2"
-               height="5">&nbsp;</td>
+       <td class="switch_sw$content[sw]" align="left">
+               <input type="text" name="perc[$content[id]]" class="admin_normal" value="$content[percents]" size="3" maxlength="5" />&#37;
+       </td>

 </tr>
 </tr>

diff --git a/templates/de/html/member/member_refback_edit.tpl b/templates/de/html/member/member_refback_edit.tpl
index 884121f6708a5b14a847c673e9098d200fe9b155..60fe9c1880213b5c33aeb8ae0b02416efc0fdf55 100644 (file)
--- a/templates/de/html/member/member_refback_edit.tpl
+++ b/templates/de/html/member/member_refback_edit.tpl
@@ -8,7 +8,7 @@
 </div>
 <div class="bottom" align="center">
        {--MEMBER_REFBACK_PERCENTS--}:
 </div>
 <div class="bottom" align="center">
        {--MEMBER_REFBACK_PERCENTS--}:

-       <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="$content[refback]" />%
+       <input type="text" class="member_normal" name="percents" size="6" maxlength="7" value="$content[refback]" />&#37;

 </div>
 <div class="member_footer">
        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
 </div>
 <div class="member_footer">
        <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />