From eac9b7b757e50ad6536ccc00f46eae5d194a6b12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Nov 2009 15:18:21 +0000 Subject: [PATCH] More HTML rewrites --- inc/language/de.php | 1 + inc/language/order_de.php | 2 +- inc/modules/admin/what-config_cats.php | 53 ++++++++------- inc/modules/admin/what-list_task.php | 14 ++-- inc/modules/admin/what-payments.php | 14 ++-- .../de/html/admin/admin_add_bank_package.tpl | 4 +- templates/de/html/admin/admin_add_cat.tpl | 10 +-- templates/de/html/admin/admin_add_max.tpl | 56 ++++++---------- templates/de/html/admin/admin_add_payment.tpl | 61 +++++++---------- .../de/html/admin/admin_add_reflevel.tpl | 2 +- templates/de/html/admin/admin_config_cats.tpl | 8 +-- .../de/html/admin/admin_config_cats_row.tpl | 2 +- .../de/html/admin/admin_config_extensions.tpl | 8 ++- templates/de/html/admin/admin_config_home.tpl | 2 +- .../de/html/admin/admin_config_home_main.tpl | 17 +++-- .../html/admin/admin_config_home_settings.tpl | 21 ++---- .../de/html/admin/admin_config_order.tpl | 10 +-- .../admin/admin_config_point_settings.tpl | 66 ++++++++----------- .../de/html/admin/admin_config_points.tpl | 36 +++++----- .../de/html/admin/admin_config_proxy.tpl | 16 ++--- .../de/html/admin/admin_config_refback.tpl | 18 +++-- .../de/html/admin/admin_config_refid.tpl | 21 ++---- .../de/html/admin/admin_config_session.tpl | 10 +-- .../de/html/admin/admin_config_surfbar.tpl | 2 +- templates/de/html/admin/admin_config_user.tpl | 23 ++----- .../de/html/admin/admin_config_wernis.tpl | 2 +- .../de/html/admin/admin_config_yoomedia.tpl | 45 ++++++------- .../admin/admin_edit_bank_packages_row.tpl | 4 +- .../de/html/admin/admin_list_payments.tpl | 3 +- .../de/html/admin/admin_points_edit_row.tpl | 27 +++----- .../de/html/member/member_refback_edit.tpl | 2 +- 31 files changed, 241 insertions(+), 319 deletions(-) diff --git a/inc/language/de.php b/inc/language/de.php index 64594a311f..2f188169dc 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1058,6 +1058,7 @@ addMessages(array( 'ADMIN_DELETED_MAILS_COUNT' => "Es wurden %s Einträge gelöscht.", 'EMAIL_DELETE_COUNT' => "Buchungseinträge gelöscht", 'MXCHANGE_HAS_DIED' => "{?TITLE?} ist in Script/Funktion %s, Zeile %s mit folgender Meldung gestorben: %s", + 'ADMIN_CONFIG_POINTS_TITLE' => "Einstellungen für {?POINTS?}", 'ADMIN_SEND_RESET_LINK_TITLE' => "1/4: Administratorkennwort zurü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 9f30b5fa4d..ebac809a24 100644 --- 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_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önnen heute noch %s von %s Mailbuchungen aufgeben.", diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index e9008fb4e8..5b5d0156a8 100644 --- 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(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -50,16 +50,20 @@ $CATS = ''; 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... - 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 = "{--CATEGORY_ALREADY_EXISTS--}"; + $content = '{--CATEGORY_ALREADY_EXISTS--}'; } // Free memory @@ -76,37 +80,36 @@ if (isPostRequestElementSet('add')) { // Is the entry set? if (!empty($cat)) { - switch (getRequestElement('do')) - { + switch (getRequestElement('do')) { 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__); - 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; - } + } // END - switch } else { // Entry not saved $TEXT .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id); } - } + } // END - foreach if (isset($TEXT)) { // Display message loadTemplate('admin_settings_saved', false, $TEXT); - } + } // END - if } 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; - } + } // END - foreach // 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__); @@ -156,7 +158,7 @@ if (isPostRequestElementSet('add')) { // 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); @@ -177,8 +179,9 @@ if (isPostRequestElementSet('add')) { $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 .= " \n"; + $cat = $content['cat']; + if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...'; + $CATS .= ''; // 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 d51f0d6ab6..2452427e2f 100644 --- 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 = ''; -if (!isGetRequestElementSet(('type'))) setRequestGetElement('type', 'your'); +if (!isGetRequestElementSet('type')) setRequestGetElement('type', 'your'); 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; -} +} // END - switch 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 { @@ -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__); - } + } // END - foreach } 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); } - } + } // END - foreach } else { // Unknown action performed debug_report_bug(sprintf("Unknown task action performed. data=
%s
", print_r(postRequestArray(), true))); @@ -198,7 +198,7 @@ ORDER BY // Switch colors $SW = 3 - $SW; - } + } // END - while // Free memory SQL_FREERESULT($result_tasks); @@ -212,7 +212,7 @@ ORDER BY loadTemplate('admin_overview_footer'); } } -} +} // END - if // [EOF] ?> diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index b7d7f33b39..0c2925958c 100644 --- 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(); -} +} // END - if // 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')) { @@ -74,13 +74,13 @@ if (isFormSent()) { 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'); - $content = "".SETTINGS_SAVED.""; + $content = "{--SETTINGS_SAVED--}"; } else { // Nothing has changed! $content = "{--SETTINGS_NOT_SAVED--}"; @@ -140,7 +140,7 @@ if (isFormSent()) { 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; @@ -161,14 +161,14 @@ if (isFormSent()) { // 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); - } + } // END - if // 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 de66c264a6..5ec6a81bdf 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -81,7 +81,7 @@ {--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}   - % + % @@ -91,7 +91,7 @@ {--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}   - % + % diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 2a74cf098c..4281b2c63d 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -2,13 +2,13 @@
- - - - - diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index a8c61046c0..62ceaa0bbf 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -1,50 +1,32 @@ +
-
+ {--ADD_NEW_CATEGORY--}
+ {--ENTER_CATNAME--}: @@ -17,7 +17,7 @@
+ {--SELECT_PARENT--} @@ -29,7 +29,7 @@
+ {--CAT_IS_VISIBLE--} @@ -39,7 +39,7 @@
+
+
- + - + - - - - - - - - - - - - - - - - - - - - - - + - + + - - - +
- {--ADMIN_ADD_MAX_VALUE--} + {--ADMIN_ADD_MAX_VALUE--} +
 {--MAX_RECEIVE--}
 {--MAX_RECEIVE--} 
 
  {--ENTER_MAX_VALUE--}:  
 
 {--ENTER_MAX_COMMENT--}:   + +
 {--ENTER_MAX_COMMENT--}: + +
    + + +
-
\ No newline at end of file + + diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index 92d187c9d3..b9747d722e 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -1,54 +1,43 @@ +
- - - - - - - - - - + + - - - - - + - - - - - - - - - - + - + + - +
- {--ADD_NEW_PAYMENT--}
 
{--ENTER_PAY_TIME--}:  {--_SECONDS--} + + {--ADD_NEW_PAYMENT--}
 {--ENTER_PAY_TIME--}: + {--_SECONDS--} +
{--ENTER_PAY_PAYMENT--}:  ({?POINTS?})
  + + ({?POINTS?}) +
{--ENTER_PAY_PRICE--}:  ({?POINTS?})
 
{--ENTER_PAY_TITLE--}:  + + ({?POINTS?}) +
 {--ENTER_PAY_TITLE--}: + +
- + + +
-
\ No newline at end of file + +
\ 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 2b8703e679..f05b564ee2 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -14,7 +14,7 @@ {--ENTER_REF_PERCENTS--}: - % + % diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl index 4fa593569b..1416bdd6bc 100644 --- a/templates/de/html/admin/admin_config_cats.tpl +++ b/templates/de/html/admin/admin_config_cats.tpl @@ -2,15 +2,15 @@
- - + - - + + $content diff --git a/templates/de/html/admin/admin_config_cats_row.tpl b/templates/de/html/admin/admin_config_cats_row.tpl index 1c34145de8..0aecf5d0db 100644 --- a/templates/de/html/admin/admin_config_cats_row.tpl +++ b/templates/de/html/admin/admin_config_cats_row.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index 9634cd6364..9f63954164 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -2,35 +2,24 @@
+ {--EDIT_DEL_CATEGORIES--}
{--ID_SELECT--}{--ID_SELECT--} {--CATNAME--}{--IS_VISIBLE--}{--SORTING_KEY--}{--IS_VISIBLE--}{--SORTING_KEY--}
-  $content[cat]  + $content[cat] $content[vis] diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index f26ca5d336..e340434ff9 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -1,12 +1,13 @@ +
- +
- -
+ {--ADMIN_CONFIG_EXTENSIONS_SETTINGS--}
+ {--ADMIN_VERBOSE_SQL--}: @@ -22,3 +23,4 @@
+
diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl index cceec2ddbc..e4adf1d0ed 100644 --- a/templates/de/html/admin/admin_config_home.tpl +++ b/templates/de/html/admin/admin_config_home.tpl @@ -1,7 +1,7 @@
- diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index 8e2fcc6f08..c6a0396377 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -1,16 +1,19 @@ -
+ {--ADMIN_CONFIG_HOME--}
+
+
- + - -
{--ADMIN_CONFIG_HOME_TITLE--}{--ADMIN_CONFIG_HOME_TITLE--} +
 · {--ADMIN_EDIT_HOME_TARGET--} + +  · {--ADMIN_EDIT_HOME_TARGET--}
 · {--ADMIN_EDIT_HOME_SETTINGS--} + +  · {--ADMIN_EDIT_HOME_SETTINGS--}
+
diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl index 5271b4c706..9b786cca75 100644 --- a/templates/de/html/admin/admin_config_home_settings.tpl +++ b/templates/de/html/admin/admin_config_home_settings.tpl @@ -1,18 +1,15 @@ +
- - - - - - - - - - - - - - + + -
+ {--ADMIN_EDIT_HOME_SETTINGS--}
 
{--ADMIN_CONFIG_INDEX_DELAY--}:  
 
{--ADMIN_CONFIG_INDEX_COOKIE--} $content[cookie_selection]
 {--ADMIN_CONFIG_INDEX_COOKIE--}$content[cookie_selection]
+
+
diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 99a44d37ea..4a0ae835e7 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -1,13 +1,14 @@ +
- - @@ -77,7 +78,7 @@ - @@ -104,7 +105,7 @@ - @@ -126,3 +127,4 @@
+ {--ADMIN_ORDER_SETTINGS--}:
+ {--ADMIN_ORDER_MAX_ORDER_SELECT--}
+ {--ADMIN_ORDER_SELECTION_SETTINGS--}:
+ {--ADMIN_ORDER_MISC_SETTINGS--}:
+
diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index 20072dfae2..347012c28f 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -1,53 +1,38 @@ +
- +
- - - - - - - - - - - - - - - - + - - - - - - - - + + - + +
- {--ADMIN_EDIT_POINT_SETTINGS--}
 
- {--ADMIN_CONFIG_DIRECT_PAY--} - {--ADMIN_CONFIG_POINTS_DIRECT--} 
-
- {--ADMIN_CONFIG_POINTS_MAILS--}  + 		+ {--ADMIN_EDIT_POINT_SETTINGS--}
 
 
{--ADMIN_CONFIG_REFMODE--} - {--ADMIN_CONFIG_REFMODE_REF--}  -
- {--ADMIN_CONFIG_REFMODE_DIRECT--}  + 		+ {--ADMIN_CONFIG_DIRECT_PAY--} + + {--ADMIN_CONFIG_POINTS_DIRECT--} +
+
+ {--ADMIN_CONFIG_POINTS_MAILS--} +
 
 
{--REF_PAYOUT--}{--ADMIN_CONFIG_REFMODE--} + {--ADMIN_CONFIG_REFMODE_REF--} + +
+ {--ADMIN_CONFIG_REFMODE_DIRECT--} + +
 {--REF_PAYOUT--} + +
@@ -57,3 +42,4 @@
+
diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl index 2fbf6c53a2..feb1f53011 100644 --- a/templates/de/html/admin/admin_config_points.tpl +++ b/templates/de/html/admin/admin_config_points.tpl @@ -1,19 +1,21 @@
- - - - - - - - - - -
·  {--ADMIN_EDIT_POINTS--} -
·  {--ADMIN_EDIT_REFDEPTHS--} -
·  {--ADMIN_EDIT_POINT_SETTINGS--} -
+
+ +
+ {--ADMIN_CONFIG_POINTS_TITLE--} +
+ + + + + + + +
diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index 1df1347c5c..e750c16158 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -1,10 +1,11 @@ +
- + - - - - - - -
- {--ADMIN_EDIT_PROXY_SETTINGS--} + {--ADMIN_EDIT_PROXY_SETTINGS--} +
 
{--ADMIN_CONFIG_PROXY_HOST--} @@ -13,7 +14,6 @@
 
{--ADMIN_CONFIG_PROXY_PORT--} @@ -22,7 +22,6 @@
 
{--ADMIN_CONFIG_PROXY_USERNAME--} @@ -31,16 +30,14 @@
 
+ {--ADMIN_CONFIG_PROXY_PASSWORD--} +
 
@@ -49,3 +46,4 @@
+
diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index ab2bb46840..a2babb9131 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -1,21 +1,20 @@ +
- +
- - - - - - - - -
+ {--ADMIN_CONFIG_REFBACK_TITLE--}
 
+ {--ADMIN_CONFIG_REFBACK_ENABLED--} + {--YES--}
{--NO--}
 
{--ADMIN_CONFIG_REFBACK_MIN_PERCENTS--} @@ -24,16 +23,14 @@ %
 
+ {--ADMIN_CONFIG_REFBACK_MAX_PERCENTS--} + %
 
@@ -42,3 +39,4 @@
+
diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 25f383b170..2491037197 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -1,3 +1,4 @@ +
@@ -6,8 +7,6 @@ - - - - - - + - - - - - - - + - -
 
{--ADMIN_SELECT_DEF_REFID--}: @@ -15,11 +14,9 @@
 
{--ADMIN_SELECT_REFID_TARGRT--}: + {--ADMIN_SELECT_REFID_TARGRT--}:
 
 
{--ADMIN_RANDOM_ZERO_REFID--}: @@ -40,17 +34,13 @@
 
{--ADMIN_RANDOM_MIN_CONFIRMED--}: + {--ADMIN_RANDOM_MIN_CONFIRMED--}:
 
@@ -59,3 +49,4 @@
+
diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index 2beb1d0dd8..630ea4b5c6 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -1,11 +1,11 @@ +
- +
- - - -
+ {--ADMIN_SESSION_SETTINGS_TITLE--}
 
{--ADMIN_CONFIG_SESSION_SAVE_PATH--}:
@@ -15,7 +15,7 @@
+ {--ADMIN_BASE_PATH--}:
{?PATH?}
@@ -23,7 +23,6 @@
 
@@ -32,3 +31,4 @@
+
diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 9b90122b2c..2d37ee6a56 100644 --- 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--} 		- % + %
 
- - - - - - - + - - - - - - + - - - - diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 2d36131c87..8e3f0273b0 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -113,7 +113,7 @@ diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index 61787d9a2c..6765916b24 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -1,79 +1,72 @@ +
+ {--USER_ADMIN_CONFIG_HEADER--}
 
{--USER_ADMIN_LIMIT_USER--}:  + {--USER_ADMIN_LIMIT_USER--}:
 
{--USER_ADMIN_ALPHA_USER--}:  + {--USER_ADMIN_ALPHA_USER--}:
 
+ {--WERNIS_ADMIN_WITHDRAW_FEE_PERCENT--}:   - % + %
- - - - - - - - - - - - - - - - - - - - - - - - - -
+ {--ADMIN_CONFIG_YOOMEDIA_TITLE--}
 
+ {--ADMIN_CONFIG_YOOMEDIA_ID--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_SID--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_PASSWD--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--} +
 
@@ -90,6 +82,7 @@
+
{--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 c2b3ce7f44..4a16d28c23 100644 --- 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 @@ {--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}:
- % + % {--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}:
- % + % {--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--}:
diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index ca6dae2f5e..04f99a4dc4 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -2,7 +2,8 @@
- diff --git a/templates/de/html/admin/admin_points_edit_row.tpl b/templates/de/html/admin/admin_points_edit_row.tpl index 49cdb62d48..3593c73e1b 100644 --- a/templates/de/html/admin/admin_points_edit_row.tpl +++ b/templates/de/html/admin/admin_points_edit_row.tpl @@ -1,26 +1,17 @@ - - - - + - - - - + - - - - + diff --git a/templates/de/html/member/member_refback_edit.tpl b/templates/de/html/member/member_refback_edit.tpl index 884121f670..60fe9c1880 100644 --- a/templates/de/html/member/member_refback_edit.tpl +++ b/templates/de/html/member/member_refback_edit.tpl @@ -8,7 +8,7 @@
{--MEMBER_REFBACK_PERCENTS--}: - % + %
-- 2.30.2
{--EDIT_DEL_PAYMENT--} + + {--EDIT_DEL_PAYMENT--}
{--REF_DEPTHS_ID--} - $content[id]:
+ {--REF_DEPTHS_ID--} $content[id]: +
{--REF_LEVEL--}: 
+ +
{--REF_PERCENT--}: %
  + % +