ECOMMONS-1548 - fix for hamburger menu not working in mobile firefox/safari

angular.json

@@ -55,6 +55,16 @@
                 "inject": false,
                 "bundleName": "custom-theme"
               },
+              {
+                "input": "src/themes/ecommons/styles/theme.scss",
+                "inject": false,
+                "bundleName": "ecommons-theme"
+              },
+              {
+                "input": "src/themes/ecommons/styles/theme.scss",
+                "inject": false,
+                "bundleName": "ilr-theme"
+              },
               {
                 "input": "src/themes/dspace/styles/theme.scss",
                 "inject": false,

config/config.yml

@@ -1,5 +1,40 @@
+ui:
+  ssl: false
+  host: 0.0.0.0
+  port: 4000
+  nameSpace: /
+
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: dspace7-dev.library.cornell.edu
   port: 443
   nameSpace: /server
+
+auth:
+  ui:
+    timeUntilIdle: 14400000
+    idleGracePeriod: 14400000
+
+info:
+  enableEndUserAgreement: false
+  enablePrivacyStatement: false
+
+themes:
+  - name: ilr
+    extends: ecommons
+    uuid: '248b4901-f047-44d0-99b8-08613890ba79'
+  - name: ecommons
+    headTags:
+      - tagName: link
+        attributes:
+          rel: icon
+          href: assets/ecommons/images/favicons/favicon.ico
+          sizes: any
+      - tagName: link
+        attributes:
+          rel: apple-touch-icon
+          href: assets/ecommons/images/favicons/apple-touch-icon-152x152.png
+      - tagName: link
+        attributes:
+          rel: manifest
+          href: assets/ecommons/images/favicons/manifest.webmanifest

src/app/app.component.html

@@ -1,3 +1,5 @@
 <ds-themed-root
   [shouldShowFullscreenLoader]="(isAuthBlocking$ | async) || (isThemeLoading$ | async)"
   [shouldShowRouteLoader]="isRouteLoading$ | async"></ds-themed-root>
+
+<ds-submission-modal></ds-submission-modal>

src/app/info/feedback/feedback-form/feedback-form.component.html

@@ -1,8 +1,11 @@
 <div class="row row-offcanvas row-offcanvas-right">
   <div class="col-xs-12 col-sm-12 col-md-9 main-content">
     <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
-      <h2>{{ 'info.feedback.head' | translate }}</h2>
-      <p>{{ 'info.feedback.info' | translate }}</p>
+      <h2>Contact Us</h2>
+      <p><b>Do you wish to create an account?</b></p>
+      <p>By <a href="/login">logging in through Shibboleth</a>, you will automatically be registered for an eCommons account.</p>
+
+      <p>For any other questions or problems, please use this form and include your name in the comments. If you are writing to request approval to submit to a collection, please also include the URL of the desired collection in your request. If writing about a specific item, please include the handle in your message.</p>
       <fieldset class="col p-0">
         <div class="row">
           <div class="control-group col-sm-12">
@@ -21,6 +24,7 @@ <h2>{{ 'info.feedback.head' | translate }}</h2>
           <div class="control-group col-sm-12">
             <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
             <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
+            <p class="alert alert-info mt-2">Please remember to include your name in the comments.</p>
           </div>
         </div>
         <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
@@ -29,14 +33,14 @@ <h2>{{ 'info.feedback.head' | translate }}</h2>
         </ng-container>
         <div class="row">
           <div class="control-group col-sm-12">
-            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}:&nbsp;</label>
             <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
+            <small class="text-muted">This is the page where the contact link was clicked.</small>
           </div>
         </div>
         <div class="row py-2">
           <div class="control-group col-sm-12 text-right">
-            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">Send Message</button>
           </div>
         </div>
       </fieldset>

src/app/item-page/full/field-components/file-section/full-file-section.component.html

@@ -42,45 +42,4 @@ <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle"
             </ds-pagination>
         </div>
     </div>
-    <div *ngVar="(licenses$ | async)?.payload as licenses">
-        <div *ngIf="hasValuesInBundle(licenses)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h5>
-            <ds-pagination *ngIf="licenses?.page?.length > 0"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true"
-                           [paginationOptions]="licenseOptions"
-                           [pageInfoState]="licenses"
-                           [collectionSize]="licenses?.totalElements"
-                           [retainScrollPosition]="true">
-
-
-                <div class="file-section row" *ngFor="let file of licenses?.page;">
-                    <div class="col-3">
-                        <ds-themed-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-themed-thumbnail>
-                    </div>
-                    <div class="col-7">
-                        <dl class="row">
-                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
-
-
-                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-                        </dl>
-                    </div>
-                    <div class="col-2">
-                        <ds-themed-file-download-link [bitstream]="file" [item]="item">
-                            {{"item.page.filesection.download" | translate}}
-                        </ds-themed-file-download-link>
-                    </div>
-                </div>
-            </ds-pagination>
-        </div>
-    </div>
 </ds-metadata-field-wrapper>

src/app/item-page/item-page.module.ts

@@ -60,6 +60,9 @@ import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component
 import {
   ThemedFullFileSectionComponent
 } from './full/field-components/file-section/themed-full-file-section.component';
+import {
+  ItemPageKalturaFieldComponent
+} from "./simple/field-components/specific-field/kaltura/item-page-kaltura-field.component";
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -103,6 +106,7 @@ const DECLARATIONS = [
   ItemAlertsComponent,
   ThemedItemAlertsComponent,
   BitstreamRequestACopyPageComponent,
+  ItemPageKalturaFieldComponent
 ];
 
 @NgModule({

src/app/item-page/simple/field-components/specific-field/kaltura/item-page-kaltura-field.component.html

@@ -0,0 +1,29 @@
+<div class="item-page-kaltura-field">
+    <div *ngIf="item.metadata['dc.description.audio']?.length > 0">
+        <div *ngFor="let audio of item.metadata['dc.description.audio']; index as i;">
+            <iframe
+                    type="text/javascript"
+                    [src]=safeUrl(audio.value)
+                    style="width: 640px;height: 400px"
+                    allowfullscreen
+                    webkitallowfullscreen
+                    mozAllowFullScreen
+            >
+            </iframe>
+        </div>
+    </div>
+
+    <div *ngIf="item.metadata['dc.description.viewer']?.length > 0">
+        <div *ngFor="let viewer of item.metadata['dc.description.viewer']; index as i;">
+            <iframe
+                    type="text/javascript"
+                    [src]=safeUrl(viewer.value)
+                    style="width: 640px;height: 400px"
+                    allowfullscreen
+                    webkitallowfullscreen
+                    mozAllowFullScreen
+            >
+            </iframe>
+        </div>
+    </div>
+</div>

src/app/item-page/simple/field-components/specific-field/kaltura/item-page-kaltura-field.component.spec.ts

@@ -0,0 +1,31 @@
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
+import {ChangeDetectionStrategy, NO_ERRORS_SCHEMA} from '@angular/core';
+import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
+import {TranslateLoaderMock} from '../../../../../shared/testing/translate-loader.mock';
+import {MetadataValuesComponent} from '../../../../field-components/metadata-values/metadata-values.component';
+import {ItemPageKalturaFieldComponent} from './item-page-kaltura-field.component';
+
+let fixture: ComponentFixture<ItemPageKalturaFieldComponent>;
+
+const mockValue = 'test value';
+
+describe('ItemPageKalturaFieldComponent', () => {
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot({
+                loader: {
+                    provide: TranslateLoader,
+                    useClass: TranslateLoaderMock
+                }
+            })],
+            declarations: [ItemPageKalturaFieldComponent, MetadataValuesComponent],
+            schemas: [NO_ERRORS_SCHEMA]
+        }).overrideComponent(ItemPageKalturaFieldComponent, {
+            set: {changeDetection: ChangeDetectionStrategy.Default}
+        }).compileComponents();
+    }));
+
+    it('should display display the correct metadata value', () => {
+        expect(fixture.nativeElement.innerHTML).toContain(mockValue);
+    });
+});

src/app/item-page/simple/field-components/specific-field/kaltura/item-page-kaltura-field.component.ts

@@ -0,0 +1,35 @@
+import {Component, Input} from '@angular/core';
+
+import {Item} from '../../../../../core/shared/item.model';
+import {DSONameService} from '../../../../../core/breadcrumbs/dso-name.service';
+
+import {DomSanitizer} from '@angular/platform-browser';
+
+@Component({
+    selector: 'ds-item-page-kaltura-field',
+    templateUrl: './item-page-kaltura-field.component.html'
+})
+/**
+ * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
+ */
+export class ItemPageKalturaFieldComponent {
+
+    /**
+     * The item to display metadata for
+     */
+    @Input() item: Item;
+
+    constructor(
+        public dsoNameService: DSONameService,
+        public sanitizer: DomSanitizer
+    ) {
+
+    }
+
+    safeUrl(id: string) {
+        let untrusted = 'https://cdnapisec.kaltura.com/p/518251/embedPlaykitJs/uiconf_id/52424842?iframeembed=true&entry_id=' + id;
+        let trusted = this.sanitizer.bypassSecurityTrustResourceUrl(untrusted);
+        return trusted;
+    }
+
+}