[Explore| Trunk]
index.html: remove clipboard.js (not used) App component: add qf=true in the search research outcomes menu item Home Search bar: move class quickSelectionsBox set delayTime 0 in quick selections component git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@58816 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
a9fcf4b6d3
commit
f95e919d24
|
@ -96,7 +96,7 @@ export class AppComponent {
|
||||||
{
|
{
|
||||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
||||||
items: [
|
items: [
|
||||||
new MenuItem("", "Research Outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {}),
|
new MenuItem("", "Research Outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {qf:true}),
|
||||||
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||||
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||||
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
(selectionChange)="entityChanged($event)"
|
(selectionChange)="entityChanged($event)"
|
||||||
></entities-selection>
|
></entities-selection>
|
||||||
</div>
|
</div>
|
||||||
<div [class]="((selectedEntity == 'result')?'quickSelectionsBox':'')+' uk-padding-remove-left uk-margin-small-top'" >
|
<div class=" uk-padding-remove-left uk-margin-small-top" >
|
||||||
<div class="uk-inline">
|
<div class="uk-inline">
|
||||||
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip" (click)="keyword = ''"
|
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip" (click)="keyword = ''"
|
||||||
uk-icon="icon: close"></a>
|
uk-icon="icon: close"></a>
|
||||||
|
@ -38,9 +38,11 @@
|
||||||
[(ngModel)]="keyword"
|
[(ngModel)]="keyword"
|
||||||
name="keyword">
|
name="keyword">
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class=" quickSelectionsBox uk-width-xlarge@l uk-width-large@m uk-width-medium">
|
||||||
<quick-selections *ngIf="selectedEntity == 'result'" [resultTypes]="resultTypes"
|
<quick-selections *ngIf="selectedEntity == 'result'" [resultTypes]="resultTypes"
|
||||||
[quickFilter]="resultsQuickFilter" [QFselected]="(resultsQuickFilter)?resultsQuickFilter.selected:null" [properties]="properties">
|
[quickFilter]="resultsQuickFilter"
|
||||||
|
[QFselected]="(resultsQuickFilter)?resultsQuickFilter.selected:null"
|
||||||
|
[properties]="properties" [delayTime]="0">
|
||||||
</quick-selections>
|
</quick-selections>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -415,7 +415,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
|
||||||
if (this.resultTypes.other) {
|
if (this.resultTypes.other) {
|
||||||
values.push("other");
|
values.push("other");
|
||||||
}
|
}
|
||||||
if (values.length > 0) {
|
if (values.length > 0 && values.length !=4) {
|
||||||
parameterNames.push("type");
|
parameterNames.push("type");
|
||||||
parameterValues.push(values.join(","));
|
parameterValues.push(values.join(","));
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,6 @@ $(document).ready(function(){
|
||||||
<link rel="stylesheet" href="assets/common-assets/common/custom.css?v=5">
|
<link rel="stylesheet" href="assets/common-assets/common/custom.css?v=5">
|
||||||
<link rel="stylesheet" href="assets/common-assets/library.css?v=8">
|
<link rel="stylesheet" href="assets/common-assets/library.css?v=8">
|
||||||
<link rel="stylesheet" href="assets/explore-custom.css?v=8">
|
<link rel="stylesheet" href="assets/explore-custom.css?v=8">
|
||||||
<script src="assets/common-assets/clipboard.min.js"></script>
|
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body class="" style="">
|
<body class="" style="">
|
||||||
|
|
Loading…
Reference in New Issue