@@ -65,7 +65,7 @@ protected function renderNavbarToggler() {
65
65
66
66
protected function renderNavbarContent () {
67
67
$ rc = '<div id="navbar-content" class="collapse navbar-collapse"> ' .
68
- '<ul class="navbar-nav mr-auto"> ' ;
68
+ '<ul class="navbar-nav mr-auto main-menu "> ' ;
69
69
$ menu = $ this ->app ->getMenu ();
70
70
if (($ menu != NULL ) && is_array ($ menu )) {
71
71
foreach ($ menu AS $ menuItem ) {
@@ -75,15 +75,31 @@ protected function renderNavbarContent() {
75
75
$ rc .= '</ul> ' ;
76
76
$ principal = $ this ->app ->getPrincipal ();
77
77
if ($ principal != NULL ) {
78
- $ rc .= '<span class="navbar-text align-middle"> ' .$ principal ->__toString ().'<a class="px-2" href="?logout"><i class="fas fa-sign-out-alt fa-lg"></i></a></span> ' ;
78
+ $ rc .= '<ul class="navbar-nav user-menu"> ' ;
79
+ $ userMenu = $ this ->app ->getMenu ('user ' );
80
+ if ($ userMenu == NULL ) {
81
+ $ userMenu = array ();
82
+ $ userItem = new \WebApp \Component \MenuItem ($ this , $ principal ->__toString (), '# ' );
83
+ $ userMenu [] = new \WebApp \Component \MenuItem ($ userItem , 'logout_label ' , '?logout ' );
84
+ $ userMenu = array ($ userItem );
85
+ }
86
+ if (($ userMenu != NULL ) && is_array ($ userMenu )) {
87
+ //$userMenu[] = new \WebApp\Component\MenuItem($this, 'logout_label', '?logout');
88
+ foreach ($ userMenu AS $ menuItem ) {
89
+ $ rc .= $ this ->theme ->renderComponent ($ menuItem );
90
+ }
91
+
92
+ }
93
+ //$rc .= '<span class="navbar-text align-middle">'.$principal->__toString().'<a class="px-2" href="?logout"><i class="fas fa-sign-out-alt fa-lg"></i></a></span>';
94
+ $ rc .= '</ul> ' ;
79
95
} else if ($ this ->app ->getLoginUri () != NULL ) {
80
96
$ uri = $ this ->app ->request ->uri ;
81
97
if ($ this ->app ->request ->path == $ this ->app ->getLoginUri ()) {
82
98
$ uri = $ this ->app ->request ->path ;
83
99
} else {
84
100
$ uri = $ this ->app ->getLoginUri ().'?return= ' .urlencode ($ this ->app ->request ->uri );
85
101
}
86
- $ rc .= '<span class="navbar-text align-middle"><a class="px-2" href=" ' .$ uri .'"><i class="fas fa-sign-in-alt fa-lg"></i> </a></span> ' ;
102
+ $ rc .= '<span class="navbar-text align-middle"><a class="px-2" href=" ' .$ uri .'"> ' . I18N :: _ ( ' login_label ' ). ' </a></span> ' ;
87
103
}
88
104
$ rc .= '</nav> ' ;
89
105
return $ rc ;
0 commit comments