From 462649eb59a6b4903bdaf0428bbe671d1750866a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 6 Dec 2008 22:25:49 +0000 Subject: [PATCH] Rewritten for updated core --- .../code/action_ship_simu_login_company.ctp | 4 +-- ...hip_simu_login_government_startup_help.ctp | 6 ++-- ...on_ship_simu_login_government_training.ctp | 6 ++-- .../de/code/action_ship_simu_login_logout.ctp | 12 +++---- .../code/action_ship_simu_login_profile.ctp | 2 +- .../action_ship_simu_login_status_problem.ctp | 6 ++-- .../templates/de/code/block_company_data.ctp | 15 +++++++-- .../templates/de/code/block_persona_data.ctp | 4 +-- .../templates/de/code/confirm_link.ctp | 6 ++-- .../templates/de/code/login_failed.ctp | 6 ++-- .../templates/de/code/login_form.ctp | 6 ++-- .../templates/de/code/login_main.ctp | 33 +++++++++---------- .../templates/de/code/logout_done.ctp | 6 ++-- 13 files changed, 61 insertions(+), 51 deletions(-) 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 428e298..6508ded 100644 --- 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 @@ prefetchValueInstance('user'); @@ -85,6 +85,6 @@ $linkInstance->flushContent();
- {?company_links?} + {?companys?}
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 475c147..bd252c7 100644 --- 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: addFormNote('birthday', "Geburtstag: ".(int)$helperInstance->getValueField('birth_day').".".(int)$helperInstance->getValueField('birth_month').".".(int)$helperInstance->getValueField('birth_year').""); // 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ä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?}&page=login_area')); +$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&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 18b29dc..650dfba 100644 --- 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: " $helperInstance->addFormNote('email', "Email-Adresse: ".$helperInstance->getValueField('email').""); // 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?}&page=login_area')); +$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile', 'index.php?app={?app_short_name?}&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 998660f..f46f1a7 100644 --- 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 @@ 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?}&page=login_area')); +$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login', 'index.php?app={?app_short_name?}&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? - 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 c55cab7..98736bd 100644 --- 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 bf385d9..5d69da5 100644 --- 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. - - diff --git a/application/ship-simu/templates/de/code/logout_done.ctp b/application/ship-simu/templates/de/code/logout_done.ctp index 3869184..16fa377 100644 --- a/application/ship-simu/templates/de/code/logout_done.ctp +++ b/application/ship-simu/templates/de/code/logout_done.ctp @@ -1,9 +1,9 @@ addLinkWithTextById('relogin_link_text'); +$helperInstance->addLinkWithTextById('relogin'); // Flush the content $helperInstance->flushContent(); @@ -15,5 +15,5 @@ $helperInstance->flushContent();
- Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-) + Du kannst dich nun {?relogin?} oder weiter auf unseren Seiten bleiben. ;-)
-- 2.30.2