Changeset 2811

Timestamp:

11/14/08 16:38:53 (8 weeks ago)

Author:

chrismeller

Message:

Moving the admin_header plugin hook below stylesheet and javascript output so that plugins can properly execute things that require or override a default include.

Files:

• trunk/htdocs/system/admin/header.php (modified) (3 diffs)

trunk/htdocs/system/admin/header.php

@@ -18 +18 @@
     </script>
     <?php
-        Plugins::act( 'admin_header', $this );
         Stack::out( 'admin_header_javascript', '<script src="%s" type="text/javascript"></script>'."\r\n" );
         Stack::out( 'admin_stylesheet', '<link rel="stylesheet" type="text/css" href="%s" media="%s">'."\r\n" );
@@ -25 +24 @@
     <link rel="stylesheet" type="text/css" href="<?php Site::out_url('admin_theme'); ?>/css/ie.css" media="screen">
     <![endif]-->
+
+    <?php
+        Plugins::act( 'admin_header', $this );
+    ?>
 
 </head>
@@ -37 +40 @@
             <ul>
             <?php foreach($mainmenu as $menu_id => $menu): ?>
-                <li id="link-<?php echo $menu_id ?>" class="<?php if($menu['selected'] == TRUE) { echo 'selected'; } ?><?php if(isset($menu['submenu'])): ?> submenu<?php endif; ?>" title="<?php echo $menu['title']; ?>"><a class="top" href="<?php echo $menu['url']; ?>"><?php echo $menu['text']; ?> 
+                <li id="link-<?php echo $menu_id ?>" class="<?php if($menu['selected'] == TRUE) { echo 'selected'; } ?><?php if(isset($menu['submenu'])): ?> submenu<?php endif; ?>" title="<?php echo $menu['title']; ?>"><a class="top" href="<?php echo $menu['url']; ?>"><?php echo $menu['text']; ?>
                 <?php if(isset($menu['hotkey']) && $menu['hotkey'] != ''): ?><span class="hotkey"><?php echo $menu['hotkey']; ?></span><?php endif; ?>
                 </a>
                 <?php if(isset($menu['submenu'])): ?>
                 <ul class="submenu">
-                 <?php foreach($menu['submenu'] as $submenu_id => $submenu_item): ?> 
-                    <li id="link-<?php echo $submenu_id ?>" title="<?php echo $submenu_item['title']; ?>" class="sub<?php if(isset($submenu_item['hotkey']) && $submenu_item['hotkey'] != ''): ?> hotkey-<?php echo $submenu_item['hotkey']; ?><?php endif; ?>"><a href="<?php echo $submenu_item['url']; ?>"><?php echo $submenu_item['text']; ?> 
-                    <?php if(isset($submenu_item['hotkey']) && $submenu_item['hotkey'] != ''): ?><span class="hotkey"><?php echo $submenu_item['hotkey']; ?></span><?php endif; ?> 
-                    </a></li> 
-                 <?php endforeach; ?> 
+                 <?php foreach($menu['submenu'] as $submenu_id => $submenu_item): ?>
+                    <li id="link-<?php echo $submenu_id ?>" title="<?php echo $submenu_item['title']; ?>" class="sub<?php if(isset($submenu_item['hotkey']) && $submenu_item['hotkey'] != ''): ?> hotkey-<?php echo $submenu_item['hotkey']; ?><?php endif; ?>"><a href="<?php echo $submenu_item['url']; ?>"><?php echo $submenu_item['text']; ?>
+                    <?php if(isset($submenu_item['hotkey']) && $submenu_item['hotkey'] != ''): ?><span class="hotkey"><?php echo $submenu_item['hotkey']; ?></span><?php endif; ?>
+                    </a></li>
+                 <?php endforeach; ?>
                  </ul>
                 <?php endif; ?>