closing tags

technicalguru · technicalguru · commit a097ade7af36 · 2022-06-15T13:31:06.000+02:00
diff --git a/src/WebApp/BootstrapTheme/DefaultLayout.php b/src/WebApp/BootstrapTheme/DefaultLayout.php
@@ -21,34 +21,34 @@ protected function getBootstrapUri() {
 
 	protected function renderLinks() {
 		$webroot = $this->app->request->webRoot;
-		$rc  = '<link rel="stylesheet" href="'.$webroot.FontAwesome::getUri().'" type="text/css">'.
-		       '<link rel="stylesheet" href="'.$this->getBootstrapUri().'" type="text/css">';
+		$rc  = '<link rel="stylesheet" href="'.$webroot.FontAwesome::getUri().'" type="text/css"/>'.
+		       '<link rel="stylesheet" href="'.$this->getBootstrapUri().'" type="text/css"/>';
 		if ($this->theme->hasFeature(BootstrapTheme::DATEPICKER)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::DATERANGEPICKER)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-daterangepicker.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-daterangepicker.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::MULTISELECT)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::FILEUPLOAD)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::MULTIIMAGEUPLOAD) || $this->theme->hasFeature(BootstrapTheme::IMAGEUPLOAD)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::REMOTESEARCH)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::DYNAMICFIELDS)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" type="text/css"/>';
 		}
 		if ($this->theme->hasFeature(BootstrapTheme::CROPPERJS)) {
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" type="text/css">';
-			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" type="text/css">';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" type="text/css"/>';
+			$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" type="text/css"/>';
 		}
-		$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" type="text/css">';
+		$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" type="text/css"/>';
 		$rc .= parent::renderLinks();
 		return $rc;
 	}
diff --git a/src/WebApp/BootstrapTheme/MmenuLayout.php b/src/WebApp/BootstrapTheme/MmenuLayout.php
@@ -44,7 +44,7 @@ public function getCssPath() {
 
 	protected function renderLinks() {
 		$rc  = parent::renderLinks();
-		$rc .= '<link rel="stylesheet" href="'.$this->getCssPath().'" type="text/css">';
+		$rc .= '<link rel="stylesheet" href="'.$this->getCssPath().'" type="text/css"/>';
 		return $rc;
 	}
 
diff --git a/src/WebApp/DefaultTheme/DefaultLayout.php b/src/WebApp/DefaultTheme/DefaultLayout.php
@@ -10,8 +10,8 @@ public function __construct($theme, $page) {
 	}
 
 	protected function renderLinks() {
-		$rc  = '<link rel="stylesheet" href="'.\WebApp\Utils::getCssBaseUrl().'/app.css" type="text/css">'.
-		       '<link rel="stylesheet" href="'.\TgFontAwesome\FontAwesome::getUri().'" type="text/css">';
+		$rc  = '<link rel="stylesheet" href="'.\WebApp\Utils::getCssBaseUrl().'/app.css" type="text/css"/>'.
+		       '<link rel="stylesheet" href="'.\TgFontAwesome\FontAwesome::getUri().'" type="text/css"/>';
 		$rc .= parent::renderLinks();
 		return $rc;
 	}
diff --git a/src/WebApp/DefaultTheme/PaginationRenderer.php b/src/WebApp/DefaultTheme/PaginationRenderer.php
@@ -85,7 +85,7 @@ protected function renderShowAllCheck() {
 		} else {
 			$pageLink .= '&showAll=showAll';
 		}
-		return '<li class="page-item" style="padding:0.5em 1em;"><input id="paginationShowAll" type="checkbox" name="showAll" value="showAll"'.$checked.' onChange="webApp.showSpinner(); window.location=\''.htmlentities($pageLink).'\';"></input> <label for="paginationShowAll">'.I18N::_('show_all').'</label></li>';
+		return '<li class="page-item" style="padding:0.5em 1em;"><input id="paginationShowAll" type="checkbox" name="showAll" value="showAll"'.$checked.' onChange="webApp.showSpinner(); window.location=\''.htmlentities($pageLink).'\';"> <label for="paginationShowAll">'.I18N::_('show_all').'</label></li>';
 	}
 
 }
diff --git a/src/WebApp/Layout.php b/src/WebApp/Layout.php
@@ -28,7 +28,7 @@ public function renderPage() {
 	}
 
 	protected function renderDocumentBegin() {
-		return '<!doctype html><html lang="'.I18N::$defaultLangCode.'">';
+		return '<!DOCTYPE html><html lang="'.I18N::$defaultLangCode.'">';
 	}
 
 	protected function renderDocumentEnd() {
@@ -52,7 +52,7 @@ protected function renderOtherHeader() {
 	}
 
 	protected function renderMeta() {
-		$rc = '<meta charset="utf-8">';
+		$rc = '<meta charset="utf-8"/>';
 
 		// Meta
 		$meta = $this->page->getMeta();
@@ -67,13 +67,13 @@ protected function renderMeta() {
 
 		foreach ($meta AS $name => $content) {
 			$s   = is_array($content) ? implode(',', $content) : $content;
-			$rc .= '<meta name="'.$name.'" content="'.htmlentities($s).'">';
+			$rc .= '<meta name="'.$name.'" content="'.htmlentities($s).'"/>';
 		}
 
 		// Alternates
 		foreach ($this->app->router->getLanguages() AS $key => $label) {
 			if ($key != $this->app->request->language) {
-				$rc .= '<meta name="alternate" hreflang="'.$key.'" content="'.htmlentities($this->app->router->getCanonicalPath(NULL, $key).$params).'">';
+				$rc .= '<meta name="alternate" hreflang="'.$key.'" content="'.htmlentities($this->app->router->getCanonicalPath(NULL, $key).$params).'"/>';
 			}
 		}
 
@@ -89,7 +89,7 @@ protected function renderLinks() {
 			//if (strpos($file, '://') === FALSE) {
 			//	$rc .= '<link rel="stylesheet" href="'.Utils::getCssBaseUrl().'/'.$file.'" type="text/css">';
 			//} else {
-				$rc .= '<link rel="stylesheet" href="'.$file.'" type="text/css">';
+				$rc .= '<link rel="stylesheet" href="'.$file.'" type="text/css"/>';
 			//}
 		}
 		return $rc;

Original file line number	Diff line number	Diff line change
`@@ -21,34 +21,34 @@ protected function getBootstrapUri() {`
`21`	`21`
`22`	`22`	`protected function renderLinks() {`
`23`	`23`	`$webroot = $this->app->request->webRoot;`
`24`		`- $rc = '<link rel="stylesheet" href="'.$webroot.FontAwesome::getUri().'" type="text/css">'.`
`25`		`- '<link rel="stylesheet" href="'.$this->getBootstrapUri().'" type="text/css">';`
	`24`	`+ $rc = '<link rel="stylesheet" href="'.$webroot.FontAwesome::getUri().'" type="text/css"/>'.`
	`25`	`+ '<link rel="stylesheet" href="'.$this->getBootstrapUri().'" type="text/css"/>';`
`26`	`26`	`if ($this->theme->hasFeature(BootstrapTheme::DATEPICKER)) {`
`27`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';`
	`27`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css"/>';`
`28`	`28`	`}`
`29`	`29`	`if ($this->theme->hasFeature(BootstrapTheme::DATERANGEPICKER)) {`
`30`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-daterangepicker.css', TRUE).'" type="text/css">';`
	`30`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-daterangepicker.css', TRUE).'" type="text/css"/>';`
`31`	`31`	`}`
`32`	`32`	`if ($this->theme->hasFeature(BootstrapTheme::MULTISELECT)) {`
`33`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" type="text/css">';`
	`33`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" type="text/css"/>';`
`34`	`34`	`}`
`35`	`35`	`if ($this->theme->hasFeature(BootstrapTheme::FILEUPLOAD)) {`
`36`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';`
	`36`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css"/>';`
`37`	`37`	`}`
`38`	`38`	`if ($this->theme->hasFeature(BootstrapTheme::MULTIIMAGEUPLOAD) \|\| $this->theme->hasFeature(BootstrapTheme::IMAGEUPLOAD)) {`
`39`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" type="text/css">';`
	`39`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" type="text/css"/>';`
`40`	`40`	`}`
`41`	`41`	`if ($this->theme->hasFeature(BootstrapTheme::REMOTESEARCH)) {`
`42`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" type="text/css">';`
	`42`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" type="text/css"/>';`
`43`	`43`	`}`
`44`	`44`	`if ($this->theme->hasFeature(BootstrapTheme::DYNAMICFIELDS)) {`
`45`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" type="text/css">';`
	`45`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" type="text/css"/>';`
`46`	`46`	`}`
`47`	`47`	`if ($this->theme->hasFeature(BootstrapTheme::CROPPERJS)) {`
`48`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" type="text/css">';`
`49`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" type="text/css">';`
	`48`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" type="text/css"/>';`
	`49`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" type="text/css"/>';`
`50`	`50`	`}`
`51`		`- $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" type="text/css">';`
	`51`	`+ $rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" type="text/css"/>';`
`52`	`52`	`$rc .= parent::renderLinks();`
`53`	`53`	`return $rc;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function getCssPath() {`
`44`	`44`
`45`	`45`	`protected function renderLinks() {`
`46`	`46`	`$rc = parent::renderLinks();`
`47`		`- $rc .= '<link rel="stylesheet" href="'.$this->getCssPath().'" type="text/css">';`
	`47`	`+ $rc .= '<link rel="stylesheet" href="'.$this->getCssPath().'" type="text/css"/>';`
`48`	`48`	`return $rc;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public function __construct($theme, $page) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`protected function renderLinks() {`
`13`		`- $rc = '<link rel="stylesheet" href="'.\WebApp\Utils::getCssBaseUrl().'/app.css" type="text/css">'.`
`14`		`- '<link rel="stylesheet" href="'.\TgFontAwesome\FontAwesome::getUri().'" type="text/css">';`
	`13`	`+ $rc = '<link rel="stylesheet" href="'.\WebApp\Utils::getCssBaseUrl().'/app.css" type="text/css"/>'.`
	`14`	`+ '<link rel="stylesheet" href="'.\TgFontAwesome\FontAwesome::getUri().'" type="text/css"/>';`
`15`	`15`	`$rc .= parent::renderLinks();`
`16`	`16`	`return $rc;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected function renderShowAllCheck() {`
`85`	`85`	`} else {`
`86`	`86`	`$pageLink .= '&showAll=showAll';`
`87`	`87`	`}`
`88`		`- return '<li class="page-item" style="padding:0.5em 1em;"><input id="paginationShowAll" type="checkbox" name="showAll" value="showAll"'.$checked.' onChange="webApp.showSpinner(); window.location=\''.htmlentities($pageLink).'\';"></input> <label for="paginationShowAll">'.I18N::_('show_all').'</label></li>';`
	`88`	`+ return '<li class="page-item" style="padding:0.5em 1em;"><input id="paginationShowAll" type="checkbox" name="showAll" value="showAll"'.$checked.' onChange="webApp.showSpinner(); window.location=\''.htmlentities($pageLink).'\';"> <label for="paginationShowAll">'.I18N::_('show_all').'</label></li>';`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function renderPage() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected function renderDocumentBegin() {`
`31`		`- return '<!doctype html><html lang="'.I18N::$defaultLangCode.'">';`
	`31`	`+ return '<!DOCTYPE html><html lang="'.I18N::$defaultLangCode.'">';`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`protected function renderDocumentEnd() {`
`@@ -52,7 +52,7 @@ protected function renderOtherHeader() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`protected function renderMeta() {`
`55`		`- $rc = '<meta charset="utf-8">';`
	`55`	`+ $rc = '<meta charset="utf-8"/>';`
`56`	`56`
`57`	`57`	`// Meta`
`58`	`58`	`$meta = $this->page->getMeta();`
`@@ -67,13 +67,13 @@ protected function renderMeta() {`
`67`	`67`
`68`	`68`	`foreach ($meta AS $name => $content) {`
`69`	`69`	`$s = is_array($content) ? implode(',', $content) : $content;`
`70`		`- $rc .= '<meta name="'.$name.'" content="'.htmlentities($s).'">';`
	`70`	`+ $rc .= '<meta name="'.$name.'" content="'.htmlentities($s).'"/>';`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Alternates`
`74`	`74`	`foreach ($this->app->router->getLanguages() AS $key => $label) {`
`75`	`75`	`if ($key != $this->app->request->language) {`
`76`		`- $rc .= '<meta name="alternate" hreflang="'.$key.'" content="'.htmlentities($this->app->router->getCanonicalPath(NULL, $key).$params).'">';`
	`76`	`+ $rc .= '<meta name="alternate" hreflang="'.$key.'" content="'.htmlentities($this->app->router->getCanonicalPath(NULL, $key).$params).'"/>';`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`@@ -89,7 +89,7 @@ protected function renderLinks() {`
`89`	`89`	`//if (strpos($file, '://') === FALSE) {`
`90`	`90`	`// $rc .= '<link rel="stylesheet" href="'.Utils::getCssBaseUrl().'/'.$file.'" type="text/css">';`
`91`	`91`	`//} else {`
`92`		`- $rc .= '<link rel="stylesheet" href="'.$file.'" type="text/css">';`
	`92`	`+ $rc .= '<link rel="stylesheet" href="'.$file.'" type="text/css"/>';`
`93`	`93`	`//}`
`94`	`94`	`}`
`95`	`95`	`return $rc;`