Template library code organisation

.gitignore

@@ -10,4 +10,6 @@ application/cache/*
 
 application/logs/*
 !application/logs/index.html
-!application/logs/.htaccess
+!application/logs/.htaccess
+/nbproject
+/nbproject/private/

application/libraries/CSS.php

@@ -0,0 +1,27 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class CSS {
+
+    protected $_css = array();
+
+    /**
+     * Add css file path
+     *
+     * @access  public
+     * @param   string  $css
+     * @return  void
+     */
+    public function add($css) {
+        $this->_css[$css] = $css;
+    }
+
+    public function get() {
+        $css = array();
+        foreach ($this->_css as $css_file) {
+            $css[] = '<link rel="stylesheet" href="' . assets_url('css/' . $css_file) . '">';
+        }
+        return implode('', $css);
+    }
+}

application/libraries/Description.php

@@ -0,0 +1,27 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class Description {
+
+    protected $_description = FALSE;
+
+    /**
+     * Set page description
+     *
+     * @access  public
+     * @param   string  $description
+     * @return  void
+     */
+    public function set($description) {
+        $this->_description = $description;
+    }
+
+    public function get() {
+        if (empty($this->_description)) {
+            $this->_description = '';
+        }
+        return $this->_description;
+    }
+
+}

application/libraries/JS.php

@@ -0,0 +1,27 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class JS {
+
+    protected $_js = array();
+
+    /**
+     * Add js file path
+     *
+     * @access  public
+     * @param   string  $js
+     * @return  void
+     */
+    public function add($js) {
+        $this->_js[$js] = $js;
+    }
+
+    public function get() {
+        $js = array();
+        foreach ($this->_js as $js_file) {
+            $js[] = '<script src="' . assets_url('js/' . $js_file) . '"></script>';
+        }
+        return implode('', $js);
+    }
+}

application/libraries/Layout.php

@@ -0,0 +1,26 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class Layout {
+
+    protected $_layout;
+
+    /**
+     * Set page layout view (1 column, 2 column...)
+     *
+     * @access  public
+     * @param   string  $layout
+     * @return  void
+     */
+    public function set($_layout) {
+        $this->_layout = $_layout;
+    }
+
+    public function get() {
+        if (empty($this->_layout)) {
+            $this->_layout = 'default';
+        }
+        return $this->_layout;
+    }
+}

application/libraries/MetaData.php

@@ -0,0 +1,36 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class MetaData {
+
+    protected $_metadata = array();
+
+    /**
+     * Add metadata
+     *
+     * @access  public
+     * @param   string  $name
+     * @param   string  $content
+     * @return  void
+     */
+    public function add($name, $content) {
+        $name = htmlspecialchars(strip_tags($name));
+        $content = htmlspecialchars(strip_tags($content));
+
+        $this->_metadata[$name] = $content;
+    }
+
+    public function get() {
+        $metadata = array();
+        foreach ($this->_metadata as $name => $content) {
+            if (strpos($name, 'og:') === 0) {
+                $metadata[] = '<meta property="' . $name . '" content="' . $content . '">';
+            } else {
+                $metadata[] = '<meta name="' . $name . '" content="' . $content . '">';
+            }
+        }
+        return implode('', $metadata);
+    }
+
+}

application/libraries/Template.php

@@ -9,99 +9,26 @@ class Template {
 
     private $_ci;
 
-    protected $brand_name = 'CodeIgniter Skeleton';
-    protected $title_separator = ' - ';
+
     protected $ga_id = FALSE; // UA-XXXXX-X
 
-    protected $layout = 'default';
-
-    protected $title = FALSE;
-    protected $description = FALSE;
-
-    protected $metadata = array();
-
-    protected $js = array();
-    protected $css = array();
+    public $layout;
+    public $title;
+    public $description;
+    public $metadata;
+    public $js;
+    public $css;
 
     function __construct()
     {
         $this->_ci =& get_instance();
-    }
 
-    /**
-     * Set page layout view (1 column, 2 column...)
-     *
-     * @access  public
-     * @param   string  $layout
-     * @return  void
-     */
-    public function set_layout($layout)
-    {
-        $this->layout = $layout;
-    }
-
-    /**
-     * Set page title
-     *
-     * @access  public
-     * @param   string  $title
-     * @return  void
-     */
-    public function set_title($title)
-    {
-        $this->title = $title;
-    }
-
-    /**
-     * Set page description
-     *
-     * @access  public
-     * @param   string  $description
-     * @return  void
-     */
-    public function set_description($description)
-    {
-        $this->description = $description;
-    }
-
-    /**
-     * Add metadata
-     *
-     * @access  public
-     * @param   string  $name
-     * @param   string  $content
-     * @return  void
-     */
-    public function add_metadata($name, $content)
-    {
-        $name = htmlspecialchars(strip_tags($name));
-        $content = htmlspecialchars(strip_tags($content));
-
-        $this->metadata[$name] = $content;
-    }
-
-    /**
-     * Add js file path
-     *
-     * @access  public
-     * @param   string  $js
-     * @return  void
-     */
-    public function add_js($js)
-    {
-        $this->js[$js] = $js;
-    }
-
-    /**
-     * Add css file path
-     *
-     * @access  public
-     * @param   string  $css
-     * @return  void
-     */
-    public function add_css($css)
-    {
-        $this->css[$css] = $css;
+        $this->layout = new Layout();
+        $this->css = new CSS();
+        $this->js = new JS();
+        $this->title = new Title();
+        $this->description = new Description();
+        $this->metadata = new MetaData();
     }
 
     /**
@@ -123,54 +50,28 @@ public function load_view($view, $data = array(), $return = FALSE)
         }
 
         // Title
-        if (empty($this->title))
-        {
-            $title = $this->brand_name;
-        }
-        else
-        {
-            $title = $this->title . $this->title_separator . $this->brand_name;
-        }
+        $title = $this->title->get();
 
         // Description
-        $description = $this->description;
+        $description = $this->description->get();
 
         // Metadata
-        $metadata = array();
-        foreach ($this->metadata as $name => $content)
-        {
-            if (strpos($name, 'og:') === 0)
-            {
-                $metadata[] = '<meta property="' . $name . '" content="' . $content . '">';
-            }
-            else
-            {
-                $metadata[] = '<meta name="' . $name . '" content="' . $content . '">';
-            }
-        }
-        $metadata = implode('', $metadata);
+        $metadata = $this->metadata->get();
 
         // Javascript
-        $js = array();
-        foreach ($this->js as $js_file)
-        {
-            $js[] = '<script src="' . assets_url('js/' . $js_file) . '"></script>';
-        }
-        $js = implode('', $js);
+        $js = $this->css->get();
 
         // CSS
-        $css = array();
-        foreach ($this->css as $css_file)
-        {
-            $css[] = '<link rel="stylesheet" href="' . assets_url('css/' . $css_file) . '">';
-        }
-        $css = implode('', $css);
+        $css = $this->js->get();
 
+        // Layout        
+        $layout = $this->layout->get();
+
         $header = $this->_ci->load->view('header', array(), TRUE);
         $footer = $this->_ci->load->view('footer', array(), TRUE);
         $main_content = $this->_ci->load->view($view, $data, TRUE);
 
-        $body = $this->_ci->load->view('layout/' . $this->layout, array(
+        $body = $this->_ci->load->view('layout/' . $layout, array(
             'header' => $header,
             'footer' => $footer,
             'main_content' => $main_content,

application/libraries/Title.php

@@ -0,0 +1,32 @@
+<?php
+
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+class Title {
+
+    protected $_brand_name = 'CodeIgniter Skeleton';
+    protected $_title_separator = ' - ';
+    protected $_title = FALSE;
+
+    /**
+     * Set page title
+     *
+     * @access  public
+     * @param   string  $title
+     * @return  void
+     */
+    public function set($title) {
+        $this->_title = $title;
+    }
+
+    public function get() {
+        if (empty($this->_title)) {
+            $this->_title = $this->_brand_name;
+            ;
+        } else {
+            $this->_title = $this->_title . $this->_title_separator . $this->_brand_name;
+        }
+        return $this->_title;
+    }
+
+}

application/modules/addons/controllers/addons.php

@@ -6,9 +6,9 @@ public function index()
     {
         $this->load->library('template');
 
-        $this->template->set_title('Add-ons');
-        $this->template->add_js('modules/skeleton.js');
-        $this->template->add_css('modules/skeleton.css');
+        $this->template->title->set('Add-ons');
+        $this->template->js->add('modules/skeleton.js');
+        $this->template->css->add('modules/skeleton.css');
 
         $addons = $this->load->config('addons/addons', TRUE);
         $data = array(

application/modules/addons/data/ion_auth/controllers/auth.php

@@ -767,12 +767,12 @@ function _render_page($view, $data=null, $render=false)
 
             if ( ! in_array($view, array('auth/index')))
             {
-                $this->template->set_layout('pagelet');
+                $this->template->layout->set('pagelet');
             }
 
             if ( ! empty($data['title']))
             {
-                $this->template->set_title($data['title']);
+                $this->template->title->set($data['title']);
             }
 
             $this->template->load_view($view, $data);