ci-bonfire / Sprint

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/BaseUIKit.php

Indentation +384 added lines, -384 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class BaseUIKit
@@ -38,228 +38,228 @@ 
  */
 abstract class BaseUIKit {
 
-    /**
-     * Bucket for methods to control their current state between method calls.
-     * @var array
-     */
-    protected $states = [];
-
-    protected $name = '';
-
-    /**
-     * Attached to nav items that are considered active.
-     * @var string
-     */
-    protected $active_class = 'active';
-
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return $this->name;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grids
-    //--------------------------------------------------------------------
-
-    /**
-     * 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
-     */
-    abstract public function row($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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
-     */
-    abstract public function column($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbar($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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
-     */
-    abstract public function navbarTitle($title, $url='#');
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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
-     */
-    abstract public function navbarRight($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    abstract public function navItem($title, $url, $options=[], $isActive=false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    abstract public function navDropdown($title,$options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    abstract public function navDivider();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function breadcrumb($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // 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
-     */
-    abstract public function button($title, $style='default', $size='default', $options=[]);
-
-    /**
-     * 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
-     */
-    abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonGroup($options, \Closure $c);
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonBar($options, \Closure $c);
-
-    /**
-     * 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
-     */
-    abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    abstract public function notice($content, $style='success', $closable=true);
+	/**
+	 * Bucket for methods to control their current state between method calls.
+	 * @var array
+	 */
+	protected $states = [];
+
+	protected $name = '';
+
+	/**
+	 * Attached to nav items that are considered active.
+	 * @var string
+	 */
+	protected $active_class = 'active';
+
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grids
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	 */
+	abstract public function row($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	 */
+	abstract public function column($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbar($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	 */
+	abstract public function navbarTitle($title, $url='#');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	 */
+	abstract public function navbarRight($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	abstract public function navItem($title, $url, $options=[], $isActive=false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	abstract public function navDropdown($title,$options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	abstract public function navDivider();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function breadcrumb($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// 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
+	 */
+	abstract public function button($title, $style='default', $size='default', $options=[]);
+
+	/**
+	 * 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
+	 */
+	abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonGroup($options, \Closure $c);
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonBar($options, \Closure $c);
+
+	/**
+	 * 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
+	 */
+	abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	abstract public function notice($content, $style='success', $closable=true);
 
 	//--------------------------------------------------------------------
 	// Forms
@@ -278,137 +278,137 @@ 
 	 */
 	abstract public function inputWrap($label_text, $options=[], \Closure $c);
 
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to run a Closure and collect the output of it.
-     *
-     * @param callable $c
-     * @return string
-     */
-    protected function runClosure(\Closure $c)
-    {
-        if (! is_callable($c)) return '';
-
-        ob_start();
-        $c();
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a single method call to get the $classes, $id, and $attributes
-     * from the options array.
-     *
-     * @param        $options
-     * @param string $initial_classes
-     * @param bool   $fullClassString
-     * @return array
-     */
-    protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
-    {
-        return [
-            $this->buildClassString($initial_classes, $options, $fullClassString),
-            $this->buildIdFromOptions($options),
-            $this->buildAttributesFromOptions($options)
-        ];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the element that is to be considered the active item. This is
-     * based on the navItem's $title so it must match, though it is NOT
-     * case sensitive.
-     *
-     * @param $title
-     * @return mixed
-     */
-    public function setActiveNavItem($title)
-    {
-        $this->states['activeNavItem'] = strtolower($title);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines an initial classes string with a 'class' item that
-     * might be available within the options array.
-     *
-     * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
-     * Otherwise, just returns the raw classes.
-     *
-     * @param string $initial
-     * @param array $options
-     * @return array
-     */
-    protected function buildClassString($initial, $options, $buildEntireString=false)
-    {
-        $classes = explode(' ', $initial);
-
-        if (isset($options['class']))
-        {
-            $classes = array_merge($classes, explode(' ', $options['class']));
-        }
-
-        if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
-            $this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
-        {
-            $classes[] = $this->active_class;
-        }
-
-        $classes = implode(' ', $classes);
-
-        // Substitute the active class for a placeholder.
-        $classes = str_replace('{active}', $this->active_class, $classes);
-
-        return $buildEntireString ? "class='{$classes}'" : $classes;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks the options array for an ID and returns the entire string.
-     *
-     * Example Return:
-     *      id='MyID'
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildIdFromOptions($options)
-    {
-        return isset($options['id']) ? "id='{$options['id']}'" : ' ';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Parses out attributes from the options array. The attributes array
-     * should all contain no key names, only values, so:
-     *
-     * 'attributes' => [
-     *      'style="width:100%",
-     *      'required'
-     * ]
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildAttributesFromOptions($options)
-    {
-        if (isset($options['attributes']) && ! is_array($options['attributes']))
-        {
-            $options['attributes'] = [ $options['attributes'] ];
-        }
-
-        return isset($options['attributes']) ? implode($options['attributes']) : '';
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to run a Closure and collect the output of it.
+	 *
+	 * @param callable $c
+	 * @return string
+	 */
+	protected function runClosure(\Closure $c)
+	{
+		if (! is_callable($c)) return '';
+
+		ob_start();
+		$c();
+		$output = ob_get_contents();
+		ob_end_clean();
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a single method call to get the $classes, $id, and $attributes
+	 * from the options array.
+	 *
+	 * @param        $options
+	 * @param string $initial_classes
+	 * @param bool   $fullClassString
+	 * @return array
+	 */
+	protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
+	{
+		return [
+			$this->buildClassString($initial_classes, $options, $fullClassString),
+			$this->buildIdFromOptions($options),
+			$this->buildAttributesFromOptions($options)
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the element that is to be considered the active item. This is
+	 * based on the navItem's $title so it must match, though it is NOT
+	 * case sensitive.
+	 *
+	 * @param $title
+	 * @return mixed
+	 */
+	public function setActiveNavItem($title)
+	{
+		$this->states['activeNavItem'] = strtolower($title);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines an initial classes string with a 'class' item that
+	 * might be available within the options array.
+	 *
+	 * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
+	 * Otherwise, just returns the raw classes.
+	 *
+	 * @param string $initial
+	 * @param array $options
+	 * @return array
+	 */
+	protected function buildClassString($initial, $options, $buildEntireString=false)
+	{
+		$classes = explode(' ', $initial);
+
+		if (isset($options['class']))
+		{
+			$classes = array_merge($classes, explode(' ', $options['class']));
+		}
+
+		if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
+			$this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
+		{
+			$classes[] = $this->active_class;
+		}
+
+		$classes = implode(' ', $classes);
+
+		// Substitute the active class for a placeholder.
+		$classes = str_replace('{active}', $this->active_class, $classes);
+
+		return $buildEntireString ? "class='{$classes}'" : $classes;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the options array for an ID and returns the entire string.
+	 *
+	 * Example Return:
+	 *      id='MyID'
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildIdFromOptions($options)
+	{
+		return isset($options['id']) ? "id='{$options['id']}'" : ' ';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses out attributes from the options array. The attributes array
+	 * should all contain no key names, only values, so:
+	 *
+	 * 'attributes' => [
+	 *      'style="width:100%",
+	 *      'required'
+	 * ]
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildAttributesFromOptions($options)
+	{
+		if (isset($options['attributes']) && ! is_array($options['attributes']))
+		{
+			$options['attributes'] = [ $options['attributes'] ];
+		}
+
+		return isset($options['attributes']) ? implode($options['attributes']) : '';
+	}
+
+	//--------------------------------------------------------------------
 }

myth/UIKits/Bootstrap.php

Indentation +544 added lines, -544 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class Bootstrap3UIKit
@@ -37,168 +37,168 @@ 
  */
 class Bootstrap extends BaseUIKit {
 
-    protected $name = 'Bootstrap3UIKit';
-
-    //--------------------------------------------------------------------
-    // 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}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        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 .= ' col-xs-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' col-sm-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' col-md-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' col-lg-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' col-xs-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' col-sm-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' col-md-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' col-lg-offset-'. $value;
-                    break;
-            }
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        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 = '';
-
-        /*
+	protected $name = 'Bootstrap3UIKit';
+
+	//--------------------------------------------------------------------
+	// 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}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		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 .= ' col-xs-'. $value;
+					break;
+				case 'm':
+					$classes .= ' col-sm-'. $value;
+					break;
+				case 'l':
+					$classes .= ' col-md-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' col-lg-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' col-xs-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' col-sm-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' col-md-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' col-lg-offset-'. $value;
+					break;
+			}
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		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 = '';
+
+		/*
          * Open the navbar
          */
-        $classes = "navbar navbar-default ";
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-                case 'inverse':
-                    $classes .= " navbar-inverse";
-            }
-        }
-
-        list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output .= "<nav {$class} {$id} {$attributes} role='navigation'>
+		$classes = "navbar navbar-default ";
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+				case 'inverse':
+					$classes .= " navbar-inverse";
+			}
+		}
+
+		list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output .= "<nav {$class} {$id} {$attributes} role='navigation'>
   <div class='container-fluid'>\n";
 
-        /*
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= "</div></nav>\n";
-
-        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 '<div class="navbar-header">
+		$output .= "</div></nav>\n";
+
+		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 '<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
@@ -207,396 +207,396 @@ 
       </button>
       <a class="navbar-brand" href="'. $url .'">'. $title .'</a>
     </div>';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * 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)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
         
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
+		$output = "<ul {$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=[], $isActive=false)
-    {
-        $this->states['activeNavTitle'] = $title;
+	/**
+	 * 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=[], $isActive=false)
+	{
+		$this->states['activeNavTitle'] = $title;
 
-        $class = $isActive ? $this->active_class : '';
+		$class = $isActive ? $this->active_class : '';
 
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
 
-        return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
-    }
+		return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * 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)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
-
-        $output = "\t<li {$classes} {$id} {$attributes}>
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
+
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#' class='dropdown-toggle' data-toggle='dropdown'>{$title} <span class='caret'></span></a>
         <ul class='dropdown-menu' role='menu'>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
+
+		$output .= "    </ul></li>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return "<li class=\"divider\"></li>\n";
+	}
 
-        $output .= "    </ul></li>\n";
+	//--------------------------------------------------------------------
 
-        return $output;
-    }
+	public function sideNav($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
 
-    //--------------------------------------------------------------------
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return "<li class=\"divider\"></li>\n";
-    }
+		$output .= $this->runClosure($c);
 
-    //--------------------------------------------------------------------
+		$output .= "</ul>\n";
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
+		return $output;
+	}
 
-        $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, 'breadcrumb', true);
-
-        $output = "<ol {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ol>\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=[])
-    {
-        $tag = "<a href='{$url}' {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 .= 'btn-sm ';
-                break;
-            case 'xsmall':
-                $classes .= 'btn-xs ';
-                break;
-            case 'large':
-                $classes .= 'btn-lg ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= 'btn-primary ';
-                break;
-            case 'success':
-                $classes .= 'btn-success ';
-                break;
-            case 'info':
-                $classes .= 'btn-info ';
-                break;
-            case 'warning':
-                $classes .= 'btn-warning ';
-                break;
-            case 'danger':
-                $classes .= 'btn-danger ';
-                break;
-            case 'default':
-                $classes .= 'btn-default ';
-                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);
-
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        $options['attributes'][] = 'role="toolbar"';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', 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)
-    {
-        $tag = "<button type='button' {classes} data-toggle='dropdown'>
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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, 'breadcrumb', true);
+
+		$output = "<ol {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ol>\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=[])
+	{
+		$tag = "<a href='{$url}' {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 .= 'btn-sm ';
+				break;
+			case 'xsmall':
+				$classes .= 'btn-xs ';
+				break;
+			case 'large':
+				$classes .= 'btn-lg ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= 'btn-primary ';
+				break;
+			case 'success':
+				$classes .= 'btn-success ';
+				break;
+			case 'info':
+				$classes .= 'btn-info ';
+				break;
+			case 'warning':
+				$classes .= 'btn-warning ';
+				break;
+			case 'danger':
+				$classes .= 'btn-danger ';
+				break;
+			case 'default':
+				$classes .= 'btn-default ';
+				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);
+
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		$options['attributes'][] = 'role="toolbar"';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', 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)
+	{
+		$tag = "<button type='button' {classes} data-toggle='dropdown'>
     {title} <span class='caret'></span>
   </button>
   <ul class='dropdown-menu' role='menu'>";
 
-        $output = $this->renderButtonElement($title, $style, $size, $options, $tag);
-
-        $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', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' alert-success ';
-                break;
-            case 'info':
-                $classes .= ' alert-info ';
-                break;
-            case 'warning':
-                $classes .= ' alert-warning ';
-                break;
-            case 'danger':
-                $classes .= ' alert-danger ';
-                break;
-            case 'default':
-                $classes .= ' text-muted ';
-                break;
-        }
-
-        $output = "<div 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->renderButtonElement($title, $style, $size, $options, $tag);
+
+		$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', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' alert-success ';
+				break;
+			case 'info':
+				$classes .= ' alert-info ';
+				break;
+			case 'warning':
+				$classes .= ' alert-warning ';
+				break;
+			case 'danger':
+				$classes .= ' alert-danger ';
+				break;
+			case 'default':
+				$classes .= ' text-muted ';
+				break;
+		}
+
+		$output = "<div class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 	//--------------------------------------------------------------------
 	// Forms

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;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/_generators/Api/ApiGenerator.php

Indentation +160 added lines, -160 removed lines

@@ -239,17 +239,17 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the new APIController - based resource with basic CRUD.
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     *
-     * @return $this
-     * @internal param $name
-     *
-     */
+	/**
+	 * Creates the new APIController - based resource with basic CRUD.
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this
+	 * @internal param $name
+	 *
+	 */
 	private function createController( $single, $plural, $version )
 	{
 		$data = [
@@ -268,44 +268,44 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the language file to accompany the controller.
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     *
-     * @return $this
-     */
+	/**
+	 * Creates the language file to accompany the controller.
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this
+	 */
 	private function createLanguage( $single, $plural, $version )
 	{
-        $data = [
-            'plural'            => $plural,
-            'single'            => $single,
-            'uc_single'         => ucfirst($single),
-            'uc_plural'         => ucfirst($plural),
-        ];
+		$data = [
+			'plural'            => $plural,
+			'single'            => $single,
+			'uc_single'         => ucfirst($single),
+			'uc_plural'         => ucfirst($plural),
+		];
 
-        $destination = APPPATH ."language/english/api_{$plural}_lang.php";
+		$destination = APPPATH ."language/english/api_{$plural}_lang.php";
 
-        return $this->copyTemplate( 'lang', $destination, $data, $this->overwrite );
+		return $this->copyTemplate( 'lang', $destination, $data, $this->overwrite );
 	}
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the API Blueprint file for that resource in
-     * APPPATH/docs/api
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     * @param $model
-     *
-     * @return $this
-     * @internal param $name
-     *
-     */
+	/**
+	 * Creates the API Blueprint file for that resource in
+	 * APPPATH/docs/api
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 * @param $model
+	 *
+	 * @return $this
+	 * @internal param $name
+	 *
+	 */
 	private function createBlueprint( $single, $plural, $version, $model )
 	{
 		$version = rtrim($version, '/');
@@ -315,10 +315,10 @@ 
 		}
 
 		// Load the model so we can use the correct table to use
-        $model = strtolower( str_replace('.php', '', $model) );
+		$model = strtolower( str_replace('.php', '', $model) );
 		$this->load->model( $model, $model, true );
 
-        $obj = $this->formatObject($model);
+		$obj = $this->formatObject($model);
 
 
 		$data = [
@@ -328,139 +328,139 @@ 
 			'uc_plural'         => ucfirst($plural),
 			'version'           => $version,
 			'site_url'          => site_url(),
-            'formatted'         => $obj
+			'formatted'         => $obj
 		];
 
 		$destination = APPPATH .'docs/api/'. $version . $plural .'.md';
 
 		$success = $this->copyTemplate( 'blueprint', $destination, $data, $this->overwrite );
 
-        if (! $this->updateTOC($plural, $version))
-        {
-            CLI::write("\tUnable to modify the toc file.", 'light_red');
-        }
+		if (! $this->updateTOC($plural, $version))
+		{
+			CLI::write("\tUnable to modify the toc file.", 'light_red');
+		}
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Modifies the _toc.ini file (or creates) for the specified Blueprint docs.
+	 *
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this|bool
+	 */
+	private function updateTOC( $plural, $version )
+	{
+		$path = APPPATH .'docs/_toc.ini';
+
+		// We need a TOC file to exist if we're going to modify it silly.
+		if (! file_exists($path))
+		{
+			if (! $this->copyTemplate('toc', $path))
+			{
+				return false;
+			}
+		}
+
+		$version = rtrim($version, '/ ');
+		if (! empty($version))
+		{
+			$version .= '/';
+		}
+
+		$ucname = ucfirst($plural);
+
+		$content = "api/{$version}{$plural}\t= {$ucname}\n";
+
+		return $this->injectIntoFile($path, $content);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a generic representation of the object from the database
+	 * table.
+	 *
+	 * @param $model
+	 *
+	 * @return string
+	 */
+	private function formatObject( $model )
+	{
+		$fields = $this->db->field_data($this->$model->table_name);
+
+		$obj = '';
+
+		foreach ($fields as $field)
+		{
+			$obj .= "\"$field->name\":  ";
 
-        return $success;
+			switch ($field->type)
+			{
+				case 'tinyint':
+					$obj .= "0,\n";
+					break;
+				case 'int':
+				case 'bigint':
+					$obj .= "1234,\n";
+					break;
+				case 'float':
+				case 'double':
+					$obj .= "123.45,\n";
+					break;
+				case 'date':
+					$obj .= date("\"Y-m-d\",\n");
+					break;
+				case 'datetime':
+					$obj .= date("\"Y-m-d H:i:s\",\n");
+					break;
+			}
+
+			if ($field->name == 'email')
+			{
+				$obj .= "\"someone@example.com\",\n";
+			}
+			else if (strpos('name', $field->name) !== false)
+			{
+				$obj .= "\"Lefty\",\n";
+			}
+			else if (in_array($field->type, ['char', 'varchar', 'text']))
+			{
+				$obj .= "\"Some default string\",\n";
+			}
+		}
+
+		return $obj;
 	}
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Modifies the _toc.ini file (or creates) for the specified Blueprint docs.
-     *
-     * @param $plural
-     * @param $version
-     *
-     * @return $this|bool
-     */
-    private function updateTOC( $plural, $version )
-    {
-        $path = APPPATH .'docs/_toc.ini';
-
-        // We need a TOC file to exist if we're going to modify it silly.
-        if (! file_exists($path))
-        {
-            if (! $this->copyTemplate('toc', $path))
-            {
-                return false;
-            }
-        }
-
-        $version = rtrim($version, '/ ');
-        if (! empty($version))
-        {
-            $version .= '/';
-        }
-
-        $ucname = ucfirst($plural);
-
-        $content = "api/{$version}{$plural}\t= {$ucname}\n";
-
-        return $this->injectIntoFile($path, $content);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a generic representation of the object from the database
-     * table.
-     *
-     * @param $model
-     *
-     * @return string
-     */
-    private function formatObject( $model )
-    {
-        $fields = $this->db->field_data($this->$model->table_name);
-
-        $obj = '';
-
-        foreach ($fields as $field)
-        {
-            $obj .= "\"$field->name\":  ";
-
-            switch ($field->type)
-            {
-                case 'tinyint':
-                    $obj .= "0,\n";
-                    break;
-                case 'int':
-                case 'bigint':
-                    $obj .= "1234,\n";
-                    break;
-                case 'float':
-                case 'double':
-                    $obj .= "123.45,\n";
-                    break;
-                case 'date':
-                    $obj .= date("\"Y-m-d\",\n");
-                    break;
-                case 'datetime':
-                    $obj .= date("\"Y-m-d H:i:s\",\n");
-                    break;
-            }
-
-            if ($field->name == 'email')
-            {
-                $obj .= "\"someone@example.com\",\n";
-            }
-            else if (strpos('name', $field->name) !== false)
-            {
-                $obj .= "\"Lefty\",\n";
-            }
-            else if (in_array($field->type, ['char', 'varchar', 'text']))
-            {
-                $obj .= "\"Some default string\",\n";
-            }
-        }
-
-        return $obj;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Modifies the routes file to include a line for the API endpoints
-     * for this resource.
-     *
-     * @param string $plural
-     * @param string $version
-     *
-     * @return $this
-     */
+	/**
+	 * Modifies the routes file to include a line for the API endpoints
+	 * for this resource.
+	 *
+	 * @param string $plural
+	 * @param string $version
+	 *
+	 * @return $this
+	 */
 	private function addRoutes( $plural, $version )
 	{
-        $path = APPPATH .'config/routes.php';
+		$path = APPPATH .'config/routes.php';
 
-        $version = rtrim($version, ', ');
-        if (! empty($version))
-        {
-            $version .='/';
-        }
+		$version = rtrim($version, ', ');
+		if (! empty($version))
+		{
+			$version .='/';
+		}
 
-        $content = "\$routes->resources('{$version}{$plural}');\n";
+		$content = "\$routes->resources('{$version}{$plural}');\n";
 
-        return $this->injectIntoFile($path, $content, ['after' => "// Auto-generated routes go here\n"]);
+		return $this->injectIntoFile($path, $content, ['after' => "// Auto-generated routes go here\n"]);
 	}
 
 	//--------------------------------------------------------------------

myth/_generators/Controller/ControllerGenerator.php

Indentation +37 added lines, -37 removed lines

@@ -203,20 +203,20 @@ 
 
 		if ( empty( $fields ) )
 		{
-            // If we have a model, we can get our fields from there
-            if (! empty($this->options['model']))
-            {
-                $fields = $this->getFieldsFromModel( $this->options['model'] );
-
-                if (empty($fields))
-                {
-                    return NULL;
-                }
-            }
-            else
-            {
-                return NULL;
-            }
+			// If we have a model, we can get our fields from there
+			if (! empty($this->options['model']))
+			{
+				$fields = $this->getFieldsFromModel( $this->options['model'] );
+
+				if (empty($fields))
+				{
+					return NULL;
+				}
+			}
+			else
+			{
+				return NULL;
+			}
 		}
 
 		$fields = explode( ' ', $fields );
@@ -277,36 +277,36 @@ 
 
 	//--------------------------------------------------------------------
 
-    private function getFieldsFromModel( $model )
-    {
-        $this->load->model($model);
+	private function getFieldsFromModel( $model )
+	{
+		$this->load->model($model);
 
-        if (! $this->db->table_exists( $this->$model->table() ))
-        {
-            return '';
-        }
+		if (! $this->db->table_exists( $this->$model->table() ))
+		{
+			return '';
+		}
 
-        $fields = $this->db->field_data( $this->$model->table() );
+		$fields = $this->db->field_data( $this->$model->table() );
 
-        $return = '';
+		$return = '';
 
-        // Prepare the fields in a string format like
-        // it would have been passed on the CLI
-        foreach ($fields as $field)
-        {
-            $temp = $field->name .':'. $field->type;
+		// Prepare the fields in a string format like
+		// it would have been passed on the CLI
+		foreach ($fields as $field)
+		{
+			$temp = $field->name .':'. $field->type;
 
-            if (! empty($field->max_length))
-            {
-                $temp .= ':'. $field->max_length;
-            }
+			if (! empty($field->max_length))
+			{
+				$temp .= ':'. $field->max_length;
+			}
 
-            $return .= ' '. $temp;
-        }
+			$return .= ' '. $temp;
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }