- favicons for all platforms

- deleting message box in contact view
- optional property for showing heading in PersonTable.vue
- showing reference type and additional abstratcs in detail view of dataset
- reduced relationTypes for references

app/Http/Controllers/Publish/IndexController.php

@@ -61,9 +61,9 @@ class IndexController extends Controller
         $projects = Project::pluck('label', 'id');
         $relatedIdentifierTypes = ["doi", "handle", "isbn", "issn", "url", "urn"];
         $relatedIdentifierTypes = array_combine($relatedIdentifierTypes, $relatedIdentifierTypes);
-       
-        $relationTypes =  ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues",
-        "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"];
+
+        $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues",
+            "IsNewVersionOf", "IsPartOf", "HasPart", "Compiles", "IsVariantFormOf"];
         $relationTypes = array_combine($relationTypes, $relationTypes);
 
         $titleTypes = ['Sub' => 'Sub', 'Alternative' => 'Alternative', 'Translated' => 'Translated', 'Other' => 'Other'];
@@ -78,7 +78,18 @@ class IndexController extends Controller
         //$relationTypes = array('updates' => 'updates', 'updated-by' => 'updated-by', 'other' => 'other');
         return view(
             'publish.create-step1',
-            compact('licenses', 'languages', 'messages', 'projects', 'relatedIdentifierTypes', 'relationTypes', 'titleTypes', 'keywordTypes', 'descriptionTypes', 'page')
+            compact(
+                'licenses',
+                'languages',
+                'messages',
+                'projects',
+                'relatedIdentifierTypes',
+                'relationTypes',
+                'titleTypes',
+                'keywordTypes',
+                'descriptionTypes',
+                'page'
+            )
         );
     }
 

app/Models/Dataset.php

@@ -213,7 +213,10 @@ class Dataset extends Model
     {
         return $this->hasMany(Description::class, 'document_id', 'id');
     }
-
+    public function additionalAbstracts()
+    {
+        return $this->hasMany(Description::class, 'document_id', 'id')->where('type', '!=', 'Abstract');
+    }
     public function mainAbstract()
     {
         return $this->hasMany(Description::class, 'document_id', 'id')->where('type', 'Abstract')->first();

public/images/favicon/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/images/favicons/mstile-150x150.png"/>
+            <TileColor>#2b5797</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

public/images/favicon/favicon.svg

@@ -0,0 +1,14 @@
+<svg id="662299c0-7a48-11ea-bc55-0242ac130003" xmlns="http://www.w3.org/2000/svg" width="726" height="726" viewBox="0 0 727 727">
+    <title>
+        tethys
+    </title>
+    <path d="M 830.7 408 l 12.3 -74.3 L 689.1 301.1 l 6.3 -189.6 H 620 L 614.3 285.2 L 407 241.3 l 4.3 -129.8 H 336 L 332.2 225.5 L 180.8 193.4 l -12.3 74.3 l 161.2 34.2 l -4.9 147.4 L 151.3 412.5 l -12.3 74.3 L 322.2 525.6 l -6.1 183.4 h 75.3 l 5.6 -167.5 l 207.2 43.9 l -4.1 123.6 h 75.3 l 3.6 -107.8 l 122.2 25.9 l 12.3 -74.3 l -132 -28 l 4.9 -147.4 Z M 606.8 509 l -207.2 -43.9 l 4.9 -147.4 l 207.2 43.9 Z" transform="matrix(1,0,0,1,-139,-86.6)" fill="#3ad29f"/>
+    <polygon points="490,428.8 495.5,273.3 264.5,227 264.4,231.7 472.3,273.3 467,424.2 490,428.8" opacity="0.2"/>
+    <polygon points="496.7,201.5 502.5,24.8 481.7,24.8 476.1,197 496.7,201.5" opacity="0.2"/>
+    <polygon points="548.3,285.4 548.1,290.7 692.6,322 693.4,316.9 548.3,285.4" opacity="0.2"/>
+    <polygon points="212.7,140.4 216.5,25.5 195.7,25.5 192,136.1 212.7,140.4" opacity="0.2"/>
+    <polygon points="539.8,508.2 539.7,513.8 662.1,541.1 662.9,535.6 539.8,508.2" opacity="0.2"/>
+    <polygon points="257,450 256.4,455 465,499 462,621.5 485,621.5 489.6,494.4 255.8,451.7" opacity="0.2"/>
+    <polygon points="185.8,362.7 206.5,367.2 211.4,216.9 49.3,182.2 61.1,110.7 40.9,106.4 28.4,182.2 190.5,215 185.8,362.7" opacity="0.2"/>
+    <polygon points="20.8,400.8 32.4,330.7 12.3,326.5 0,400.8 183.2,439.6 177.1,623 197.9,623 204,439.6 20.8,400.8" opacity="0.2"/>
+</svg>

public/images/favicon/safari-pinned-tab.svg

@@ -0,0 +1,31 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1886 6648 c-6 -116 -24 -674 -29 -875 -2 -95 -4 -112 -17 -108 -8 2
+-289 63 -625 135 -335 71 -654 140 -708 151 -57 13 -101 18 -106 13 -9 -10
+-123 -705 -117 -712 3 -2 188 -42 413 -88 1015 -210 1126 -233 1132 -239 5 -5
+-38 -1407 -44 -1413 -2 -2 -375 76 -831 173 -455 96 -831 172 -834 168 -7 -8
+-122 -704 -118 -709 2 -1 396 -85 876 -187 480 -101 875 -187 878 -190 5 -5
+-24 -1008 -48 -1692 l-3 -70 360 4 c198 2 361 4 362 5 1 1 14 359 29 796 15
+437 29 797 31 800 5 6 38 -1 1103 -226 481 -102 878 -188 881 -192 6 -6 -10
+-632 -26 -1025 l-6 -157 360 0 360 0 5 33 c3 17 10 208 16 422 14 516 18 575
+39 575 9 0 272 -56 584 -123 364 -79 570 -120 572 -113 12 37 116 699 111 704
+-4 3 -288 66 -633 139 -345 73 -627 134 -629 136 -1 1 9 310 22 687 13 377 23
+695 24 708 0 18 4 21 23 17 50 -11 1343 -286 1357 -288 11 -1 17 14 22 63 5
+36 30 196 57 355 43 259 46 291 32 297 -9 4 -340 75 -736 159 -396 83 -722
+153 -724 155 -5 5 47 1692 54 1772 l5 52 -365 0 -365 0 0 -27 c1 -64 -53
+-1638 -55 -1641 -4 -5 -1985 415 -1991 421 -3 3 4 274 16 603 11 330 20 609
+20 622 l0 22 -364 0 -364 0 -6 -112z m1369 -2022 c924 -192 1279 -267 1287
+-275 4 -3 -4 -316 -17 -696 -14 -379 -25 -696 -25 -702 0 -7 -6 -13 -12 -13
+-14 -1 -1971 412 -1976 416 -5 3 39 1385 44 1402 2 7 13 10 26 7 13 -3 316
+-65 673 -139z"/>
+</g>
+</svg>

public/images/favicon/site.webmanifest

@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/images/favicons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/images/favicons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#646b63",
+    "background_color": "#646b63",
+    "display": "standalone"
+}

public/images/help/secure_data.svg

@@ -1,4 +1,4 @@
-<svg id="e8f68bdd-4984-4f2e-95b7-7fc8ec281257" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="140" height="80" viewBox="0 0 918.14 765.54">
+<svg id="78492d38-7a4a-11ea-bc55-0242ac130003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="140" height="80" viewBox="0 0 918.14 765.54">
     <defs/>
     <!--linkes Blatt-->
     <rect x="169" y="94.7" width="455" height="609.1" style="fill:#f2f2f2;stroke:#6b716f;stroke-width:1"/>

public/images/help/specs.svg

@@ -1,4 +1,4 @@
-<svg id="f31880e0-b367-484e-a419-f98cd1dead11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="130" height="80" viewBox="0 0 813.71645 690.72993">
+<svg id="1001c996-7a4b-11ea-bc55-0242ac130003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="130" height="80" viewBox="0 0 813.71645 690.72993">
     <defs>
     <linearGradient id="gradient" x1="0%" y1="0%" x2="0" y2="100%">
       <stop offset="0%" style="stop-color:skyblue;" />

public/images/help/upload.svg

@@ -1,6 +1,5 @@
-<svg id="fc1f5aea-a643-4136-ad0f-c5867679d735" data-name="Layer 1" 
-    xmlns="http://www.w3.org/2000/svg" width="130" height="80" viewBox="0 0 1075.56483 723">
-    <title>add_file</title>
+<svg id="20095fb6-7a4b-11ea-bc55-0242ac130003" 
+    xmlns="http://www.w3.org/2000/svg" width="130" height="80" viewBox="0 0 1075.56483 723">   
     <rect x="618.01845" y="721" width="457.54639" height="2" fill="#3f3d56"/>
     <rect x="583.01845" y="692" width="457.54639" height="2" fill="#3f3d56"/>
     <rect x="438.01845" y="663" width="457.54639" height="2" fill="#3f3d56"/>

resources/js/components/PersonTable.vue

@@ -1,6 +1,6 @@
  <template>
   <div>
-    <h3 v-if="heading && personlist.length">{{ heading }}</h3>
+    <h3 v-if="heading && personlist.length && showHeading == true">{{ heading }}</h3>
     <table class="pure-table pure-table-horizontal" v-if="personlist.length">
       <thead class="thead-dark">
         <tr>
@@ -133,6 +133,8 @@ export default class PersonTable extends Vue {
   heading;
   @Prop({ required: true, type: Array })
   messages;
+  @Prop({ default: true, type: Boolean })
+  showHeading;
 
   // props: {
   //   personlist: {

resources/views/frontend/dataset/show.blade.php

@@ -47,8 +47,7 @@
                       Zusätzliche Titel:
                       <ul>
                         @foreach ($dataset->additionalTitles as $title)
-                        <li>{{ $title->type }}: {{ $title->value }}</li>
-                        <br />
+                        <li>{{ $title->type }}: {{ $title->value }}</li>                        
                         @endforeach
                       </ul>
                     </p>
@@ -56,6 +55,17 @@
 
                     <p class="dataset__abstract">{{ $dataset->mainAbstract()->value }}</p>
 
+                    @if($dataset->additionalAbstracts()->exists())
+                    <p class="dataset__abstract">
+                      Zusätzliche Beschreibungen:
+                      <ul>
+                        @foreach ($dataset->additionalAbstracts as $abstract)
+                        <li>{{ $abstract->type }}: {{ $abstract->value }}</li>                       
+                        @endforeach
+                      </ul>
+                    </p>
+                    @endif
+
                     @if($dataset->authors()->exists())
                     <p class="dataset__abstract" v-if="dataset.subject && dataset.subject.length > 0">
                       Ersteller/Autor: {{ $dataset->authors->implode('full_name', ', ')  }}
@@ -79,8 +89,7 @@
                       Referenzen:
                       <ul>
                         @foreach ($dataset->references as $reference)
-                        <li>{{ $reference->value }}</li>
-                        <br />
+                        <li>{{ $reference->type . ': ' . $reference->value . ' (' . $reference->relation . ')' }}</li>                       
                         @endforeach
                       </ul>
                     </p>
@@ -192,6 +201,7 @@
   .tab-nav {
     z-index: 2;
   }
+
   .tab-content .tab-pane {
     display: none;
     /* visibility: hidden; */
@@ -262,10 +272,6 @@
     position: relative;
   }
 
-  .dataset {
-    /* // max-width: 500px; */
-  }
-
   .dataset__title {
     position: relative;
     text-transform: uppercase;
@@ -286,7 +292,7 @@
     right: -20px;
     line-height: 1;
     font-weight: 900;
-    z-index: -1;    
+    z-index: -1;
   }
 
   .dataset__blog-meta {
@@ -301,26 +307,26 @@
 
 @section('after-scripts')
 <script type="text/javascript">
-  (function() {
+  (function () {
     function main() {
-        var tabButtons = [].slice.call(document.querySelectorAll('ul.tab-nav li span.button'));
+      var tabButtons = [].slice.call(document.querySelectorAll('ul.tab-nav li span.button'));
 
-        tabButtons.map(function(button) {
-            button.addEventListener('click', function() {
-                document.querySelector('li span.active.button').classList.remove('active');
-                button.classList.add('active');
+      tabButtons.map(function (button) {
+        button.addEventListener('click', function () {
+          document.querySelector('li span.active.button').classList.remove('active');
+          button.classList.add('active');
 
-                document.querySelector('.tab-pane.active').classList.remove('active');
-                document.querySelector(button.getAttribute('name')).classList.add('active');
-            })
+          document.querySelector('.tab-pane.active').classList.remove('active');
+          document.querySelector(button.getAttribute('name')).classList.add('active');
         })
+      })
     }
 
     if (document.readyState !== 'loading') {
-        main();
+      main();
     } else {
-        document.addEventListener('DOMContentLoaded', main);
+      document.addEventListener('DOMContentLoaded', main);
     }
-})();
+  })();
 </script>
 @stop

resources/views/frontend/home/contact.blade.php

@@ -63,38 +63,38 @@
 </section> --}}
 <!-- Contact Us -->
 <section data-sr class="contact-us u-full-width">
-        <div class="container">
-    <div class="row">      
-       
-        <h4>
-            Want to keep updated or need further information?
-        </h4>
-       
-           
-    </div>
-    <div class="row">
-        <div class="four columns contact-us-details">
-            <h3>Our Location</h3>
-            <h5>
-                Neulinggasse 38 <br />
-                1030 Wien <br />
-                +43-1-7125674 <br />
-            </h5>
-            <ul class="social-links">
-                <li>
-                    <a href="https://twitter.com/GeologischeBA" target="_blank">
-                        <i class="fab fa-twitter"></i>
-                    </a>
-                </li>
-                <li>
-                    <a href="https://www.facebook.com/geologie.ac.at" target="_blank">
-                        <i class="fab fa-facebook"></i>
-                    </a>
-                </li>
+    <div class="container">
+        <div class="row">
+
+            <h4>
+                Want to keep updated or need further information?
+            </h4>
+
 
-            </ul>
         </div>
-        <div class="eight columns contact-us-form">
+        <div class="row">
+            <div class="twelve columns contact-us-details">
+                <h3>Our Location</h3>
+                <h5>
+                    Neulinggasse 38 <br />
+                    1030 Wien <br />
+                    +43-1-7125674 <br />
+                </h5>
+                <ul class="social-links">
+                    <li>
+                        <a href="https://twitter.com/GeologischeBA" target="_blank">
+                            <i class="fab fa-twitter"></i>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="https://www.facebook.com/geologie.ac.at" target="_blank">
+                            <i class="fab fa-facebook"></i>
+                        </a>
+                    </li>
+
+                </ul>
+            </div>
+            <!-- <div class="eight columns contact-us-form">
             <form>
                 <div class="row">
                     <div class="six columns">
@@ -108,9 +108,9 @@
                 <input class="button u-pull-right" type="submit" value="Send">
             </form>
 
+        </div> -->
         </div>
     </div>
-        </div>
 </section>
 
 @endsection

resources/views/layouts/app.blade.php

@@ -31,12 +31,18 @@
     <link rel="stylesheet" href="/css/style.css">
 
     <!-- Favicon
-    –––––––––––––––––––––––––––––––––––––––––––––––––– -->
-    <link rel="icon" type="image/png" href="/images/favicon/favicon.ico" />
-    <!-- <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">
-    <link rel="manifest" href="images/favicon/site.webmanifest"> -->
+    –––––––––––––––––––––––––––––––––––––––––––––––––– -->  
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon/favicon-16x16.png">
+    <link rel="manifest" href="/images/favicon/site.webmanifest">
+    <link rel="mask-icon" href="/images/favicon/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="shortcut icon" href="/images/favicon/favicon.ico">
+    <meta name="msapplication-TileColor" content="#2b5797">
+    <meta name="msapplication-config" content="/images/favicon/browserconfig.xml">
+    <meta name="theme-color" content="#646b63">
+
+
 
     <!-- Javascript
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->

resources/views/workflow/submitter/_form.blade.php

@@ -75,7 +75,7 @@
         <button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button> --}}
     </div>
     <input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'" data-vv-as="Author">
-    <person-table name="authors" v-bind:messages="messages" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
+    <person-table name="authors" v-bind:messages="messages" v-bind:show-heading="false" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
     <person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
     </person-table>
 </fieldset>