From 97a873969aeeb8fdd4670f79bf2c25cb6fdf60fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Nov 2009 08:58:23 +0000 Subject: [PATCH] Next phase of rewrite: member_header->header_column and other CSS class fixes/rewrites --- templates/de/html/member/member_bonus.tpl | 28 +++++++++++-------- templates/de/html/member/member_cat_row.tpl | 14 ++++------ .../de/html/member/member_cats_footer.tpl | 11 ++++---- .../de/html/member/member_cats_header.tpl | 14 ++-------- templates/de/html/member/member_list_beg.tpl | 10 +++---- .../html/member/member_mail_bonus_deleted.tpl | 2 +- .../de/html/member/member_mail_bonus_new.tpl | 2 +- .../html/member/member_mail_bonus_queue.tpl | 2 +- .../de/html/member/member_mail_bonus_send.tpl | 2 +- .../html/member/member_mail_normal_active.tpl | 2 +- .../html/member/member_mail_normal_admin.tpl | 2 +- .../member/member_mail_normal_deleted.tpl | 2 +- .../de/html/member/member_mail_normal_new.tpl | 2 +- .../html/member/member_mail_normal_send.tpl | 2 +- .../html/member/member_mail_normal_temp.tpl | 2 +- .../de/html/member/member_mydata_edit.tpl | 2 +- .../de/html/member/member_newsletter.tpl | 2 +- templates/de/html/member/member_points.tpl | 8 +++--- .../member/member_points_bonus_disabled.tpl | 2 +- .../html/member/member_points_bonus_rows.tpl | 2 +- .../de/html/member/member_pool_table.tpl | 4 ++- templates/de/html/member/member_ref_list.tpl | 2 +- .../de/html/member/member_ref_list_level.tpl | 2 +- .../de/html/member/member_refback_edit.tpl | 2 +- .../de/html/member/member_refback_list.tpl | 22 ++++++--------- .../html/member/member_refback_list_level.tpl | 8 ++---- .../html/member/member_refback_list_row.tpl | 2 +- .../member_refback_list_row_deleted.tpl | 4 +-- .../de/html/member/member_stats_table.tpl | 2 +- .../html/member/member_support_contcted.tpl | 2 +- .../de/html/member/member_support_form.tpl | 12 +++----- .../de/html/member/member_surfbar_list.tpl | 14 +++++----- .../html/member/member_unconfirmed_table.tpl | 10 +++---- .../member_unconfirmed_table_nopoints.tpl | 8 +++--- templates/de/html/show_bonus_msg.tpl | 6 ++-- 35 files changed, 100 insertions(+), 113 deletions(-) diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl index c7490a6223..bf4bb081d2 100644 --- a/templates/de/html/member/member_bonus.tpl +++ b/templates/de/html/member/member_bonus.tpl @@ -1,13 +1,17 @@
-{--BONUS_MEMBER_HERE_IS_THE_LIST--}
-
+ +
+{--BONUS_MEMBER_HERE_IS_THE_LIST--} +
+ +
- - + + - - + + $content[rows] @@ -16,14 +20,15 @@
{--BONUS_RALLYE_NOTE--}
{--BONUS_RANK--}:{--_UID--}:{--BONUS_RANK--}:{--_UID--}:{?POINTS?}:{--ADMIN_LAST_ONLINE--}:{?POINTS?}:{--ADMIN_LAST_ONLINE--}:
-
+
- +
+
- + align="center">{--BONUS_RALLYE_CONDITIONS--}: +
{--BONUS_RALLYE_CONDITIONS--}:
@@ -44,3 +49,4 @@
+ diff --git a/templates/de/html/member/member_cat_row.tpl b/templates/de/html/member/member_cat_row.tpl index fe12473753..c97540d1f0 100644 --- a/templates/de/html/member/member_cat_row.tpl +++ b/templates/de/html/member/member_cat_row.tpl @@ -1,11 +1,7 @@ - $content[cat]   -   - {--YES--}   - {--NO--} - - -   + $content[cat] + + {--YES--} + {--NO--} + diff --git a/templates/de/html/member/member_cats_footer.tpl b/templates/de/html/member/member_cats_footer.tpl index f8741cb2d2..e6048ef4ff 100644 --- a/templates/de/html/member/member_cats_footer.tpl +++ b/templates/de/html/member/member_cats_footer.tpl @@ -1,8 +1,9 @@ - - - + + + + - \ No newline at end of file + + diff --git a/templates/de/html/member/member_cats_header.tpl b/templates/de/html/member/member_cats_header.tpl index 5a2910acda..f5aeab88f2 100644 --- a/templates/de/html/member/member_cats_header.tpl +++ b/templates/de/html/member/member_cats_header.tpl @@ -1,15 +1,7 @@ +
- - - - - - - - - - - + + diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl index b721ca2759..4040388c6c 100644 --- a/templates/de/html/member/member_list_beg.tpl +++ b/templates/de/html/member/member_list_beg.tpl @@ -2,10 +2,10 @@
 
 {--CATNAME--} {--SELECT_CAT--} 
 {--CATNAME--}{--SELECT_CAT--}
- - - - + + + + $content[rows] @@ -19,7 +19,7 @@
{--BEG_RANK--}:{--_UID--}:{--BEG_POINTS--}:{--ADMIN_LAST_ONLINE--}:{--BEG_RANK--}:{--_UID--}:{--BEG_POINTS--}:{--ADMIN_LAST_ONLINE--}:
- diff --git a/templates/de/html/member/member_mail_bonus_deleted.tpl b/templates/de/html/member/member_mail_bonus_deleted.tpl index 4c00676a87..4594ef0770 100644 --- a/templates/de/html/member/member_mail_bonus_deleted.tpl +++ b/templates/de/html/member/member_mail_bonus_deleted.tpl @@ -1,6 +1,6 @@
{--BEG_RALLYE_CONDITIONS--}:
- diff --git a/templates/de/html/member/member_mail_bonus_new.tpl b/templates/de/html/member/member_mail_bonus_new.tpl index e085dd7c61..494212cf60 100644 --- a/templates/de/html/member/member_mail_bonus_new.tpl +++ b/templates/de/html/member/member_mail_bonus_new.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_bonus_queue.tpl b/templates/de/html/member/member_mail_bonus_queue.tpl index e5caf09241..034d774d4a 100644 --- a/templates/de/html/member/member_mail_bonus_queue.tpl +++ b/templates/de/html/member/member_mail_bonus_queue.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_bonus_send.tpl b/templates/de/html/member/member_mail_bonus_send.tpl index 89a6fd8bc0..1811bc9fef 100644 --- a/templates/de/html/member/member_mail_bonus_send.tpl +++ b/templates/de/html/member/member_mail_bonus_send.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_active.tpl b/templates/de/html/member/member_mail_normal_active.tpl index a6223eacb3..d8f79d666f 100644 --- a/templates/de/html/member/member_mail_normal_active.tpl +++ b/templates/de/html/member/member_mail_normal_active.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_admin.tpl b/templates/de/html/member/member_mail_normal_admin.tpl index 54a2919e90..8f78c83a47 100644 --- a/templates/de/html/member/member_mail_normal_admin.tpl +++ b/templates/de/html/member/member_mail_normal_admin.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_deleted.tpl b/templates/de/html/member/member_mail_normal_deleted.tpl index e9da21c2cf..e18ea2d517 100644 --- a/templates/de/html/member/member_mail_normal_deleted.tpl +++ b/templates/de/html/member/member_mail_normal_deleted.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_new.tpl b/templates/de/html/member/member_mail_normal_new.tpl index b888d87cf7..ac7186d394 100644 --- a/templates/de/html/member/member_mail_normal_new.tpl +++ b/templates/de/html/member/member_mail_normal_new.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_send.tpl b/templates/de/html/member/member_mail_normal_send.tpl index c2d967a592..ffac5cfab2 100644 --- a/templates/de/html/member/member_mail_normal_send.tpl +++ b/templates/de/html/member/member_mail_normal_send.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mail_normal_temp.tpl b/templates/de/html/member/member_mail_normal_temp.tpl index 92bb6ff61d..6a80843c47 100644 --- a/templates/de/html/member/member_mail_normal_temp.tpl +++ b/templates/de/html/member/member_mail_normal_temp.tpl @@ -1,6 +1,6 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 77ca7cebce..6cb78c890c 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -2,7 +2,7 @@
+ {--MEMBER_MAIL_NORMAL_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_NORMAL_DETAILS_TITLE_2--}
- diff --git a/templates/de/html/member/member_newsletter.tpl b/templates/de/html/member/member_newsletter.tpl index 4c89e13634..54e9f9a570 100644 --- a/templates/de/html/member/member_newsletter.tpl +++ b/templates/de/html/member/member_newsletter.tpl @@ -2,7 +2,7 @@
+ {--YOUR_LOGIN--}: $content[userid]
- diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 1b5c20b08e..9a30946bae 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -1,9 +1,9 @@
{--NL_MEMBER_TITLE--}: + {--NL_MEMBER_TITLE--}:
- - - + + + $content[rows] @@ -25,7 +25,7 @@ $content[special_rows] - diff --git a/templates/de/html/member/member_points_bonus_disabled.tpl b/templates/de/html/member/member_points_bonus_disabled.tpl index 59effa6901..5e85cd6226 100644 --- a/templates/de/html/member/member_points_bonus_disabled.tpl +++ b/templates/de/html/member/member_points_bonus_disabled.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl index ca0af4b6ad..6f3f1a864a 100644 --- a/templates/de/html/member/member_points_bonus_rows.tpl +++ b/templates/de/html/member/member_points_bonus_rows.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/member/member_pool_table.tpl b/templates/de/html/member/member_pool_table.tpl index 56c64cf465..75bc7e634b 100644 --- a/templates/de/html/member/member_pool_table.tpl +++ b/templates/de/html/member/member_pool_table.tpl @@ -1,8 +1,10 @@ +
{--REF_LEVEL--}{?POINTS?}{--REFERALS--}{--REF_LEVEL--}{?POINTS?}{--REFERALS--}
+
{--CLICK_STATISTICS--}
+ {--BONUS_POINTS_DISABLED--}
+ {--BONUS_POINTS_TITLE--}
- $content
+
{--MEMBER_POOL_CONTENT--}
+
diff --git a/templates/de/html/member/member_ref_list.tpl b/templates/de/html/member/member_ref_list.tpl index 596706426b..c63a9ad669 100644 --- a/templates/de/html/member/member_ref_list.tpl +++ b/templates/de/html/member/member_ref_list.tpl @@ -1,6 +1,6 @@ - diff --git a/templates/de/html/member/member_ref_list_level.tpl b/templates/de/html/member/member_ref_list_level.tpl index 12f5bee3f5..8a6d99e9ea 100644 --- a/templates/de/html/member/member_ref_list_level.tpl +++ b/templates/de/html/member/member_ref_list_level.tpl @@ -2,7 +2,7 @@ - - + diff --git a/templates/de/html/member/member_refback_list_row.tpl b/templates/de/html/member/member_refback_list_row.tpl index 61512da72d..219abce3fe 100644 --- a/templates/de/html/member/member_refback_list_row.tpl +++ b/templates/de/html/member/member_refback_list_row.tpl @@ -6,7 +6,7 @@ $content[level_refid]
+ {--MEMBER_REFLIST_TITLE--}
- diff --git a/templates/de/html/member/member_refback_edit.tpl b/templates/de/html/member/member_refback_edit.tpl index 2b4e1b3da6..884121f670 100644 --- a/templates/de/html/member/member_refback_edit.tpl +++ b/templates/de/html/member/member_refback_edit.tpl @@ -2,7 +2,7 @@
-
+
{--MEMBER_REFBACK_EDIT_TITLE--}
{--MEMBER_REFBACK_REFID--}: $content[refid]
diff --git a/templates/de/html/member/member_refback_list.tpl b/templates/de/html/member/member_refback_list.tpl index d7e7092724..cbfe74042f 100644 --- a/templates/de/html/member/member_refback_list.tpl +++ b/templates/de/html/member/member_refback_list.tpl @@ -1,14 +1,10 @@ -
+ {--MEMBER_REFLIST_LIST_TITLE_1--}$content[level]{--MEMBER_REFLIST_LIST_TITLE_2--}$content[percents]{--MEMBER_REFLIST_LIST_TITLE_3--}
- - - +
+
+ {--MEMBER_REFBACK_TITLE--} +
$content -
- - -
- {--MEMBER_REFBACK_TITLE--} -
-
{--MEMBER_REFBACK_NOTE--}
-
{--MEMBER_REFBACK_EXAMPLE--}
-
+
+
{--MEMBER_REFBACK_NOTE--}
+
{--MEMBER_REFBACK_EXAMPLE--}
+
+ diff --git a/templates/de/html/member/member_refback_list_level.tpl b/templates/de/html/member/member_refback_list_level.tpl index 555acd1af4..8dd7d2f34d 100644 --- a/templates/de/html/member/member_refback_list_level.tpl +++ b/templates/de/html/member/member_refback_list_level.tpl @@ -1,8 +1,7 @@ -
+
- @@ -33,5 +32,4 @@ $content[rows]
+ {--MEMBER_REFBACK_LIST_TITLE_1--}$content[level]{--MEMBER_REFBACK_LIST_TITLE_2--}$content[percents]{--MEMBER_REFBACK_LIST_TITLE_3--}
-
- $content[refback] % + $content[refback]% $content[points] {?POINTS?} diff --git a/templates/de/html/member/member_refback_list_row_deleted.tpl b/templates/de/html/member/member_refback_list_row_deleted.tpl index 061237b970..9e52de5dbc 100644 --- a/templates/de/html/member/member_refback_list_row_deleted.tpl +++ b/templates/de/html/member/member_refback_list_row_deleted.tpl @@ -3,10 +3,10 @@ $content[refid] ($content[nickname]) - $content[status] + $content[level_refid] - $content[refback] % + $content[refback]% $content[points] {?POINTS?} diff --git a/templates/de/html/member/member_stats_table.tpl b/templates/de/html/member/member_stats_table.tpl index d47c64207e..94f3f0c100 100644 --- a/templates/de/html/member/member_stats_table.tpl +++ b/templates/de/html/member/member_stats_table.tpl @@ -1,6 +1,6 @@ - diff --git a/templates/de/html/member/member_support_contcted.tpl b/templates/de/html/member/member_support_contcted.tpl index 848413e742..3f49373724 100644 --- a/templates/de/html/member/member_support_contcted.tpl +++ b/templates/de/html/member/member_support_contcted.tpl @@ -1,5 +1,5 @@
+
{--MEMBER_STATS_CONTENT--}
+ align="center" class="header_column"> diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl index 265cfae024..5d96879e5e 100644 --- a/templates/de/html/member/member_support_form.tpl +++ b/templates/de/html/member/member_support_form.tpl @@ -1,8 +1,6 @@ +
-
 
- - - +
 
+ Support-Anfrage schnell beantwortet werden kann!) - - -
Sie haben eine Frage an unseren Support?
@@ -28,7 +26,7 @@
(Bitte halten Sie den Text kurz und knapp, damit Ihre
- Support-Anfrage schnell beantwortet werden kann!)
@@ -40,8 +38,6 @@
 
+ diff --git a/templates/de/html/member/member_surfbar_list.tpl b/templates/de/html/member/member_surfbar_list.tpl index bb49fecfe3..d47662edb3 100644 --- a/templates/de/html/member/member_surfbar_list.tpl +++ b/templates/de/html/member/member_surfbar_list.tpl @@ -1,26 +1,26 @@ - - - - - - - diff --git a/templates/de/html/member/member_unconfirmed_table.tpl b/templates/de/html/member/member_unconfirmed_table.tpl index 8171859714..fe468bf3de 100644 --- a/templates/de/html/member/member_unconfirmed_table.tpl +++ b/templates/de/html/member/member_unconfirmed_table.tpl @@ -1,10 +1,10 @@
+ {--MEMBER_SURFBAR_LIST_TITLE--}
+ {--MEMBER_SURFBAR_TEST_URL--} + {--MEMBER_SURFBAR_STATUS--} + {--MEMBER_SURFBAR_REGISTERED--} + {--MEMBER_SURFBAR_LAST_LOCKED--} + {--MEMBER_SURFBAR_LOCK_REASON--} + {--MEMBER_SURFBAR_ACTIONS--}
- - - - - + + + + + $content[rows] diff --git a/templates/de/html/member/member_unconfirmed_table_nopoints.tpl b/templates/de/html/member/member_unconfirmed_table_nopoints.tpl index df69007ad5..03c3a8238c 100644 --- a/templates/de/html/member/member_unconfirmed_table_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_table_nopoints.tpl @@ -1,9 +1,9 @@
{--CONFIRM_LINK2--}:{--EMAIL_SENDER--}:{--EMAIL_DETAILS--}:{--EMAIL_TIMESTAMP--}:{--EMAIL_POINTS--}:{--CONFIRM_LINK2--}:{--EMAIL_SENDER--}:{--EMAIL_DETAILS--}:{--EMAIL_TIMESTAMP--}:{--EMAIL_POINTS--}:
- - - - + + + + $content[rows] diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl index 4b83cd88fc..65b01d18a4 100644 --- a/templates/de/html/show_bonus_msg.tpl +++ b/templates/de/html/show_bonus_msg.tpl @@ -6,9 +6,9 @@
{--CONFIRM_LINK2--}:{--EMAIL_SENDER--}:{--EMAIL_DETAILS--}:{--EMAIL_TIMESTAMP--}:{--CONFIRM_LINK2--}:{--EMAIL_SENDER--}:{--EMAIL_DETAILS--}:{--EMAIL_TIMESTAMP--}:
- - - + + + $content[rows] -- 2.30.2
{--BONUS_RANK--}:{--_UID--}:{?POINTS?}:{--BONUS_RANK--}:{--_UID--}:{?POINTS?}: