This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit d806e9dd authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Preliminary final commit

parent 790d6754
Branches
Tags
No related merge requests found
Showing
with 55 additions and 30 deletions
......@@ -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" >
......
......@@ -9,4 +9,3 @@
top: 0;
}
......@@ -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();
}
......
<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>
......@@ -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,
......
......@@ -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 -->
......
......@@ -73,8 +73,8 @@
</form>
</div>
</ng-container>
<jhi-watchlist>
</jhi-watchlist>
<jhi-bookmark-info>
</jhi-bookmark-info>
</div>
......@@ -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 {}
......@@ -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(),
})
);
......
......@@ -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;
......
......@@ -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;
}
}
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -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": {
......
......@@ -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: "
}
}
}
......@@ -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": {
......
......@@ -19,7 +19,8 @@
},
"name": "Name",
"userId": "User Id",
"selectedList": "selected bookmark list: "
"selectedList": "selected bookmark list: ",
"currentList": "current bookmark list: "
}
}
}
......@@ -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 -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment