Extensions fixed/improved:

- ext-rallye: A lot templates renamed and member-related added for better
  naming, language strings swapped out to language file
- ext-active: Fixed missing variable $last
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 576fc54534100eedb582914434f114c509e64b9f..daf30353e93607da68f4c990d8381e595cf793c5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1562,6 +1562,11 @@ templates/de/html/guest/guest_footer.tpl svneol=native#text/plain
 templates/de/html/guest/guest_frametester.tpl svneol=native#text/plain
 templates/de/html/guest/guest_goto_top.tpl svneol=native#text/plain
 templates/de/html/guest/guest_header.tpl svneol=native#text/plain
+templates/de/html/guest/guest_list_active.tpl svneol=native#text/plain
+templates/de/html/guest/guest_list_active_row.tpl svneol=native#text/plain
+templates/de/html/guest/guest_list_active_row_none.tpl svneol=native#text/plain
+templates/de/html/guest/guest_list_rallye.tpl svneol=native#text/plain
+templates/de/html/guest/guest_list_rallye_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_login.tpl svneol=native#text/plain
 templates/de/html/guest/guest_menu_bottom.tpl svneol=native#text/plain
 templates/de/html/guest/guest_menu_content.tpl svneol=native#text/plain
@@ -1571,12 +1576,14 @@ templates/de/html/guest/guest_menu_title.tpl svneol=native#text/plain
 templates/de/html/guest/guest_nickname_login.tpl svneol=native#text/plain
 templates/de/html/guest/guest_no_rallyes.tpl svneol=native#text/plain
 templates/de/html/guest/guest_rallye.tpl svneol=native#text/plain
+templates/de/html/guest/guest_rallye_404.tpl svneol=native#text/plain
 templates/de/html/guest/guest_rallye_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_rallye_show.tpl svneol=native#text/plain
 templates/de/html/guest/guest_receive_table.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain
+templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_infos.tpl svneol=native#text/plain
@@ -1673,6 +1680,8 @@ templates/de/html/member/member_list_beg.tpl svneol=native#text/plain
 templates/de/html/member/member_list_beg_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_rallye.tpl svneol=native#text/plain
+templates/de/html/member/member_list_rallye_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback_deleted_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback_level.tpl svneol=native#text/plain
@@ -1730,6 +1739,7 @@ templates/de/html/member/member_primera_mode_list.tpl svneol=native#text/plain
 templates/de/html/member/member_primera_mode_list_row.tpl svneol=native#text/plain
 templates/de/html/member/member_primera_mode_pay.tpl svneol=native#text/plain
 templates/de/html/member/member_profile_outdated.tpl svneol=native#text/plain
+templates/de/html/member/member_rallye_404.tpl svneol=native#text/plain
 templates/de/html/member/member_receive_table.tpl svneol=native#text/plain
 templates/de/html/member/member_ref_list.tpl svneol=native#text/plain
 templates/de/html/member/member_ref_list_level.tpl svneol=native#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index b382914394050f9b8a381c03e153d911917a4399..e8a948b47dead22a197730d2f6e0617ecb25ed57 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -314,6 +314,12 @@
 ./templates/de/html/admin/admin_list_user_sort_form.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_active_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_active_table.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_no_rallyes.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_rallye_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_rallye_show.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_rallye.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/member/member_refback_edit.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/member/member_refback_list_level.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/member/member_refback_list_row_deleted.tpl:1:<!-- @DEPRECATED //-->

diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index f85446e806438c2a12cfcebc1dd9df2129520bd1..aa37b12181c46e383d0c9003485e9aacfaae9632 100644 (file)
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -107,7 +107,7 @@ addMessages(array(
        'RALLYE_NEW_REFS' => "Neue Refs",
        'RALLYE_STOP_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder deaktivieren",
        'RALLYE_START_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder aktivieren",
-       'RALLYE_GUEST_REFS' => "Geworbene Mitglieder",
+       'RALLYE_REFS' => "Geworbene Mitglieder",
        '_RALLYE_PRICE' => "Platz",
        'RALLYE_EXPIRE_ONE_DAY' => "Rallye endet in weniger als 24 Stunden.",
        'RALLYE_HAS_EXPIRED' => "Diese Referal-Rallye ist beendet.",
@@ -143,6 +143,9 @@ addMessages(array(
        'RALLYE_REMOVE_PRICES' => "Rallye-Preis(e) entfernen",
        'RALLYE_NO_TEMPLATES_FOUND' => "Keine Templates gefunden.",
        'ADMIN_LIST_RALLYES_PRICING' => "Auflisten von Referal-Rallyes - Preise einrichten",
+       'GUEST_RALLYE_HAS_STARTED_TITLE' => "{?MAIN_TITLE?} - Referal-Rallye gestartet",
+       'RALLYE_NONE_ACTIVE_TITLE' => "Keine Referal-Rallyes aktiv",
+       'RALLYE_NONE_ACTIVE' => "Derzeit ist noch keine Rallye im Gange. Bitte kommen Sie später noch einmal wieder.",
 ));
 
 // [EOF]

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 13bc3b07de9da5bcdbe7ea3ad622bf00a510f107..8be338a0662694a510e26e160d426beed789ba3c 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -222,7 +222,7 @@ ORDER BY
 }
 
 //
-function addReferalRallyeTopUsers ($rallye, $default=0) {
+function addReferalRallyeTopUsers ($mode, $rallye, $default=0) {
        // Init variables
        $min_users = 0; $min_prices = 0;
 
@@ -333,7 +333,7 @@ LIMIT 1",
                );
 
                // Load row template and switch color
-               $OUT .= loadTemplate('guest_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
        } // END - for
 
        // Add min_prices/users
@@ -342,7 +342,7 @@ LIMIT 1",
        $content['min_users']  = bigintval($min_users);
 
        // And finnally return the output
-       return loadTemplate('guest_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', true, $content);
 }
 
 // Run this function only when a new member has confirmed his email address!
@@ -702,7 +702,7 @@ LIMIT 1",
 }
 
 // @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
-function addReferalRallyeWinners ($rallye, $default=0) {
+function addReferalRallyeWinners ($mode, $rallye, $default=0) {
        // First check how many prices are set
        $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
 
@@ -749,7 +749,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
                );
 
                // Load row template
-               $OUT .= loadTemplate('guest_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
        } // END - for
 
        // Prepare content
@@ -760,7 +760,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
        );
 
        // Load main template and finnally return the output
-       return loadTemplate('guest_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', true, $content);
 }
 
 //

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index af4246cebd12b0c758f19a287b4f724bb7ea4a57..1c4e001ed7f000894565d9e173c8b2a25a5f20bd 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -71,18 +71,18 @@ if (!SQL_HASZERONUMS($result)) {
                } // END - if
 
                // Translate comma
-               $content['last_online'] = generateDateTime($last, 2);
+               $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load template
-               $OUT .= loadTemplate('guest_active_row', true, $content);
+               $OUT .= loadTemplate('guest_list_active_row', true, $content);
        } // END - while
 } else {
        // No member was online today! :-(
-       $OUT = loadTemplate('guest_active_none_row', true);
+       $OUT = loadTemplate('guest_list_active_row_none', true);
 }
 
 // Load template
-loadTemplate('guest_active_table', false, $OUT);
+loadTemplate('guest_list_active', false, $OUT);
 
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 7a47b42e709c48876da8e2e050bda5602c7ff795..41f784ed30632d97f09b98bd63def7df4c2231ce 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -111,20 +111,20 @@ if (SQL_NUMROWS($result) == 1) {
        $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
 
        if ($expired === true) {
-               $content['prices']       = addReferalRallyeWinners($id);
+               $content['prices']       = addReferalRallyeWinners('guest', $id);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
        } else {
                $content['prices']       = addReferalRallyePrices($id, 'html');
-               $content['top_users']    = addReferalRallyeTopUsers($id, getMemberId());
+               $content['top_users']    = addReferalRallyeTopUsers('guest', $id, getMemberId());
                $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
        }
 
        // And load final template
-       loadTemplate('guest_rallye_show', false, $content);
+       loadTemplate('guest_show_rallye', false, $content);
 } else {
        // No rallye found so far
-       loadTemplate('guest_no_rallyes');
+       loadTemplate('guest_rallye_404');
 }
 
 // Close the div tag

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 88bf9bb768741c0588e1ee606743dd8b015e2773..dc29eac5eb2ae385aca55b7a27505b87196a6193 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -103,20 +103,20 @@ if (SQL_NUMROWS($result) == 1) {
        $content['end']   = generateDateTime($content['end_time']  , 1);
 
        if ($expired === true) {
-               $content['prices']       = addReferalRallyeWinners($content['id']);
+               $content['prices']       = addReferalRallyeWinners('member', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
        } else {
                $content['prices']       = addReferalRallyePrices($content['id'], 'html');
-               $content['top_users']    = addReferalRallyeTopUsers($content['id'], getMemberId());
+               $content['top_users']    = addReferalRallyeTopUsers('member', $content['id'], getMemberId());
                $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
        }
 
        // And load final template
-       loadTemplate('guest_rallye_show', false, $content);
+       loadTemplate('member_show_rallye', false, $content);
 } else {
        // No rallye found so far
-       loadTemplate('guest_no_rallyes');
+       loadTemplate('member_rallye_404');
 }
 
 // Free result

diff --git a/templates/de/html/guest/guest_active_row.tpl b/templates/de/html/guest/guest_active_row.tpl
index be39d2aa9a1580ad02370b80015fc9627009fd33..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_active_row.tpl
+++ b/templates/de/html/guest/guest_active_row.tpl
@@ -1,5 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%} bottom right">$content[userid] ({%user,nickname,fixEmptyContentToDashes=$content[userid]%})</td>
-       <td class="{%template,ColorSwitch%} bottom right">{%pipe,getTotalPoints,translateComma=$content[userid]%}</td>
-       <td class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
-</tr>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_active_table.tpl b/templates/de/html/guest/guest_active_table.tpl
index 7d6a92e8ef1ae431d675a78ed8008b43c9200b87..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_active_table.tpl
+++ b/templates/de/html/guest/guest_active_table.tpl
@@ -1,26 +1 @@
-<div align="center">
-<table border="0" cellspacing="0" cellpadding="0" width="480" class="table dashed">
-       <tr>
-               <td colspan="3" class="table_header bottom">
-                       <strong>{--GUEST_ACTIVE_HEADER--}</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="header_column bottom right">
-                       <strong>{--_USERID--}:</strong>
-               </td>
-               <td class="header_column bottom right">
-                       <strong>{--TOTAL_POINTS--}:</strong>
-               </td>
-               <td class="header_column bottom">
-                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
-               </td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="3" align="center" class="table_footer">
-                       <div class="notice tiny">{--GUEST_ACTIVE_FOOTER--}</div>
-               </td>
-       </tr>
-</table>
-</div>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_list_active.tpl b/templates/de/html/guest/guest_list_active.tpl
new file mode 100644 (file)
index 0000000..7d6a92e
--- /dev/null
+++ b/templates/de/html/guest/guest_list_active.tpl
@@ -0,0 +1,26 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="480" class="table dashed">
+       <tr>
+               <td colspan="3" class="table_header bottom">
+                       <strong>{--GUEST_ACTIVE_HEADER--}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td class="header_column bottom right">
+                       <strong>{--_USERID--}:</strong>
+               </td>
+               <td class="header_column bottom right">
+                       <strong>{--TOTAL_POINTS--}:</strong>
+               </td>
+               <td class="header_column bottom">
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
+               </td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="3" align="center" class="table_footer">
+                       <div class="notice tiny">{--GUEST_ACTIVE_FOOTER--}</div>
+               </td>
+       </tr>
+</table>
+</div>

diff --git a/templates/de/html/guest/guest_list_active_row.tpl b/templates/de/html/guest/guest_list_active_row.tpl
new file mode 100644 (file)
index 0000000..be39d2a
--- /dev/null
+++ b/templates/de/html/guest/guest_list_active_row.tpl
@@ -0,0 +1,5 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom right">$content[userid] ({%user,nickname,fixEmptyContentToDashes=$content[userid]%})</td>
+       <td class="{%template,ColorSwitch%} bottom right">{%pipe,getTotalPoints,translateComma=$content[userid]%}</td>
+       <td class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
+</tr>

diff --git a/templates/de/html/guest/guest_list_active_row_none.tpl b/templates/de/html/guest/guest_list_active_row_none.tpl
new file mode 100644 (file)
index 0000000..ceeb3c4
--- /dev/null
+++ b/templates/de/html/guest/guest_list_active_row_none.tpl
@@ -0,0 +1,10 @@
+<tr>
+       <td colspan="3" align="center" class="bottom">
+               <table border="0" cellspacing="0" cellpadding="0" width="400" class="table dashed">
+               <tr>
+                       <td align="center" height="40"><strong>{--GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY--}</strong>
+                       </td>
+               </tr>
+               </table>
+       </td>
+</tr>

diff --git a/templates/de/html/guest/guest_list_rallye.tpl b/templates/de/html/guest/guest_list_rallye.tpl
new file mode 100644 (file)
index 0000000..5366463
--- /dev/null
+++ b/templates/de/html/guest/guest_list_rallye.tpl
@@ -0,0 +1,20 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="430" class="table dashed">
+<tr>
+       <td align="center" class="header_column bottom" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></td>
+       <td align="center" class="header_column bottom" width="50"><strong>{--_USERID--}</strong></td>
+       <td align="center" class="header_column bottom" width="300"><strong>{--RALLYE_REFS--}</strong></td>
+</tr>
+$content[rows]
+<tr>
+       <td colspan="3" class="table_footer">
+       <ul>
+               <li><div class="notice">Es werden nur aktive User gewertet.</div></li>
+               <li><div class="notice">{%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}</div></li>
+               <li><div class="notice">{%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}</div></li>
+               <li><div class="notice">Der Rechtsweg ist ausgeschlossen.</div></li>
+       </ul>
+       </td>
+</tr>
+</table>
+</div>

diff --git a/templates/de/html/guest/guest_list_rallye_row.tpl b/templates/de/html/guest/guest_list_rallye_row.tpl
new file mode 100644 (file)
index 0000000..d88f39f
--- /dev/null
+++ b/templates/de/html/guest/guest_list_rallye_row.tpl
@@ -0,0 +1,6 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom">$content[idx].</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[userid]%}.$content[end]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[ref]%}.$content[end]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[infos]%}.$content[end]</td>
+</tr>

diff --git a/templates/de/html/guest/guest_no_rallyes.tpl b/templates/de/html/guest/guest_no_rallyes.tpl
index 4fb4b299dfe7fdde20e6fb31c68b054e71a8fd1f..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_no_rallyes.tpl
+++ b/templates/de/html/guest/guest_no_rallyes.tpl
@@ -1,16 +1 @@
-<div align="center">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td class="table_header bottom" height="25">
-                       <strong>Keine Referal-Rallyes aktiv!</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" class="bottom">
-                       <div style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px" align="center">
-                               Derzeit ist noch keine Rallye im Gange! Bitte kommen Sie sp&auml;ter noch einmal wieder!
-                       </div>
-               </td>
-       </tr>
-</table>
-</div>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_rallye.tpl b/templates/de/html/guest/guest_rallye.tpl
index 2650ca0fcc83e9fc98845d28bd0599626a2e8ff5..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_rallye.tpl
+++ b/templates/de/html/guest/guest_rallye.tpl
@@ -1,20 +1 @@
-<div align="center">
-<table border="0" cellspacing="0" cellpadding="0" width="430" class="table dashed">
-<tr>
-       <td align="center" class="header_column bottom" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></td>
-       <td align="center" class="header_column bottom" width="50"><strong>{--_USERID--}</strong></td>
-       <td align="center" class="header_column bottom" width="300"><strong>{--RALLYE_GUEST_REFS--}</strong></td>
-</tr>
-$content[rows]
-<tr>
-       <td colspan="3" class="table_footer">
-       <ul>
-               <li><div class="notice">Es werden nur aktive User gewertet.</div></li>
-               <li><div class="notice">{%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}</div></li>
-               <li><div class="notice">{%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}</div></li>
-               <li><div class="notice">Der Rechtsweg ist ausgeschlossen.</div></li>
-       </ul>
-       </td>
-</tr>
-</table>
-</div>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_rallye_404.tpl b/templates/de/html/guest/guest_rallye_404.tpl
new file mode 100644 (file)
index 0000000..74a52f5
--- /dev/null
+++ b/templates/de/html/guest/guest_rallye_404.tpl
@@ -0,0 +1,10 @@
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>{--RALLYE_NONE_ACTIVE_TITLE--}</strong>
+       </div>
+       <div style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px" align="center">
+               {--RALLYE_NONE_ACTIVE--}
+       </div>
+</div>
+</div>

diff --git a/templates/de/html/guest/guest_rallye_row.tpl b/templates/de/html/guest/guest_rallye_row.tpl
index d88f39fb4d10753fada8a0789dee60641a70b6ab..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_rallye_row.tpl
+++ b/templates/de/html/guest/guest_rallye_row.tpl
@@ -1,6 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%} bottom">$content[idx].</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[userid]%}.$content[end]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[ref]%}.$content[end]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[infos]%}.$content[end]</td>
-</tr>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_rallye_show.tpl b/templates/de/html/guest/guest_rallye_show.tpl
index f836a809c6349c03ad9698506dbf947cbc0998d8..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_rallye_show.tpl
+++ b/templates/de/html/guest/guest_rallye_show.tpl
@@ -1,59 +1 @@
-<table border="0" cellspacing="0" cellpadding="0" width="90%" class="table dashed">
-       <tr>
-               <td class="table_header bottom" height="25">
-                       <strong>Referal-Rallye gestartet!</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="left" style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
-               <ul>
-                       <li>Titel: <strong>$content[title]</strong></li>
-                       <li>Start: <strong>$content[start]</strong></li>
-                       <li>Ende : <strong>$content[end]</strong></li>
-               </ul>
-               </td>
-       </tr>
-       <tr>
-               <td class="table_header bottom" height="25">
-                       <strong>...::&nbsp;$content[title]&nbsp;::...</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom">
-               <div style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-                       $content[descr]
-               </div>
-               </td>
-       </tr>
-       <tr>
-               <td class="table_header bottom" height="25">
-                       <strong>$content[can_win_this]:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom">
-               <div style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
-                       $content[prices]
-               </div>
-               </td>
-       </tr>
-       <tr>
-               <td class="table_header bottom" height="25">
-                       <strong>Aktueller Stand der Rallye:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="center">
-               <div style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px" align="center">
-                       $content[top_users]
-               </div>
-               </td>
-       </tr>
-       <tr>
-               <td class="table_footer" height="25">
-               <div align="center" style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-                       <strong>...::&nbsp;$content[extras]&nbsp;::...</strong>
-               </div>
-               </td>
-       </tr>
-</table>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_show_rallye.tpl b/templates/de/html/guest/guest_show_rallye.tpl
new file mode 100644 (file)
index 0000000..135d033
--- /dev/null
+++ b/templates/de/html/guest/guest_show_rallye.tpl
@@ -0,0 +1,61 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="90%" class="table dashed">
+       <tr>
+               <td class="table_header bottom" height="25">
+                       <strong>{--GUEST_RALLYE_HAS_STARTED_TITLE--}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom" align="left" style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
+               <ul>
+                       <li>Titel: <strong>$content[title]</strong></li>
+                       <li>Start: <strong>$content[start]</strong></li>
+                       <li>Ende : <strong>$content[end]</strong></li>
+               </ul>
+               </td>
+       </tr>
+       <tr>
+               <td class="table_header bottom" height="25">
+                       <strong>...::&nbsp;$content[title]&nbsp;::...</strong>
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom">
+               <div style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
+                       $content[descr]
+               </div>
+               </td>
+       </tr>
+       <tr>
+               <td class="table_header bottom" height="25">
+                       <strong>$content[can_win_this]:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom">
+               <div style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
+                       $content[prices]
+               </div>
+               </td>
+       </tr>
+       <tr>
+               <td class="table_header bottom" height="25">
+                       <strong>Aktueller Stand der Rallye:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom" align="center">
+               <div style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px" align="center">
+                       $content[top_users]
+               </div>
+               </td>
+       </tr>
+       <tr>
+               <td class="table_footer" height="25">
+               <div align="center" style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
+                       <strong>...::&nbsp;$content[extras]&nbsp;::...</strong>
+               </div>
+               </td>
+       </tr>
+</table>
+</div>

diff --git a/templates/de/html/member/member_list_rallye.tpl b/templates/de/html/member/member_list_rallye.tpl
new file mode 100644 (file)
index 0000000..5366463
--- /dev/null
+++ b/templates/de/html/member/member_list_rallye.tpl
@@ -0,0 +1,20 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="430" class="table dashed">
+<tr>
+       <td align="center" class="header_column bottom" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></td>
+       <td align="center" class="header_column bottom" width="50"><strong>{--_USERID--}</strong></td>
+       <td align="center" class="header_column bottom" width="300"><strong>{--RALLYE_REFS--}</strong></td>
+</tr>
+$content[rows]
+<tr>
+       <td colspan="3" class="table_footer">
+       <ul>
+               <li><div class="notice">Es werden nur aktive User gewertet.</div></li>
+               <li><div class="notice">{%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}</div></li>
+               <li><div class="notice">{%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}</div></li>
+               <li><div class="notice">Der Rechtsweg ist ausgeschlossen.</div></li>
+       </ul>
+       </td>
+</tr>
+</table>
+</div>

diff --git a/templates/de/html/member/member_list_rallye_row.tpl b/templates/de/html/member/member_list_rallye_row.tpl
new file mode 100644 (file)
index 0000000..d88f39f
--- /dev/null
+++ b/templates/de/html/member/member_list_rallye_row.tpl
@@ -0,0 +1,6 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom">$content[idx].</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[userid]%}.$content[end]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[ref]%}.$content[end]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">$content[start].{%pipe,fixEmptyContentToDashes=$content[infos]%}.$content[end]</td>
+</tr>

diff --git a/templates/de/html/member/member_rallye_404.tpl b/templates/de/html/member/member_rallye_404.tpl
new file mode 100644 (file)
index 0000000..74a52f5
--- /dev/null
+++ b/templates/de/html/member/member_rallye_404.tpl
@@ -0,0 +1,10 @@
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>{--RALLYE_NONE_ACTIVE_TITLE--}</strong>
+       </div>
+       <div style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px" align="center">
+               {--RALLYE_NONE_ACTIVE--}
+       </div>
+</div>
+</div>