From: Roland Häder Date: Fri, 4 Dec 2009 02:35:39 +0000 (+0000) Subject: More HTML cleanups X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=6ea0eb7fcb88ddd30395c47963c5e7a3c43fc70e More HTML cleanups --- diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 62ceaa0bbf..3c37caa694 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -1,6 +1,6 @@
- +
{--ADMIN_ADD_MAX_VALUE--} diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index 3cf59c7f7e..25f8dfd66b 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -1,133 +1,82 @@
- +
- - - - + - - - - - - - - + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - +
- {--ADMIN_RALLYE_ADD_NEW_TITLE--}:
  + {--ADMIN_RALLYE_ADD_NEW_TITLE--}: +
{--RALLYE_TITLE--}: 
 
  + +
{--RALLYE_DESCR--}: 
  + +
{--RALLYE_TEMPLATE--}:  $content[templates_selection]
 
 
{--RALLYE_START_DAY--}:  $content[start_day].$content[start_month].$content[start_year]
$content[start_hour]:$content[start_min]:$content[start_sec]
 
 
{--RALLYE_END_DAY--}:  $content[end_day].$content[end_month].$content[end_year]
$content[end_hour]:$content[end_min]:$content[end_sec]
 
 
{--RALLYE_IS_ACTIVE--}: 
 
{--RALLYE_AUTO_ADD_USER--}: 
 
{--RALLYE_SEND_NOTIFY--}: 
 
{--RALLYE_MIN_USERS--}: 
  + +
{--RALLYE_MIN_PRICES--}: 
  + +
- + + +
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 4ecfb2ebcb..2693a343b0 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -1,153 +1,109 @@ +
- +
- - - - - - - - - - - - - - - - - - - - - - + {--ADMIN_CONFIG_BEG_TIMEOUT--}: + + - + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ {--ADMIN_EDIT_BEG_SETTINGS--}
 
{--ADMIN_BEG_POINTS--}:  
 
{--ADMIN_BEG_POINTS_MAX--}:  
 
{--ADMIN_CONFIG_BEG_TIMEOUT--}: $content[timeout]
 
- {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}: $content[userid_timeout] + $content[timeout] +
  + {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}: + + $content[userid_timeout] +
{--ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT--}:  $content[ip_timeout]
 
{--ADMIN_BEG_USERID--}:  - $content[member_selection] + $content[ip_timeout]
 {--ADMIN_BEG_USERID--}: + $content[member_selection] +
+ {--ADMIN_SELECT_BEG_MODE--}:
 
+ {--BEG_MODE_DIRECT--}   + {--BEG_MODE_REF--}
 
+ {--ADMIN_EDIT_BEG_RALLYE_SETTINGS--}
 
{--ADMIN_BEG_RALLYE_ACTIVE--}  {--YES--}
{--NO--}
 
{--ADMIN_BEG_INCLUDE_OWN--}  {--YES--}
{--NO--}
 
{--ADMIN_BEG_RANKS--} 
 
{--ADMIN_BEG_RALLYE_ONLY_ACTIVE--}   {--YES--}
{--NO--}
 
+ {--ADMIN_BEG_PAY_MODE--}   +
 
+ {--ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS--}
 
{--ADMIN_BEG_RAL_EN_NOTIFY--}  {--YES--}
{--NO--}
 
{--ADMIN_BEG_RAL_DI_NOTIFY--}  {--YES--}
{--NO--}
 
{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}  {--YES--}
{--NO--}
 
{--ADMIN_BEG_NOTIFY_BONUS--} 
 
{--ADMIN_BEG_NOTIFY_WAIT--}  $content[wait_selection]
 
+
+
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index df8c7625ce..b9ae99a64f 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,70 +1,70 @@
- +
- - - - - - - - - - - - - - @@ -75,38 +75,38 @@ - - - - - - - - @@ -117,14 +117,14 @@ - + - - + - + @@ -157,19 +157,19 @@ - + - + - + @@ -180,46 +180,48 @@ - - - - - - - - - - +
{--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_BONUS_ORDER_BONUS--}: + ({?POINTS?})
+ {--ADMIN_BONUS_REF_BONUS--}:   + ({?POINTS?})
+ {--ADMIN_BONUS_STATS_BONUS--}: + ({?POINTS?})
+ {--ADMIN_BONUS_LOGIN_BONUS--}: + ({?POINTS?})
{--ADMIN_BONUS_TURBO_BONUS--}:{--ADMIN_BONUS_TURBO_BONUS--}: ({?POINTS?})
+ {--ADMIN_BONUS_TURBO_RATES--}:

@@ -144,11 +144,11 @@
{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:{--ADMIN_CONFIG_LOGIN_TIMEOUT--}: $content[login_timeout_selection]
{--ADMIN_CONFIG_BONUS_TIMEOUT--}:{--ADMIN_CONFIG_BONUS_TIMEOUT--}: $content[bonus_timeout_selection]
{--ADMIN_BONUS_TURBO_RANKS--}:{--ADMIN_BONUS_TURBO_RANKS--}:
{--ADMIN_BONUS_TURBO_LINES--}:{--ADMIN_BONUS_TURBO_LINES--}:
{--ADMIN_BONUS_USERID--}:{--ADMIN_BONUS_USERID--}: $content[member_selection]
+ {--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 49ed962460..476736ee68 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,201 +1,134 @@
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - diff --git a/templates/de/html/admin/admin_config_email_del.tpl b/templates/de/html/admin/admin_config_email_del.tpl index af9f4d1b51..e64adbbcdb 100644 --- a/templates/de/html/admin/admin_config_email_del.tpl +++ b/templates/de/html/admin/admin_config_email_del.tpl @@ -1,18 +1,15 @@
-
+ {--ADMIN_EDIT_DOUBLER_SETTINGS--}
 
{--ADMIN_DOUBLER_CHARGE--}:   (%)
 
{--ADMIN_DOUBLER_REFERAL--}:   (%)
 
{--ADMIN_DOUBLER_MINIMUM--}:   ({?POINTS?})
 
{--ADMIN_DOUBLER_MAXIMUM--}:   ({?POINTS?})
 
{--ADMIN_DOUBLER_LEFT--}:   ({?POINTS?})
 
{--ADMIN_DOUBLER_GROUP_SENT--}:  
 
{--ADMIN_DOUBLER_MAX_SENT--}:  
 
{--ADMIN_DOUBLER_SENT_ALL--}:  {--YES--}
{--NO--}
 
{--ADMIN_DOUBLER_JACKPOT--}:  {--YES--}
{--NO--}
 
{--ADMIN_DOUBLER_OWN--}:  {--YES--}
{--NO--}
 
{--ADMIN_DOUBLER_TIMEOUT--}:  $content[timeout_selection]
 
{--ADMIN_DOUBLER_USERID--}:  $content[member_selection]
 
+ {--ADMIN_DOUBLER_SEND_MODE--}:
 
{--ADMIN_DOUBLER_SEND_DIRECT--}   {--ADMIN_DOUBLER_SEND_RESET--}
 
 
+ {--ADMIN_DOUBLER_DISPLAY_SETTINGS--}:
 
{--ADMIN_DOUBLER_DISPLAY_NEW--}: 
 
{--ADMIN_DOUBLER_DISPLAY_PAY--}: 
 
{--ADMIN_DOUBLER_DISPLAY_OLD--}:  + {--ADMIN_DOUBLER_DISPLAY_OLD--}:
 
+
+
$content[rows] - - - - +
{--DELETE_MRECEIVE--}:
  + + +
diff --git a/templates/de/html/admin/admin_config_email_edit.tpl b/templates/de/html/admin/admin_config_email_edit.tpl index aff246e435..1579cc7a2a 100644 --- a/templates/de/html/admin/admin_config_email_edit.tpl +++ b/templates/de/html/admin/admin_config_email_edit.tpl @@ -1,19 +1,18 @@
- +
- + $content[rows] - - - -
{--EDIT_MRECEIVE--}: + {--EDIT_MRECEIVE--}: +
+
 
diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index 4e78c5328f..76f8212626 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -1,12 +1,11 @@
- +
- - - - -
{--ADMIN_CONFIG_MENU_TITLE--}
 
{--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--} @@ -16,17 +15,15 @@ {--NO--}
 
+ {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--} + {--YES--}
{--NO--}
 
diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index e750c16158..3953136c56 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -1,6 +1,6 @@
- +
{--ADMIN_EDIT_PROXY_SETTINGS--} diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 97c79d18a4..833b260c6b 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -1,11 +1,11 @@ +
- +
- - - - - - - - - - - - - - - - - - - -
{--ADMIN_CONFIG_REMOVEIP_TITLE--}
 
{--ADMIN_CONFIG_REMOVEIP_ANON_IP--} @@ -15,8 +15,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_ANON_HOST--} @@ -26,8 +24,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_ANON_UA--} @@ -37,8 +33,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_ANON_REF--} @@ -48,8 +42,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_ANONYMOUS_IP--} @@ -62,8 +54,6 @@
 
 
{--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--} @@ -73,8 +63,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--} @@ -84,8 +72,6 @@ {--NO--}
 
 
{--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--} @@ -95,18 +81,15 @@ {--NO--}
 
 
+ {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--} + {--YES--}  {--NO--}
 
@@ -115,3 +98,4 @@
+
diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index c2be857ce8..6f8eb4a7f8 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -1,11 +1,11 @@ +
- +
- - - - -
{--ADMIN_CONFIG_SPONSOR_TITLE--}
 
{--ADMIN_SPONSOR_MIN_POINTS--}: @@ -14,16 +14,14 @@
 
+ {--ADMIN_SPONSOR_REF_POINTS--}: +
 
@@ -31,4 +29,5 @@
-
\ No newline at end of file + +
diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index 6765916b24..a182f7e513 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -1,6 +1,6 @@
- +
{--ADMIN_CONFIG_YOOMEDIA_TITLE--} @@ -82,8 +82,8 @@
-
{--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--}
+ diff --git a/templates/de/html/admin/admin_del_cats.tpl b/templates/de/html/admin/admin_del_cats.tpl index 9bc827dceb..c446fa0a2a 100644 --- a/templates/de/html/admin/admin_del_cats.tpl +++ b/templates/de/html/admin/admin_del_cats.tpl @@ -1,5 +1,6 @@ +
- +
{--DELETE_CATEGORIES--}: @@ -14,3 +15,4 @@
+
diff --git a/templates/de/html/admin/admin_del_payments.tpl b/templates/de/html/admin/admin_del_payments.tpl index 91b1860d4d..168f10a9af 100644 --- a/templates/de/html/admin/admin_del_payments.tpl +++ b/templates/de/html/admin/admin_del_payments.tpl @@ -1,5 +1,6 @@ +
- +
{--DELETE_PAYMENT--}: @@ -14,3 +15,4 @@
+
diff --git a/templates/de/html/admin/admin_edit_payments.tpl b/templates/de/html/admin/admin_edit_payments.tpl index c0cbedc254..d776870149 100644 --- a/templates/de/html/admin/admin_edit_payments.tpl +++ b/templates/de/html/admin/admin_edit_payments.tpl @@ -1,5 +1,6 @@ +
- +
@@ -12,3 +13,4 @@
{--EDIT_PAYMENT--}:
+
diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index a2fb85eaca..b03053d10b 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -1,16 +1,21 @@ - +
+
- $content[rows] -
{--USER_ID--}: $content[userid]($content[email]) + + {--USER_ID--}: $content[userid] + ($content[email])
- {--ADMIN_MEMBER_FUNCTIONS--}:
- $content[member_links] + 		+
+ {--ADMIN_MEMBER_FUNCTIONS--}: +
+
+ $content[member_links] +
+ diff --git a/templates/de/html/admin/admin_logout_sql_patches_install.tpl b/templates/de/html/admin/admin_logout_sql_patches_install.tpl index aec0e9dd51..4de748a1b1 100644 --- a/templates/de/html/admin/admin_logout_sql_patches_install.tpl +++ b/templates/de/html/admin/admin_logout_sql_patches_install.tpl @@ -1,18 +1,13 @@ -
- - - - - - - - - - -
 
{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}
-
- {--ADMIN_RELOGIN_LINK--}
-
- {--ADMIN_BACK_TO_GUEST_MENU--}
-
 
+
+
+
+ {--ADMIN_LOGOUT_SQL_PATCHES_DONE--} +
+
+ {--ADMIN_RELOGIN_LINK--} +
+
+ {--ADMIN_BACK_TO_GUEST_MENU--} +
+
diff --git a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl index 8609012b84..82732fad17 100644 --- a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl +++ b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl @@ -1,17 +1,11 @@ -
- - - - - - - - - - + +
 
- {--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}
-
+
+
+
+ {--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--} +
+
{--ADMIN_RESET_PASS_LINK--} -
 
diff --git a/templates/de/html/admin/admin_points_del.tpl b/templates/de/html/admin/admin_points_del.tpl index 18ae4988b5..12147875b1 100644 --- a/templates/de/html/admin/admin_points_del.tpl +++ b/templates/de/html/admin/admin_points_del.tpl @@ -1,6 +1,6 @@
- +
{--DELETE_REF_DEPTHS--}: diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl index 59455174f3..8154aa2912 100644 --- a/templates/de/html/guest/guest_beg.tpl +++ b/templates/de/html/guest/guest_beg.tpl @@ -1,49 +1,23 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   
{--BEG_GUEST_TRAILER--}

- {?MAIN_TITLE?}
 
 
-

{--BEG_GUEST_EARN_1--} $content[points] - {?POINTS?} {--BEG_GUEST_EARN_2--} $content[points_max] - {?POINTS?} {--BEG_GUEST_EARN_3--}

-

{--BEG_GUEST_TIMEOUT_1--} $content[timeout] - {--BEG_GUEST_TIMEOUT_2--}

-

{--BEG_GUEST_HAVE_FUN--}

-
 
 
 
{--BEG_CONTINUE_REGISTER--} -
 
 
-
\ No newline at end of file +
+
+
{--BEG_GUEST_TRAILER--}
+
{?MAIN_TITLE?}
+
+
+
+ {--BEG_GUEST_EARN_1--} $content[points] {?POINTS?} + {--BEG_GUEST_EARN_2--} $content[points_max] {?POINTS?} + {--BEG_GUEST_EARN_3--} +
+
+ {--BEG_GUEST_TIMEOUT_1--} $content[timeout] + {--BEG_GUEST_TIMEOUT_2--} +
+
+ {--BEG_GUEST_HAVE_FUN--} +
+
+
+ {--BEG_CONTINUE_REGISTER--} +
+
diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl index a3a6813925..6fd9fd4bb0 100644 --- a/templates/de/html/member/member_beg.tpl +++ b/templates/de/html/member/member_beg.tpl @@ -1,23 +1,28 @@ - - - - - - - - - - -
- {--BEG_MEMBER_YOUR_LINK--}:
+
+
+
+ {--BEG_MEMBER_YOUR_LINK--}: +
+
- {--BEG_MEMBER_CLICKS_TOTAL--}:
- {%user,beg_clicks,translateComma%}
-

{--BEG_MEMBER_EARN_1--} {%config,translateComma=beg_points%} - {?POINTS?} {--BEG_MEMBER_EARN_2--} {%config,translateComma=beg_points_max%} - {?POINTS?} {--BEG_MEMBER_EARN_3--}

-

{--BEG_MEMBER_TIMEOUT_1--} {%config,createFancyTime=beg_timeout%} - {--BEG_MEMBER_TIMEOUT_2--}

-

{--BEG_MEMBER_HAVE_FUN--}

-
+ + +
+ {--BEG_MEMBER_CLICKS_TOTAL--}: + {%user,beg_clicks,translateComma%} +
+
+
+ {--BEG_MEMBER_EARN_1--} {%config,translateComma=beg_points%} {?POINTS?} + {--BEG_MEMBER_EARN_2--} {%config,translateComma=beg_points_max%} {?POINTS?} + {--BEG_MEMBER_EARN_3--} +
+
+ {--BEG_MEMBER_TIMEOUT_1--} {%config,createFancyTime=beg_timeout%} + {--BEG_MEMBER_TIMEOUT_2--} +
+
+ {--BEG_MEMBER_HAVE_FUN--} +
+
+ diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl index 420f20112f..59b4572a57 100644 --- a/templates/de/html/member/member_order_page1.tpl +++ b/templates/de/html/member/member_order_page1.tpl @@ -1,5 +1,6 @@ +
- +
$content[zip_content] $content[html_extension] @@ -13,3 +14,4 @@
+
diff --git a/templates/de/html/member/member_reflinks_table.tpl b/templates/de/html/member/member_reflinks_table.tpl index b68fc02f08..7fc4f01011 100644 --- a/templates/de/html/member/member_reflinks_table.tpl +++ b/templates/de/html/member/member_reflinks_table.tpl @@ -1,8 +1,5 @@
- - - - - $content +
 
+$content
diff --git a/templates/de/html/member/member_support_contcted.tpl b/templates/de/html/member/member_support_contcted.tpl index 3f49373724..fa345caa14 100644 --- a/templates/de/html/member/member_support_contcted.tpl +++ b/templates/de/html/member/member_support_contcted.tpl @@ -1,20 +1,8 @@ - - - - - - - - - - - - - - - - -
 
Vielen Dank, dass Sie uns kontaktiert haben!
 
Einer unserer - Mitarbeiter wird sich um Ihr Anliegen kümmern.
 
+
+
+ Vielen Dank, dass Sie uns kontaktiert haben! +
+
+ Einer unserer Mitarbeiter wird sich um Ihr Anliegen kümmern. +
+