Rewritten for updated core

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
index 428e298180503cbdf08504ed85879b4d72190e1c..6508dede6e354bea3a58a9393415d75264d8f93d 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a link helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company_links', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'companys', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch the user data
 $linkInstance->prefetchValueInstance('user');
@@ -85,6 +85,6 @@ $linkInstance->flushContent();
        </div>
 
        <div class="table_footer">
-               {?company_links?}
+               {?companys?}
        </div>
 </div>

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
index 475c147c9d005812e02add1222005c000b7c73e7..bd252c71c004c84225fac85fcad01cca5c72397d 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
@@ -18,7 +18,7 @@ $helperInstance->addFormNote('email', "Email-Adresse: <span class=\"persona_data
 $helperInstance->addFormNote('birthday', "Geburtstag: <span class=\"persona_data\">".(int)$helperInstance->getValueField('birth_day').".".(int)$helperInstance->getValueField('birth_month').".".(int)$helperInstance->getValueField('birth_year')."</span>");
 
 // Add link placeholder for profile page
-$helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile_link?}");
+$helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile?}");
 
 // Ask again for current account password
 $helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein derzeitiges Passwort ein.");
@@ -41,10 +41,10 @@ $helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&u
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Add action
-$linkInstance->addActionLinkById('profile', 'link_text_profile');
+$linkInstance->addActionLinkById('profile', 'profile');
 
 // Flush the finished form
 $linkInstance->flushContent();

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
index 18b29dcfe06583c6d0faffee1f1d7763177c95e6..650dfbaa2ce7bfb9b4a82be291b431c018f83785 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp
@@ -28,16 +28,16 @@ $helperInstance->addFormNote('family', "Nachname: <span class=\"persona_data\">"
 $helperInstance->addFormNote('email', "Email-Adresse: <span class=\"persona_data\">".$helperInstance->getValueField('email')."</span>");
 
 // Add link placeholder for profile page
-$helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile_link?}");
+$helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile?}");
 
 // Flush the finished form
 $helperInstance->flushContent();
 
 // Get link helper for profile link
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Add action
-$linkInstance->addActionLinkById('profile', 'link_text_profile');
+$linkInstance->addActionLinkById('profile', 'profile');
 
 // Flush the finished form
 $linkInstance->flushContent();

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
index 998660f8340b5f82c3ace22f2d61cef92fc851a9..f46f1a7aacbdf8da547218412c208d623434eac3 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_logout.ctp
@@ -1,18 +1,18 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now', 'index.php?app={?app_short_name?}&amp;page=logout'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('logout_now_link_text');
+$helperInstance->addLinkWithTextById('logout_now');
 
 // Flush the content
 $helperInstance->flushContent();
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('return_login_link_text');
+$helperInstance->addLinkWithTextById('return_login');
 
 // Flush the content
 $helperInstance->flushContent();
@@ -24,7 +24,7 @@ $helperInstance->flushContent();
                Willst du dich wirklich aus dem Spiel ausloggen?
        </div>
 
-       <div id="logout_links">
-               {?logout_now_link?} | {?return_login_link?}
+       <div id="logouts">
+               {?logout_now?} | {?return_login?}
        </div>
 </div>

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
index c55cab785d7fd7cf47a1848cdb79852d1c747ebd..98736bde1eca5d45950e554d2855011d463e1bc6 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
@@ -32,7 +32,7 @@ if ($helperInstance->ifEmailChangeAllowed()) {
        } // END - if
 
        if ($helperInstance->ifEmailChangeRequireConfirmation()) {
-               $helperInstance->addFormNote('confirm_link', "Es wird ein Bestätigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann möglichst schnell an.");
+               $helperInstance->addFormNote('confirm', "Es wird ein Bestätigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann möglichst schnell an.");
        } // END - if
 } // END - if
 

diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp
index bf385d9b7eb276b6b28bd8460b737e94a9cf53ea..5d69da5d66ecefea97e4a04ac719419c6b988d75 100644 (file)
--- a/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp
+++ b/application/ship-simu/templates/de/code/action_ship_simu_login_status_problem.ctp
@@ -2,7 +2,7 @@
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class
 // BaseHelper.
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend"));
 
 // Pre-fetch field data with a given registry key
 $helperInstance->prefetchValueInstance('user');
@@ -59,8 +59,8 @@ if ($helperInstance->ifUserAccountUnconfirmed()) {
        kannst dir nun den Bestätigungslink erneut aussenden lassen, oder den
        Bestätigungscode unten eingeben.
 
-       <div id="resend_link_box">
-               {?resend_link?}
+       <div id="resend_box">
+               {?resend?}
        </div>
 
        <div id="confirm_code_box">

diff --git a/application/ship-simu/templates/de/code/block_company_data.ctp b/application/ship-simu/templates/de/code/block_company_data.ctp
index 25809e8f7184f8fa6e0f9f2648bfd7aa3f20bee8..2c36aa4bac86ca548fb75657e7c90d55b02a9598 100644 (file)
--- a/application/ship-simu/templates/de/code/block_company_data.ctp
+++ b/application/ship-simu/templates/de/code/block_company_data.ctp
@@ -1,7 +1,18 @@
+<?php
+// Get helper instance
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'company', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+
+// Set link text
+$helperInstance->addActionLinkById('company', 'company');
+
+// Flush the content
+$helperInstance->flushContent();
+
+// [EOC]
+?>
 <div class="user_name_div">
        Firmenstatus: <span class="company_status">{?company_status?}</span>
 </div>
 <div class="user_profile_div">
-       <a href="$config[base_url]/index.php?app={?app_short_name?}&amp;page=login_area&amp;action={?company_link_action?}"
-        title="{?company_link_title?}">{?company_link_text?}</a>
+       {?company?}
 </div>

diff --git a/application/ship-simu/templates/de/code/block_persona_data.ctp b/application/ship-simu/templates/de/code/block_persona_data.ctp
index d0cf0de4a83c54044e8aa6d5a857bc4706dddcde..4965145b1c3aedc84dbb227230782d1be22a3447 100644 (file)
--- a/application/ship-simu/templates/de/code/block_persona_data.ctp
+++ b/application/ship-simu/templates/de/code/block_persona_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile', 'index.php?app={?app_short_name?}&amp;page=login_area'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -17,7 +17,7 @@ $helperInstance->flushContent();
        Spielerstatus: <span id="user_status">{?block_user_status?}</span>
 </div>
 <div class="user_profile_div">
-       {?profile_link?}
+       {?profile?}
 </div>
 <div class="user_registered_div">
        Angemeldet seit: <span id="registered">{?block_registered?}</span>

diff --git a/application/ship-simu/templates/de/code/confirm_link.ctp b/application/ship-simu/templates/de/code/confirm_link.ctp
index 6e6c6bbc8888e4b62c436ec9c29eb9bf0737d1ef..e8e784bb78dccfa1cb411570ba7749a25a80de64 100644 (file)
--- a/application/ship-simu/templates/de/code/confirm_link.ctp
+++ b/application/ship-simu/templates/de/code/confirm_link.ctp
@@ -1,9 +1,9 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('direct_login_link_text');
+$helperInstance->addLinkWithTextById('direct_login');
 
 // Flush the content
 $helperInstance->flushContent();
@@ -21,5 +21,5 @@ $helperInstance->flushContent();
 </div>
 
 <div id="content_footer">
-       {?direct_login_link?}
+       {?direct_login?}
 </div>

diff --git a/application/ship-simu/templates/de/code/login_failed.ctp b/application/ship-simu/templates/de/code/login_failed.ctp
index b982f434ad8fee56a59494263dc144a08f6604c2..99f180cc7e3f1afdbc6aa6786e648e9fffcbbf79 100644 (file)
--- a/application/ship-simu/templates/de/code/login_failed.ctp
+++ b/application/ship-simu/templates/de/code/login_failed.ctp
@@ -1,9 +1,9 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('login_retry_text');
+$helperInstance->addLinkWithTextById('login_retry');
 
 // Flush the content
 $helperInstance->flushContent();
@@ -39,7 +39,7 @@ $helperInstance->flushContent();
 
 <div id="content_footer">
        <div id="login_retry">
-               {?login_retry_link?}
+               {?login_retry?}
        </div>
 
        Vielen Dank f&uuml;r deine Mitarbeit! :-)

diff --git a/application/ship-simu/templates/de/code/login_form.ctp b/application/ship-simu/templates/de/code/login_form.ctp
index 560b79fdb24778ac15df2865179894b41a060175..6b0110df88c384c2d23cf20295cdb52e961bbf82 100644 (file)
--- a/application/ship-simu/templates/de/code/login_form.ctp
+++ b/application/ship-simu/templates/de/code/login_form.ctp
@@ -70,10 +70,10 @@ if ($helperInstance->ifGuestLoginAllowed()) {
 }
 
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&page=register'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form', 'index.php?app={?app_short_name?}&page=register'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('register_login_form_link_text');
+$helperInstance->addLinkWithTextById('register_login');
 
 // Flush the content
 $helperInstance->flushContent();
@@ -95,5 +95,5 @@ $helperInstance->flushContent();
 </div>
 
 <div id="content_footer">
-       Noch kein Spieleaccount? {?register_login_form_link?}
+       Noch kein Spieleaccount? {?register_login_form?}
 </div>

diff --git a/application/ship-simu/templates/de/code/login_main.ctp b/application/ship-simu/templates/de/code/login_main.ctp
index a2d19106dddfe4db0dd5fe86a5f142b72d614562..0ad51a2f849bff1b6a5656fe7f01d57b3e6cd72e 100644 (file)
--- a/application/ship-simu/templates/de/code/login_main.ctp
+++ b/application/ship-simu/templates/de/code/login_main.ctp
@@ -36,38 +36,37 @@ $blockInstance->prefetchValueInstance('company', 'user');
 if ($blockInstance->getValueInstance()->ifUserIsFounder()) {
        // User is the founder of the company
        $blockInstance->assignMessageField('company_status', "user_is_company_founder");
-       $blockInstance->assignLinkFieldWithAction('company_link' , "company_overview");
-       $blockInstance->assignMessageField('company_link_text', "link_text_company_overview");
-       $blockInstance->assignMessageField('company_link_title', "link_title_company_overview");
+       $blockInstance->assignLinkFieldWithAction('company' , "company_overview");
+       $blockInstance->assignMessageField('company', "link_text_company_overview");
+       $blockInstance->assignMessageField('company_title', "link_title_company_overview");
 } elseif ($blockInstance->getValueInstance()->ifUserIsOwner()) {
        // User owns the company
        $blockInstance->assignMessageField('company_status', "user_is_company_owner");
-       $blockInstance->assignLinkFieldWithAction('company_link' , "company_overview");
-       $blockInstance->assignMessageField('company_link_text', "link_text_company_overview");
-       $blockInstance->assignMessageField('company_link_title', "link_title_company_overview");
+       $blockInstance->assignLinkFieldWithAction('company' , "company_overview");
+       $blockInstance->assignMessageField('company', "link_text_company_overview");
+       $blockInstance->assignMessageField('company_title', "link_title_company_overview");
 } elseif ($blockInstance->getValueInstance()->ifUserIsEmployee()) {
        // User is employed in company
        $blockInstance->assignMessageField('company_status', "user_is_employed_in_company");
-       $blockInstance->assignLinkFieldWithAction('company_link' , "employee_overview");
-       $blockInstance->assignMessageField('company_link_text', "link_text_employee_overview");
-       $blockInstance->assignMessageField('company_link_title', "link_title_employee_overview");
+       $blockInstance->assignLinkFieldWithAction('company' , "employee_overview");
+       $blockInstance->assignMessageField('company', "link_text_employee_overview");
+       $blockInstance->assignMessageField('company_title', "link_title_employee_overview");
 } else {
        // No company participation!
        $blockInstance->assignMessageField('company_status', "user_not_assigned_company");
-       $blockInstance->assignLinkFieldWithAction('company_link' , "company");
-       $blockInstance->assignMessageField('company_link_text', "link_text_company");
-       $blockInstance->assignMessageField('company_link_title', "link_title_company");
+       $blockInstance->assignLinkFieldWithAction('company' , "company");
+       $blockInstance->assignMessageField('company', "link_text_company");
+       $blockInstance->assignMessageField('company_title', "link_title_company");
 }
 
 // Flush the content out to a template variable
 $blockInstance->flushContent();
 
 // Get helper instance
-$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&page=login_area'));
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action', 'index.php?app={?app_short_name?}&page=login_area'));
 
 // Add action
-$linkInstance->addLinkGroup('logout', "");
-$linkInstance->addActionLink('logout', "Ausloggen");
+$linkInstance->addActionLinkById('logout', 'logout');
 
 // Flush the content
 $linkInstance->flushContent();
@@ -91,8 +90,8 @@ $linkInstance->flushContent();
                {?persona_data?}
        </div>
 
-       <div id="logout_link">
-               {?logout_action_link?}
+       <div id="logout">
+               {?logout_action?}
        </div>
 </div>
 

diff --git a/application/ship-simu/templates/de/code/logout_done.ctp b/application/ship-simu/templates/de/code/logout_done.ctp
index 386918425b2c426d4e71010e1cd18608a9797ce0..16fa3770d2b4bfed94809cc9ec38b7b71959a02c 100644 (file)
--- a/application/ship-simu/templates/de/code/logout_done.ctp
+++ b/application/ship-simu/templates/de/code/logout_done.ctp
@@ -1,9 +1,9 @@
 <?php
 // Get helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin', 'index.php?app={?app_short_name?}&amp;page=login'));
 
 // Set link text
-$helperInstance->addLinkWithTextById('relogin_link_text');
+$helperInstance->addLinkWithTextById('relogin');
 
 // Flush the content
 $helperInstance->flushContent();
@@ -15,5 +15,5 @@ $helperInstance->flushContent();
 </div>
 
 <div id="content_body">
-       Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-)
+       Du kannst dich nun {?relogin?} oder weiter auf unseren Seiten bleiben. ;-)
 </div>