only add Display Search Facets to the Homepage #2275
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,58 @@ | ||
| <div class="container"> | ||
| <div class="collection-page" *ngVar="(collectionRD$ | async) as collectionRD"> | ||
| <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut> | ||
| <div *ngIf="collectionRD?.payload as collection"> | ||
| <ds-view-tracker [object]="collection"></ds-view-tracker> | ||
| <div class="d-flex flex-row border-bottom mb-4 pb-4"> | ||
| <header class="comcol-header mr-auto"> | ||
| <!-- Collection Name --> | ||
| <ds-comcol-page-header [name]="dsoNameService.getName(collection)"> | ||
| </ds-comcol-page-header> | ||
| <!-- Collection logo --> | ||
| <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'"> | ||
| </ds-comcol-page-logo> | ||
|
|
||
| <!-- Handle --> | ||
| <ds-themed-comcol-page-handle [content]="collection.handle" [title]="'collection.page.handle'"> | ||
| </ds-themed-comcol-page-handle> | ||
| <!-- Introductory text --> | ||
| <ds-comcol-page-content [content]="collection.introductoryText" [hasInnerHtml]="true"> | ||
| </ds-comcol-page-content> | ||
| <!-- News --> | ||
| <ds-comcol-page-content [content]="collection.sidebarText" [hasInnerHtml]="true" [title]="'collection.page.news'"> | ||
| </ds-comcol-page-content> | ||
| </header> | ||
| <ds-dso-edit-menu></ds-dso-edit-menu> | ||
| </div> | ||
| <section class="comcol-page-browse-section"> | ||
| <!-- Browse-By Links --> | ||
| <ds-themed-comcol-page-browse-by [id]="collection.id" [contentType]="collection.type"> | ||
| </ds-themed-comcol-page-browse-by> | ||
| <ng-container *ngVar="(itemRD$ | async) as itemRD"> | ||
| <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn> | ||
| <h3 class="sr-only">{{'collection.page.browse.recent.head' | | ||
| translate}}</h3> | ||
| <ds-viewable-collection [config]="paginationConfig" [sortConfig]="sortConfig" [objects]="itemRD" | ||
| [hideGear]="true"> | ||
| </ds-viewable-collection> | ||
| </div> | ||
| <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error> | ||
| <ds-themed-loading *ngIf="!itemRD || itemRD.isLoading" | ||
| message="{{'loading.recent-submissions' | translate}}"></ds-themed-loading> | ||
| <div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" | ||
| role="alert"> | ||
| {{'collection.page.browse.recent.empty' | translate}} | ||
| </div> | ||
| </ng-container> | ||
| </section> | ||
| <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4"> | ||
| <!-- Copyright --> | ||
| <ds-comcol-page-content [content]="collection.copyrightText" [hasInnerHtml]="true"> | ||
| </ds-comcol-page-content> | ||
| </footer> | ||
| </div> | ||
| </div> | ||
| <ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error> | ||
| <ds-themed-loading *ngIf="collectionRD?.isLoading" message="{{'loading.collection' | translate}}"></ds-themed-loading> | ||
| </div> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,10 +28,12 @@ | |
| <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type"> | ||
| </ds-themed-comcol-page-browse-by> | ||
|
|
||
| <ds-themed-community-page-sub-community-list | ||
|
There was a problem hiding this comment. Same here, could you undo the changes to this file too? There was a problem hiding this comment. @GauravD2t : The changes to the There was a problem hiding this comment. @GauravD2t : Same as above, this |
||
| [community]="communityPayload"></ds-themed-community-page-sub-community-list> | ||
| <ds-themed-community-page-sub-collection-list | ||
| [community]="communityPayload"></ds-themed-community-page-sub-collection-list> | ||
| </section> | ||
| <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4"> | ||
| <!-- Copyright --> | ||
| <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true"> | ||
| </ds-comcol-page-content> | ||
|
|
@@ -41,4 +43,4 @@ | |
|
|
||
| <ds-error *ngIf="communityRD?.hasFailed" message="{{'error.community' | translate}}"></ds-error> | ||
| <ds-themed-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-themed-loading> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,18 @@ | ||
| <ds-themed-home-news></ds-themed-home-news> | ||
| <div class="container-fluid"> | ||
| <div class="row m-5"> | ||
| <div class="col-sm-3"> | ||
| <ds-configuration-search-page [sideBarWidth]="12" [showViewModes]="false" [searchEnabled]="false" | ||
| [inPlaceSearch]="false" [showScopeSelector]="false"></ds-configuration-search-page> | ||
| </div> | ||
| <div class="col-sm-9"> | ||
| <ng-container *ngIf="(site$ | async) as site"> | ||
| <ds-view-tracker [object]="site"></ds-view-tracker> | ||
| </ng-container> | ||
| <ds-themed-search-form [inPlaceSearch]="false" | ||
| [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-themed-search-form> | ||
| <ds-themed-top-level-community-list></ds-themed-top-level-community-list> | ||
| <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,22 +3,17 @@ <h2 class="comcol-browse-label h5">{{'browse.comcol.head' | translate}}</h2> | |
| <div class="d-none d-sm-block"> | ||
|
|
||
| <div class="list-group list-group-horizontal"> | ||
| <a *ngFor="let option of allOptions" class="list-group-item" [routerLink]="option.routerLink" | ||
|
There was a problem hiding this comment. I think all the changes to this file can also be undone. These are specific to Community/Collection pages again There was a problem hiding this comment. @GauravD2t : The changes to the There was a problem hiding this comment. @GauravD2t : Same again here. I believe this |
||
| [queryParams]="option.params" routerLinkActive="active">{{ option.label | translate }}</a> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="d-block d-sm-none"> | ||
| <select name="browse-type" class="form-control" aria-label="Browse Community or Collection" | ||
| (ngModelChange)="onSelectChange($event)" [ngModel]="currentOptionId$ | async"> | ||
| <option *ngFor="let option of allOptions" [ngValue]="option.id" | ||
| [attr.selected]="(currentOptionId$ | async) === option.id ? 'selected' : null">{{ option.label | translate }} | ||
| </option> | ||
| </select> | ||
| </div> | ||
| </nav> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| <h3>{{filterLabel+'.filters.head' | translate}}</h3> | ||
| <div *ngIf="(filters | async)?.hasSucceeded"> | ||
GauravD2t marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate"> | ||
| <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter> | ||
| </div> | ||
| </div> | ||
| <a class="btn btn-primary" *ngIf="inPlaceSearch" [routerLink]="[searchLink]" [queryParams]="clearParams | async" | ||
| queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be possible to undo all the changes to this file? It appears that you may have just realigned the HTML, but it'd be best to revert all changes, otherwise you may cause code conflicts with other PRs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GauravD2t : The changes to the
collection-page.component.htmlare still not undone. They still are visible in the files changed tab in GitHub: https://github.com/DSpace/dspace-angular/pull/2275/filesThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GauravD2t : It appears that you still haven't removed the changes to this
collection-page.component.html. Please look in GitHub at the "Files changed" tab and you'll see there are still 130 lines of this file which are shown as modified. https://github.com/DSpace/dspace-angular/pull/2275/files