Merge pull request #9 from mlibrary/issue-working8

UI changes.
mlibrary · May 28, 2024 · e0ad6ae · e0ad6ae
2 parents c7af4f7 + af88c88
commit e0ad6ae
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 35 deletions.
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
@@ -555,7 +555,7 @@ <h2 _ngcontent-dspace-angular-c161="" class="simple-view-element-header ng-star-
 
     <div>
       <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button">
-        <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
+        <i class="fas"></i> {{"item.page.link.full" | translate}}
       </a>
     </div>
 

diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
@@ -4,6 +4,7 @@
     <div *ngIf="i === 1" class="text-center mt-2">
       <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
     </div>
+    {{authMethod.authMethodType}}
     <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
   </ng-container>
 

diff --git a/...ect-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/...ect-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -13,10 +13,6 @@ <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMet
         <div>
           <span class="text-muted">
             <ds-truncatable-part [id]="item.id" [minLines]="1">
-              (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
-                [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
-              <span class="item-list-date"
-                [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
               <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
                 class="item-list-authors">
                 <span
@@ -27,6 +23,10 @@ <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMet
                   <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                   <span *ngIf="!last">; </span>
                 </span>
+                (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
+                [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
+              <span class="item-list-date"
+                [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
               </span>
 
             </ds-truncatable-part>

diff --git a/...element/item-search-result/item-types/item/item-search-result-list-element.component.html b/...element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -27,17 +27,20 @@
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <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>)
-          </ng-container>
+
           <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
             <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                 <span *ngIf="!last">; </span>
             </span>
           </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>)
+          </ng-container>
+
         </ds-truncatable-part>
       </span>
 

diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
@@ -9,19 +9,23 @@
 
         <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
           <ng-container *ngIf="!isSectionHidden">
+<!--
             <ds-submission-form-collection [currentCollectionId]="collectionId"
                                            [currentDefinition]="definitionId"
                                            [submissionId]="submissionId"
                                            [collectionModifiable]="collectionModifiable"
                                            [isReadonly]="isSectionReadonly"
                                            (collectionChange)="onCollectionChange($event)">
             </ds-submission-form-collection>
+-->
           </ng-container>
         </div>
         <div class="submission-form-header-item text-right">
+<!--
             <ds-submission-form-section-add [collectionId]="collectionId"
                                             [submissionId]="submissionId">
             </ds-submission-form-section-add>
+-->
         </div>
     </div>
 

diff --git a/src/assets/static/about/deepbluefaq.html b/src/assets/static/about/deepbluefaq.html
@@ -5,27 +5,23 @@
    <title>Deep Blue Frequently Asked Questions</title>  
    <link rel="stylesheet" href="styles.css">
    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+<link href="https://cdn.jsdelivr.net/npm/@umich-lib/web@1.3.0/umich-lib.css" rel="stylesheet"/>
+<script type="module" src="https://cdn.jsdelivr.net/npm/@umich-lib/web@1.3.0/dist/umich-lib/umich-lib.esm.js"></script>
+<script nomodule src="https://cdn.jsdelivr.net/npm/@umich-lib/components@1.1.0/dist/umich-lib/umich-lib.js"></script>
+
 </head>
 
+
+
 <html>
+<m-universal-header></m-universal-header>
 
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" bgcolor=#FFFFFF lang=EN-US>
 
-<table class="pageBanner" width="100%" border="0" cellpadding="0" cellspacing="0">
-
-   <tr>
-    <td>
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr>
-<!-- note tweaked width; should=162,  but for some reason this isn't working with navigationBarTable below -->
-          <td><a href="/"><img src="image/drop1.gif" width="166" height="103" alt="Deep Blue droplet"></a></td>
-        </tr>
-      </table>
-        <a href="/"><img src="image/deepbluetype1.gif" width="166" height="27" alt="Deep Blue"></a>
-     </td>
-   </tr>
-
-</table>
+<a href="/"><img src="image/drop1.gif" width="166" height="103" alt="Deep Blue droplet"></a>
+<a href="/"><img src="image/deepbluetype1.gif" width="166" height="27" alt="Deep Blue"></a>
+
+
 
 <a name="top"><b>Getting Started with Deep Blue: Frequently Asked Questions</b></a></p> 
 

diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
@@ -4,6 +4,8 @@
 <!-- this part is for putting in the hamburger -->
 <header class="header">
 
-
-  <ds-themed-navbar></ds-themed-navbar>
+  <ds-themed-navbar>
+  </ds-themed-navbar>
+
 </header>
+
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -5,8 +5,8 @@
       <div class="d-flex flex-wrap">
         <div>
           <h1>Deep Blue Documents</h1>
-          <p class="lead">Deep Blue provides access to the work that makes the University of Michigan a leader in research, teaching, and creativity.</p>
-          <p class="lead">To find work by U-M authors, browse or search the contents of Deep Blue, then link to what you find using a URL that will always work (available to all). To deposit your work, please contact us <a style="color: white; text-decoration: underline;" href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&amp;RequestorType=Service">contact us</a> (available to U-M faculty and staff).</p>
+          <p class="lead">Deep Blue Documents provides access to the work that makes the University of Michigan a leader in research, teaching, and creativity.</p>
+          <p class="lead">To find work by U-M authors, browse or search the contents of Deep Blue Documents, then link to what you find using a URL that will always work (available to all). To deposit your work, please <a style="color: white; text-decoration: underline;" href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&amp;RequestorType=Service">contact us</a> (available to U-M faculty and staff).</p>
         </div>
       </div>
 

diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
@@ -2,8 +2,14 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
   class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
   <div class="navbar-inner-container w-100 h-100" [class.container]="!(isXsOrSm$ | async)">
+
+
+
+
     <div id="collapsingNav" class="w-100 h-100">
       <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
+        <li><div class="nav-item navbar-section-sup-help text-md-center" ><a class="nav-link nav-item" href="assets/static/about/deepbluefaq.html">Help</a></div></li>
+        <li><div class="nav-item navbar-section-sup-help text-md-center" ><a class="nav-link nav-item" href="https://teamdynamix.umich.edu/TDClient/88/Portal/Requests/TicketRequests/NewForm?ID=7Az64AR5TqI_&RequestorType=Service">Contact Us</a></div></li>
         <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
             <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
         </li>
@@ -25,11 +31,6 @@
     <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
     <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
   </div>
-
-
-
 </nav>
-
-
-    </m-website-header>
+</m-website-header>
 
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -3,6 +3,12 @@ nav.navbar {
   align-items: baseline;
 }
 
+.navbar-section-sup-help {
+  display: flex;
+  align-items: center;
+  height: 100%;
+} 
+
 /** Mobile menu styling **/
 @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
   .navbar {