fix scrut bugs

Author: jcheron

Ajax/bootstrap/html/HtmlGlyphicon.php

@@ -3,8 +3,8 @@
 namespace Ajax\bootstrap\html;
 
 use Ajax\common\html\HtmlSingleElement;
-use Ajax\service\PhalconUtils;
 use Ajax\bootstrap\html\base\CssGlyphicon;
+use Ajax\service\JString;
 
 /**
  * Composant Twitter Bootstrap Glyphicon
@@ -32,7 +32,7 @@ public function setGlyphicon($glyphicon) {
 			}
 		} else {
 			$glyphicon=strtolower($glyphicon);
-			if (PhalconUtils::startsWith($glyphicon, "glyphicon-")===false) {
+			if (JString::startsWith($glyphicon, "glyphicon-")===false) {
 				$glyphicon="glyphicon-".$glyphicon;
 			}
 		}

Ajax/bootstrap/html/HtmlNavbar.php

@@ -4,10 +4,10 @@
 
 use Ajax\JsUtils;
 use Ajax\bootstrap\components\Scrollspy;
-use Ajax\service\PhalconUtils;
 use Ajax\bootstrap\html\content\HtmlNavzone;
 use Ajax\bootstrap\html\base\CssNavbar;
 use Ajax\common\html\BaseHtml;
+use Ajax\common\html\html5\HtmlImg;
 /**
  * Twitter Bootstrap HTML Navbar component
  * @author jc
@@ -60,10 +60,7 @@ public function setBrandTarget($brandTarget) {
 	}
 
 	public function setBrandImage($imageSrc) {
-		$this->brandImage=PhalconUtils::image(array (
-				$imageSrc,
-				"alt" => $this->brand
-		));
+		$this->brandImage=new HtmlImg("brand-img-".$this->_identifier,$imageSrc,$this->brand);
 		$this->brand="";
 		return $this;
 	}

Ajax/bootstrap/html/HtmlPanel.php

@@ -5,7 +5,7 @@
 use Ajax\bootstrap\html\base\HtmlBsDoubleElement;
 use Ajax\bootstrap\html\base\CssRef;
 use Ajax\JsUtils;
-use Ajax\service\PhalconUtils;
+use Ajax\service\JString;
 
 /**
  * Composant Twitter Bootstrap panel
@@ -89,7 +89,7 @@ public function addFooter($content) {
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
 	 */
 	public function setStyle($cssStyle) {
-		if (!PhalconUtils::startsWith($cssStyle, "panel"))
+		if (!JString::startsWith($cssStyle, "panel"))
 			$cssStyle="panel".$cssStyle;
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
 	}

Ajax/common/html/html5/HtmlUtils.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Ajax\common\html\html5;
+
+class HtmlUtils {
+	public static function javascriptInclude($url){
+		return '<script src="'.$url.'"></script>';
+	}
+	
+	public static function stylesheetInclude($url){
+		return '<link rel="stylesheet" type="text/css" href="'.$url.'">';
+	}
+}

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

@@ -3,7 +3,6 @@
 
 use Ajax\service\JString;
 use Ajax\common\html\BaseHtml;
-use Ajax\common\html\BaseWidget;
 
 /**
  * @author jc
@@ -21,7 +20,7 @@ public function getProperties() {
 
 	/**
 	 * @param array $properties
-	 * @return BaseHtml
+	 * @return $this
 	 */
 	public function setProperties($properties) {
 		$this->_self->properties=$properties;
@@ -38,6 +37,12 @@ public function getProperty($name) {
 			return $this->_self->properties[$name];
 	}
 
+	/**
+	 * @param string $name
+	 * @param mixed $value
+	 * @param string $separator
+	 * @return $this
+	 */
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
 			foreach ( $value as $v ) {

Ajax/lib/CDNBase.php

@@ -2,7 +2,8 @@
 
 namespace Ajax\lib;
 
-use Ajax\service\PhalconUtils;
+
+use Ajax\service\JString;
 
 abstract class CDNBase {
 	protected $version;
@@ -26,7 +27,7 @@ public function getJsUrl() {
 	public function setJsUrl($jsUrl, $local=null) {
 		$this->jsUrl=$jsUrl;
 		if (isset($local)===false) {
-			$local=PhalconUtils::startsWith($jsUrl, "http")===false;
+			$local=JString::startsWith($jsUrl, "http")===false;
 		}
 		$this->setLocal($local);
 		return $this;

Ajax/lib/CDNCoreCss.php

@@ -2,7 +2,9 @@
 
 namespace Ajax\lib;
 
-use Ajax\service\PhalconUtils;
+
+use Ajax\service\JString;
+use Ajax\common\html\html5\HtmlUtils;
 
 class CDNCoreCss extends CDNBase {
 	protected $cssUrl;
@@ -26,14 +28,13 @@ public function getCss() {
 	public function __toString() {
 		$url=$this->getUrl();
 		$css=$this->getCss();
-		return PhalconUtils::javascriptInclude($url, $this->local)."\n".PhalconUtils::stylesheetLink($css, $this->localCss);
-		;
+		return HtmlUtils::javascriptInclude($url)."\n".HtmlUtils::stylesheetInclude($css);
 	}
 
 	public function setCssUrl($cssUrl, $local=null) {
 		$this->cssUrl=$cssUrl;
 		if (isset($local)===false) {
-			$local=PhalconUtils::startsWith($cssUrl, "http")===false;
+			$local=JString::startsWith($cssUrl, "http")===false;
 		}
 		$this->setLocalCss($local);
 		return $this;

Ajax/lib/CDNGuiGen.php

@@ -2,7 +2,9 @@
 
 namespace Ajax\lib;
 
-use Ajax\service\PhalconUtils;
+
+use Ajax\service\JString;
+use Ajax\common\html\html5\HtmlUtils;
 
 class CDNGuiGen extends CDNBase {
 	protected $theme;
@@ -60,13 +62,13 @@ public function getCss() {
 	public function __toString() {
 		$url=$this->getUrl();
 		$css=$this->getCss();
-		return PhalconUtils::javascriptInclude($url, $this->local)."\n".PhalconUtils::stylesheetLink($css, $this->localCss);
+		return HtmlUtils::javascriptInclude($url)."\n".HtmlUtils::stylesheetInclude($css);
 	}
 
 	public function setCssUrl($cssUrl, $local=null) {
 		$this->cssUrl=$cssUrl;
 		if (isset($local)===false) {
-			$local=PhalconUtils::startsWith($cssUrl, "http")===false;
+			$local=JString::startsWith($cssUrl, "http")===false;
 		}
 		$this->setLocalCss($local);
 		return $this;

Ajax/lib/CDNJQuery.php

@@ -2,7 +2,8 @@
 
 namespace Ajax\lib;
 
-use Ajax\service\PhalconUtils;
+
+use Ajax\common\html\html5\HtmlUtils;
 
 class CDNJQuery extends CDNBase {
 
@@ -17,6 +18,6 @@ public function getUrl() {
 
 	public function __toString() {
 		$url=$this->getUrl();
-		return PhalconUtils::javascriptInclude($url, $this->local);
+		return HtmlUtils::javascriptInclude($url);
 	}
 }