X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fheader.tpl;h=ce8e229c51aa792347d39965d0a52b33262cdffa;hb=11441db31dcbed7b2070e800bcb1b0e6547b86bd;hp=2d3bb203195b8191807e98b8de7d0eb4bf0872aa;hpb=9a23a8c0a51b7ec38a96f525484134f3cb85dc7e;p=timetracker.git

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 2d3bb203..ce8e229c 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -55,7 +55,7 @@ With 101% height we essentially force the scrollbar to always appear. -->
         </tr>
       </table>
       <!-- End of top image -->
-      
+
 {if $authenticated}
   {if $user->isAdmin()}
       <!-- Top menu for admin -->
@@ -101,16 +101,15 @@ With 101% height we essentially force the scrollbar to always appear. -->
     {if !$user->isClient()}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if in_array('ex', explode(',', $user->plugins)) && !$user->isClient()}
+    {if $user->isPluginEnabled('ex') && !$user->isClient()}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
             {if !$user->isClient()}&middot; {/if}<a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
-    {if ($user->canManageTeam() || $user->isClient()) && in_array('iv', explode(',', $user->plugins))}
+    {if ($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv')}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
-    {if (in_array('ch', explode(',', $user->plugins)) && !$user->isClient()) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
-      || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode
-      || in_array('cl', explode(',', $user->plugins)))}
+    {if ($user->isPluginEnabled('ch') && !$user->isClient()) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
+      || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
     {if !$user->isClient() && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
@@ -122,7 +121,7 @@ With 101% height we essentially force the scrollbar to always appear. -->
     {if !$user->isClient()}
             &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
-    {if $user->canManageTeam() && in_array('cl', explode(',', $user->plugins))}
+    {if $user->canManageTeam() && $user->isPluginEnabled('cl')}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
     {if $user->isManager()}
@@ -160,11 +159,11 @@ With 101% height we essentially force the scrollbar to always appear. -->
       <!-- End of page title and user details -->
 
       <!-- Output errors -->
-{if !$errors->isEmpty()}
+{if $err->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
-  {foreach $errors->getErrors() as $error}
+  {foreach $err->getErrors() as $error}
             {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
   {/foreach}
           </td>
@@ -174,15 +173,15 @@ With 101% height we essentially force the scrollbar to always appear. -->
       <!-- End of output errors -->
 
       <!-- Output messages -->
-{if !$messages->isEmpty()}
+{if $msg->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">
-  {foreach $messages->getErrors() as $message}
+  {foreach $msg->getErrors() as $message}
             {$message.message}<br> {* No need to escape. *}
   {/foreach}
           </td>
         </tr>
       </table>
 {/if}
-      <!-- End of output messages -->
\ No newline at end of file
+      <!-- End of output messages -->