x-systems / epesi-core

src/Layout/LayoutView.php

Indentation +80 added lines, -80 removed lines

@@ -30,51 +30,51 @@ 
  */
 class LayoutView extends ModuleView
 {
-    /**
-     * @var View\NavMenu
-     */
-    public $menuLeft;    // vertical menu
+	/**
+	 * @var View\NavMenu
+	 */
+	public $menuLeft;    // vertical menu
        
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menu;        // horizontal menu
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menu;        // horizontal menu
     
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuRight;   // vertical pull-down
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuRight;   // vertical pull-down
        
-    /**
-     * @var View\ActionBar
-     */
-    public $actionBar;   
-    public $locationBar;
+	/**
+	 * @var View\ActionBar
+	 */
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
         
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();  
-        $this->setMenuRight();
+		$this->setMenuLeft();  
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -83,25 +83,25 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see \Epesi\Core\Controller::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see \Epesi\Core\Controller::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see \Epesi\Core\Controller::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -144,52 +144,52 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
+		$this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
 
-    	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
+		$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -33,17 +33,17 @@ 
     /**
      * @var View\NavMenu
      */
-    public $menuLeft;    // vertical menu
+    public $menuLeft; // vertical menu
        
     /**
      * @var \atk4\ui\Menu
      */
-    public $menu;        // horizontal menu
+    public $menu; // horizontal menu
     
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuRight;   // vertical pull-down
+    public $menuRight; // vertical pull-down
        
     /**
      * @var View\ActionBar
@@ -51,7 +51,7 @@ 
     public $actionBar;   
     public $locationBar;
     
-    public $burger = true;      // burger menu item
+    public $burger = true; // burger menu item
 
     /*
      * Whether or not left Menu is visible on Page load.
@@ -104,7 +104,7 @@ 
         $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
-		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
+		$this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]);
 	}
 
 	public function setLocation($crumbs)
@@ -150,20 +150,20 @@ 
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (!$this->burger) return;
 
-        if (! session()->get('menu', 1)) {
+        if (!session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
         }
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
+        $this->burger->add(['Icon', 'content'])->on('click', [
         		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
         		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
         		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
         		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
+        			session()->put('menu', $visible ? 1 : 0);
         			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+        		}, [new \atk4\ui\jsExpression('$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0')])
         ]);
     }
     

Braces +15 added lines, -5 removed lines

@@ -87,7 +87,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
  
         $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
@@ -137,7 +139,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new View\RightMenu([
 				'ui' => false
@@ -146,11 +150,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         if (! session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
@@ -169,7 +177,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
 
     	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	

src/Data/Persistence/SQL.php

Indentation +16 added lines, -16 removed lines

@@ -7,22 +7,22 @@
 
 class SQL extends \atk4\data\Persistence\SQL
 {
-    /**
-     * Take a laravel connection and pass it to ATK Data
-     *
-     * @param \Illuminate\Database\DatabaseManager $db The Laravel database manager
-     *
-     * @return \atk4\data\Persistence_SQL
-     * @throws \atk4\data\Exception
-     * @throws \atk4\dsql\Exception
-     */
-    public function __construct(DatabaseManager $database)
-    {
-    	$pdo = $database->connection()->getPdo();
+	/**
+	 * Take a laravel connection and pass it to ATK Data
+	 *
+	 * @param \Illuminate\Database\DatabaseManager $db The Laravel database manager
+	 *
+	 * @return \atk4\data\Persistence_SQL
+	 * @throws \atk4\data\Exception
+	 * @throws \atk4\dsql\Exception
+	 */
+	public function __construct(DatabaseManager $database)
+	{
+		$pdo = $database->connection()->getPdo();
     	
-    	// temporary fix of atk4/data inability to handle PREPARE on 'is null'
-    	$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
+		// temporary fix of atk4/data inability to handle PREPARE on 'is null'
+		$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
 
-    	parent::__construct(Connection::connect($pdo));
-    }
+		parent::__construct(Connection::connect($pdo));
+	}
 }