Changeset 851

Timestamp:

2007-09-17 21:00:18 (12 months ago)

Author:

freakerz

Message:

First pass at implementing header and footer aggregation functions.

Theme::header() and Theme::footer() are the new functions.

They call THEME_CLASS::header() and THEME_CLASS::footer, plus:

New plugin hooks: template_header, template_footer.

New Stack names: template_stylesheet, template_header_javascript and template_footer_javascript.

-

Moved the K2 header verification for jQuery to the K2 theme.php file.

Comment/Suggestions?

Location:

trunk/htdocs

Files:

• system/classes/theme.php (modified) (1 diff)
• user/themes/k2/footer.php (modified) (1 diff)
• user/themes/k2/header.php (modified) (1 diff)
• user/themes/k2/theme.php (modified) (1 diff)

trunk/htdocs/system/classes/theme.php

@@ -357 +357 @@
     }
     
+    
+    /**
+     * Aggregates and echos the additional header code by combining Plugins and Stack calls.
+     */
+    public function header() {
+        Plugins::act( 'template_header' );
+        if ( is_callable( array( THEME_CLASS, 'header' ) ) ) {
+            call_user_func( array( THEME_CLASS, 'header' ) );
+        }
+        $header= Stack::get( 'template_stylesheet', ' <link rel="stylesheet" type="text/css"  href="%s" media="%s">'."\r\n" );
+        $header.= Stack::get( 'template_header_javascript', ' <script src="%s" type="text/javascript"></script>'."\r\n" );
+        if ( $header != '' ) {
+            echo $header;
+        }
+    }
+    
+    /**
+     * Aggregates and echos the additional footer code by combining Plugins and Stack calls.
+     */
+    public function footer() {
+        Plugins::act( 'template_footer' );
+        if ( is_callable( array( THEME_CLASS, 'footer' ) ) ) {
+            call_user_func( array( THEME_CLASS, 'footer' ) );
+        }
+        $footer= Stack::get( 'template_footer_javascript', ' <script src="%s" type="text/javascript"></script>'."\r\n" );
+        if ( $footer != '' ) {
+            echo $footer;
+        }
+    }
+    
     /** 
      * Detects if a variable is assigned to the template engine for use in 

trunk/htdocs/user/themes/k2/footer.php

@@ -11 +11 @@
 </p>
 
+<?php Theme::footer(); ?>
+
 <?php
 // Uncomment this to view your DB profiling info

trunk/htdocs/user/themes/k2/header.php

@@ -13 +13 @@
  <link rel="stylesheet" type="text/css" media="screen" href="<?php Site::out_url( 'theme' ); ?>/style.css">
 
-<?php if ( $user ) { // Still needs to check for edit permissions ?>
- <script type="text/javascript" src="<?php Site::out_url( 'habari' ); ?>/scripts/jquery.js"></script>
-<?php } ?>
+<?php Theme::header() ?>
 </head>
 

trunk/htdocs/user/themes/k2/theme.php

@@ -63 +63 @@
     }
     
+    public function header()
+    {
+        if ( $this->user instanceof User ) {
+            Stack::add( 'template_header_javascript', Site::get_url('scripts') . '/jquery.js', 'jquery' );
+        }
+    }
+    
 }