hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

83635: Button layout changes + LGTM fixes

Browse Source
This commit is contained in:
Kristof De Langhe
2021-10-05 16:07:02 +02:00
committed by Art Lowel
parent 120b9f5ce9
commit 03ddde9a97
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/bitstream-page/bitstream-page-routing.module.ts
View File

@@ -10,7 +10,6 @@ import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/re
import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component'; import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component'; import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
const EDIT_BITSTREAM_PATH = ':id/edit'; const EDIT_BITSTREAM_PATH = ':id/edit';
const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';

1
src/app/item-page/item-page-routing.module.ts
View File

@@ -13,7 +13,6 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { ThemedItemPageComponent } from './simple/themed-item-page.component';
import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
import { BitstreamPageResolver } from '../bitstream-page/bitstream-page.resolver';
@NgModule({ @NgModule({
imports: [ imports: [

10
src/app/request-copy/email-request-copy/email-request-copy.component.html
View File

@@ -14,17 +14,17 @@
</div> </div>
</div> </div>
<ng-content></ng-content> <ng-content></ng-content>
<div class="d-flex"> <div class="d-flex flex-row-reverse">
<button (click)="submit()" <button (click)="submit()"
[disabled]="!message || message.length === 0 || !subject || subject.length === 0" [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
class="btn btn-success mr-auto" class="btn btn-primary"
title="{{'grant-deny-request-copy.email.send' | translate }}"> title="{{'grant-deny-request-copy.email.send' | translate }}">
<i class="fa fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }} <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
</button> </button>
<button (click)="return()" <button (click)="return()"
class="btn btn-outline-secondary" class="btn btn-outline-secondary mr-1"
title="{{'grant-deny-request-copy.email.back' | translate }}"> title="{{'grant-deny-request-copy.email.back' | translate }}">
{{'grant-deny-request-copy.email.back' | translate }} <i class="fas fa-arrow-left"></i> {{'grant-deny-request-copy.email.back' | translate }}
</button> </button>
</div> </div>
</form> </form>

2
src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, OnDestroy, OnInit } from '@angular/core';
import { filter, map, switchMap, take, tap } from 'rxjs/operators'; import { filter, map, switchMap, take } from 'rxjs/operators';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { hasValue, isNotEmpty } from '../empty.util'; import { hasValue, isNotEmpty } from '../empty.util';
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';

2
src/assets/i18n/en.json5
View File

@@ -1453,7 +1453,7 @@
"grant-deny-request-copy.email.message.empty": "Please enter a message", "grant-deny-request-copy.email.message.empty": "Please enter a message",
"grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If there is no reason to keep it restricted, please check the box below.", "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
"grant-deny-request-copy.email.permissions.label": "Change to open access", "grant-deny-request-copy.email.permissions.label": "Change to open access",