Skip to content

Commit 0eb5d85

Browse files
technicalgurutechnicalguru
committed
Fix HTML bugs
1 parent 9baacf4 commit 0eb5d85

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎src/WebApp/BootstrapTheme/DefaultLayout.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@ protected function getBootstrapUri() {
2121

2222
protected function renderLinks() {
2323
$webroot = $this->app->request->webRoot;
24-
$rc = '<link rel="stylesheet" href="'.$webroot.FontAwesome::getUri().'" rel="stylesheet" type="text/css">'.
25-
'<link rel="stylesheet" href="'.$this->getBootstrapUri().'" rel="stylesheet" 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">';
2626
if ($this->theme->hasFeature(BootstrapTheme::DATEPICKER)) {
27-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" rel="stylesheet" type="text/css">';
27+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';
2828
}
2929
if ($this->theme->hasFeature(BootstrapTheme::MULTISELECT)) {
30-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" rel="stylesheet" type="text/css">';
30+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('filter-multi-select.css', TRUE).'" type="text/css">';
3131
}
3232
if ($this->theme->hasFeature(BootstrapTheme::FILEUPLOAD)) {
33-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" rel="stylesheet" type="text/css">';
33+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap-datepicker.min.css', TRUE).'" type="text/css">';
3434
}
3535
if ($this->theme->hasFeature(BootstrapTheme::MULTIIMAGEUPLOAD) || $this->theme->hasFeature(BootstrapTheme::IMAGEUPLOAD)) {
36-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" rel="stylesheet" type="text/css">';
36+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('multi-image-upload.css', TRUE).'" type="text/css">';
3737
}
3838
if ($this->theme->hasFeature(BootstrapTheme::REMOTESEARCH)) {
39-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" rel="stylesheet" type="text/css">';
39+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('remote-search.css', TRUE).'" type="text/css">';
4040
}
4141
if ($this->theme->hasFeature(BootstrapTheme::DYNAMICFIELDS)) {
42-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" rel="stylesheet" type="text/css">';
42+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('dynamic-fields.css', TRUE).'" type="text/css">';
4343
}
4444
if ($this->theme->hasFeature(BootstrapTheme::CROPPERJS)) {
45-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" rel="stylesheet" type="text/css">';
46-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" rel="stylesheet" type="text/css">';
45+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper.min.css', TRUE).'" type="text/css">';
46+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('cropper/cropper-ui.css', TRUE).'" type="text/css">';
4747
}
48-
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" rel="stylesheet" type="text/css">';
48+
$rc .= '<link rel="stylesheet" href="'.Utils::getCssPath('bootstrap.css', TRUE).'" type="text/css">';
4949
$rc .= parent::renderLinks();
5050
return $rc;
5151
}
@@ -92,7 +92,7 @@ protected function renderNavbarBrand() {
9292
}
9393

9494
protected function renderNavbarToggler() {
95-
$rc = '<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbarContent" aria-expanded="false" aria-label="'.I18N::_('navbar_toggle_label').'"><span class="navbar-toggler-icon"></span></button>';
95+
$rc = '<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="'.I18N::_('navbar_toggle_label').'"><span class="navbar-toggler-icon"></span></button>';
9696
return $rc;
9797
}
9898

@@ -136,7 +136,7 @@ protected function renderNavbarContent() {
136136
$rc .= '</ul>';
137137
}
138138

139-
$rc .= '</nav>';
139+
$rc .= '</div>';
140140
return $rc;
141141
}
142142

‎src/WebApp/BootstrapTheme/MenuItemRenderer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function render() {
1717
$target = $this->component->getLinkTarget() != NULL ? ' target="'.$this->component->getLinkTarget().'"' : '';
1818
if ($this->component->hasChildren()) {
1919
$rc .= '<a class="nav-link dropdown-toggle" href="'.$link.'" id="dropDown-'.$this->component->getId().'"'.$target.' role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'.$this->component->getLabel().'</a>'.
20-
'<div class="dropdown-menu bg-dark" aria-labelledby=""dropDown-'.$this->component->getId().'">';
20+
'<div class="dropdown-menu bg-dark" aria-labelledby="dropDown-'.$this->component->getId().'">';
2121
foreach ($this->component->getChildren() AS $child) {
2222
switch(get_class($child)) {
2323
case 'WebApp\Component\MenuItem':

‎src/WebApp/DefaultTheme/DefaultLayout.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public function __construct($theme, $page) {
1010
}
1111

1212
protected function renderLinks() {
13-
$rc = '<link rel="stylesheet" href="'.\WebApp\Utils::getCssBaseUrl().'/app.css" rel="stylesheet" type="text/css">'.
14-
'<link rel="stylesheet" href="'.\TgFontAwesome\FontAwesome::getUri().'" rel="stylesheet" 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">';
1515
$rc .= parent::renderLinks();
1616
return $rc;
1717
}

‎src/WebApp/Layout.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ protected function renderLinks() {
8080
if (!is_array($files)) $files = array($files);
8181
foreach ($files AS $file) {
8282
//if (strpos($file, '://') === FALSE) {
83-
// $rc .= '<link rel="stylesheet" href="'.Utils::getCssBaseUrl().'/'.$file.'" rel="stylesheet" type="text/css">';
83+
// $rc .= '<link rel="stylesheet" href="'.Utils::getCssBaseUrl().'/'.$file.'" type="text/css">';
8484
//} else {
85-
$rc .= '<link rel="stylesheet" href="'.$file.'" rel="stylesheet" type="text/css">';
85+
$rc .= '<link rel="stylesheet" href="'.$file.'" type="text/css">';
8686
//}
8787
}
8888
return $rc;

0 commit comments

Comments
 (0)