ci-bonfire / Sprint

myth/Themers/escape.php

Indentation +69 added lines, -69 removed lines

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

myth/UIKits/Foundation.php

Indentation +574 added lines, -574 removed lines

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

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

myth/_generators/Controller/controller.tpl.php

Indentation +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 
 if (! empty($model) )
 {
-    $index_method = <<<EOD
+	$index_method = <<<EOD
 \$this->load->library('table');
 
         \$offset = \$this->uri->segment( \$this->uri->total_segments() );
@@ -44,7 +44,7 @@ 
 
 if (! empty($model))
 {
-    $create_method = <<<EOD
+	$create_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -72,7 +72,7 @@ 
 
 if (! empty($model))
 {
-    $show_method = <<<EOD
+	$show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
 
         if (! \$item)
@@ -94,7 +94,7 @@ 
 
 if (! empty($model))
 {
-    $update_method = <<<EOD
+	$update_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -125,7 +125,7 @@ 
 
 if (! empty($model))
 {
-    $delete_method = <<<EOD
+	$delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))
         {
             \$this->setMessage('Successfully deleted item.', 'success');
@@ -145,12 +145,12 @@ 
 
 if ($themed)
 {
-    $index_method   .= "\$this->render();";
-    $create_method  .= "\$this->render();";
-    $show_method    .= "\$this->render();";
-    $update_method  .= "\$this->render();";
+	$index_method   .= "\$this->render();";
+	$create_method  .= "\$this->render();";
+	$show_method    .= "\$this->render();";
+	$update_method  .= "\$this->render();";
 
-    $fields = "
+	$fields = "
     /**
      * Allows per-controller override of theme.
      * @var null

myth/_generators/Controller/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
+	'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
 ];
 
 $long_description = <<<EOT

myth/_generators/Controller/view_create.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -4,43 +4,43 @@
 
 <?= $uikit->row([], function() use($uikit, $fields) {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
-
-        foreach ($fields as $field)
-        {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
-
-                switch ($field['type'])
-                {
-                    case 'text':
-                        echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-
-    });
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
+
+		foreach ($fields as $field)
+		{
+			echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+
+				switch ($field['type'])
+				{
+					case 'text':
+						echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+
+	});
 
 }); ?>
 

myth/_generators/Controller/view_update.tpl.php

Indentation +39 added lines, -39 removed lines

@@ -5,45 +5,45 @@
 <?= $uikit->row([], function() use($uikit, $fields)
 {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column( [ 'sizes' => $sizes ], function () use ( $uikit, $fields )
-    {
-
-        foreach ( $fields as $field )
-        {
-
-            echo $uikit->inputWrap( humanize( $field['name'] ), NULL, function () use ( $uikit, $field )
-            {
-
-                switch ( $field['type'] )
-                {
-                    case 'text':
-                        echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('" . $field["name"] . "') ?></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-    } );
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column( [ 'sizes' => $sizes ], function () use ( $uikit, $fields )
+	{
+
+		foreach ( $fields as $field )
+		{
+
+			echo $uikit->inputWrap( humanize( $field['name'] ), NULL, function () use ( $uikit, $field )
+			{
+
+				switch ( $field['type'] )
+				{
+					case 'text':
+						echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('" . $field["name"] . "') ?></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+	} );
 } );
 ?>
 

myth/_generators/Migration/migration.tpl.php

Indentation +11 added lines, -11 removed lines

@@ -12,21 +12,21 @@ 
  */
 if ($action == 'create')
 {
-    $up = "\$fields = {$fields};
+	$up = "\$fields = {$fields};
 
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
-    {
-        $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
+	if (! empty($primary_key))
+	{
+		$up .= "        \$this->dbforge->add_key('{$primary_key}', true);
 ";
-    }
+	}
 
-    $up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
+	$up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
     ";
 
-    $down = "\$this->dbforge->drop_table('{$table}');";
+	$down = "\$this->dbforge->drop_table('{$table}');";
 }
 
 /*
@@ -34,10 +34,10 @@ 
  */
 if ($action == 'add' && ! empty($column))
 {
-    $up = "\$field = {$column_string};
+	$up = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 
-    $down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 }
 
 /*
@@ -45,9 +45,9 @@ 
  */
 if ($action == 'remove' && ! empty($column))
 {
-    $up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 
-    $down = "\$field = {$column_string};
+	$down = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 }