From 27fed6ed8bbc0d91404947d91db1a07e36c1ea60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Nov 2009 02:19:19 +0000 Subject: [PATCH] Profi-Concepts patch integrated and overworked for HTML cleanups --- .../de/html/admin/admin_add_bank_package.tpl | 69 +------ templates/de/html/admin/admin_add_points.tpl | 30 +-- .../de/html/admin/admin_add_points_all.tpl | 13 +- .../de/html/admin/admin_add_reflevel.tpl | 2 + templates/de/html/admin/admin_admin_add.tpl | 59 +----- templates/de/html/admin/admin_admins_add.tpl | 60 +++--- .../de/html/admin/admin_admins_add_acl.tpl | 32 +-- .../de/html/admin/admin_admins_mails_list.tpl | 2 + .../de/html/admin/admin_config_bonus.tpl | 184 +++--------------- .../de/html/admin/admin_config_doubler.tpl | 2 + .../de/html/admin/admin_config_home_main.tpl | 28 ++- .../de/html/admin/admin_config_register2.tpl | 4 +- .../de/html/admin/admin_config_sub_points.tpl | 6 +- templates/de/html/admin/admin_del_user.tpl | 56 ++---- templates/de/html/admin/admin_edit_user.tpl | 18 +- templates/de/html/admin/admin_guest_add.tpl | 63 +----- templates/de/html/admin/admin_list_admins.tpl | 19 +- .../admin/admin_list_doubler_overview.tpl | 6 +- templates/de/html/admin/admin_list_refs.tpl | 2 + templates/de/html/admin/admin_list_user.tpl | 2 + templates/de/html/admin/admin_lock_user.tpl | 14 +- templates/de/html/admin/admin_member_add.tpl | 65 +------ .../html/admin/admin_member_selection_box.tpl | 47 ++--- templates/de/html/admin/admin_sub_points.tpl | 2 + .../de/html/admin/admin_sub_points_all.tpl | 4 +- 25 files changed, 204 insertions(+), 585 deletions(-) diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index d0fc8f7bf9..699883ac47 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,60 +1,41 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -161,4 +107,7 @@
+ {--ADMIN_ADD_BANK_PACKAGE_TITLE--}
 
{--ADMIN_BANK_PACKAGE_TITLE--} 
 
{--ADMIN_BANK_PACKAGE_DESCRIPTION--}  
 
{--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}    ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_TRANSFERS--} 
 
{--ADMIN_BANK_PACKAGE_OUTPUT_MODE--} 
 
{--ADMIN_BANK_PACKAGE_FREE_MONTHS_FEE--}  {--_MONTHS--}
 
{--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}  %
 
{--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}  %
 
{--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--}   ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}   ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--}  
 
{--ADMIN_BANK_PACKAGE_TAN_LOCK--} 
 
+ {--ADMIN_BANK_PACKAGE_ACTIVE--}   + {--YES--}
{--NO--}
 
+
-
{--ADMIN_BANK_FOOTER_NOTE--}
+
+ {--ADMIN_BANK_FOOTER_NOTE--} +
+
diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 1dca5b5e60..09575415c9 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,48 +1,30 @@ +
- - - - - - - - - - - - - - - - - + - - - - - - -
 
+ {--ADMIN_ADD_POINTS_TO_USER--}:
$content[user]
 
 
{--ENTER_POINTS_ADD--}: 
 
{--ENTER_ADD_REASON--}:  + {--ENTER_ADD_REASON--}:
 
 
+
+
diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index f8d9862dbc..89b12fd821 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -1,6 +1,6 @@ +
- +
@@ -35,10 +35,11 @@ - +
 
 
  + + +
+
diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index f05b564ee2..d6abb7ccc3 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,3 +1,4 @@ +
@@ -25,3 +26,4 @@
+
diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl index e5e282bcee..c83e093988 100644 --- a/templates/de/html/admin/admin_admin_add.tpl +++ b/templates/de/html/admin/admin_admin_add.tpl @@ -1,81 +1,42 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--ENTER_DESCR--}:  - + +  
{--SELECT_BELOW_MENU--}:$content[below_selection]
 {--SELECT_BELOW_MENU--}: $content[below_selection] 
  +  
+
diff --git a/templates/de/html/admin/admin_admins_add.tpl b/templates/de/html/admin/admin_admins_add.tpl index 8e7ff583a6..09911be03c 100644 --- a/templates/de/html/admin/admin_admins_add.tpl +++ b/templates/de/html/admin/admin_admins_add.tpl @@ -1,53 +1,41 @@ +
- +
- - - - + - - - - - + - - - - - + - - - - - - - - - - + - + + - +
- {--ADMIN_ADMINS_ADD_NEW_ADMIN--}:
  + {--ADMIN_ADMINS_ADD_NEW_ADMIN--}: +
{--ADMIN_ADMINS_ENTER_LOGIN--}: 
  + +
{--ADMIN_ADMINS_ENTER_EMAIL--}: 
  + +
{--ADMIN_ADMINS_ENTER_PASS1--}: 
 
{--ADMIN_ADMINS_ENTER_PASS2--}:  + +
 {--ADMIN_ADMINS_ENTER_PASS2--}: + +
  + + +
-
\ No newline at end of file + +
diff --git a/templates/de/html/admin/admin_admins_add_acl.tpl b/templates/de/html/admin/admin_admins_add_acl.tpl index afd6c7931c..604905dee1 100644 --- a/templates/de/html/admin/admin_admins_add_acl.tpl +++ b/templates/de/html/admin/admin_admins_add_acl.tpl @@ -1,57 +1,41 @@ +
- - - - + - - - - - - - - - - - - - - - + - - - -
- {--ADMIN_ADMINS_ADD_ACL--}:
  + {--ADMIN_ADMINS_ADD_ACL--}: +
{--ADMIN_ADMINS_SELECT_LOGIN--}: 
 
{--ADMIN_ADMINS_SELECT_ACTION--}:  $content[action_selection]
 
{--ADMIN_ADMINS_SELECT_WHAT--}:  $content[what_selection]
 
{--ADMIN_ADMINS_SELECT_MODE--}:  + {--ADMIN_ADMINS_SELECT_MODE--}:
 
+
+
diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index 5a6cbd128f..0b6a34c482 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -1,3 +1,4 @@ +
@@ -25,3 +26,4 @@
+
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 2c10397309..df8c7625ce 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,140 +1,88 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -
+ {--ADMIN_ACTIVATE_BONUS_SETTINGS--}
 
{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}   {--YES--}
{--NO--}
 
+ {--ADMIN_BONUS_INCLUDE_OWN--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_REF_INCLUDE--}   + {--YES--}
{--NO--}
 
+ {--ADMIN_EDIT_BONUS_SETTINGS--}
 
{--ADMIN_BONUS_ORDER_BONUS--}:   ({?POINTS?})
 
{--ADMIN_BONUS_REF_BONUS--}: @@ -145,56 +93,38 @@ ({?POINTS?})
 
{--ADMIN_BONUS_STATS_BONUS--}:   ({?POINTS?})
 
+ {--ADMIN_BONUS_LOGIN_BONUS--}:   + ({?POINTS?})
 
+ {--ADMIN_BONUS_TURBO_BONUS_TITLE--}:
 
{--ADMIN_BONUS_TURBO_BONUS--}:  ({?POINTS?})
 
+ {--ADMIN_BONUS_TURBO_RATES--}:

@@ -206,149 +136,97 @@
 $content[trates_list]$content[trates_list]
 
+ {--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:
 
{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:  $content[login_timeout_selection]
 
{--ADMIN_CONFIG_BONUS_TIMEOUT--}: $content[bonus_timeout_selection]{--ADMIN_CONFIG_BONUS_TIMEOUT--}:$content[bonus_timeout_selection]
 
+ {--ADMIN_BONUS_TURBO_MISC_TITLE--}:
 
{--ADMIN_BONUS_TURBO_RANKS--}: 
 
{--ADMIN_BONUS_TURBO_LINES--}: 
 
{--ADMIN_BONUS_USERID--}:  + {--ADMIN_BONUS_USERID--}: $content[member_selection]
 
+ {--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:
 
{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}:   ({?POINTS?})
 
+ {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:  $content[wait_selection]
 $content[wait_selection]
+
+
diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 660e05111e..49ed962460 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,3 +1,4 @@ +
@@ -224,3 +225,4 @@
+
diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index c6a0396377..dcc2a73ee0 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -1,19 +1,13 @@
- - - - - - - - - - -
{--ADMIN_CONFIG_HOME_TITLE--} -
-  · {--ADMIN_EDIT_HOME_TARGET--} -
-  · {--ADMIN_EDIT_HOME_SETTINGS--} -
+
+
+ {--ADMIN_CONFIG_HOME_TITLE--} +
+
+  · {--ADMIN_EDIT_HOME_TARGET--} +
+
+  · {--ADMIN_EDIT_HOME_SETTINGS--} +
+
diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 0bb9a5b783..7ad39b5de7 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,5 +1,6 @@ +
- +
{--EDIT_REGFORM_SETTINGS--} @@ -39,3 +40,4 @@
+
diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index 7cb0532e6b..006636ea77 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -1,7 +1,8 @@ +
- @@ -18,10 +19,11 @@ -
+ {--EDIT_POINTS_SETTINGS--}
+
+
diff --git a/templates/de/html/admin/admin_del_user.tpl b/templates/de/html/admin/admin_del_user.tpl index baee1f189d..906a7cd067 100644 --- a/templates/de/html/admin/admin_del_user.tpl +++ b/templates/de/html/admin/admin_del_user.tpl @@ -1,38 +1,22 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$content[header] -
 
- $content[text] -
 
[ $content[surname] $content[family] ]
 
 
- - -
+
+
+ $content[header] +
+
+ $content[text] +
+
+ [ $content[surname] $content[family] ] +
+
+ +
+
+ + +
+
+
diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 958a66d990..fef7296aae 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -1,13 +1,13 @@ +
- - - - - - - - - - - - -
+ {--ADMIN_EDIT_USER_PROFILE--}: ($content)
{--GENDER--}: 
{--SURNAME--}: 
{--FAMILY--}: 
{--STREET_NR--}: 
{--COUNTRY--}: 
{--ZIP--}: 
{--CITY--}: 
{--EMAIL--}: 
+
{--ADMIN_EDIT_USER_PASSWORD_NOTE--}
{--ADMIN_PASS1--}: 
{--ADMIN_PASS2--}: 
+
+
diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl index 51c945be65..e089c58fb2 100644 --- a/templates/de/html/admin/admin_guest_add.tpl +++ b/templates/de/html/admin/admin_guest_add.tpl @@ -1,99 +1,52 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--SELECT_BELOW_MENU--}: $content[below_selection] 
$content[below_selection]
  {--MENU_IS_VISIBLE--}:  +  
 {--MENU_IS_ACTIVE--}:  + {--MENU_IS_ACTIVE--}:  
  +  
diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 82d12a2c08..bf83baecfb 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -1,9 +1,10 @@ +
- +
+ {--ADMIN_ADMINS_EDIT_ACCOUNTS--} + @@ -14,12 +15,12 @@ $content -
- {--ADMIN_ADMINS_EDIT_ACCOUNTS--}
{--ID_SELECT--}
- + + + +
-
\ No newline at end of file + +
diff --git a/templates/de/html/admin/admin_list_doubler_overview.tpl b/templates/de/html/admin/admin_list_doubler_overview.tpl index dbd65882ba..f4699cb7b7 100644 --- a/templates/de/html/admin/admin_list_doubler_overview.tpl +++ b/templates/de/html/admin/admin_list_doubler_overview.tpl @@ -1,3 +1,4 @@ +
@@ -14,7 +15,7 @@
- +
{--ADMIN_DOUBLER_ALREADY_ALL--}: @@ -42,7 +43,7 @@
- +
{--ADMIN_DOUBLER_WAITING_ALL--}: @@ -71,3 +72,4 @@
+ diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index d297927243..ffb3028375 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -1,3 +1,4 @@ +
@@ -19,3 +20,4 @@ $content[rows]
+
diff --git a/templates/de/html/admin/admin_list_user.tpl b/templates/de/html/admin/admin_list_user.tpl index 3cbef37aef..5eb3f45c28 100644 --- a/templates/de/html/admin/admin_list_user.tpl +++ b/templates/de/html/admin/admin_list_user.tpl @@ -1,3 +1,4 @@ +
@@ -10,3 +11,4 @@ $content[rows] {!__PAGE_NAV!}
+
diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index e09c2d22b8..7a51c8ebb2 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,3 +1,4 @@ +
@@ -5,31 +6,19 @@
$content[header]
- - - - - - - - - - - -
 
$content[text]
 
[ $content[surname] $content[family] ]
 
 
@@ -38,3 +27,4 @@
+
diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl index 1c8774c8a9..c4ea81c320 100644 --- a/templates/de/html/admin/admin_member_add.tpl +++ b/templates/de/html/admin/admin_member_add.tpl @@ -1,99 +1,54 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--SELECT_BELOW_MENU--}: $content[below_selection] 
$content[below_selection]
  {--MENU_IS_VISIBLE--}:  +  
 {--MENU_IS_ACTIVE--}:  + {--MENU_IS_ACTIVE--}:  
  +  
+
diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl index c78cb20767..eb03c87875 100644 --- a/templates/de/html/admin/admin_member_selection_box.tpl +++ b/templates/de/html/admin/admin_member_selection_box.tpl @@ -1,34 +1,21 @@ +
- - - - - - - - - - - - - - - - - - - -
- {--ADMIN_SELECTION_BOX_TITLE--} -
 
- {--ADMIN_SELECT_USER--}: - -
 
 
- - -
+
+
+ {--ADMIN_SELECTION_BOX_TITLE--} +
+
+ {--ADMIN_SELECT_USER--}: + +
+
+ + +
+
+
diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index aadd77c7dc..060d79a2e6 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -1,3 +1,4 @@ +
@@ -26,3 +27,4 @@
+
diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index fc8279814e..6ed7dbbba9 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -1,5 +1,6 @@ +
- +
@@ -23,3 +24,4 @@
{--ADMIN_SUB_POINTS_FROM_ALL--}:
+
-- 2.39.5