phpMv / phpMv-UI

Ajax/lib/CDNGuiGen.php

Braces +22 added lines, -16 removed lines

@@ -14,10 +14,11 @@ 
 		$this->data=$this->data ["JQueryUI"];
 		if (is_int($theme)) {
 			$themes=$this->getThemes();
-			if (sizeof($themes)>$theme-1)
-				$this->theme=$themes [$theme-1];
-			else
-				throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas");
+			if (sizeof($themes)>$theme-1) {
+							$this->theme=$themes [$theme-1];
+			} else {
+							throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas");
+			}
 		}
 		$this->theme=$theme;
 		$this->cssUrl=null;
@@ -28,16 +29,18 @@ 
 	}
 
 	public function getThemes($provider=NULL) {
-		if (isset($provider))
-			return $this->data [$provider] ["themes"];
-		else
-			return $this->data [$this->provider] ["themes"];
+		if (isset($provider)) {
+					return $this->data [$provider] ["themes"];
+		} else {
+					return $this->data [$this->provider] ["themes"];
+		}
 	}
 
 	public function getFirstTheme($provider=NULL) {
 		$themes=$this->getThemes($provider);
-		if (sizeof($themes)>0)
-			return $themes [0];
+		if (sizeof($themes)>0) {
+					return $themes [0];
+		}
 		return "";
 	}
 
@@ -46,14 +49,17 @@ 
 	}
 
 	public function getCss() {
-		if (isset($this->cssUrl))
-			return $this->cssUrl;
+		if (isset($this->cssUrl)) {
+					return $this->cssUrl;
+		}
 		$version=$this->version;
-		if (array_search($version, $this->getVersions())===false)
-			$version=$this->getLastVersion();
+		if (array_search($version, $this->getVersions())===false) {
+					$version=$this->getLastVersion();
+		}
 		$theme=$this->theme;
-		if (array_search($theme, $this->getThemes())===false)
-			$theme=$this->getFirstTheme();
+		if (array_search($theme, $this->getThemes())===false) {
+					$theme=$this->getFirstTheme();
+		}
 		return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme);
 	}
 

Ajax/php/cakephp/_JsUtils.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 		$viewVars=$view->viewVars;
 		if (isset($viewVars["q"]) === false) {
 			$controls=array ();
-		}else{
+		} else{
 			$controls=$viewVars["q"];
 		}
 		$controls[$identifier]=$content;

Spacing +18 added lines, -18 removed lines

@@ -8,23 +8,23 @@ 
 use Cake\Network\Response;
 use Cake\Core\App;
 
-class _JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class _JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		return Router::url($url);
 	}
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$viewVars=$view->viewVars;
-		if (isset($viewVars["q"]) === false) {
-			$controls=array ();
-		}else{
+		if (isset($viewVars["q"])===false) {
+			$controls=array();
+		} else {
 			$controls=$viewVars["q"];
 		}
 		$controls[$identifier]=$content;
 		$view->set("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->set($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->set($view_var, $output);
 	}
 
 	/**
@@ -34,18 +34,18 @@ 
 	 * @param array $params
 	 * @see \Ajax\JsUtils::forward()
 	 */
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		\ob_start();
-		if(isset($params) && !\is_array($params)){
+		if (isset($params) && !\is_array($params)) {
 			$params=[$params];
 		}
 		$url=h(Router::url(\array_merge([
 				'controller' => $controllerName,
-				'action' => $actionName],$params),false
+				'action' => $actionName], $params), false
 		));
 		$base=Router::url("/");
-		if (substr($url, 0, strlen($base)) == $base) {
-			$url = substr($url, strlen($base));
+		if (substr($url, 0, strlen($base))==$base) {
+			$url=substr($url, strlen($base));
 		}
 		$initialControllerInstance->requestAction($url);
 		$result=\ob_get_contents();
@@ -53,17 +53,17 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		$view = new View(Router::getRequest(true), new Response());
-		if(\is_array($params)){
-			foreach ($params as $k=>$v){
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		$view=new View(Router::getRequest(true), new Response());
+		if (\is_array($params)) {
+			foreach ($params as $k=>$v) {
 				$view->set($k, $v);
 			}
 		}
 		return $view->render($viewName);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return \explode("/", Router::getRequest(true)->url);
 	}
 }
\ No newline at end of file

Ajax/php/cakephp/JsUtilsComponent.php

Spacing +2 added lines, -2 removed lines

@@ -11,10 +11,10 @@
 	 * @var Ajax\php\cakephp\_JsUtils
 	 */
 	public $jquery;
-	public function initialize(array $config){
+	public function initialize(array $config) {
 		\extract($config);
 		$this->jquery=new _JsUtils();
-		if(isset($semantic)){
+		if (isset($semantic)) {
 			$this->jquery->semantic(new Semantic());
 		}
 	}

Ajax/php/micro/JsUtils.php

Spacing +12 added lines, -12 removed lines

@@ -4,34 +4,34 @@
 
 use micro\controllers\Startup;
 use micro\utils\RequestUtils;
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return RequestUtils::getUrl($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		return $initialController->forward($controller,$action,$params,true,true,true);
+	public function forward($initialController, $controller, $action, $params=array()) {
+		return $initialController->forward($controller, $action, $params, true, true, true);
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return $initialControllerInstance->loadView($viewName,$params,true);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return $initialControllerInstance->loadView($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return Startup::$urlParts;
 	}
 }
\ No newline at end of file

Ajax/semantic/html/modules/HtmlTab.php

Braces +9 added lines, -6 removed lines

@@ -67,8 +67,9 @@ 
 		if($index<$menu->count()){
 			if(isset($this->content[$index])===false){
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
-				$this->content[$index]->setContent($content);
+			} else {
+							$this->content[$index]->setContent($content);
+			}
 		}
 		return $this;
 	}
@@ -228,15 +229,17 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		if(isset($this->_bsComponent)===false) {
+					$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
-			$this->activate(0);
+		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) {
+					$this->activate(0);
+		}
 		return parent::compile($js,$view);
 	}
 }
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -14,14 +14,14 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlTab extends HtmlSemCollection{
+class HtmlTab extends HtmlSemCollection {
 
 	protected $params=array("debug"=>true);
 
-	public function __construct( $identifier, $tabs=array()){
-		parent::__construct( $identifier, "div", "");
+	public function __construct($identifier, $tabs=array()) {
+		parent::__construct($identifier, "div", "");
 		$menu=new HtmlMenu("menu".$this->identifier);
-		$menu->asTab(false)->setAttachment(NULL,Side::TOP);
+		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
 		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
@@ -31,12 +31,12 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 * @return HtmlSegment
 	 */
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
 		$title=$value;
 		$content=NULL;
-		if(\is_array($value)){
-			$title=@$value[0];$content=@$value[1];
+		if (\is_array($value)) {
+			$title=@$value[0]; $content=@$value[1];
 		}
 		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
@@ -50,9 +50,9 @@ 
 	 * @param string $datatab
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	private function createSegment($count,$content,$datatab){
+	private function createSegment($count, $content, $datatab) {
 		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
-		$segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab);
+		$segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab);
 		return $segment;
 	}
 
@@ -62,12 +62,12 @@ 
 	 * @param String $content new content
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabContent($index,$content){
+	public function setTabContent($index, $content) {
 		$menu=$this->content["menu"];
-		if($index<$menu->count()){
-			if(isset($this->content[$index])===false){
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
+			} else
 				$this->content[$index]->setContent($content);
 		}
 		return $this;
@@ -78,9 +78,9 @@ 
 	 * @param array $contents
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabsContent($contents){
+	public function setTabsContent($contents) {
 		$size=\sizeof($contents);
-		for($i=0;$i<$size;$i++){
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -91,7 +91,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function activate($index){
+	public function activate($index) {
 		$this->content["menu"]->getItem($index)->setActive(true);
 		$this->content[$index]->setActive(true);
 		return $this;
@@ -103,8 +103,8 @@ 
 	 * @param string $content
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addTab($title,$content){
-		return $this->addItem([$title,$content]);
+	public function addTab($title, $content) {
+		return $this->addItem([$title, $content]);
 	}
 
 	/**
@@ -118,13 +118,13 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->forward($initialController, $controller, $action,$params);
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
-		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params);
+		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params);
 	}
 
 	/**
@@ -137,12 +137,12 @@ 
 	 * @param $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->renderContent($initialController, $viewName,$params);
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
-		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params);
+		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
 	}
 
 
@@ -156,8 +156,8 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		return $this->addTab($title, $js->forward($initialController, $controller, $action,$params));
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		return $this->addTab($title, $js->forward($initialController, $controller, $action, $params));
 	}
 
 	/**
@@ -169,8 +169,8 @@ 
 	 * @param $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addTab($title, $js->renderContent($initialController, $viewName,$params));
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
 	public function setPointing($value=Direction::NONE) {
@@ -186,7 +186,7 @@ 
 	 * @param int $index
 	 * @return Ajax\semantic\html\content\HtmlMenuItem
 	 */
-	public function getMenuTab($index){
+	public function getMenuTab($index) {
 		return $this->content["menu"]->getItem($index);
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param int $index
 	 * @return HtmlSegment
 	 */
-	public function getTab($index){
+	public function getTab($index) {
 		return $this->content[$index];
 	}
 
@@ -204,22 +204,22 @@ 
 	 * @param HtmlMenu $menu
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setMenu($menu){
+	public function setMenu($menu) {
 		$contentSize=\sizeof($this->content);
-		for($i=0;$i<$contentSize;$i++){
-			if($menu->getItem($i)!==NULL){
-				if(isset($this->content[$i])){
-					$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
+				if (isset($this->content[$i])) {
+					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
 		$menuSize=$menu->count();
-		for($i=0;$i<$menuSize;$i++){
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if(isset($this->content[$i])===false){
+			if (isset($this->content[$i])===false) {
 				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier());
 			}
-			$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
 		$this->content["menu"]=$menu;
@@ -231,15 +231,15 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
+		if ($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/content/HtmlGridCol.php

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	public function setValue($value) {
@@ -52,7 +52,7 @@ 
 			$divider->setVertical();
 		else
 			$divider->setHorizontal();
-		$this->wrap($divider,"");
+		$this->wrap($divider, "");
 		return $divider;
 	}
 }
\ No newline at end of file

Braces +8 added lines, -6 removed lines

@@ -20,8 +20,9 @@ 
 	public function __construct($identifier, $width=NULL) {
 		parent::__construct($identifier, "div");
 		$this->setClass("column");
-		if (isset($width))
-			$this->setWidth($width);
+		if (isset($width)) {
+					$this->setWidth($width);
+		}
 	}
 
 	/**
@@ -48,10 +49,11 @@ 
 
 	public function addDivider($vertical=true, $content=NULL) {
 		$divider=new HtmlDivider("", $content);
-		if ($vertical)
-			$divider->setVertical();
-		else
-			$divider->setHorizontal();
+		if ($vertical) {
+					$divider->setVertical();
+		} else {
+					$divider->setHorizontal();
+		}
 		$this->wrap($divider,"");
 		return $divider;
 	}

Ajax/semantic/components/Popup.php

Spacing +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@ 
 	 * @return $this
 	 */
 	public function setOnShow($jsCode) {
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		return $this->setParam("exclusive", $value);
 	}
 
@@ -40,15 +40,15 @@ 
 	 * @param string $popup the css selector of the popup
 	 * @return \Ajax\semantic\components\Popup
 	 */
-	public function setPopup($popup){
+	public function setPopup($popup) {
 		return $this->setParam("popup", $popup);
 	}
 
-	public function setInline($value){
+	public function setInline($value) {
 		return $this->setParam("inline", $value);
 	}
 
-	public function setPosition($value){
+	public function setPosition($value) {
 		return $this->setParam("position", $value);
 	}
 	//TODO other events implementation

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Braces +15 added lines, -10 removed lines

@@ -32,8 +32,9 @@ 
 	}
 
 	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	public function addPopup($title="", $content="", $variation=NULL, $params=array()) {
@@ -60,8 +61,9 @@ 
 		$labelO=$label;
 		if (\is_object($label) === false) {
 			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
 		}
@@ -80,21 +82,24 @@ 
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
 	public function asLink($href=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
 		return $this->setTagName("a");
 	}
 
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
-			$status="show";
+		if ($show === true) {
+					$status="show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-	if (isset($this->_popup))
-			$this->_popup->compile($js);
+	if (isset($this->_popup)) {
+				$this->_popup->compile($js);
+	}
 		return parent::compile($js, $view);
 	}
 

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 	use BaseTrait;
 	protected $_popup=NULL;
 	protected $_dimmer=NULL;
-	protected $_params=array ();
+	protected $_params=array();
 
 
 	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
@@ -51,7 +51,7 @@ 
 	}
 
 	public function addDimmer($params=array(), $content=NULL) {
-		$dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content);
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -60,20 +60,20 @@ 
 
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$labelO=$label;
-		if (\is_object($label) === false) {
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addContent($labelO, $before);
 		return $labelO;
 	}
 
-	public function attachLabel($label,$side,$direction=Direction::NONE,$icon=NULL){
-		$label=$this->addLabel($label,true,$icon);
-		$label->setAttached($side,$direction);
+	public function attachLabel($label, $side, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
+		$label->setAttached($side, $direction);
 		return $this;
 	}
 
@@ -89,9 +89,9 @@ 
 
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
+		if ($show===true)
 			$status="show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
@@ -101,7 +101,7 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		$this->_bsComponent=$js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {

Ajax/semantic/html/modules/HtmlDropdown.php

Braces +28 added lines, -20 removed lines

@@ -71,7 +71,7 @@ 
 		}
 		if(!$item instanceof HtmlDropdownItem){
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		} elseif($itemO instanceof HtmlDropdownItem){
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -85,8 +85,9 @@ 
 	}
 
 	public function addInput($name){
-		if(!isset($name))
-			$name="input-".$this->identifier;
+		if(!isset($name)) {
+					$name="input-".$this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input=new HtmlInput($name,"hidden");
 	}
@@ -143,7 +144,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem($v)->setData($k);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -167,7 +168,7 @@ 
 		if($dropdown===false){
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else{
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
@@ -187,20 +188,24 @@ 
 	}
 
 	public function asButton($floating=false){
-		if($floating)
-			$this->addToProperty("class", "floating");
+		if($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		$this->removePropertyValue("class", "selection");
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
-			$this->addInput($name);
-		if($multiple)
-			$this->addToProperty("class", "multiple");
+		if(isset($name)) {
+					$this->addInput($name);
+		}
+		if($multiple) {
+					$this->addToProperty("class", "multiple");
+		}
 		if ($selection){
-			if($this->propertyContains("class", "button")===false)
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
+			if($this->propertyContains("class", "button")===false) {
+							$this->addToPropertyCtrl("class", "selection",array("selection"));
+			}
 		}
 		return $this;
 	}
@@ -211,8 +216,9 @@ 
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
-			$name="select-".$this->identifier;
+		if(!isset($name)) {
+					$name="select-".$this->identifier;
+		}
 		$this->input=null;
 		if($multiple){
 			$this->setProperty("multiple", true);
@@ -248,12 +254,13 @@ 
 		$value=$this->value;
 		if(isset($this->input) && isset($value)){
 			$this->input->setProperty("value", $value);
-		}else{
+		} else{
 			$this->setProperty("value", $value);
 		}
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-			if(isset($textElement))
-				$textElement->setContent($value);
+			if(isset($textElement)) {
+							$textElement->setContent($value);
+			}
 		return $this;
 	}
 
@@ -263,8 +270,9 @@ 
 	 */
 	public function run(JsUtils $js) {
 		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			if(isset($this->_bsComponent)===false) {
+							$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+			}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}

Spacing +80 added lines, -80 removed lines

@@ -13,53 +13,53 @@ 
 use Ajax\semantic\html\collections\form\traits\FieldTrait;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover");
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover");
 	protected $input;
 	protected $value;
 	protected $_associative;
 
-	public function __construct($identifier, $value="", $items=array(),$associative=true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+		$content=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 		$content->setClass("text");
 		$this->setValue($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
+		$content->wrap("", new HtmlIcon("", "dropdown"));
 		$this->content=array($content);
 		$this->tagName="div";
 		$this->_associative=$associative;
 		$this->addItems($items);
 	}
 
-	public function getField(){
+	public function getField() {
 		return $this->input;
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->input;
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image,$description);
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
-		$this->addIconP($icon,$before,$labeled);
+	public function addIcon($icon, $before=true, $labeled=false) {
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 
-	public function addIcons($icons){
+	public function addIcons($icons) {
 		$count=$this->count();
-		for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -70,26 +70,26 @@ 
 	 * @param number $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
 		$itemO=$item;
-		if(\is_array($item)){
+		if (\is_array($item)) {
 			$description=JArray::getValue($item, "description", 3);
 			$value=JArray::getValue($item, "value", 1);
 			$image=JArray::getValue($item, "image", 2);
 			$item=JArray::getValue($item, "item", 0);
 		}
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -102,11 +102,11 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
 	/**
@@ -115,15 +115,15 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon));
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
 	/**
 	 * Adds a divider item
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addDividerItem(){
+	public function addDividerItem() {
 		return $this->addItem(HtmlDropdownItem::divider());
 	}
 
@@ -133,8 +133,8 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function addHeaderItem($caption=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::header($caption,$icon));
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * @param string $color
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
-	public function addCircularLabelItem($caption,$color){
+	public function addCircularLabelItem($caption, $color) {
 		return $this->addItem(HtmlDropdownItem::circular($caption, $color));
 	}
 
@@ -152,87 +152,87 @@ 
 	 * @param string $image
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addMiniAvatarImageItem($caption,$image){
+	public function addMiniAvatarImageItem($caption, $image) {
 		return $this->addItem(HtmlDropdownItem::avatar($caption, $image));
 	}
 
-	public function addItems($items){
-		if(\is_array($items) && $this->_associative){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (\is_array($items) && $this->_associative) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 	}
 
-	public function getItem($index){
+	public function getItem($index) {
 		return $this->items[$index];
 	}
 
 	/**
 	 * @return int
 	 */
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setInline(){
-		return $this->addToPropertyCtrl("class", "inline",["inline"]);
+	public function setInline() {
+		return $this->addToPropertyCtrl("class", "inline", ["inline"]);
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
-		if($floating)
+	public function asButton($floating=false) {
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		$this->removePropertyValue("class", "selection");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple)
+		if ($multiple)
 			$this->addToProperty("class", "multiple");
-		if ($selection){
-			if($this->propertyContains("class", "button")===false)
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if ($selection) {
+			if ($this->propertyContains("class", "button")===false)
+				$this->addToPropertyCtrl("class", "selection", array("selection"));
 		}
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=true){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -240,37 +240,37 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		$this->value=$value;
 		return $this;
 	}
-	private function applyValue(){
+	private function applyValue() {
 		$value=$this->value;
-		if(isset($this->input) && isset($value)){
+		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		} else {
 			$this->setProperty("value", $value);
 		}
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-			if(isset($textElement))
+			if (isset($textElement))
 				$textElement->setContent($value);
 		return $this;
 	}
@@ -280,29 +280,29 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false)
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false)
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}
 	}
 
-	public function setCompact(){
+	public function setCompact() {
 		return $this->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function getInput() {

Doc Comments +13 added lines, -1 removed lines

@@ -24,6 +24,9 @@ 
 	protected $value;
 	protected $_associative;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $value="", $items=array(),$associative=true) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
@@ -67,7 +70,7 @@ 
 	/**
 	 * Insert an item at a position
 	 * @param mixed $item
-	 * @param number $position
+	 * @param integer $position
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown
 	 */
 	public function insertItem($item,$position=0){
@@ -168,6 +171,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public function getItem($index){
 		return $this->items[$index];
 	}
@@ -258,6 +264,9 @@ 
 		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function setValue($value){
 		$this->value=$value;
 		return $this;
@@ -292,6 +301,9 @@ 
 		return $this->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function setAction($action){
 		$this->_params["action"]=$action;
 	}