Update HTML and JavaScript files

jhu-library-applications · Feb 19, 2024 · aaa666d · aaa666d
1 parent bfea0e8
commit aaa666d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/01JHU_INST-JHU/html/prm-location-items-after.html b/01JHU_INST-JHU/html/prm-location-items-after.html
@@ -1,4 +1,4 @@
-<h5 class="section-title" style="margin-bottom: .75em !important; margin-top: -.75em !important;"><span
+<h5 class="section-title"><span
     translate="nui.aria.locationItems.locationItems"></span></h5>
 <div layout="column" layout-align="start start space-between center"><md-button
     class="button-right-align button-link link-alt-color zero-margin"
@@ -48,7 +48,18 @@ <h5 class="section-title" style="margin-bottom: .75em !important; margin-top: -.
           ng-if="$ctrl.parentCtrl.isLocationsFilterVisible" icon-type="{{$ctrl.parentCtrl.opacLocations.filterOut.type}}"
           svg-icon-set="{{$ctrl.parentCtrl.opacLocations.filterOut.iconSet}}"
           icon-definition="{{$ctrl.parentCtrl.opacLocations.filterOut.icon}}"></prm-icon></md-button>
-     </div>
+      <div class="vertical-divider transparent-divider"></div><md-button
+        aria-label="{{$ctrl.parentCtrl.currLoc.isExpandAll ?  ('nui.locItems.collapse' | translate) : ('nui.locItems.expand' | translate)}}"
+        class="md-icon-button header-action expand-collapse-button"
+        (click)="$ctrl.parentCtrl.toggleExpandAll($ctrl.parentCtrl.currLoc)"><md-tooltip md-autohide="true"><span
+            ng-if="$ctrl.parentCtrl.currLoc.isExpandAll" translate="nui.locItems.collapse"></span> <span
+            ng-if="!$ctrl.parentCtrl.currLoc.isExpandAll" translate="nui.locItems.expand"></span></md-tooltip><span
+          ng-if="!$ctrl.parentCtrl.currLoc.isExpandAll"><prm-icon icon-type="{{$ctrl.parentCtrl.opacLocations.expandAllIcon.type}}"
+            svg-icon-set="{{$ctrl.parentCtrl.opacLocations.expandAllIcon.iconSet}}"
+            icon-definition="{{$ctrl.parentCtrl.opacLocations.expandAllIcon.icon}}"></prm-icon></span><span
+          ng-if="$ctrl.parentCtrl.currLoc.isExpandAll"><prm-icon icon-type="{{$ctrl.parentCtrl.opacLocations.collapseAllIcon.type}}"
+            svg-icon-set="{{$ctrl.parentCtrl.opacLocations.collapseAllIcon.iconSet}}"
+            icon-definition="{{$ctrl.parentCtrl.opacLocations.collapseAllIcon.icon}}"></prm-icon></span></md-button>
     </div>
   </div>
 </div><prm-locations-filter ng-if="$ctrl.parentCtrl.isLocationsFilterVisible && $ctrl.parentCtrl.isAnyFilterFilled()" [item]="$ctrl.parentCtrl.item"
@@ -82,7 +93,7 @@ <h5 class="section-title" style="margin-bottom: .75em !important; margin-top: -.
             <p><span translate="nui.item.brief.4"></span> <span ng-click="$ctrl.parentCtrl.checkClick($event)"
                 ng-bind-html="item.itemFields[3]" /></p><md-tooltip>{{item.itemFields[3]}}</md-tooltip>
           </div>
-          <div>
+          <div ng-if="item.isExpanded">
             <div ng-repeat="full in item.fullItemFields track by $index">
               <p ng-click="$ctrl.parentCtrl.checkClick($event)" ng-bind-html="full"></p>
               <md-tooltip>{{item.fullItemValues[$index]}}</md-tooltip>
@@ -101,7 +112,6 @@ <h5 class="section-title" style="margin-bottom: .75em !important; margin-top: -.
           </div>
         </div>
       </div>
-
     </div><prm-location-item-after parent-ctrl="$ctrl"></prm-location-item-after>
   </md-list-item><prm-spinner ng-if="$ctrl.parentCtrl.inProgress" class="inline-loader half-transparent no-text" layout="row"
     layout-align="center center"></prm-spinner></md-list><md-button

diff --git a/01JHU_INST-JHU/js/custom.js b/01JHU_INST-JHU/js/custom.js
@@ -35,11 +35,12 @@
       this.isLoggedIn = AuthService.getIsLoggedIn();
 
       this.$onInit = function () {
-        console.log(this.isLoggedIn);
+        console.log('prmLocationAfter');
       }
     }]
   });
 
+
   /* Used to get the user's authentication information -- not displayed */
   app.component('prmAuthenticationAfter', {
     bindings: { parentCtrl: '<' },
@@ -64,7 +65,6 @@
     }
   });
 
-
   /*Services */
 
   /* Simple service used to capitalize the first letter of a string */