@@ -16,8 +16,9 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
| 18 | 18 | if ($library!=NULL) { |
| 19 | - if(isset($view)) |
|
| 20 | - $library->compileHtml($this, $view); |
|
| 19 | + if(isset($view)) { |
|
| 20 | + $library->compileHtml($this, $view); |
|
| 21 | + } |
|
| 21 | 22 | if ($library->isAutoCompile()) { |
| 22 | 23 | $library->compile(true); |
| 23 | 24 | } |
@@ -37,7 +38,9 @@ discard block |
||
| 37 | 38 | } |
| 38 | 39 | |
| 39 | 40 | protected function minify($input) { |
| 40 | - if(trim($input) === "") return $input; |
|
| 41 | + if(trim($input) === "") { |
|
| 42 | + return $input; |
|
| 43 | + } |
|
| 41 | 44 | return preg_replace( |
| 42 | 45 | array( |
| 43 | 46 | // Remove comment(s) |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | namespace Ajax\common\traits; |
| 3 | 3 | use Ajax\common\BaseGui; |
| 4 | 4 | |
| 5 | -trait JsUtilsInternalTrait{ |
|
| 5 | +trait JsUtilsInternalTrait { |
|
| 6 | 6 | |
| 7 | - protected $jquery_code_for_compile=array (); |
|
| 8 | - protected $jquery_code_for_compile_at_last=array (); |
|
| 7 | + protected $jquery_code_for_compile=array(); |
|
| 8 | + protected $jquery_code_for_compile_at_last=array(); |
|
| 9 | 9 | |
| 10 | 10 | protected function _addToCompile($jsScript) { |
| 11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,9 +15,9 @@ discard block |
||
| 15 | 15 | * @param BaseGui $library |
| 16 | 16 | * @param mixed $view |
| 17 | 17 | */ |
| 18 | - protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
|
| 18 | + protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) { |
|
| 19 | 19 | if ($library!=NULL) { |
| 20 | - if(isset($view)) |
|
| 20 | + if (isset($view)) |
|
| 21 | 21 | $library->compileHtml($this, $view); |
| 22 | 22 | if ($library->isAutoCompile()) { |
| 23 | 23 | $library->compile(true); |
@@ -25,20 +25,20 @@ discard block |
||
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - protected function defer($script){ |
|
| 28 | + protected function defer($script) { |
|
| 29 | 29 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
| 30 | 30 | $result.="window.defer(function(){".$script."})"; |
| 31 | 31 | return $result; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - protected function ready($script){ |
|
| 34 | + protected function ready($script) { |
|
| 35 | 35 | $result='$(document).ready(function() {'."\n"; |
| 36 | 36 | $result.=$script.'})'; |
| 37 | 37 | return $result; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | protected function minify($input) { |
| 41 | - if(trim($input) === "") return $input; |
|
| 41 | + if (trim($input)==="") return $input; |
|
| 42 | 42 | return preg_replace( |
| 43 | 43 | array( |
| 44 | 44 | // Remove comment(s) |
@@ -7,6 +7,11 @@ |
||
| 7 | 7 | use Ajax\common\html\HtmlDoubleElement; |
| 8 | 8 | |
| 9 | 9 | trait AttachedTrait { |
| 10 | + |
|
| 11 | + /** |
|
| 12 | + * @param string $name |
|
| 13 | + * @param string $value |
|
| 14 | + */ |
|
| 10 | 15 | abstract public function addToPropertyCtrl($name, $value, $typeCtrl); |
| 11 | 16 | /** |
| 12 | 17 | * @param HtmlSemDoubleElement $toElement |
@@ -17,6 +17,6 @@ |
||
| 17 | 17 | if (isset($toElement) && \method_exists($toElement, "setAttached")) { |
| 18 | 18 | $toElement->setAttached(true); |
| 19 | 19 | } |
| 20 | - return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached")); |
|
| 20 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
| 21 | 21 | } |
| 22 | 22 | } |
@@ -2,5 +2,5 @@ |
||
| 2 | 2 | namespace Ajax\semantic\html\base\constants; |
| 3 | 3 | use Ajax\common\BaseEnum; |
| 4 | 4 | abstract class Social extends BaseEnum { |
| 5 | - const FACEBOOK="facebook", TWITTER="twitter",GOOGLEPLUS="google plus",VK="vk",LINKEDIN="linkedin",INSTAGRAM="instagram",YOUTUBE="youtube",GITHUB="github"; |
|
| 5 | + const FACEBOOK="facebook", TWITTER="twitter", GOOGLEPLUS="google plus", VK="vk", LINKEDIN="linkedin", INSTAGRAM="instagram", YOUTUBE="youtube", GITHUB="github"; |
|
| 6 | 6 | } |
@@ -27,11 +27,11 @@ discard block |
||
| 27 | 27 | * @return $this |
| 28 | 28 | */ |
| 29 | 29 | public function setOnShow($jsCode) { |
| 30 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
| 30 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
| 31 | 31 | return $this->setParam("onShow", "%function(){".$jsCode."}%"); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function setExclusive($value){ |
|
| 34 | + public function setExclusive($value) { |
|
| 35 | 35 | return $this->setParam("exclusive", $value); |
| 36 | 36 | } |
| 37 | 37 | |
@@ -40,19 +40,19 @@ discard block |
||
| 40 | 40 | * @param string $popup the css selector of the popup |
| 41 | 41 | * @return \Ajax\semantic\components\Popup |
| 42 | 42 | */ |
| 43 | - public function setPopup($popup){ |
|
| 43 | + public function setPopup($popup) { |
|
| 44 | 44 | return $this->setParam("popup", $popup); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function setInline($value){ |
|
| 47 | + public function setInline($value) { |
|
| 48 | 48 | return $this->setParam("inline", $value); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function setPosition($value){ |
|
| 51 | + public function setPosition($value) { |
|
| 52 | 52 | return $this->setParam("position", $value); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function setSetFluidWidth($value){ |
|
| 55 | + public function setSetFluidWidth($value) { |
|
| 56 | 56 | return $this->setParam("setFluidWidth", $value); |
| 57 | 57 | } |
| 58 | 58 | } |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | * @param array $instances |
| 19 | 19 | * @return DataTable |
| 20 | 20 | */ |
| 21 | - public function dataTable($identifier,$model, $instances){ |
|
| 22 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
| 21 | + public function dataTable($identifier, $model, $instances) { |
|
| 22 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | * @param array $instances |
| 29 | 29 | * @return JsonDataTable |
| 30 | 30 | */ |
| 31 | - public function jsonDataTable($identifier,$model, $instances){ |
|
| 32 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
| 31 | + public function jsonDataTable($identifier, $model, $instances) { |
|
| 32 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | * @param object $instance |
| 38 | 38 | * @return DataElement |
| 39 | 39 | */ |
| 40 | - public function dataElement($identifier, $instance){ |
|
| 41 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
| 40 | + public function dataElement($identifier, $instance) { |
|
| 41 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | * @param object $instance |
| 47 | 47 | * @return DataForm |
| 48 | 48 | */ |
| 49 | - public function dataForm($identifier, $instance){ |
|
| 50 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
| 49 | + public function dataForm($identifier, $instance) { |
|
| 50 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -55,8 +55,8 @@ discard block |
||
| 55 | 55 | * @param object $instance |
| 56 | 56 | * @return FormLogin |
| 57 | 57 | */ |
| 58 | - public function defaultLogin($identifier,$instance=null){ |
|
| 59 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
| 58 | + public function defaultLogin($identifier, $instance=null) { |
|
| 59 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | * @param object $instance |
| 65 | 65 | * @return FormLogin |
| 66 | 66 | */ |
| 67 | - public function smallLogin($identifier,$instance=null){ |
|
| 68 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
| 67 | + public function smallLogin($identifier, $instance=null) { |
|
| 68 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | * @param object $instance |
| 74 | 74 | * @return FormLogin |
| 75 | 75 | */ |
| 76 | - public function segmentedLogin($identifier,$instance=null){ |
|
| 77 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
| 76 | + public function segmentedLogin($identifier, $instance=null) { |
|
| 77 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @param object $instance |
| 83 | 83 | * @return FormAccount |
| 84 | 84 | */ |
| 85 | - public function defaultAccount($identifier,$instance=null){ |
|
| 86 | - return $this->addHtmlComponent(FormAccount::regular($identifier,$instance)); |
|
| 85 | + public function defaultAccount($identifier, $instance=null) { |
|
| 86 | + return $this->addHtmlComponent(FormAccount::regular($identifier, $instance)); |
|
| 87 | 87 | } |
| 88 | 88 | } |
@@ -7,26 +7,26 @@ |
||
| 7 | 7 | |
| 8 | 8 | class HtmlFormDropdown extends HtmlFormField { |
| 9 | 9 | |
| 10 | - public function __construct($identifier,$items=array(), $label=NULL,$value="",$multiple=false,$associative=true) { |
|
| 11 | - parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label); |
|
| 10 | + public function __construct($identifier, $items=array(), $label=NULL, $value="", $multiple=false, $associative=true) { |
|
| 11 | + parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label); |
|
| 12 | 12 | $this->_identifier=$identifier; |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - public function setItems($items){ |
|
| 15 | + public function setItems($items) { |
|
| 16 | 16 | return $this->getField()->setItems($items); |
| 17 | 17 | } |
| 18 | - public function addItem($item,$value=NULL,$image=NULL){ |
|
| 19 | - return $this->getField()->addItem($item,$value,$image); |
|
| 18 | + public function addItem($item, $value=NULL, $image=NULL) { |
|
| 19 | + return $this->getField()->addItem($item, $value, $image); |
|
| 20 | 20 | } |
| 21 | - public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value="",$associative=true){ |
|
| 22 | - return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative); |
|
| 21 | + public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) { |
|
| 22 | + return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function getDataField(){ |
|
| 25 | + public function getDataField() { |
|
| 26 | 26 | return $this->getField()->getInput(); |
| 27 | 27 | } |
| 28 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
| 29 | - $this->getField()->asSelect($name,$multiple,$selection); |
|
| 28 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
| 29 | + $this->getField()->asSelect($name, $multiple, $selection); |
|
| 30 | 30 | return $this; |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -10,61 +10,61 @@ |
||
| 10 | 10 | * @param string $identifier |
| 11 | 11 | * @param object $modelInstance |
| 12 | 12 | */ |
| 13 | - public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) { |
|
| 14 | - parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators); |
|
| 13 | + public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) { |
|
| 14 | + parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - protected function getDefaultModelInstance(){ |
|
| 17 | + protected function getDefaultModelInstance() { |
|
| 18 | 18 | return new UserModel(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public static function regular($identifier,$modelInstance=null){ |
|
| 22 | - return new FormAccount($identifier,$modelInstance, |
|
| 23 | - ["message","login","password","passwordConf","email","submit","error"], |
|
| 21 | + public static function regular($identifier, $modelInstance=null) { |
|
| 22 | + return new FormAccount($identifier, $modelInstance, |
|
| 23 | + ["message", "login", "password", "passwordConf", "email", "submit", "error"], |
|
| 24 | 24 | ["message"=>[["icon"=>"sign in"]], |
| 25 | 25 | "input0"=>[["rules"=>"empty"]], |
| 26 | - "input1"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty']]], |
|
| 27 | - "input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
| 26 | + "input1"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty']]], |
|
| 27 | + "input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
| 28 | 28 | "input3"=>[["rules"=>"email"]], |
| 29 | 29 | "submit"=>["green fluid"], |
| 30 | 30 | "message2"=>[["error"=>true]]], |
| 31 | - ["Account","login","password","passwordConf","email","submit","error"], |
|
| 32 | - ["Please enter your account informations","Login","Password","Password confirmation","Email address","Creation"], |
|
| 33 | - [0,1,3,4,5,6]); |
|
| 31 | + ["Account", "login", "password", "passwordConf", "email", "submit", "error"], |
|
| 32 | + ["Please enter your account informations", "Login", "Password", "Password confirmation", "Email address", "Creation"], |
|
| 33 | + [0, 1, 3, 4, 5, 6]); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public static function smallInline($identifier,$modelInstance=null){ |
|
| 37 | - $result=new FormAccount($identifier,$modelInstance, |
|
| 38 | - ["login","password","submit"], |
|
| 39 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
| 40 | - ["login","password","submit"], |
|
| 41 | - ["","","Connection"], |
|
| 36 | + public static function smallInline($identifier, $modelInstance=null) { |
|
| 37 | + $result=new FormAccount($identifier, $modelInstance, |
|
| 38 | + ["login", "password", "submit"], |
|
| 39 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
| 40 | + ["login", "password", "submit"], |
|
| 41 | + ["", "", "Connection"], |
|
| 42 | 42 | [2]); |
| 43 | 43 | $result->addDividerBefore(0, "Connection"); |
| 44 | 44 | return $result; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public static function small($identifier,$modelInstance=null){ |
|
| 48 | - $result=new FormAccount($identifier,$modelInstance, |
|
| 49 | - ["login","password","passwordConf","email","submit"], |
|
| 47 | + public static function small($identifier, $modelInstance=null) { |
|
| 48 | + $result=new FormAccount($identifier, $modelInstance, |
|
| 49 | + ["login", "password", "passwordConf", "email", "submit"], |
|
| 50 | 50 | [ |
| 51 | 51 | "input0"=>[["rules"=>"empty"]], |
| 52 | - "input1"=>[["inputType"=>"password","rules"=>['minLength[6]', 'empty']]], |
|
| 53 | - "input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
| 52 | + "input1"=>[["inputType"=>"password", "rules"=>['minLength[6]', 'empty']]], |
|
| 53 | + "input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
| 54 | 54 | "input3"=>[["rules"=>"email"]], |
| 55 | 55 | "submit"=>["green basic"]], |
| 56 | - ["login","password","passwordConf","email","submit"], |
|
| 57 | - ["Login","Password","Password confirmation","Email address","Creation"], |
|
| 58 | - [1,2]); |
|
| 56 | + ["login", "password", "passwordConf", "email", "submit"], |
|
| 57 | + ["Login", "Password", "Password confirmation", "Email address", "Creation"], |
|
| 58 | + [1, 2]); |
|
| 59 | 59 | $result->addDividerBefore(0, "Creation"); |
| 60 | 60 | return $result; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - public static function attachedSegment($identifier,$modelInstance=null){ |
|
| 64 | - $result=self::regular($identifier,$modelInstance); |
|
| 65 | - $result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]); |
|
| 66 | - $result->addWrapper("message",null,"<div class='ui attached segment'>"); |
|
| 67 | - $result->addWrapper("error", null,"</div>"); |
|
| 63 | + public static function attachedSegment($identifier, $modelInstance=null) { |
|
| 64 | + $result=self::regular($identifier, $modelInstance); |
|
| 65 | + $result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]); |
|
| 66 | + $result->addWrapper("message", null, "<div class='ui attached segment'>"); |
|
| 67 | + $result->addWrapper("error", null, "</div>"); |
|
| 68 | 68 | return $result; |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | trait LabeledIconTrait { |
| 14 | 14 | |
| 15 | 15 | abstract public function addToProperty($name, $value, $separator=" "); |
| 16 | - abstract public function addContent($content,$before=false); |
|
| 16 | + abstract public function addContent($content, $before=false); |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Adds an icon before or after |
@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | * @param boolean $labeled |
| 23 | 23 | * @return \Ajax\semantic\html\elements\HtmlIcon |
| 24 | 24 | */ |
| 25 | - public function addIcon($icon,$before=true,$labeled=false){ |
|
| 25 | + public function addIcon($icon, $before=true, $labeled=false) { |
|
| 26 | 26 | $iconO=$icon; |
| 27 | - if(\is_string($icon)){ |
|
| 27 | + if (\is_string($icon)) { |
|
| 28 | 28 | $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
| 29 | 29 | } |
| 30 | - if($labeled!==false){ |
|
| 31 | - $direction=($before===true)?Direction::LEFT:Direction::RIGHT; |
|
| 30 | + if ($labeled!==false) { |
|
| 31 | + $direction=($before===true) ?Direction::LEFT : Direction::RIGHT; |
|
| 32 | 32 | $this->addToProperty("class", $direction." labeled icon"); |
| 33 | 33 | $this->tagName="div"; |
| 34 | 34 | } |
| 35 | - $this->addContent($iconO,$before); |
|
| 35 | + $this->addContent($iconO, $before); |
|
| 36 | 36 | return $iconO; |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -16,16 +16,16 @@ |
||
| 16 | 16 | return $this; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function showDimmer(){ |
|
| 19 | + public function showDimmer() { |
|
| 20 | 20 | return $this->setBehavior("hide dimmer"); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function setInverted(){ |
|
| 23 | + public function setInverted() { |
|
| 24 | 24 | $this->params["inverted"]=true; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function setOnHidden($jsCode) { |
| 28 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
| 28 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
| 29 | 29 | return $this->setParam("onHidden", "%function(){".$jsCode."}%"); |
| 30 | 30 | } |
| 31 | 31 | } |