Fixing more navbar and admin issues

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -12,20 +12,20 @@
                     </span>
                 </a>
             </li>
-            <!-- jhipster-needle-add-element-to-menu - JHipster will add new menu items here -->
-            <li *ngSwitchCase="true" ngbDropdown class="nav-item dropdown pointer" display="dynamic" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
-                <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu">
+            <li ngbDropdown class="nav-item dropdown pointer" display="dynamic" *ngIf="languages && languages.length > 1">
+                <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="languagesnavBarDropdown">
                     <span>
-                        <fa-icon icon="th-list"></fa-icon>
-                        <span jhiTranslate="global.menu.entities.main">
-                            Entities
-                        </span>
+                        <fa-icon icon="flag"></fa-icon>
+                        <span jhiTranslate="global.menu.language">Language</span>
                     </span>
                 </a>
-                <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
-                    <!-- jhipster-needle-add-entity-to-menu - JHipster will add entities to the menu here -->
+                <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="languagesnavBarDropdown">
+                    <li *ngFor="let language of languages">
+                        <a class="dropdown-item" [jhiActiveMenu]="language" href="javascript:void(0);" (click)="changeLanguage(language);collapseNavbar();">{{ language | findLanguageFromKey }}</a>
+                    </li>
                 </ul>
             </li>
+            <!-- jhipster-needle-add-element-to-menu - JHipster will add new menu items here -->
             <!-- Search -->
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
                 <a class="nav-link" routerLink="/" (click)="collapseNavbar()" routerLink="/search">
@@ -36,13 +36,32 @@
                             </svg>
                             <span jhiTranslate="global.menu.search"></span>
                 </a>
+            <!-- end Search -->
+            <!-- Entities -->
+            <li *ngSwitchCase="true" ngbDropdown class="nav-item dropdown pointer" display="dynamic" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
+                <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu">
+                    <span>
+                        <fa-icon icon="th-list"></fa-icon>
+                        <span jhiTranslate="global.menu.entities.main">
+                            Entities
+                        </span>
+                    </span>
+                </a>
+                <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
+                    <!-- jhipster-needle-add-entity-to-menu - JHipster will add entities to the menu here -->
+                </ul>
+            </li>
+            <!-- End Entities -->
+            
+            <!--  Admin -->
             <li *jhiHasAnyAuthority="'ROLE_ADMIN'" ngbDropdown class="nav-item dropdown pointer" display="dynamic" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
-                <a class="nav-link dropdown-toggle" routerLink="/search" id="search-menu">
+                  <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="admin-menu">
                     <span>
                         <fa-icon icon="user-plus"></fa-icon>
                         <span jhiTranslate="global.menu.admin.main">Administration</span>
                     </span>
                 </a>
+            
                 <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="admin-menu">
                     <li>
                         <a class="dropdown-item" routerLink="admin/user-management" routerLinkActive="active" (click)="collapseNavbar()">
@@ -80,6 +99,12 @@
                             <span jhiTranslate="global.menu.admin.logs">Logs</span>
                         </a>
                     </li>
+                    <li>
+                        <a class="dropdown-item" (click)="collapseNavbar(); resetPagesCache()">
+                             <fa-icon icon="times" [fixedWidth]="true"></fa-icon>
+                              <span jhiTranslate="global.menu.admin.pagesCacheReset">reset pages Cache</span>
+                            </a>
+                    </li>
                     <li *ngIf="swaggerEnabled">
                         <a class="dropdown-item" routerLink="admin/docs" routerLinkActive="active" (click)="collapseNavbar()">
                             <fa-icon icon="book" [fixedWidth]="true"></fa-icon>
@@ -95,19 +120,7 @@
                     </li>
                 </ul>
             </li>
-            <li ngbDropdown class="nav-item dropdown pointer" display="dynamic" *ngIf="languages && languages.length > 1">
-                <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="languagesnavBarDropdown">
-                    <span>
-                        <fa-icon icon="flag"></fa-icon>
-                        <span jhiTranslate="global.menu.language">Language</span>
-                    </span>
-                </a>
-                <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="languagesnavBarDropdown">
-                    <li *ngFor="let language of languages">
-                        <a class="dropdown-item" [jhiActiveMenu]="language" href="javascript:void(0);" (click)="changeLanguage(language);collapseNavbar();">{{ language | findLanguageFromKey }}</a>
-                    </li>
-                </ul>
-            </li>
+            <!-- End Admin -->
             
             <!-- Login -->
             <li ngbDropdown class="nav-item dropdown pointer" display="dynamic" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
@@ -122,7 +135,7 @@
                         <img [src]="getImageUrl()" class="profile-image rounded-circle" alt="Avatar">
                     </span>
                 </a>
-                <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="account-menu">
+                <ul class="dropdown-menu search-container" ngbDropdownMenu aria-labelledby="account-menu">
                    <ng-container *ngSwitchCase="false">
                      <li *ngFor="let config of configs">
                             <img src="{{'oauth2.'+config.registrationId + '.icon'| translate}}"
@@ -133,8 +146,8 @@
                                         Account
                                     </button>
                     </li>
+                    <li class="dropdown-divider"></li>
                     </ng-container>
-                    
                     <li *ngSwitchCase="true">
                         <a class="dropdown-item" (click)="logout()" id="logout">
                             <fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
@@ -142,7 +155,7 @@
                         </a>
                     </li>
                     <li *ngSwitchCase="false">
-<form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
+                        <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
                                         <h5 style="color: #b3b3b3; margin-bottom: 25px;">Sign in locally</h5>
                                         <div class="input-group mb-3">
                                             <input type="text" class="form-control" name="username" id="username"

src/main/webapp/swagger-ui/index.html

@@ -20,7 +20,7 @@
     window.onload = function () {
 
 
-        var urls = ["http://localhost:8080/v2/api-docs"];
+        var urls = [/* {"name": "gitsearch", "url": "http://localhost:8080/v2/api-docs"} */];
         axios.get("/swagger-resources").then(function (response) {
             response.data.forEach(function (resource) {
                 urls.push({"name": resource.name, "url": resource.location});