Skip to content

Commit

Permalink
UI changes requested by D&D
Browse files Browse the repository at this point in the history
  • Loading branch information
blancoj committed Oct 30, 2024
1 parent f613a4a commit 15a4768
Show file tree
Hide file tree
Showing 38 changed files with 75 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>

<div *ngIf="!isEPersonFormShown">
<button class="mr-auto btn btn-success addEPerson-button"
<button class="mr-auto btn btn-info addEPerson-button"
(click)="isEPersonFormShown = true">
<i class="fas fa-plus"></i>
<span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="d-flex justify-content-between border-bottom mb-3">
<h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
<div>
<button class="mr-auto btn btn-success"
<button class="mr-auto btn btn-info"
[routerLink]="['newGroup']">
<i class="fas fa-plus"></i>
<span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>

<p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
<p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
<p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-info">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>


<ds-pagination
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
<label>{{ 'collection.edit.template.label' | translate}}</label>
<div class="button-row space-children-mr">
<button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
<button *ngIf="!itemTemplateRD?.payload" class="btn btn-info" (click)="addItemTemplate()">
<i class="fas fa-plus"></i>
<span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="item-metadata" *ngIf="form">
<div class="button-row top d-flex my-2 space-children-mr ml-gap">
<button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
<button class="mr-auto btn btn-info" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
[title]="dsoType + '.edit.metadata.add-button' | translate"
(click)="add()"><i class="fas fa-plus"></i>
<span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/app/footer/footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>About Deep Blue Documents</h2>
<a href="https://www.lib.umich.edu/collections/deep-blue-repositories">Deep Blue Repositories</a>
</li>
<li>
<a href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&RequestorType=Service">Contact Us</a>
<a href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&RequestorType=Service" target="_blank">Contact Us</a>
</li>
<li>
<a href="assets/static/about/deepbluefaq.html">Frequently Asked Questions</a>
Expand Down
8 changes: 7 additions & 1 deletion src/app/footer/footer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ export class FooterComponent {
* A boolean representing if to show or not the top footer container
*/
showTopFooter = false;
showPrivacyPolicy = environment.info.enablePrivacyStatement;

/* showPrivacyPolicy = environment.info.enablePrivacyStatement;
showEndUserAgreement = environment.info.enableEndUserAgreement;
*/

showPrivacyPolicy = false;
showEndUserAgreement = false;

showSendFeedback$: Observable<boolean>;

constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<ng-container *ngVar="(itemRD$ | async) as itemRD">
<div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
<!-- Remove boderr line on the home page
<div class="d-flex flex-row border-bottom mb-4 pb-4 ng-tns-c416-2"></div>
-->
<h2> {{'home.recent-submissions.head' | translate}}</h2>
<div class="my-4" *ngFor="let item of itemRD?.payload?.page">
<ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- To remove the communities from showing up on the home page
<ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
<div *ngIf="communitiesRD?.hasSucceeded ">
<h2>
Expand All @@ -13,3 +14,4 @@ <h2>
</div>
<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
<ds-themed-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-themed-loading></ng-container>
-->
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2>{{'item.bitstreams.upload.title' | translate}}</h2>
(click)="f.open()"
ngDefaultControl>
</ds-dso-input-suggestions>
<button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success mr-2" (click)="createBundle()">
<button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-info mr-2" (click)="createBundle()">
<i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
</button>
<ds-uploader class="w-100" *ngIf="selectedBundleId"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
<div class="button-row top d-flex mt-2 space-children-mr">
<button class="mr-auto btn btn-success"
<button class="mr-auto btn btn-info"
[routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
class="fas fa-upload"></i>
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h5>
{{getRelationshipMessageKey() | async | translate}}
<button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
<button class="ml-2 btn btn-info" [disabled]="(hasChanges | async)" (click)="openLookup()">
<i class="fas fa-plus"></i>
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,14 @@ describe('EditRelationshipListComponent', () => {
describe('changes managment for add buttons', () => {

it('should show enabled add buttons', () => {
const element = de.query(By.css('.btn-success'));
const element = de.query(By.css('.btn-info'));
expect(element.nativeElement?.disabled).toBeFalse();
});

it('after hash changes changed', () => {
comp.hasChanges = observableOf(true);
fixture.detectChanges();
const element = de.query(By.css('.btn-success'));
const element = de.query(By.css('.btn-info'));
expect(element.nativeElement?.disabled).toBeTrue();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@

<ds-themed-item-page-file-section [item]="object"></ds-themed-item-page-file-section>


<ds-item-page-metrics-field [item]="object"></ds-item-page-metrics-field>
<ds-item-page-metrics-dimensions-field [item]="object"></ds-item-page-metrics-dimensions-field>

<!-- Don't display Publisher on left side of short item of item page
<ds-generic-item-page-field [item]="object"
[fields]="['journal.title']"
[label]="'item.page.journal-title'">
Expand All @@ -73,7 +75,7 @@
[fields]="['dc.publisher']"
[label]="'item.page.publisher'">
</ds-generic-item-page-field>

-->
</div>
<div class="col-xs-12 col-md-8">
<div *ngIf="object.hasMetadata('dc.description.abstract')" [id]="object.id">
Expand Down Expand Up @@ -146,7 +148,7 @@ <h2 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
<span *ngIf="object.allMetadata(['dc.identifier.doi']).length > 0" >
<span *ngFor="let doi of object.allMetadataValues(['dc.identifier.doi']); let last=last;">
<span *ngIf="doi.includes(this.doiPrefix)" >
<h2 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-inserted">Deep Blue DOI</h2>
<h2 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-inserted">Deep Blue Documents DOI</h2>

<span *ngIf="doi.includes('http')" ><a href="{{doi}}">{{doi}}</a></span>
<span *ngIf="!doi.includes('http')" ><a href="http://dx.doi.org/{{doi}}">http://dx.doi.org/{{doi}}</a></span>
Expand Down Expand Up @@ -574,7 +576,7 @@ <h2 style="font-size: 18px; font-weight: bold">Remediation of Harmful Language<
<div>
<p></p>
<h2 style="font-size: 18px; font-weight: bold">Accessibility</h2>
If you are unable to use this file in its current format, please select the <a href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&RequestorType=Service">Contact Us</a> link and we can modify it to make it more accessible to you.
If you are unable to use this file in its current format, please select the <a href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&RequestorType=Service" target="_blank">Contact Us</a> link and we can modify it to make it more accessible to you.
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
<i class="fas fa-times fa-fw"></i> {{'item.version.create.modal.button.cancel' | translate}}
</button>
<button class="btn btn-success btn-sm ml-0"
<button class="btn btn-info btn-sm ml-0"
type="submit"
(click)="onModalSubmit()"
title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
Expand Down
2 changes: 1 addition & 1 deletion src/app/process-page/detail/process-detail.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h2 class="flex-grow-1">
</ds-process-detail-field>

<ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
<button class="btn btn-success mr-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
<button class="btn btn-info mr-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
class="fas fa-plus pr-2"></i>{{'process.detail.create' | translate}}</button>
<button *ngIf="isProcessFinished(process)" id="delete" class="btn btn-danger"
(click)="openDeleteModal(deleteModal)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
(click)="openDeleteModal(deleteModal)"><i
class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
</button>
<button class="btn btn-success" routerLink="/processes/new"><i
<button class="btn btn-info" routerLink="/processes/new"><i
class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>

</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')" class="form-group"
[class.d-none]="model.hidden"
[formGroup]="group"
[ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
Expand Down
3 changes: 2 additions & 1 deletion src/app/shared/form/form.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
<span><i class="fas fa-trash" aria-hidden="true"></i></span>
</button>
</div>
<div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix pl-4 w-100">

<div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" style="margin-top: -20px;" class="clearfix pl-4 w-100">
<div class="btn-group" role="group">
<button type="button" role="button" class="ds-form-add-more btn btn-link"
title="{{'form.add' | translate}}"
Expand Down
3 changes: 3 additions & 0 deletions src/app/shared/listfiles/listfiles.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
<ng-container *ngVar="(bitstreams$ | async) as bitstreams">


<ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="">
<!-- To remove Files from display on the
<ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
-->
<div class="file-section" *ngFor="let file of bitstreams; let last=last;">


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button type="button"
[className]="'btn btn-success'"
[className]="'btn btn-ifo'"
ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
[disabled]="processing$ | async"
(click)="submitTask()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
});

it('should display approve button', () => {
const btn = fixture.debugElement.query(By.css('.btn-success'));
const btn = fixture.debugElement.query(By.css('.btn-info'));

expect(btn).not.toBeNull();
});
Expand All @@ -79,7 +79,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
component.processing$.next(true);
fixture.detectChanges();

const span = fixture.debugElement.query(By.css('.btn-success .fa-spin'));
const span = fixture.debugElement.query(By.css('.btn-info .fa-spin'));

expect(span).not.toBeNull();
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<div class="row">
<div *ngIf="showThumbnails" class="col-3 col-md-2">
<!--
<ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
</ds-thumbnail>
-->
</div>
<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
<div *ngIf="item" @fadeInOut>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@
</span>

<ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
(<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
<span *ngIf="dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')">, </span>
<span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
(<span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
</ng-container>

</ds-truncatable-part>
</span>

<ds-listfiles [item]="dso"></ds-listfiles>

<!-- No need for abstract in search result page
<div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
<ds-truncatable-part [id]="dso.id" [minLines]="3"><span
[innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
</ds-truncatable-part>
</div>
-->
</ds-truncatable>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{'resource-policies.delete.btn' | translate}}
</span>
</button>
<button class="btn btn-success p-1"
<button class="btn btn-info p-1"
[disabled]="(isProcessingDelete() | async)"
[title]="'resource-policies.add.for.' + resourceType | translate"
(click)="redirectToResourcePolicyCreatePage()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
</button>
</div>
<div id="search-sidebar-content">
<!-- Remove the list and thumbnail mode toggle
<ds-view-mode-switch *ngIf="showViewModes" class="d-none d-md-block"
[viewModeList]="viewModeList"
(changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
-->
<div class="sidebar-content">
<ds-search-switch-configuration *ngIf="configurationList"
[configurationList]="configurationList"
Expand Down
2 changes: 2 additions & 0 deletions src/app/shared/search/search.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
</div>
<div id="search-content" class="col-12">
<div class="d-block d-md-none search-controls clearfix">
<!-- Remove ability to switch between list and thumbnail
<ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-->
<button (click)="openSidebar()" aria-controls="#search-body"
class="btn btn-outline-primary float-right open-sidebar"><i
class="fas fa-sliders"></i> {{"search.sidebar.open"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
(click)="activeModal.close()">
{{'subscriptions.modal.close' | translate}}
</button>
<button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
<button type="submit" class="btn btn-info" [disabled]="(processing$ | async) || !isValid">
<span *ngIf="(processing$ | async)">
<i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/app/submission/edit/submission-edit.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="submission-submit-container" >
<div class="container submission-submit-container" >
<ds-submission-form [collectionId]="collectionId"
[sections]="sections"
[selfUrl]="selfUrl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
type="button"
id="deposit"
[attr.data-test]="'deposit' | dsBrowserOnly"
class="btn btn-success"
class="btn btn-info"
[disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
(click)="deposit($event)">
<span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ describe('SubmissionFormFooterComponent', () => {
comp.showDepositAndDiscard = observableOf(true);
compAsAny.submissionIsInvalid = observableOf(true);
fixture.detectChanges();
const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
const depositBtn: any = fixture.debugElement.query(By.css('.btn-info'));

expect(depositBtn.nativeElement.disabled).toBeFalsy();
});
Expand All @@ -222,7 +222,7 @@ describe('SubmissionFormFooterComponent', () => {
comp.showDepositAndDiscard = observableOf(true);
compAsAny.submissionIsInvalid = observableOf(false);
fixture.detectChanges();
const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
const depositBtn: any = fixture.debugElement.query(By.css('.btn-info'));

expect(depositBtn.nativeElement.disabled).toBeFalsy();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h
</div>
<div class="row">
<div class="col-md-12 text-right">
<button class="btn btn-success" (click)="import()" role="button">
<button class="btn btn-info" (click)="import()" role="button">
<i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
</button>
</div>
Expand Down
Loading

0 comments on commit 15a4768

Please sign in to comment.