ci-bonfire / Sprint

myth/Mail/MailServiceInterface.php

Indentation +140 added lines, -140 removed lines

@@ -42,145 +42,145 @@
  */
 interface MailServiceInterface {
 
-    /**
-     * Does the actual delivery of a message.
-     *
-     * @param bool  $clear_after    If TRUE, will reset the class after sending.
-     *
-     * @return mixed
-     */
-    public function send($clear_after=true);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a header value for the email. Not every service will provide this.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function setHeader($field, $value);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Options
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the email address to send the email to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function to($email);
+	/**
+	 * Does the actual delivery of a message.
+	 *
+	 * @param bool  $clear_after    If TRUE, will reset the class after sending.
+	 *
+	 * @return mixed
+	 */
+	public function send($clear_after=true);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a header value for the email. Not every service will provide this.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function setHeader($field, $value);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Options
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the email address to send the email to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function to($email);
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets who the email is coming from.
-     *
-     * @param $email
-     * @param null $name
-     * @return mixed
-     */
-    public function from($email, $name=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single additional email address to 'cc'.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function cc($email);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a single email address to 'bcc' to.
-     *
-     * @param $email
-     * @return mixed
-     */
-    public function bcc($email);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the reply to address.
-     *
-     * @param $email
-     * @param $name
-     * @return mixed
-     */
-    public function reply_to($email, $name=null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the subject line of the email.
-     *
-     * @param $subject
-     * @return mixed
-     */
-    public function subject($subject);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the HTML portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function html_message($message);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the text portion of the email address. Optional.
-     *
-     * @param $message
-     * @return mixed
-     */
-    public function text_message($message);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the format to send the email in. Either 'html' or 'text'.
-     *
-     * @param $format
-     * @return mixed
-     */
-    public function format($format);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Resets the state to blank, ready for a new email. Useful when
-     * sending emails in a loop and you need to make sure that the
-     * email is reset.
-     *
-     * @param bool $clear_attachments
-     * @return mixed
-     */
-    public function reset($clear_attachments=true);
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets who the email is coming from.
+	 *
+	 * @param $email
+	 * @param null $name
+	 * @return mixed
+	 */
+	public function from($email, $name=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single additional email address to 'cc'.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function cc($email);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single email address to 'bcc' to.
+	 *
+	 * @param $email
+	 * @return mixed
+	 */
+	public function bcc($email);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the reply to address.
+	 *
+	 * @param $email
+	 * @param $name
+	 * @return mixed
+	 */
+	public function reply_to($email, $name=null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the subject line of the email.
+	 *
+	 * @param $subject
+	 * @return mixed
+	 */
+	public function subject($subject);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the HTML portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function html_message($message);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the text portion of the email address. Optional.
+	 *
+	 * @param $message
+	 * @return mixed
+	 */
+	public function text_message($message);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the format to send the email in. Either 'html' or 'text'.
+	 *
+	 * @param $format
+	 * @return mixed
+	 */
+	public function format($format);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the state to blank, ready for a new email. Useful when
+	 * sending emails in a loop and you need to make sure that the
+	 * email is reset.
+	 *
+	 * @param bool $clear_attachments
+	 * @return mixed
+	 */
+	public function reset($clear_attachments=true);
+
+	//--------------------------------------------------------------------
 }

myth/Settings/ConfigStore.php

Indentation +138 added lines, -138 removed lines

@@ -49,143 +49,143 @@
  */
 class ConfigStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        // Treat the 'app' group as our primary, un-sectioned
-        // config files.
-        if ($group != 'app')
-        {
-            return $this->ci->config->set_item($key, $value);
-        }
-
-        // Otherwise, we'll need to ensure a section exists
-        if (! isset($this->ci->config->config[$group]))
-        {
-            $this->ci->config->config[$group] = [];
-        }
-
-        $this->ci->config->config[$group][$key] = $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item. If the config system doesn't have the
-     * value loaded, yet, it will attempt to load a config file matching
-     * the 'group' name and grab the value from that.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='application')
-    {
-        // First, see if CI already has this key loaded.
-        $result = $this->ci->config->item($key);
-
-        // This bit will fail when the actual value is NULL
-        // but should result in false hits infrequently.
-        if ($result !== null)
-        {
-            return $result;
-        }
-
-        // Try to load the 'group' file, then try to load a
-        // config file that matches the group name
-        $this->ci->load->config($group, false, true);
+	protected $ci;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		// Treat the 'app' group as our primary, un-sectioned
+		// config files.
+		if ($group != 'app')
+		{
+			return $this->ci->config->set_item($key, $value);
+		}
+
+		// Otherwise, we'll need to ensure a section exists
+		if (! isset($this->ci->config->config[$group]))
+		{
+			$this->ci->config->config[$group] = [];
+		}
+
+		$this->ci->config->config[$group][$key] = $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item. If the config system doesn't have the
+	 * value loaded, yet, it will attempt to load a config file matching
+	 * the 'group' name and grab the value from that.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='application')
+	{
+		// First, see if CI already has this key loaded.
+		$result = $this->ci->config->item($key);
+
+		// This bit will fail when the actual value is NULL
+		// but should result in false hits infrequently.
+		if ($result !== null)
+		{
+			return $result;
+		}
+
+		// Try to load the 'group' file, then try to load a
+		// config file that matches the group name
+		$this->ci->load->config($group, false, true);
         
-        $result = $this->ci->config->item($key);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * NOT supported by this store.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * Does not work.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($group))
-        {
-            return $this->ci->config->config;
-        }
-
-        // If we're a group, does the group already exists
-        // as a 'section' in the config array?
-        if (isset($this->ci->config->config[$group]))
-        {
-            return $this->ci->config->config[$group];
-        }
-
-        // Still here? Attempt to load the file into a section
-        // and try one last time.
-        if ($this->ci->load->config($group))
-        {
-            return $this->ci->config->config($group);
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
+		$result = $this->ci->config->item($key);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * NOT supported by this store.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * Does not work.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($group))
+		{
+			return $this->ci->config->config;
+		}
+
+		// If we're a group, does the group already exists
+		// as a 'section' in the config array?
+		if (isset($this->ci->config->config[$group]))
+		{
+			return $this->ci->config->config[$group];
+		}
+
+		// Still here? Attempt to load the file into a section
+		// and try one last time.
+		if ($this->ci->load->config($group))
+		{
+			return $this->ci->config->config($group);
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Settings/SettingsStoreInterface.php

Indentation +44 added lines, -44 removed lines

@@ -40,58 +40,58 @@
  */
 interface SettingsStoreInterface {
 
-    /**
-     * Inserts/Replaces a single setting item.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     */
-    public function save($key, $value=null, $group='app');
+	/**
+	 * Inserts/Replaces a single setting item.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 */
+	public function save($key, $value=null, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app');
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app');
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app');
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value);
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null);
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Themers/MetaCollection.php

Indentation +213 added lines, -213 removed lines

@@ -35,219 +35,219 @@
 
 class MetaCollection implements MetaInterface {
 
-    /**
-     * Stores the meta values the user has set.
-     *
-     * @var array
-     */
-    protected $meta = [];
-
-    /**
-     * Stores the standard meta-value names
-     * Mostly here for reference, I guess.
-     *
-     * @var array
-     */
-    protected $std_meta = [
-        'application-name',
-        'author',
-        'copyright',
-        'description',
-        'generator',
-        'keywords',
-        'robots',
-        'googlebot'
-    ];
-
-    /**
-     * Stores the HTTP-Equiv meta tags
-     * since they need to be rendered differently.
-     *
-     * @var array
-     */
-    protected $http_equiv_meta = [
-        'cache-control',
-        'content-language',
-        'content-type',
-        'default-style',
-        'expires',
-        'pragma',
-        'refresh',
-        'set-cookie'
-    ];
-
-    /**
-     * Stores the document's character encoding.
-     *
-     * @var string
-     */
-    public $charset = 'utf-8';
-
-    //--------------------------------------------------------------------
-
-    public function __construct($ci)
-    {
-        $ci->config->load('html_meta', true);
-
-        $config = $ci->config->item('html_meta');
-
-        $this->meta = $config['meta'];
-
-        $this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets a single meta item.
-     * $alias can also be an array of key/value pairs to set.
-     *
-     * @param string|array $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null, $escape=true)
-    {
-        if (is_array($alias))
-        {
-            foreach ($alias as $key => $val)
-            {
-                $this->set($key, $val);
-            }
-
-            return $this;
-        }
-
-        // Charset
-        if (strtolower($alias) == 'charset')
-        {
-            $this->charset = $value;
-
-            return $this;
-        }
-
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias)
-    {
-        $alias = strtolower($alias);
-
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @return mixed
-     */
-    public function renderTags()
-    {
-        if (! count($this->meta))
-        {
-            return null;
-        }
-
-        $output = '';
-
-        // Character Encoding
-        $output .= "\t<meta charset=\"{$this->charset}\" >";
-
-        // Everything else
-        foreach ($this->meta as $name => $content)
-        {
-            if (is_array($content))
-            {
-                $content = implode(',', $content);
-            }
-
-            if (empty($content))
-            {
-                continue;
-            }
-
-            // Http Equivalent meta tags.
-            if (in_array($name, $this->http_equiv_meta))
-            {
-                $output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
-            }
-            // Standard Meta Tag
-            else {
-                $output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name)
-    {
-        if (is_null($name))
-        {
-            return $this;
-        }
-
-        $this->http_equiv_meta[] = strtolower($name);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Convenience implementation to set a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     * @param null $value
-     */
-    public function __set($alias, $value=null)
-    {
-        $this->set($alias, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Convenience method to access a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function __get($alias)
-    {
-        return $this->get($alias);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores the meta values the user has set.
+	 *
+	 * @var array
+	 */
+	protected $meta = [];
+
+	/**
+	 * Stores the standard meta-value names
+	 * Mostly here for reference, I guess.
+	 *
+	 * @var array
+	 */
+	protected $std_meta = [
+		'application-name',
+		'author',
+		'copyright',
+		'description',
+		'generator',
+		'keywords',
+		'robots',
+		'googlebot'
+	];
+
+	/**
+	 * Stores the HTTP-Equiv meta tags
+	 * since they need to be rendered differently.
+	 *
+	 * @var array
+	 */
+	protected $http_equiv_meta = [
+		'cache-control',
+		'content-language',
+		'content-type',
+		'default-style',
+		'expires',
+		'pragma',
+		'refresh',
+		'set-cookie'
+	];
+
+	/**
+	 * Stores the document's character encoding.
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	//--------------------------------------------------------------------
+
+	public function __construct($ci)
+	{
+		$ci->config->load('html_meta', true);
+
+		$config = $ci->config->item('html_meta');
+
+		$this->meta = $config['meta'];
+
+		$this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets a single meta item.
+	 * $alias can also be an array of key/value pairs to set.
+	 *
+	 * @param string|array $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null, $escape=true)
+	{
+		if (is_array($alias))
+		{
+			foreach ($alias as $key => $val)
+			{
+				$this->set($key, $val);
+			}
+
+			return $this;
+		}
+
+		// Charset
+		if (strtolower($alias) == 'charset')
+		{
+			$this->charset = $value;
+
+			return $this;
+		}
+
+		$this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias)
+	{
+		$alias = strtolower($alias);
+
+		return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @return mixed
+	 */
+	public function renderTags()
+	{
+		if (! count($this->meta))
+		{
+			return null;
+		}
+
+		$output = '';
+
+		// Character Encoding
+		$output .= "\t<meta charset=\"{$this->charset}\" >";
+
+		// Everything else
+		foreach ($this->meta as $name => $content)
+		{
+			if (is_array($content))
+			{
+				$content = implode(',', $content);
+			}
+
+			if (empty($content))
+			{
+				continue;
+			}
+
+			// Http Equivalent meta tags.
+			if (in_array($name, $this->http_equiv_meta))
+			{
+				$output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
+			}
+			// Standard Meta Tag
+			else {
+				$output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name)
+	{
+		if (is_null($name))
+		{
+			return $this;
+		}
+
+		$this->http_equiv_meta[] = strtolower($name);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Convenience implementation to set a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 */
+	public function __set($alias, $value=null)
+	{
+		$this->set($alias, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Convenience method to access a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function __get($alias)
+	{
+		return $this->get($alias);
+	}
+
+	//--------------------------------------------------------------------
 
 
 

myth/Themers/MetaInterface.php

Indentation +38 added lines, -38 removed lines

@@ -33,50 +33,50 @@
 
 interface MetaInterface {
 
-    /**
-     * Sets a single meta item.
-     *
-     * @param $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null);
+	/**
+	 * Sets a single meta item.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias);
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @param array $show_tags
-     *
-     * @return mixed
-     */
-    public function renderTags();
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @param array $show_tags
+	 *
+	 * @return mixed
+	 */
+	public function renderTags();
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name);
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }
\ No newline at end of file

myth/Themers/ThemerInterface.php

Indentation +214 added lines, -214 removed lines

@@ -38,219 +38,219 @@
  */
 interface ThemerInterface
 {
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout If provided, will override the default layout.
-     */
-    public function render($layout = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Used within the template layout file to render the current content.
-     * This content is typically used to display the current view.
-     */
-    public function content();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use.
-     *
-     * @param $theme
-     * @return mixed
-     */
-    public function setDefaultTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the active layout.
-     *
-     * @return mixed
-     */
-    public function layout();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed        $value
-     */
-    public function set($key, $value = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     */
-    public function removeThemePath($alias);
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * @param string    $view
-     * @param array     $data
-     * @param int       $cache_time  The number of MINUTES to cache the output
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return mixed
-     */
-    public function setVariant($variant);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function addVariant($name, $postfix);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function removeVariant($name);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_minutes
-     * @return mixed
-     */
-    public function call($command, $cache_minutes=0);
-
-    //--------------------------------------------------------------------
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout If provided, will override the default layout.
+	 */
+	public function render($layout = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used within the template layout file to render the current content.
+	 * This content is typically used to display the current view.
+	 */
+	public function content();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use.
+	 *
+	 * @param $theme
+	 * @return mixed
+	 */
+	public function setDefaultTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the active layout.
+	 *
+	 * @return mixed
+	 */
+	public function layout();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed        $value
+	 */
+	public function set($key, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 */
+	public function removeThemePath($alias);
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * @param string    $view
+	 * @param array     $data
+	 * @param int       $cache_time  The number of MINUTES to cache the output
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return mixed
+	 */
+	public function setVariant($variant);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function addVariant($name, $postfix);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function removeVariant($name);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_minutes
+	 * @return mixed
+	 */
+	public function call($command, $cache_minutes=0);
+
+	//--------------------------------------------------------------------
 
 }

myth/Themers/ViewThemer.php

Indentation +522 added lines, -522 removed lines

@@ -35,70 +35,70 @@ 
 class ViewThemer implements ThemerInterface
 {
 
-    protected $theme = '';
+	protected $theme = '';
 
-    protected $default_theme = null;
+	protected $default_theme = null;
 
 	protected $active_theme = null;
 
-    protected $layout = 'index';
+	protected $layout = 'index';
 
-    protected $view = '';
+	protected $view = '';
 
-    protected $vars = [];
+	protected $vars = [];
 
-    protected $folders = [];
+	protected $folders = [];
 
-    protected $variants = [];
+	protected $variants = [];
 
-    protected $current_variant = '';
+	protected $current_variant = '';
 
 	protected $parse_views = false;
 
-    protected $ci;
+	protected $ci;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct($ci)
-    {
-        $this->ci = $ci;
+	public function __construct($ci)
+	{
+		$this->ci = $ci;
 
-	    $this->parse_views = config_item('theme.parse_views');
-    }
+		$this->parse_views = config_item('theme.parse_views');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout        If provided, will override the default layout.
-     * @param int    $cache_time    The number of seconds to cache the output for.
-     * @return mixed
-     */
-    public function render($layout = null)
-    {
-        // Make the template engine available within the views.
-        $this->vars['themer'] = $this;
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout        If provided, will override the default layout.
+	 * @param int    $cache_time    The number of seconds to cache the output for.
+	 * @return mixed
+	 */
+	public function render($layout = null)
+	{
+		// Make the template engine available within the views.
+		$this->vars['themer'] = $this;
 
-        // Render our current view content
-        $this->vars['view_content'] = $this->content();
+		// Render our current view content
+		$this->vars['view_content'] = $this->content();
 
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
 
-        if (! isset($this->folders[$theme])) {
-            throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
-        }
+		if (! isset($this->folders[$theme])) {
+			throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
+		}
 
-	    $this->active_theme = $theme;
+		$this->active_theme = $theme;
 
-        // Make the path available within views.
-        $this->vars['theme_path'] = $this->folders[$theme];
+		// Make the path available within views.
+		$this->vars['theme_path'] = $this->folders[$theme];
 
-        return $this->display($this->folders[$theme] . '/' . $this->layout);
-    }
+		return $this->display($this->folders[$theme] . '/' . $this->layout);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Used within the template layout file to render the current content.
@@ -108,490 +108,490 @@ 
 	 *
 	 * @return mixed
 	 */
-    public function content()
-    {
-        // Calc our view name based on current method/controller
-        $dir = $this->ci->router->fetch_directory();
+	public function content()
+	{
+		// Calc our view name based on current method/controller
+		$dir = $this->ci->router->fetch_directory();
 
-        foreach (Modules::$locations as $key => $offset) {
+		foreach (Modules::$locations as $key => $offset) {
 
-            if (stripos($dir, 'module') !== false) {
+			if (stripos($dir, 'module') !== false) {
 //                $dir = str_replace($offset, '', $dir);
-                $dir = str_replace('controllers/', '', $dir);
-            }
-        }
-
-        $module = $this->ci->router->fetch_module();
-
-        if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
-            $dir = '';
-        }
-
-        $view = ! empty($this->view) ? $this->view :
-            $dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
-
-        return $this->display($view);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * If a variant has been specified, it will be added to the end
-     * of the view name before looking for the file.
-     *
-     * @param string $view
-     * @param array  $data
-     * @param int    $cache_time Number of minutes to cache the page for
-     * @param string $cache_name A custom name for the cached file.
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
-		    $cache_name = str_replace( '/', '_', $cache_name );
-	    }
-
-	    if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
-	    {
-		    $theme        = NULL;
-		    $variant_view = NULL;
-
-		    // Pull out the theme from the view, if given.
-		    if ( strpos( $view, ':' ) !== FALSE )
-		    {
-			    list( $theme, $view ) = explode( ':', $view );
-
-			    $theme = str_replace('{theme}', $this->active_theme, $theme);
-		    }
-
-		    if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
-		    {
-			    $view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
-		    }
-
-		    if (! is_array($data))
-		    {
-			    $data = [];
-		    }
-
-		    $data = array_merge( $this->vars, $data );
-
-		    // if using a variant, add it to the view name.
-		    if ( ! empty( $this->current_variant ) )
-		    {
-			    $variant_view = $view . $this->variants[ $this->current_variant ];
-
-			    $output = $this->loadView($variant_view, $data);
-		    }
-
-		    // If that didn't find anything, then try it without a variant
-		    if ( empty( $output ) )
-		    {
-			    $output = $this->loadView($view, $data);
-		    }
-
-		    // Cache it
-		    if ((int)$cache_time > 0)
-		    {
-			    $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-		    }
-	    }
-
-	    // Parse views?
-	    if ($this->parse_views)
-	    {
-		    $this->ci->load->library('parser');
-
-		    // Any class objects will cause failure
-		    // so get rid of those bad boys....
-		    unset($data['uikit'], $data['themer']);
-
-		    $output = $this->ci->parser->parse_string($output, $data, true);
-	    }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_time
-     * @param string $cache_name    // Number of MINUTES to cache output
-     * @return mixed|void
-     */
-    public function call($command, $cache_time=0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_call_' . md5( $command );
-	    }
-
-        if (! $output = $this->ci->cache->get($cache_name)) {
-            $parts = explode(' ', $command);
-
-            list($class, $method) = explode(':', array_shift($parts));
-
-            // Prepare our parameter list to send to the callback
-            // by splitting $parts on equal signs.
-            $params = array();
-
-            foreach ($parts as $part) {
-                $p = explode('=', $part);
-
-                if (empty($p[0]) || empty($p[1]))
-                {
-                    continue;
-                }
-
-                $params[ $p[0] ] = $p[1];
-            }
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                $this->ci->load->library($class);
-                $class =& $this->ci->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
-            }
-
-            // Call the class with our parameters
-            $output = $class->{$method}($params);
-
-            // Cache it
-            if ((int)$cache_time > 0)
-            {
-                $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme)
-    {
-        $this->theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme()
-    {
-        return $this->theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use if another isn't specified.
-     *
-     * @param $theme
-     * @return mixed|void
-     */
-    public function setDefaultTheme($theme)
-    {
-        $this->default_theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file)
-    {
-        $this->view = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view()
-    {
-        return $this->view;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file)
-    {
-        if (empty($file)) return;
-
-        $this->layout = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current layout.
-     *
-     * @return mixed|string
-     */
-    public function layout()
-    {
-        return $this->layout;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed $value
-     * @return $this
-     */
-    public function set($key, $value = null)
-    {
-        if (is_array($key)) {
-            $this->vars = array_merge($this->vars, $key);
-            return;
-        }
-
-        $this->vars[$key] = $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return isset($this->vars[$key]) ? $this->vars[$key] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false)
-    {
-	    $this->parse_views = $parse;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path)
-    {
-        $this->folders[$alias] = $path;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     * @return $this
-     */
-    public function removeThemePath($alias)
-    {
-        unset($this->folders[$alias]);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the path to the active/default theme's folder.
-     *
-     * @return string|null
-     */
-    public function getThemePath()
-    {
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
-
-        if (! isset($this->folders[ $theme ]))
-        {
-            return null;
-        }
-
-        return $this->folders[$theme];
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    //--------------------------------------------------------------------
-    // Variants
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return $this
-     */
-    public function setVariant($variant)
-    {
-        if (isset($this->variants[$variant])) {
-            $this->current_variant = $variant;
-        }
-
-        return $this;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return $this|mixed
-     */
-    public function addVariant($name, $postfix)
-    {
-        $this->variants[$name] = $postfix;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @return $this|mixed
-     */
-    public function removeVariant($name)
-    {
-        if (isset($this->variants[$name])) {
-            unset($this->variants[$name]);
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Handles the actual loading of a view file, and checks for any
-     * overrides in themes, etc.
-     *
-     * @param $view
-     * @param $data
-     *
-     * @return string
-     */
-    private function loadView($view, $data)
-    {
-        // First - does it exist in the current theme?
-        $theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
-        $theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
-        $theme = rtrim($theme, '/ ') .'/';
-
-        if (file_exists($theme ."{$view}.php"))
-        {
-            $output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
-        }
-
-        // Next, if it's a real file with path, then load it
-        elseif ( realpath( $view . '.php' ) )
-        {
-            $output = $this->ci->load->view_path( $view, $data, TRUE );
-        }
-
-        // Otherwise, treat it as a standard view, which means
-        // application/views will override any modules. (See HMVC/Loader)
-        else
-        {
-            $output = $this->ci->load->view( $view, $data, TRUE );
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+				$dir = str_replace('controllers/', '', $dir);
+			}
+		}
+
+		$module = $this->ci->router->fetch_module();
+
+		if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
+			$dir = '';
+		}
+
+		$view = ! empty($this->view) ? $this->view :
+			$dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
+
+		return $this->display($view);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * If a variant has been specified, it will be added to the end
+	 * of the view name before looking for the file.
+	 *
+	 * @param string $view
+	 * @param array  $data
+	 * @param int    $cache_time Number of minutes to cache the page for
+	 * @param string $cache_name A custom name for the cached file.
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
+			$cache_name = str_replace( '/', '_', $cache_name );
+		}
+
+		if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
+		{
+			$theme        = NULL;
+			$variant_view = NULL;
+
+			// Pull out the theme from the view, if given.
+			if ( strpos( $view, ':' ) !== FALSE )
+			{
+				list( $theme, $view ) = explode( ':', $view );
+
+				$theme = str_replace('{theme}', $this->active_theme, $theme);
+			}
+
+			if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
+			{
+				$view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
+			}
+
+			if (! is_array($data))
+			{
+				$data = [];
+			}
+
+			$data = array_merge( $this->vars, $data );
+
+			// if using a variant, add it to the view name.
+			if ( ! empty( $this->current_variant ) )
+			{
+				$variant_view = $view . $this->variants[ $this->current_variant ];
+
+				$output = $this->loadView($variant_view, $data);
+			}
+
+			// If that didn't find anything, then try it without a variant
+			if ( empty( $output ) )
+			{
+				$output = $this->loadView($view, $data);
+			}
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		// Parse views?
+		if ($this->parse_views)
+		{
+			$this->ci->load->library('parser');
+
+			// Any class objects will cause failure
+			// so get rid of those bad boys....
+			unset($data['uikit'], $data['themer']);
+
+			$output = $this->ci->parser->parse_string($output, $data, true);
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_time
+	 * @param string $cache_name    // Number of MINUTES to cache output
+	 * @return mixed|void
+	 */
+	public function call($command, $cache_time=0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_call_' . md5( $command );
+		}
+
+		if (! $output = $this->ci->cache->get($cache_name)) {
+			$parts = explode(' ', $command);
+
+			list($class, $method) = explode(':', array_shift($parts));
+
+			// Prepare our parameter list to send to the callback
+			// by splitting $parts on equal signs.
+			$params = array();
+
+			foreach ($parts as $part) {
+				$p = explode('=', $part);
+
+				if (empty($p[0]) || empty($p[1]))
+				{
+					continue;
+				}
+
+				$params[ $p[0] ] = $p[1];
+			}
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				$this->ci->load->library($class);
+				$class =& $this->ci->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
+			}
+
+			// Call the class with our parameters
+			$output = $class->{$method}($params);
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme)
+	{
+		$this->theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme()
+	{
+		return $this->theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use if another isn't specified.
+	 *
+	 * @param $theme
+	 * @return mixed|void
+	 */
+	public function setDefaultTheme($theme)
+	{
+		$this->default_theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file)
+	{
+		$this->view = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view()
+	{
+		return $this->view;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file)
+	{
+		if (empty($file)) return;
+
+		$this->layout = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current layout.
+	 *
+	 * @return mixed|string
+	 */
+	public function layout()
+	{
+		return $this->layout;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function set($key, $value = null)
+	{
+		if (is_array($key)) {
+			$this->vars = array_merge($this->vars, $key);
+			return;
+		}
+
+		$this->vars[$key] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		return isset($this->vars[$key]) ? $this->vars[$key] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false)
+	{
+		$this->parse_views = $parse;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path)
+	{
+		$this->folders[$alias] = $path;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 * @return $this
+	 */
+	public function removeThemePath($alias)
+	{
+		unset($this->folders[$alias]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the path to the active/default theme's folder.
+	 *
+	 * @return string|null
+	 */
+	public function getThemePath()
+	{
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
+
+		if (! isset($this->folders[ $theme ]))
+		{
+			return null;
+		}
+
+		return $this->folders[$theme];
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	//--------------------------------------------------------------------
+	// Variants
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return $this
+	 */
+	public function setVariant($variant)
+	{
+		if (isset($this->variants[$variant])) {
+			$this->current_variant = $variant;
+		}
+
+		return $this;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return $this|mixed
+	 */
+	public function addVariant($name, $postfix)
+	{
+		$this->variants[$name] = $postfix;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @return $this|mixed
+	 */
+	public function removeVariant($name)
+	{
+		if (isset($this->variants[$name])) {
+			unset($this->variants[$name]);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the actual loading of a view file, and checks for any
+	 * overrides in themes, etc.
+	 *
+	 * @param $view
+	 * @param $data
+	 *
+	 * @return string
+	 */
+	private function loadView($view, $data)
+	{
+		// First - does it exist in the current theme?
+		$theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
+		$theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
+		$theme = rtrim($theme, '/ ') .'/';
+
+		if (file_exists($theme ."{$view}.php"))
+		{
+			$output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
+		}
+
+		// Next, if it's a real file with path, then load it
+		elseif ( realpath( $view . '.php' ) )
+		{
+			$output = $this->ci->load->view_path( $view, $data, TRUE );
+		}
+
+		// Otherwise, treat it as a standard view, which means
+		// application/views will override any modules. (See HMVC/Loader)
+		else
+		{
+			$output = $this->ci->load->view( $view, $data, TRUE );
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Themers/escape.php

Indentation +69 added lines, -69 removed lines

@@ -4,79 +4,79 @@
 
 if (! function_exists('esc'))
 {
-    /**
-     * Escapes strings to make them safe for use
-     * within HTML templates. Used by the auto-escaping
-     * functionality in setVar() and available to
-     * use within your views.
-     *
-     * Uses ZendFramework's Escaper to handle the actual escaping,
-     * based on context. Valid contexts are:
-     *      - html
-     *      - htmlAttr
-     *      - js
-     *      - css
-     *      - url
-     *
-     * References:
-     *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
-     *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
-     *
-     * @param $data
-     * @param $context
-     * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
-     *
-     * @return string
-     */
-    function esc($data, $context='html', $escaper=null)
-    {
-        if (is_array($data))
-        {
-            foreach ($data as $key => &$value)
-            {
-                $value = esc($value, $context);
-            }
-        }
+	/**
+	 * Escapes strings to make them safe for use
+	 * within HTML templates. Used by the auto-escaping
+	 * functionality in setVar() and available to
+	 * use within your views.
+	 *
+	 * Uses ZendFramework's Escaper to handle the actual escaping,
+	 * based on context. Valid contexts are:
+	 *      - html
+	 *      - htmlAttr
+	 *      - js
+	 *      - css
+	 *      - url
+	 *
+	 * References:
+	 *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
+	 *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
+	 *
+	 * @param $data
+	 * @param $context
+	 * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
+	 *
+	 * @return string
+	 */
+	function esc($data, $context='html', $escaper=null)
+	{
+		if (is_array($data))
+		{
+			foreach ($data as $key => &$value)
+			{
+				$value = esc($value, $context);
+			}
+		}
 
-        $context = strtolower($context);
+		$context = strtolower($context);
 
-        if (! is_object($escaper))
-        {
-            $escaper = new Escaper(config_item('charset'));
-        }
+		if (! is_object($escaper))
+		{
+			$escaper = new Escaper(config_item('charset'));
+		}
 
-        // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
-        {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
-        }
+		// Valid context?
+		if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+		{
+			throw new \InvalidArgumentException('Invalid Context type: '. $context);
+		}
 
-        if (! is_string($data))
-        {
-            return $data;
-        }
+		if (! is_string($data))
+		{
+			return $data;
+		}
 
-        switch ($context)
-        {
-            case 'html':
-                $data = $escaper->escapeHtml($data);
-                break;
-            case 'htmlattr':
-                $data = $escaper->escapeHtmlAttr($data);
-                break;
-            case 'js':
-                $data = $escaper->escapeJs($data);
-                break;
-            case 'css':
-                $data = $escaper->escapeCss($data);
-                break;
-            case 'url':
-                $data = $escaper->escapeUrl($data);
-                break;
-            default:
-                break;
-        }
+		switch ($context)
+		{
+			case 'html':
+				$data = $escaper->escapeHtml($data);
+				break;
+			case 'htmlattr':
+				$data = $escaper->escapeHtmlAttr($data);
+				break;
+			case 'js':
+				$data = $escaper->escapeJs($data);
+				break;
+			case 'css':
+				$data = $escaper->escapeCss($data);
+				break;
+			case 'url':
+				$data = $escaper->escapeUrl($data);
+				break;
+			default:
+				break;
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }
\ No newline at end of file

myth/UIKits/Foundation.php

Indentation +574 added lines, -574 removed lines

@@ -37,639 +37,639 @@
  */
 class Foundation extends BaseUIKit {
 
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return 'Foundation5UIKit';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grid
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    public function row($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    public function column($options=[], \Closure $c)
-    {
-        // Build our classes
-        $classes = '';
-
-        foreach ($options['sizes'] as $size => $value)
-        {
-            switch ($size)
-            {
-                case 's':
-                    $classes .= ' small-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' medium-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' large-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' large-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' small-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' medium-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' large-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' large-offset-'. $value;
-                    break;
-            }
-        }
-
-        $classes = $this->buildClassString($classes .' columns', $options, true);
-
-        $id = $this->buildIdFromOptions($options);
-
-        $attributes = $this->buildAttributesFromOptions($options);
-
-        $output = "<div {$classes} {$id} {$attributes}>";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbar($options=[], \Closure $c)
-    {
-        $output = '';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'top-bar ', true);
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-            }
-        }
-
-        $output .= "<nav {$classes} {$id} {$attributes} data-topbar>";
-
-        /*
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return 'Foundation5UIKit';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grid
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function row($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	public function column($options=[], \Closure $c)
+	{
+		// Build our classes
+		$classes = '';
+
+		foreach ($options['sizes'] as $size => $value)
+		{
+			switch ($size)
+			{
+				case 's':
+					$classes .= ' small-'. $value;
+					break;
+				case 'm':
+					$classes .= ' medium-'. $value;
+					break;
+				case 'l':
+					$classes .= ' large-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' large-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' small-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' medium-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' large-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' large-offset-'. $value;
+					break;
+			}
+		}
+
+		$classes = $this->buildClassString($classes .' columns', $options, true);
+
+		$id = $this->buildIdFromOptions($options);
+
+		$attributes = $this->buildAttributesFromOptions($options);
+
+		$output = "<div {$classes} {$id} {$attributes}>";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbar($options=[], \Closure $c)
+	{
+		$output = '';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'top-bar ', true);
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+			}
+		}
+
+		$output .= "<nav {$classes} {$id} {$attributes} data-topbar>";
+
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        if (isset($this->states['nav-section-open']))
-        {
-            $output .= "</section>";
-            unset($this->states['nav-section-open']);
-        }
+		if (isset($this->states['nav-section-open']))
+		{
+			$output .= "</section>";
+			unset($this->states['nav-section-open']);
+		}
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= '</nav>';
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    public function navbarTitle($title, $url='#')
-    {
-        return "<ul class='title-area'>
+		$output .= '</nav>';
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	public function navbarTitle($title, $url='#')
+	{
+		return "<ul class='title-area'>
     <li class='name'>
       <h1><a href='{$url}'>{$title}</a></h1>
     </li>
     <li class='toggle-topbar menu-icon'><a href='#'><span>Menu</span></a></li>
   </ul>";
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarRight($options=[], \Closure $c)
-    {
-        $output = '';
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarRight($options=[], \Closure $c)
+	{
+		$output = '';
 
-        if (! isset($this->states['nav-section-open']))
-        {
-            $output .= "<section class='top-bar-section'>\n";
-            $this->states['nav-section-open'] = true;
-        }
+		if (! isset($this->states['nav-section-open']))
+		{
+			$output .= "<section class='top-bar-section'>\n";
+			$this->states['nav-section-open'] = true;
+		}
 
-        // Class
-        $classes = $this->buildClassString('right', $options);
+		// Class
+		$classes = $this->buildClassString('right', $options);
 
-        // ID
-        $id = $this->buildIdFromOptions($options);
+		// ID
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
+		$output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a UL meant to pull to the left within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarLeft($options=[], \Closure $c)
-    {
-        $output = '';
+	/**
+	 * Creates a UL meant to pull to the left within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarLeft($options=[], \Closure $c)
+	{
+		$output = '';
 
-        if (! isset($this->states['nav-section-open']))
-        {
-            $output .= "<section class='top-bar-section'>\n";
-            $this->states['nav-section-open'] = true;
-        }
+		if (! isset($this->states['nav-section-open']))
+		{
+			$output .= "<section class='top-bar-section'>\n";
+			$this->states['nav-section-open'] = true;
+		}
 
-        // Class
-        $classes = $this->buildClassString('left', $options);
+		// Class
+		$classes = $this->buildClassString('left', $options);
 
-        // ID
-        $id = $this->buildIdFromOptions($options);
+		// ID
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
+		$output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function nav()
-    {
+	public function nav()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    public function navItem($title, $url='#', $options=[], $active=false)
-    {
-        $options['active'] = $active;
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	public function navItem($title, $url='#', $options=[], $active=false)
+	{
+		$options['active'] = $active;
 
-        $classes = $this->buildClassString('', $options, true);
+		$classes = $this->buildClassString('', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        return "\t<li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>";
-    }
+		return "\t<li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>";
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    public function navDropdown($title,$options=[], \Closure $c)
-    {
-        $classes = $this->buildClassString('has-dropdown', $options, true);
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	public function navDropdown($title,$options=[], \Closure $c)
+	{
+		$classes = $this->buildClassString('has-dropdown', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output = "\t<li {$classes} {$id} {$attributes}>
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#'>{$title}</a>
         <ul class='dropdown'>";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "\t</ul></li>";
+		$output .= "\t</ul></li>";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return '<li class="divider"></li>';
-    }
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return '<li class="divider"></li>';
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        $classes = $this->buildClassString('side-nav', $options, true);
+	public function sideNav($options=[], \Closure $c)
+	{
+		$classes = $this->buildClassString('side-nav', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function breadcrumb($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
-
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tables
-    //--------------------------------------------------------------------
-
-    public function table()
-    {
-        return 'table';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function button($title, $style='default', $size='default', $options=[])
-    {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
-    {
-        $class = isset($options['class']) ? $options['class'] .' button' : 'button';
-        $options['class'] = $class;
-
-        $tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to render out our buttons in a DRY manner.
-     *
-     * @param $title
-     * @param $style
-     * @param $size
-     * @param $tag
-     */
-    protected function renderButtonElement($title, $style, $size, $options, $tag)
-    {
-        $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
-        $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
-
-        if (! in_array($style, $valid_styles))
-        {
-            $style = 'default';
-            $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
-        }
-
-        $classes = 'btn ';
-
-        // Sizes
-        switch($size)
-        {
-            case 'small':
-                $classes .= 'small ';
-                break;
-            case 'xsmall':
-                $classes .= 'tiny ';
-                break;
-            case 'large':
-                $classes .= 'large ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= '';
-                break;
-            case 'success':
-                $classes .= 'success ';
-                break;
-            case 'info':
-                $classes .= 'secondary ';
-                break;
-            case 'warning':
-                $classes .= 'alert ';
-                break;
-            case 'danger':
-                $classes .= 'alert ';
-                break;
-            case 'default':
-                $classes .= 'secondary ';
-                break;
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $tag = str_replace('{classes}', $classes, $tag);
-        $tag = str_replace('{id}', $id, $tag);
-        $tag = str_replace('{attributes}', $attributes, $tag);
-        $tag = str_replace('{title}', $title, $tag);
-
-        // If we're in a button group we need to wrap each item in li tags.
-        if (isset($this->states['inButtonGroup']))
-        {
-            $tag = '<li>'. $tag .'</li>';
-        }
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        $this->states['inButtonGroup'] = true;
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-group', true);
-
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        unset($this->states['inButtonGroup']);
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-bar', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
-
-        $output = "<a href='#' {$classes} {$id} {$attributes}>{$title} <span data-dropdown='drop'></span></a><br>\n
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function breadcrumb($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
+
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tables
+	//--------------------------------------------------------------------
+
+	public function table()
+	{
+		return 'table';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function button($title, $style='default', $size='default', $options=[])
+	{
+		$tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+	{
+		$class = isset($options['class']) ? $options['class'] .' button' : 'button';
+		$options['class'] = $class;
+
+		$tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to render out our buttons in a DRY manner.
+	 *
+	 * @param $title
+	 * @param $style
+	 * @param $size
+	 * @param $tag
+	 */
+	protected function renderButtonElement($title, $style, $size, $options, $tag)
+	{
+		$valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
+		$valid_sizes  = ['default', 'small', 'xsmall', 'large'];
+
+		if (! in_array($style, $valid_styles))
+		{
+			$style = 'default';
+			$options['attributes'][] = 'data-error="Invalid Style passed to button method."';
+		}
+
+		$classes = 'btn ';
+
+		// Sizes
+		switch($size)
+		{
+			case 'small':
+				$classes .= 'small ';
+				break;
+			case 'xsmall':
+				$classes .= 'tiny ';
+				break;
+			case 'large':
+				$classes .= 'large ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= '';
+				break;
+			case 'success':
+				$classes .= 'success ';
+				break;
+			case 'info':
+				$classes .= 'secondary ';
+				break;
+			case 'warning':
+				$classes .= 'alert ';
+				break;
+			case 'danger':
+				$classes .= 'alert ';
+				break;
+			case 'default':
+				$classes .= 'secondary ';
+				break;
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$tag = str_replace('{classes}', $classes, $tag);
+		$tag = str_replace('{id}', $id, $tag);
+		$tag = str_replace('{attributes}', $attributes, $tag);
+		$tag = str_replace('{title}', $title, $tag);
+
+		// If we're in a button group we need to wrap each item in li tags.
+		if (isset($this->states['inButtonGroup']))
+		{
+			$tag = '<li>'. $tag .'</li>';
+		}
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		$this->states['inButtonGroup'] = true;
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-group', true);
+
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		unset($this->states['inButtonGroup']);
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-bar', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
+
+		$output = "<a href='#' {$classes} {$id} {$attributes}>{$title} <span data-dropdown='drop'></span></a><br>\n
                   <ul id='drop' class='f-dropdown' data-dropdown-content>\n";
 
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    public function notice($content, $style='success', $closable=true, $options=[])
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' success ';
-                break;
-            case 'info':
-                $classes .= ' secondary ';
-                break;
-            case 'warning':
-                $classes .= ' alert ';
-                break;
-            case 'danger':
-                $classes .= ' alert ';
-                break;
-            case 'default':
-                $classes .= ' secondary ';
-                break;
-        }
-
-        $output = "<div data-alert class='{$classes}'>\n";
-
-        $output .= "\t$content\n";
-
-        if ($closable)
-        {
-            $output .= "\t<a href='#' class='close'>&times;</a>\n";
-        }
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	public function notice($content, $style='success', $closable=true, $options=[])
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' success ';
+				break;
+			case 'info':
+				$classes .= ' secondary ';
+				break;
+			case 'warning':
+				$classes .= ' alert ';
+				break;
+			case 'danger':
+				$classes .= ' alert ';
+				break;
+			case 'default':
+				$classes .= ' secondary ';
+				break;
+		}
+
+		$output = "<div data-alert class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }