Merge pull request #57 from dhlab-basel/pre-release/version-1.4.0

Pre-release v1.4.0
dasch-swiss · Aug 26, 2019 · a01f732 · a01f732
2 parents 6b3b9f8 + 7319dcc
commit a01f732
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kuirl",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src/app/project/list/list-info-form/list-info-form.component.html b/src/app/project/list/list-info-form/list-info-form.component.html
@@ -25,6 +25,11 @@
                 <select matNativeControl [formControl]="form.controls['language']">
                     <option *ngFor="let lang of languagesList" [value]="lang.language">{{lang.value}}</option>
                 </select>
+                <span class="fill-remaining-space"></span>
+                <button type="button" mat-icon-button matPrefix matTooltipPosition="above" color="accent"
+                        matTooltip="PROTOTYPE ONLY! Set the language for the whole list and list node labels. This selector will be replaced in the next release by StringLiteral input">
+                    <mat-icon>warning</mat-icon>
+                </button>
             </mat-form-field>
 
 

diff --git a/src/app/user/dashboard/dashboard.component.html b/src/app/user/dashboard/dashboard.component.html
@@ -6,7 +6,13 @@
         <div class="app-headline">
             <h1 class="mat-headline">Welcome {{user?.givenName}} {{user?.familyName}}</h1>
 
-            <h2 class="mat-title">Here you'll find your latest work, your projects, and collections.</h2>
+            <h2 class="mat-title">Here you'll find your latest work, your projects, and collections.
+                <button type="button" mat-icon-button matPrefix matTooltipPosition="above" color="accent"
+                        matTooltip="COMING SOON! All these features are not yet fully implemented.">
+                    <mat-icon>warning</mat-icon>
+                </button>
+            </h2>
+
 
         </div>
 
@@ -27,15 +33,17 @@ <h2 class="mat-title show-projects-title">
                 </h2>
                 <span class="fill-remaining-space"></span>
                 <span class="app-toolbar-action">
-                    <button mat-button color="'primary'" *ngIf="sysAdmin" (click)="showSystemProjects = !showSystemProjects" class="toggle-view">
+                    <button mat-button color="'primary'" *ngIf="sysAdmin"
+                            (click)="showSystemProjects = !showSystemProjects" class="toggle-view">
                         <span *ngIf="showSystemProjects">Show only my projects</span>
                         <span *ngIf="!showSystemProjects">Show all projects</span>
                     </button>
 
                 </span>
             </div>
             <!-- customised button for phone -->
-            <button mat-stroked-button color="'primary'" *ngIf="sysAdmin" (click)="showSystemProjects = !showSystemProjects" class="toggle-view-mobile">
+            <button mat-stroked-button color="'primary'" *ngIf="sysAdmin"
+                    (click)="showSystemProjects = !showSystemProjects" class="toggle-view-mobile">
                 <span *ngIf="showSystemProjects">Show only my projects</span>
                 <span *ngIf="!showSystemProjects">Show all projects</span>
             </button>

diff --git a/src/assets/style/_layout.scss b/src/assets/style/_layout.scss
@@ -141,7 +141,7 @@
     }
 
     .active-link {
-      background: rgba($accent, 1);
+      background: rgba($primary_50, 1);
 
       .mat-icon.suffix {
         display: block;

diff --git a/yarn.lock b/yarn.lock
@@ -4342,20 +4342,25 @@ lodash.debounce@^4.0.8:
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+lodash@^4.0.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
 log4js@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"