From c10691a8c7e0f2d04f5c7b0e705a21375f9f5f31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 4 Mar 2009 15:53:00 +0000 Subject: [PATCH] Several markup fixes --- .../de/html/admin/admin_del_email_bonus.tpl | 2 +- .../de/html/admin/admin_del_email_normal.tpl | 3 ++- .../de/html/admin/admin_del_email_notify.tpl | 2 +- .../de/html/admin/admin_list_bonus_emails.tpl | 2 +- .../html/admin/admin_list_doubler_already.tpl | 10 ++++---- .../admin/admin_list_doubler_overview.tpl | 25 ++++++++----------- templates/de/html/admin/admin_list_emails.tpl | 2 +- .../de/html/admin/admin_list_emails_row.tpl | 20 +++++++-------- .../html/admin/admin_list_links_problem.tpl | 2 +- .../html/admin/admin_list_sponsor_details.tpl | 2 +- .../de/html/admin/admin_lock_sponsor.tpl | 2 +- .../de/html/admin/admin_overview_header.tpl | 2 +- .../html/admin/admin_overview_header_task.tpl | 2 +- .../html/admin/admin_unlock_emails_redir.tpl | 2 +- .../de/html/admin/admin_update_download.tpl | 2 +- templates/de/html/birthday/birthday_msg.tpl | 6 ++--- .../de/html/guest/guest_confirm_link.tpl | 8 +++--- .../de/html/guest/guest_confirm_table.tpl | 2 +- templates/de/html/guest/guest_register.tpl | 3 ++- .../de/html/guest/guest_sponsor_infos.tpl | 5 +++- templates/de/html/guest/guest_sponsor_reg.tpl | 4 ++- templates/de/html/install/install_page1.tpl | 3 ++- templates/de/html/install/install_page2.tpl | 3 ++- templates/de/html/install/install_page3.tpl | 3 ++- templates/de/html/install/install_welcome.tpl | 3 ++- .../de/html/mailid/mailid_points_done2.tpl | 8 +++--- .../de/html/mailid/mailid_points_locked2.tpl | 4 +-- .../de/html/member/member_pool_table.tpl | 2 +- .../de/html/member/member_stats_table.tpl | 2 +- .../de/html/member/member_unconfirmed_404.tpl | 2 +- .../member_unconfirmed_404_nopoints.tpl | 2 +- templates/de/html/sponsor/sponsor_header.tpl | 5 +++- 32 files changed, 77 insertions(+), 68 deletions(-) diff --git a/templates/de/html/admin/admin_del_email_bonus.tpl b/templates/de/html/admin/admin_del_email_bonus.tpl index b4defb95fb..b844db4e95 100644 --- a/templates/de/html/admin/admin_del_email_bonus.tpl +++ b/templates/de/html/admin/admin_del_email_bonus.tpl @@ -1,7 +1,7 @@ diff --git a/templates/de/html/admin/admin_del_email_normal.tpl b/templates/de/html/admin/admin_del_email_normal.tpl index 48779a2cbf..4918cc205c 100644 --- a/templates/de/html/admin/admin_del_email_normal.tpl +++ b/templates/de/html/admin/admin_del_email_normal.tpl @@ -2,7 +2,8 @@ class="admin_table dashed" width="99%"> +
{--ADMIN_EMAIL_DELETED--}
+ diff --git a/templates/de/html/admin/admin_del_email_notify.tpl b/templates/de/html/admin/admin_del_email_notify.tpl index b0502ee0c3..710f72e098 100644 --- a/templates/de/html/admin/admin_del_email_notify.tpl +++ b/templates/de/html/admin/admin_del_email_notify.tpl @@ -1,7 +1,7 @@
-
{--ADMIN_EMAIL_DELETED--} +
{--ADMIN_EMAIL_DELETED--}
-
{--ADMIN_EMAIL_DELETED--}
{--ID_SELECT--}
diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl index ae0729f45c..d69a67904c 100644 --- a/templates/de/html/admin/admin_list_bonus_emails.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails.tpl @@ -2,7 +2,7 @@
-
{--ADMIN_NOTIFICATION_DELETED_TITLE--} +
{--ADMIN_NOTIFICATION_DELETED_TITLE--}
$content[nav] diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl index a6ad8f0e65..f6411cd034 100644 --- a/templates/de/html/admin/admin_list_doubler_already.tpl +++ b/templates/de/html/admin/admin_list_doubler_already.tpl @@ -1,21 +1,21 @@
-
{--ADMIN_BONUS_CONTENT--} +
{--ADMIN_BONUS_CONTENT--}
{!__ROWS_CONTENT!} diff --git a/templates/de/html/admin/admin_list_doubler_overview.tpl b/templates/de/html/admin/admin_list_doubler_overview.tpl index e0f4f47e67..a3c37bd89a 100644 --- a/templates/de/html/admin/admin_list_doubler_overview.tpl +++ b/templates/de/html/admin/admin_list_doubler_overview.tpl @@ -1,21 +1,20 @@ -
-
{!__ADMIN_DOUBLER_LIST_ALREADY!} +
{!__ADMIN_DOUBLER_LIST_ALREADY!}
-
{--_UID--}: +
{--_UID--}:
 -
{!POINTS!}: +
{!POINTS!}:
 -
{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}: +
{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:
 -
{--REMOTE_IP--}: +
{--REMOTE_IP--}:
+
+
{--ADMIN_DOUBLER_LIST_OVERVIEW--}
+ - +
{--ADMIN_DOUBLER_LIST_WAITING--}
+ -
-
{--ADMIN_DOUBLER_LIST_OVERVIEW--}
{--ADMIN_DOUBLER_LIST_ALREADY--} +
+
{--ADMIN_DOUBLER_LIST_ALREADY--}
 -
{--ADMIN_DOUBLER_LIST_WAITING--}
- + -
+ @@ -36,10 +35,8 @@
{--ADMIN_DOUBLER_ALREADY_ALL--}: 
 - + -
+ diff --git a/templates/de/html/admin/admin_list_emails.tpl b/templates/de/html/admin/admin_list_emails.tpl index 4a21b1e507..a2bc034e31 100644 --- a/templates/de/html/admin/admin_list_emails.tpl +++ b/templates/de/html/admin/admin_list_emails.tpl @@ -2,7 +2,7 @@
{--ADMIN_DOUBLER_WAITING_ALL--}: 
$content[nav] diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl index 4a9cb68293..cb16538414 100644 --- a/templates/de/html/admin/admin_list_emails_row.tpl +++ b/templates/de/html/admin/admin_list_emails_row.tpl @@ -1,15 +1,15 @@ @@ -27,31 +27,31 @@ diff --git a/templates/de/html/admin/admin_list_links_problem.tpl b/templates/de/html/admin/admin_list_links_problem.tpl index b748220a16..9cea9dbb5e 100644 --- a/templates/de/html/admin/admin_list_links_problem.tpl +++ b/templates/de/html/admin/admin_list_links_problem.tpl @@ -1,5 +1,5 @@ diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 718c15a165..7f86174692 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -1,7 +1,7 @@
-
{--ADMIN_POOL_CONTENT--} ($content[who]) +
{--ADMIN_POOL_CONTENT--} ($content[who])
{--EMAIL_SENDER--}:
-
$content[sender_link] +
$content[sender_link]
 {--EMAIL_SUBJECT--}:
-
$content[subject] +
$content[subject]
 {--EMAIL_TEXT--}:
-
$content[text] +
$content[text]
{--EMAIL_RECEIVERS--}:
-
$content[sent_email] - ({--EMAIL_RUIDS--}:
$content[receivers]) +
$content[sent_email]
+ ({--EMAIL_RUIDS--}:
$content[receivers]
)
{--USERS_LINKS--}:
-
$content[unconfirmed] +
$content[unconfirmed]
 {--EMAIL_POOL_TYPE--}:
-
$content[type] +
$content[type]
{--EMAIL_TSEND--}:
-
$content[target_send] +
$content[target_send]
 {--EMAIL_URL--}:
-
{--ADMIN_TEST_URL--} +
{--ADMIN_TEST_URL--}
 {--EMAIL_TIMESTAMP--}:
-
$content[timestamp] +
$content[timestamp]
-
$content[problem]: $content[data] + $content[problem]: $content[data]
diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index 3adb307f6b..64ecfd7102 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -2,7 +2,7 @@
-
{--ADMIN_SPONSOR_DETAILS--}: +
{--ADMIN_SPONSOR_DETAILS--}:
diff --git a/templates/de/html/admin/admin_overview_header.tpl b/templates/de/html/admin/admin_overview_header.tpl index 8a7c49c0df..43584d4a4a 100644 --- a/templates/de/html/admin/admin_overview_header.tpl +++ b/templates/de/html/admin/admin_overview_header.tpl @@ -2,7 +2,7 @@
-
{!__HEADER_MESSAGE!} +
{!__HEADER_MESSAGE!}
 
diff --git a/templates/de/html/admin/admin_overview_header_task.tpl b/templates/de/html/admin/admin_overview_header_task.tpl index f3f328df51..3a1a35a5ad 100644 --- a/templates/de/html/admin/admin_overview_header_task.tpl +++ b/templates/de/html/admin/admin_overview_header_task.tpl @@ -2,7 +2,7 @@
-
{--ADMIN_TASK_SYSTEM_WELCOME--} +
{--ADMIN_TASK_SYSTEM_WELCOME--}
diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl index c68f36156e..0acdc68828 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl @@ -5,7 +5,7 @@ diff --git a/templates/de/html/admin/admin_update_download.tpl b/templates/de/html/admin/admin_update_download.tpl index c2233f0e3e..98b3b1709a 100644 --- a/templates/de/html/admin/admin_update_download.tpl +++ b/templates/de/html/admin/admin_update_download.tpl @@ -2,7 +2,7 @@ align="center" class="admin_table dashed" align="center"> +
{--NEW_VERSION_AVAILABLE--}
diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl index a67c0b5ef2..d06a4ae596 100644 --- a/templates/de/html/birthday/birthday_msg.tpl +++ b/templates/de/html/birthday/birthday_msg.tpl @@ -1,8 +1,8 @@ -
Herzlichen Glückwunsch zum Geburtstag!
+
Herzlichen Glückwunsch zum Geburtstag!


Hallo {!__GENDER!} {!__SNAME!} {!__FNAME!}!

-Wir das Team von
{!MAIN_TITLE!} wüschen Ihnen +Wir das Team von {!MAIN_TITLE!} wüschen Ihnen alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben wir -Ihnen soeben
{!__GIFT!} {!POINTS!} Ihrem Account +Ihnen soeben {!__GIFT!} {!POINTS!} Ihrem Account gutgeschrieben! diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl index f5b92c85c3..7f9f3a1b4e 100644 --- a/templates/de/html/guest/guest_confirm_link.tpl +++ b/templates/de/html/guest/guest_confirm_link.tpl @@ -1,11 +1,9 @@
-
-
-
$content[message] +
$content[message]
 
{--ADMIN_REJECTED_URLS--} + height="35">
{--ADMIN_REJECTED_URLS--}
  
-
{--NEW_VERSION_AVAILABLE--}
 
+ +
+
{--REQUEST_CONFIRM_LINK_TITLE--}
diff --git a/templates/de/html/guest/guest_confirm_table.tpl b/templates/de/html/guest/guest_confirm_table.tpl index 0b68339cff..c53bdb0e50 100644 --- a/templates/de/html/guest/guest_confirm_table.tpl +++ b/templates/de/html/guest/guest_confirm_table.tpl @@ -1,7 +1,7 @@
-
{--REQUEST_CONFIRM_LINK_TITLE--}
 
-
{!__CONFIRM_MSG!} +
{!__CONFIRM_MSG!}
\ No newline at end of file diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index d2a6eef9da..1b80b9ce71 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -83,7 +83,8 @@ 		 
{!MUST_MARKER!} : {--REGISTER_MUST_SET_NOTE--} +
+
{!MUST_MARKER!} : {--REGISTER_MUST_SET_NOTE--}
diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl index 5f02f54b2e..9613bbf961 100644 --- a/templates/de/html/guest/guest_sponsor_infos.tpl +++ b/templates/de/html/guest/guest_sponsor_infos.tpl @@ -2,7 +2,10 @@ diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index a1403c0cdb..c12502dcb6 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -1,5 +1,7 @@ {!__SPONSOR_FORM_ERRORS!} -
{--GUEST_SPONSOR_TITLE--}
+
+
{--GUEST_SPONSOR_TITLE--}
+

{--GUEST_SPONSOR_TEASER_1--}

diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index 020a471e30..54da51b1a9 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -1,7 +1,8 @@
-
{--GUEST_SPONSOR_WANT_BECOME_HEADER--}
+
+ {--GUEST_SPONSOR_WANT_BECOME_HEADER--} +
+
{--GUEST_SPONSOR_INFOS_PRICING_HEADER--}
- diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index a59638fab3..3c94e03ed3 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -2,7 +2,8 @@ target="_self">
{--HEADER_TEXT_PAGE1--} +
+
{--HEADER_TEXT_PAGE1--}
- diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 02454b0ef4..032c220c04 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -1,7 +1,8 @@
{--HEADER_TEXT_PAGE2--} +
+
{--HEADER_TEXT_PAGE2--}
- diff --git a/templates/de/html/install/install_welcome.tpl b/templates/de/html/install/install_welcome.tpl index 2745b382a5..eed27166ae 100644 --- a/templates/de/html/install/install_welcome.tpl +++ b/templates/de/html/install/install_welcome.tpl @@ -1,7 +1,8 @@
{--HEADER_TEXT_PAGE3--} +
+
{--HEADER_TEXT_PAGE3--}
- diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl index 66bf259e6a..3e7b41364c 100644 --- a/templates/de/html/mailid/mailid_points_done2.tpl +++ b/templates/de/html/mailid/mailid_points_done2.tpl @@ -4,13 +4,13 @@ + target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
{--WELCOME_TEXT--} +
+
{--WELCOME_TEXT--}
 
- {--THANX_POINTS_ADDED_1--}
{--_POINTS_VALUE!} {--THANX_POINTS_ADDED_2--}
- {--MAILID_TOTAL_POINTS1--}
{!__TOTAL_POINTS!} - {!POINTS!} {--MAILID_TOTAL_POINTS2--}
+ {--THANX_POINTS_ADDED_1--}{--_POINTS_VALUE!} {--THANX_POINTS_ADDED_2--}
+ {--MAILID_TOTAL_POINTS1--} {!__TOTAL_POINTS!} + {!POINTS!} {--MAILID_TOTAL_POINTS2--}

{--BONUS_SHOW_TURBO_BONUS--}
  + target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
 
- {--THANX_POINTS_LOCKED_1--}
{--_POINTS_VALUE!} {--THANX_POINTS_LOCKED_2--}
+ {--THANX_POINTS_LOCKED_1--}{--_POINTS_VALUE!} {--THANX_POINTS_LOCKED_2--}

{--BONUS_SHOW_TURBO_BONUS--}
  $content diff --git a/templates/de/html/member/member_stats_table.tpl b/templates/de/html/member/member_stats_table.tpl index 1aa01740bc..da8ef34be2 100644 --- a/templates/de/html/member/member_stats_table.tpl +++ b/templates/de/html/member/member_stats_table.tpl @@ -1,7 +1,7 @@
-
{--MEMBER_POOL_CONTENT--} +
{--MEMBER_POOL_CONTENT--}
$content diff --git a/templates/de/html/member/member_unconfirmed_404.tpl b/templates/de/html/member/member_unconfirmed_404.tpl index 445b7eb2fc..17b10a06f9 100644 --- a/templates/de/html/member/member_unconfirmed_404.tpl +++ b/templates/de/html/member/member_unconfirmed_404.tpl @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl index 0ad1db14b6..72da1ac447 100644 --- a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/templates/de/html/sponsor/sponsor_header.tpl b/templates/de/html/sponsor/sponsor_header.tpl index 644670b1ac..04456ecedb 100644 --- a/templates/de/html/sponsor/sponsor_header.tpl +++ b/templates/de/html/sponsor/sponsor_header.tpl @@ -1,2 +1,5 @@ -
{--SPONSOR_WELCOME_TO--}
+
+ {--SPONSOR_WELCOME_TO--} +
+
{!MAIN_TITLE!} -- 2.30.2
-
{--MEMBER_STATS_CONTENT--} +
{--MEMBER_STATS_CONTENT--}
-
$content[probl]: $content[data] + $content[probl]: $content[data]
-
$content[probl]: $content[data] + $content[probl]: $content[data]