Merge pull request #4 from mlibrary/issue-working3

change to short display, no thumbnail on sub form and discovery labels.
mlibrary · Jan 29, 2024 · 751c8d9 · 751c8d9
2 parents 810b86b + c1516db
commit 751c8d9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 30 deletions.
diff --git a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
@@ -29,6 +29,20 @@ export class WorkspaceitemSectionUploadFileObject {
     value: string;
   };
 
+  /** not sure this is needed UM */
+  /**
+   * The file format information
+   */
+  format: {
+    shortDescription: string,
+    description: string,
+    mimetype: string,
+    supportLevel: string,
+    internal: boolean,
+    type: string
+  };
+
+
   /**
    * The file url
    */

diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -166,11 +166,6 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
        [label]="'Citation'">
     </ds-generic-item-page-field>
 
-    <ds-generic-item-page-field [item]="object"
-       [fields]="['dc.description.abstract']"
-       [label]="'Abstract'">
-    </ds-generic-item-page-field>
-
     <ds-generic-item-page-field [item]="object"
        [fields]="['dc.publisher']"
        [label]="'Publisher'">
@@ -270,10 +265,6 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
        [label]="'Series/Report no.'">
     </ds-generic-item-page-field>
 
-    <ds-generic-item-page-field [item]="object"
-       [fields]="['dc.description.abstract']"
-       [label]="'Abstract'">
-    </ds-generic-item-page-field>
 
     <ds-generic-item-page-field [item]="object"
        [fields]="['dc.description']"
@@ -360,10 +351,6 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
        [label]="'Series/Report no.'">
     </ds-generic-item-page-field>
 
-    <ds-generic-item-page-field [item]="object"
-       [fields]="['dc.description.abstract']"
-       [label]="'Abstract'">
-    </ds-generic-item-page-field>
 
     <ds-generic-item-page-field [item]="object"
        [fields]="['dc.description']"
@@ -420,10 +407,6 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
 <div *ngVar="(object.owningCollection | async)?.payload as collection">
   <div *ngIf="!collection?.handle.endsWith('/2027.42/65133') && !collection?.handle.endsWith('/2027.42/35324') &&
   !collection?.handle.endsWith('/2027.42/13914')" >
-    {{collection?.handle}}
-
-here
-
 
     <ds-generic-item-page-field [item]="object"
        [fields]="['dc.title.alternative']"
@@ -435,10 +418,6 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
        [label]="'Citation'">
     </ds-generic-item-page-field>
 
-    <ds-generic-item-page-field [item]="object"
-       [fields]="['dc.description.abstract']"
-       [label]="'Abstract'">
-    </ds-generic-item-page-field>
 
     <ds-generic-item-page-field [item]="object"
        [fields]="['dc.publisher']"
@@ -573,7 +552,7 @@ <h5 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
     <div>
       <p></p>
       <h2 style="font-size: 18px;  font-weight: bold">Remediation of Harmful Language</h2>
-      The University of Michigan Library aims to describe library materials in a way that respects the people and communities who create, use, and are represented in our collections. Report harmful or offensive language in catalog records, finding aids, or elsewhere in our collections anonymously through our <a href="https://docs.google.com/forms/d/e/1FAIpQLSfSJ7y-zqmbNQ6ssAhSmwB7vF-NyZR9nVwBICFI8dY5aP1-TA/viewform">metadata feedback form</a>. More information at <a href="https://www.lib.umich.edu/about-us/policies/remediation-harmful-language-library-metadata">Remediation of Harmful Language</a>ß.
+      The University of Michigan Library aims to describe library materials in a way that respects the people and communities who create, use, and are represented in our collections. Report harmful or offensive language in catalog records, finding aids, or elsewhere in our collections anonymously through our <a href="https://docs.google.com/forms/d/e/1FAIpQLSfSJ7y-zqmbNQ6ssAhSmwB7vF-NyZR9nVwBICFI8dY5aP1-TA/viewform">metadata feedback form</a>. More information at <a href="https://www.lib.umich.edu/about-us/policies/remediation-harmful-language-library-metadata">Remediation of Harmful Language</a>.
     </div>
 
     <div>

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,16 +1,13 @@
 <ng-container *ngIf="fileData">
   <div class="row">
-    <div class="col-md-2">
-      <!--ds-themed-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-themed-thumbnail-->
-      <ds-themed-thumbnail [thumbnail]="fileData?.thumbnail"></ds-themed-thumbnail>
-    </div>
-    <div class="col-md-10">
+    <div class="col-md-12">
       <div class="float-left w-75">
         <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
       <div class="float-right w-15">
         <ng-container>
-          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true" [bitstream]="getBitstream()" [enableRequestACopy]="false">
+          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
+                                        [bitstream]="getBitstream()" [enableRequestACopy]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-themed-file-download-link>
           <button class="btn btn-link-focus"
@@ -46,7 +43,9 @@ <h4 class="modal-title text-danger">{{ 'submission.sections.upload.delete.confir
     <p>{{ 'submission.sections.upload.delete.confirm.info' | translate }}</p>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
-    <button type="button" class="btn btn-danger" (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
+    <button type="button" class="btn btn-secondary"
+            (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
+    <button type="button" class="btn btn-danger"
+            (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -3662,6 +3662,20 @@
 
   "search.filters.filter.author.head": "Author",
 
+
+
+  "search.filters.filter.discipline.head": "Discipline",
+
+  "search.filters.filter.identifiersource.head": "Identifier Source",
+
+  "search.filters.filter.hlbtoplevel.head": "Subject Top",
+
+  "search.filters.filter.hlbsecondlevel.head": "Subject Second",
+
+  "search.filters.filter.peerreviewed.head": "Peer Reviewed",
+
+
+
   "search.filters.filter.author.placeholder": "Author name",
 
   "search.filters.filter.author.label": "Search author name",