[Library|Trunk]
Updates on searchbar and navbar: searchbar width, button, css library.css: searchbar css navbar z-index same as uk-sticky nav bar (from theme.css) beta indication z-index git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58522 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki
parent
bfc49c0e18
commit
20559bb7d1
|
|
@ -27,7 +27,7 @@
|
|||
{{community.name}} </div>
|
||||
</a>
|
||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
||||
class=" ">
|
||||
class=" uk-width-large ">
|
||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
||||
[searchRoute]="searchRoute" [properties]="properties"></search-bar>
|
||||
</div>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
</a>
|
||||
|
||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
||||
class=" uk-margin-large-left ">
|
||||
class=" uk-margin-left uk-width-xlarge ">
|
||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
||||
[searchRoute]="searchRoute" [properties]="properties"></search-bar>
|
||||
</div>
|
||||
|
|
@ -170,7 +170,7 @@
|
|||
class="uk-margin-left uk-text-large"> {{community.name}} </div>
|
||||
</a>
|
||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
||||
class=" ">
|
||||
class="uk-width-large ">
|
||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
||||
[searchRoute]="searchRoute" [properties]="properties"></search-bar>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,42 +1,32 @@
|
|||
<div *ngIf="enableSearchbar" class="">
|
||||
<!-- <form class="uk-search uk-search-default uk-width-1-1">
|
||||
<a routerLinkActive="uk-link"
|
||||
routerLink="{{searchRoute}}" [queryParams]="{keyword: keyword}" class="uk-search-icon-flip" uk-search-icon></a>
|
||||
<input class="uk-search-input" type="search" [placeholder]="searchPlaceHolder"
|
||||
aria-describedby="sizing-addon2" [(ngModel)]="keyword" name="keyword" >
|
||||
</form>-->
|
||||
<!-- <advanced-search-form [showAdvancedSearchLink]="false" [simpleView]="true" ></advanced-search-form>-->
|
||||
<form class=" uk-margin-medium-bottom uk-margin-top searchBar ">
|
||||
<div class="uk-grid uk-margin-small-left">
|
||||
<div
|
||||
[class]="((entitiesSelection)?'':'uk-width-small@s')+' uk-margin-small-top uk-padding-remove-left'">
|
||||
<entities-selection *ngIf="entitiesSelection" [simpleView]="true" [currentEntity]="entityType"
|
||||
[selectedEntity]="entityType"
|
||||
[properties]="properties"
|
||||
(selectionChange)=" entityChanged($event)"
|
||||
[customFilter]="customFilter"
|
||||
[onlyresults]="true" matPanelClass="navbarMatSelectPanelClass"
|
||||
[onChangeNavigate]="false" ></entities-selection>
|
||||
|
||||
</div>
|
||||
<div class=" uk-padding-remove-left uk-margin-small-top">
|
||||
<div class="uk-inline">
|
||||
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip"
|
||||
(click)="keyword = ''"
|
||||
uk-icon="icon: close"></a>
|
||||
<input type="text" class="uk-input text-input-box"
|
||||
[placeholder]="searchPlaceHolder" aria-describedby="sizing-addon2"
|
||||
[(ngModel)]="keyword" name="keyword">
|
||||
</div>
|
||||
<form *ngIf="enableSearchbar"
|
||||
class=" uk-margin-medium-bottom uk-margin-top searchBar uk-form-width-1-1 uk-grid uk-margin-small-left">
|
||||
<div
|
||||
[class]="((entitiesSelection)?'':'uk-width-small@s')+' uk-margin-small-top uk-padding-remove-left'">
|
||||
<entities-selection *ngIf="entitiesSelection" [simpleView]="true" [currentEntity]="entityType"
|
||||
[selectedEntity]="entityType"
|
||||
[properties]="properties"
|
||||
(selectionChange)=" entityChanged($event)"
|
||||
[customFilter]="customFilter"
|
||||
[onlyresults]="true" matPanelClass="navbarMatSelectPanelClass"
|
||||
[onChangeNavigate]="false" ></entities-selection>
|
||||
|
||||
</div>
|
||||
<div class="uk-padding-remove-left uk-margin-small-top">
|
||||
<button (click)="keywordChanged()" type="submit"
|
||||
class=" uk-button portal-button uk-text-bold ">
|
||||
Search
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class=" uk-padding-remove-left uk-margin-small-top uk-inline uk-width-expand">
|
||||
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip"
|
||||
(click)="keyword = ''"
|
||||
uk-icon="icon: close"></a>
|
||||
<input type="text" class="uk-input text-input-box uk-width-expand"
|
||||
[placeholder]="searchPlaceHolder" aria-describedby="sizing-addon2"
|
||||
[(ngModel)]="keyword" name="keyword">
|
||||
</div>
|
||||
<!--<div class="uk-padding-remove-left uk-margin-small-top">
|
||||
<button (click)="keywordChanged()" type="submit"
|
||||
class=" uk-button portal-button uk-text-bold ">
|
||||
Search
|
||||
</button>
|
||||
</div>-->
|
||||
<button (click)="keywordChanged()" type="submit"
|
||||
class="uk-icon-button uk-icon portal-button uk-padding-remove-left uk-margin-small-left uk-margin-small-top"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" data-svg="search"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ console.log(this.entityType);
|
|||
}
|
||||
|
||||
getCurrentRoute() {
|
||||
console.log(this.router.url.split('?')[0]);
|
||||
return this.router.url.split('?')[0];
|
||||
}
|
||||
entityChanged($event){
|
||||
|
|
|
|||
Loading…
Reference in New Issue