Errors in confirmation/company link fixed

[shipsimu.git] / application / ship-simu / templates / de / code / login_main.ctp

diff --git a/application/ship-simu/templates/de/code/login_main.ctp b/application/ship-simu/templates/de/code/login_main.ctp
index 1b7cc5e9e9087fd7ffce2b08aa56c3279d781cb1..fb4771b89f942b73b22caa6b26ac172d914d5e38 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'));
 
 // Add action
-$linkInstance->addLinkGroup('logout', "");
-$linkInstance->addActionLink('logout', "Ausloggen");
+$linkInstance->addActionLinkById('logout', 'logout');
 
 // Flush the content
 $linkInstance->flushContent();
@@ -75,7 +74,7 @@ $linkInstance->flushContent();
 // [EOC]
 ?>
 <div id="content_header">
-       Willkommen im Loginbereich  von {?app_full_name?}!
+       Willkommen im Loginbereich von <span class="app_name">{?app_full_name?}</span>!
 </div>
 
 <div id="content_body">
@@ -91,8 +90,8 @@ $linkInstance->flushContent();
                {?persona_data?}
        </div>
 
-       <div id="logout_link">
-               {?logout_action_link?}
+       <div id="logout">
+               {?logout?}
        </div>
 </div>