More 'money' removed... ;)

diff --git a/.gitattributes b/.gitattributes
index 5dbb67a5f14777e02705d8b4865e3ef45030cd55..7d0519d8c62d2c588f358b901a5b71e331442c52 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -204,8 +204,8 @@ application/ship-simu/templates/.htaccess -text
 application/ship-simu/templates/de/.htaccess -text
 application/ship-simu/templates/de/code/action_login_company.ctp -text
 application/ship-simu/templates/de/code/action_login_logout.ctp -text
-application/ship-simu/templates/de/code/action_login_money_refill.ctp -text
 application/ship-simu/templates/de/code/action_login_profile.ctp -text
+application/ship-simu/templates/de/code/action_login_refill.ctp -text
 application/ship-simu/templates/de/code/action_login_status_problem.ctp -text
 application/ship-simu/templates/de/code/action_login_welcome.ctp -text
 application/ship-simu/templates/de/code/block_company_data.ctp -text

diff --git a/application/ship-simu/templates/de/code/action_login_company.ctp b/application/ship-simu/templates/de/code/action_login_company.ctp
index b6c53775bd473e913929f6fcfe528617536968b9..63285af742d82989c4238b13d5a14d81fc456efd 100644 (file)
--- a/application/ship-simu/templates/de/code/action_login_company.ctp
+++ b/application/ship-simu/templates/de/code/action_login_company.ctp
@@ -64,7 +64,7 @@ $linkInstance->addLinkGroup('refill_page', "Hole dir virtuelles Geld von uns zu
 
 if ($linkInstance->ifRefillPageActive()) {
        // Display link to refill page
-       $linkInstance->addActionLink('money_refill', "Jetzt dein virtuelles Geld aufladen.");
+       $linkInstance->addActionLink('refill', "Jetzt dein virtuelles Geld aufladen.");
 } else {
        // Refill page not active
        $linkInstance->addLinkNote("Das Aufladen ist derzeit nicht möglich oder gestört und wurde von uns deaktiviert.");

diff --git a/application/ship-simu/templates/de/code/action_login_money_refill.ctp b/application/ship-simu/templates/de/code/action_login_money_refill.ctp
deleted file mode 100644 (file)
index d922418..0000000
--- a/application/ship-simu/templates/de/code/action_login_money_refill.ctp
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// Neue Helper-Instanz holen
-$helper = WebFormHelper::createWebFormHelper($this, 'money_refill_form');
-
-// Add form group
-$helper->addFormGroup('money_refill_form', "Bitte w&auml;hle aus, was du nachbestellen willst und gebe die Menge an.");
-
-// Add sub group
-$helper->addInputSelectField('type', "--- Bitte ausw&auml;hlen ---");
-
-// In-game currencies (if more than default add them here!)
-$helper->addSelectSubOption('currencies', "--- W&auml;hrungen ---");
-$helper->addSelectOption('currency', "{?currency?}");
-
-// Raw materials
-$helper->addSelectSubOption('raw_materials', "--- Rohstoffe ---");
-$helper->addSelectOption('raw_wood', "Holz");
-$helper->addSelectOption('raw_iron', "Metall");
-$helper->addSelectOption('raw_stones', "Steine");
-
-// This is needed to close the select tag
-$helper->addInputSelectField('type', "");
-
-// Field for amount
-$helper->addFormSubGroup('amount', "Gebe hier in ganzen Zahlen die Menge an, die du nachbestellen willst.");
-$helper->addInputTextField('amount', 1000);
-
-// CAPTCHA enbaled?
-if ($helper->ifFormSecuredWithCaptcha()) {
-       $helper->addFormGroup('captcha_refill', "Bitte wiederhole den angezeigten Code:");
-       $helper->addCaptcha();
-} // END - if
-
-// Submit button
-$helper->addFormGroup('buttons_refill', "Mit Absenden des Formulars wird deine Nachbestellung rechtskr&auml;ftig!");
-$helper->addInputResetButton("Eingaben l&ouml;schen");
-$helper->addInputSubmitButton("Nachbestellung verbindlich aufgeben");
-$helper->flushContent();
-?>
-<div id="refill_frame">
-       <div class="content_header">
-               Jetzt dein {?currency?}-Konto aufladen!
-       </div>
-       <div class="content_body">
-               {?money_refill_form?}
-       </div>
-</div>

diff --git a/application/ship-simu/templates/de/code/action_login_refill.ctp b/application/ship-simu/templates/de/code/action_login_refill.ctp
new file mode 100644 (file)
index 0000000..b31d356
--- /dev/null
+++ b/application/ship-simu/templates/de/code/action_login_refill.ctp
@@ -0,0 +1,47 @@
+<?php
+// Neue Helper-Instanz holen
+$helper = WebFormHelper::createWebFormHelper($this, 'refill_form');
+
+// Add form group
+$helper->addFormGroup('refill_form', "Bitte w&auml;hle aus, was du nachbestellen willst und gebe die Menge an.");
+
+// Add sub group
+$helper->addInputSelectField('type', "--- Bitte ausw&auml;hlen ---");
+
+// In-game currencies (if more than default add them here!)
+$helper->addSelectSubOption('currencies', "--- W&auml;hrungen ---");
+$helper->addSelectOption('currency', "{?currency?}");
+
+// Raw materials
+$helper->addSelectSubOption('raw_materials', "--- Rohstoffe ---");
+$helper->addSelectOption('raw_wood', "Holz");
+$helper->addSelectOption('raw_iron', "Metall");
+$helper->addSelectOption('raw_stones', "Steine");
+
+// This is needed to close the select tag
+$helper->addInputSelectField('type', "");
+
+// Field for amount
+$helper->addFormSubGroup('amount', "Gebe hier in ganzen Zahlen die Menge an, die du nachbestellen willst.");
+$helper->addInputTextField('amount', 1000);
+
+// CAPTCHA enbaled?
+if ($helper->ifFormSecuredWithCaptcha()) {
+       $helper->addFormGroup('captcha_refill', "Bitte wiederhole den angezeigten Code:");
+       $helper->addCaptcha();
+} // END - if
+
+// Submit button
+$helper->addFormGroup('buttons_refill', "Mit Absenden des Formulars wird deine Nachbestellung rechtskr&auml;ftig!");
+$helper->addInputResetButton("Eingaben l&ouml;schen");
+$helper->addInputSubmitButton("Nachbestellung verbindlich aufgeben");
+$helper->flushContent();
+?>
+<div id="refill_frame">
+       <div class="content_header">
+               Jetzt dein {?currency?}-Konto aufladen!
+       </div>
+       <div class="content_body">
+               {?refill_form?}
+       </div>
+</div>