Preliminary final commit

src/main/webapp/app/bookmarks/bookmarks.component.html

@@ -49,7 +49,7 @@
             </thead>
             <tbody infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page >= links['last']" [infiniteScrollDistance]="0">
                 <tr *ngFor="let userWatchList of userWatchLists ;trackBy: trackId">
-                    <td class="{{isSelected(userWatchList)?'selected':''}}">{{ userWatchList.name }}</td>
+                    <td class="{{isSelected(userWatchList)?'selected':''}}" (click)="view(userWatchList)" style="cursor: pointer;">{{ userWatchList.name }}</td>
                     <td class="text-right">
                         <div class="btn-group">
                             <button type="submit" (click)="view(userWatchList)" style="border-width:0px;background-color: transparent;"
@@ -73,12 +73,16 @@
                 </tr>
             </tbody>
         </table>
-                    <a *ngFor="let action of getCommonActions()" class="btn btn-outline-secondary" role="button" aria-pressed="true"
-                                    style="float: left; margin-right: 5px; margin-top: 5px;" (click)="startAction(action)"
-                                    >{{action.commandName}}</a>
-    
-    </div>
-    
+        <span *ngIf="getCommonActions().length > 0">
+		<p style="text-align: left; margin-top: 20px;">
+			<strong jhiTranslate="exercise.export.export"></strong>
+		</p>
+		<a *ngFor="let action of getCommonActions()"
+			class="btn btn-outline-secondary" role="button" aria-pressed="true"
+			style="float: left; margin-right: 5px; margin-top: 5px;"
+			(click)="startAction(action)">{{action.commandName}}</a>
+		</span>
+        </div>
     </div>
     <div class="col-12 col-md-7 col-lg-8 col-xl-9">
         <div *ngIf="results.length === 0" >

src/main/webapp/app/bookmarks/bookmarks.component.scss

@@ -9,4 +9,3 @@
   top: 0;
 }
 
-

src/main/webapp/app/bookmarks/bookmarks.component.ts

@@ -217,6 +217,7 @@ export class BookmarkComponent implements OnInit, OnDestroy {
         this.page = 0;
         this.results = [];
         this.selectedWatchList = userWatchList;
+        this.watchlistManager.setCurrentWatchList(userWatchList.name!);
         this.onScroll();
     }
 

src/main/webapp/app/exercise/watchlist/watchlist.component.html → src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.html

 <div *ngIf="getMyWatchLists() && getCurrentWatchList()" ngbDropdown>
+<span jhiTranslate="gitsearchApp.userWatchList.currentList">Selected Bookmarkliste</span> <A [routerLink]="['/bookmarks']" style="font-weight: bold; cursor: pointer;">{{getCurrentWatchList()?getCurrentWatchList()!.userWatchList.name:'undefined'}}</A>
+<!-- 
   <button class="btn btn-outline-primary mr-2" id="dropdownManual" ngbDropdownToggle ngbDropdownAnchor>{{'gitsearchApp.userWatchList.selectedList'|translate}}<br/>{{getCurrentWatchList()?getCurrentWatchList()!.userWatchList.name:'undefined'}}</button>
  <div ngbDropdownMenu aria-labelledby="dropdownManual"  >
     <button ngbDropdownItem *ngFor="let watchList of getMyWatchLists()" (click)="setCurrentWatchList(watchList.name)">{{watchList.name}}</button>
   </div>
+   -->
 </div>
 
 

src/main/webapp/app/exercise/watchlist/watchlist.component.ts → src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts

@@ -4,11 +4,11 @@ import { IUserWatchList, UserWatchListWithContent } from 'app/shared/model/user-
 
 
 @Component({
-    selector: 'jhi-watchlist',
-    templateUrl: './watchlist.component.html',
-    styleUrls: ['./watchlist.component.scss'],
+    selector: 'jhi-bookmark-info',
+    templateUrl: './bookmarkInfo.component.html',
+    styleUrls: ['./bookmarkInfo.component.scss'],
 })
-export class WatchlistComponent {
+export class BookmarkInfoComponent {
 
     constructor(
         private watchlistManager: WatchlistManager,

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

@@ -109,7 +109,7 @@
                     </span>
                 </div>
                 <!-- End search -->
-                <!-- Bookmarks -->
+                <!-- Bookmarks --><span *ngSwitchCase="true" >
                 <div class="nav-item" >
                     <span class="nav-link">
                         <a routerLink="/bookmarks">
@@ -120,7 +120,7 @@
                             <span jhiTranslate="global.menu.bookmarks"></span><!-- <span>{{getCurrentBookmarkListName()}}</span> -->
                         </a>
                     </span>
-                </div>
+                </div></span>
                 <!-- End Bookmarks -->
 
                 <!-- Menu Entities -->

src/main/webapp/app/search/search-input/search-input.component.html

@@ -73,8 +73,8 @@
             </form>
         </div>
     </ng-container>
-    <jhi-watchlist>
-    </jhi-watchlist>
+    <jhi-bookmark-info>
+    </jhi-bookmark-info>
 </div>
 
 

src/main/webapp/app/search/search.module.ts

@@ -8,13 +8,13 @@ import { ExerciseModule } from 'app/exercise/exercise.module';
 
 import { SearchComponent } from './search.component';
 import { SearchInputComponent } from './search-input/search-input.component';
-import { WatchlistComponent } from '../exercise/watchlist/watchlist.component';
+import { BookmarkInfoComponent } from '../exercise/bookmarkInfo/bookmarkInfo.component';
 
 
 @NgModule({
   imports: [RouterModule.forChild([SEARCH_ROUTE]), GitSearchV2SharedModule, QueryParamModule, InfiniteScrollModule,
      ExerciseModule],
-  declarations: [SearchComponent, SearchInputComponent, WatchlistComponent],
+  declarations: [SearchComponent, SearchInputComponent, BookmarkInfoComponent],
   exports: [SearchComponent],
 })
 export class SearchModule {}

src/main/webapp/app/teaserContent/teaserContent.component.ts

@@ -36,7 +36,7 @@ export class TeaserContentComponent implements OnInit {
         this.keywords.forEach(kw =>
           this.keywordCloudData.push({
             text: kw.target.toString(),
-            weight: kw.hitCount.valueOf(),
+            weight: Math.min(kw.hitCount.valueOf(), 10),
             color: this.randomColor(new Color('#ffaaee'), new Color('#440000')).getHex(),
           })
         );
@@ -53,7 +53,7 @@ export class TeaserContentComponent implements OnInit {
         this.programmingLanguages.forEach(pl =>
           this.programmingLanguageCloudData.push({
             text: pl.target.toString(),
-            weight: pl.hitCount.valueOf(),
+            weight: Math.min(pl.hitCount.valueOf(), 10),
             color: this.randomColor(new Color('#2222ff'), new Color('#004444')).getHex(),
           })
         );
@@ -69,7 +69,7 @@ export class TeaserContentComponent implements OnInit {
         this.contributors.forEach(pl =>
           this.contributorCloudData.push({
             text: pl.target.toString(),
-            weight: pl.hitCount.valueOf() * 0.5,
+            weight: Math.min(pl.hitCount.valueOf(), 10),
             color: this.randomColor(new Color('#aaff44'), new Color('#004400')).getHex(),
           })
         );

src/main/webapp/content/css/loading.css

@@ -133,7 +133,7 @@
   left: -8px;
   width: 24px;
   height: 10px;
-  background-image: url('../images/Logo_codeAbility_4c_300dpi_RGB3.gif');
+  background-image: url('../../favicon.ico');
   background-size: contain;
   -webkit-animation: lds-pacman-3 1s linear infinite;
   animation: lds-pacman-3 1.5s linear infinite;

src/main/webapp/content/scss/global.scss

@@ -4,3 +4,22 @@
 .dropdown-item.active, .dropdown-item:active {
   background-color: #aaaaaa;
 }
+
+.btn-secondary {
+    background-color: rgb(180, 180, 180);
+    
+    &:hover {
+        background-color: rgb(192, 192, 192);
+    }
+}
+
+
+.btn-primary {
+    background-color: #6c757d;
+    border-bottom-color: black;
+    
+    &:hover {
+        background-color: #222222;
+    }
+}
+

src/main/webapp/i18n/de/search.json

@@ -12,7 +12,7 @@
     },
     "noResults": "Keine Suchergebnisse gefunden.",
     "noResultsAnonymous": "Sie finden vielleicht mehr Resultate, wenn Sie sich anmelden",
-    "numberResults": "Wir haben ungefähr {{ length }} Treffer gefunden.",
+    "numberResults": "Wir haben {{ length }} Treffer gefunden.",
     "showUsage": "Hilfe anzeigen",
     "hideUsage": "Hilfe ausblenden",
     "metadata": {

src/main/webapp/i18n/de/userWatchList.json

@@ -3,7 +3,7 @@
     "userWatchList": {
       "home": {
         "title": "Lesezeichenlisten",
-        "createLabel": "Leserzeichenliste erstellen",
+        "createLabel": "Neue Leserzeichenliste erstellen",
         "createOrEditLabel": "Leserzeichenliste erstellen oder bearbeiten",
         "search": "Suche nach Leserzeichenliste",
         "notFound": "Keine Leserzeichenliste gefunden"
@@ -19,7 +19,8 @@
       },
       "name": "Name",
       "userId": "User Id",
-      "selectedList": "ausgewählte Lesezeichenliste: "
+      "selectedList": "ausgewählte Lesezeichenliste: ",
+      "currentList": "aktuelle Lesezeichenliste: "
     }
   }
 }

src/main/webapp/i18n/en/search.json

@@ -12,7 +12,7 @@
     },
     "noResults": "No results found.",
     "noResultsAnonymous": "You may find more results, if logged in",
-    "numberResults": "We have found about {{ length }} hit(s).",
+    "numberResults": "We have found {{ length }} hit(s).",
     "showUsage": "Show help",
     "hideUsage": "Hide help",
     "metadata": {

src/main/webapp/i18n/en/userWatchList.json

@@ -19,7 +19,8 @@
       },
       "name": "Name",
       "userId": "User Id",
-      "selectedList": "selected bookmark list: "
+      "selectedList": "selected bookmark list: ",
+      "currentList": "current bookmark list: "
     }
   }
 }

src/main/webapp/index.html

@@ -14,9 +14,6 @@
     <!--  old -->
     <link rel="stylesheet" href="content/css/loading.css">
     <!-- Custom CSS -->	
-    <!-- 
-	<link rel="stylesheet" href="content/css/navbar.css">
-	 -->
 	<!-- jQuery library -->
 	<script src="content/js/jquery3.5.1.min.js"></script>
 	<!-- Popper JS -->