- demo Schleife im Header

- Sprachen nur englisch und deutsch
- Migrations und TableSeeder ausgebessert (zusätzlich document_identifiers)
- reviewer nun reviewer Rolle (Fehler ausgebessert)

app/Http/Controllers/Publish/IndexController.php

@@ -56,7 +56,7 @@ class IndexController extends Controller
         // ->toArray();
 
         // $projects = Project::pluck('label', 'id');
-        $relatedIdentifierTypes = ["ARK", "arXiv", "bibcode", "DOI", "EAN13", "EISSN", "Handle", "IGSN", "ISBN", "ISSN", "ISTC", "LISSN", "LSID", "PMID", "PURL", "UPC", "URL", "URN"];
+        $relatedIdentifierTypes = ["doi", "handle", "isbn", "issn",  "url", "urn"];
         $relatedIdentifierTypes = array_combine($relatedIdentifierTypes, $relatedIdentifierTypes);
        
         $relationTypes = ["IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", "HasMetadata", "IsMetadataFor","IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsReferencedBy", "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf"];

database/migrations/2019_09_02_105025_create_document_references_table.php

@@ -23,7 +23,7 @@ class CreateDocumentReferencesTable extends Migration
           
             $table->enum(
                 'type',
-                ["DOI", "Handle", "ISBN", "ISSN",  "URL", "URN"]
+                ["doi", "handle", "isbn", "issn",  "url", "urn"]
             );
             $table->enum(
                 'relation',

database/migrations/2019_09_13_150519_create_document_identifiers_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateDocumentIdentifiersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('document_identifiers', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->integer('document_id')->unsigned();
+            $table->foreign('document_id')->references('id')->on('documents')
+            ->onUpdate('cascade')->onDelete('cascade');
+          
+            $table->enum(
+                'type',
+                ["doi", "handle", "isbn", "issn",  "url", "urn"]
+            );
+           
+            $table->string('value', 255);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('document_identifiers');
+    }
+}

database/seeds/LanguagesTableSeeder.php

@@ -44,7 +44,7 @@ class LanguagesTableSeeder extends Seeder
                 'scope' => 'I',
                 'type' => 'L',
                 'ref_name' => 'Italian',
-                'active' =>true,
+                'active' =>false,
             ],
             [
                 'part2_b' => 'fre',
@@ -53,7 +53,7 @@ class LanguagesTableSeeder extends Seeder
                 'scope' => 'I',
                 'type' => 'L',
                 'ref_name' => 'French',
-                'active' =>true,
+                'active' =>false,
             ],
             [
                 'part2_b' => 'rus',

database/seeds/PagesTableSeeder.php

@@ -18,58 +18,58 @@ class PagesTableSeeder extends Seeder
             [
                 // 1
                 //'title'       => 'Terms and conditions',
-                'page_slug'   => 'terms-and-conditions',
+                'page_slug' => 'terms-and-conditions',
                 // 'description' => $faker->text($maxNbChars = 255),
                 'seo_title' => 'Terms and Conditions',
                 'seo_keyword' => 'GBA, repository, terms and conditions',
                 'seo_description' => 'Terms and Conditions',
                 'status' => '1',
-                'created_by'  => 1,
+                'created_by' => 1,
-                'updated_by'  => 1,
+                'updated_by' => 1,
-                'created_at'  => Carbon::now(),
+                'created_at' => Carbon::now(),
-                'updated_at'  => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
                 // 2
                 //'title'       => 'imprint',
-                'page_slug'   => 'imprint',
+                'page_slug' => 'imprint',
                 // 'description' => $faker->text($maxNbChars = 255),
                 'seo_title' => 'Impressum',
                 'seo_keyword' => 'GBA, repository, imprint',
                 'seo_description' => 'Imprint',
                 'status' => '1',
-                'created_by'  => 1,
+                'created_by' => 1,
-                'updated_by'  => 1,
+                'updated_by' => 1,
-                'created_at'  => Carbon::now(),
+                'created_at' => Carbon::now(),
-                'updated_at'  => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
                 // 3
                 //'title'       => 'Terms and conditions',
-                'page_slug'   => 'about',
+                'page_slug' => 'about',
                 // 'description' => $faker->text($maxNbChars = 255),
                 'seo_title' => 'About',
                 'seo_keyword' => 'GBA, repository, about',
                 'seo_description' => 'About',
                 'status' => '1',
-                'created_by'  => 1,
+                'created_by' => 1,
-                'updated_by'  => 1,
+                'updated_by' => 1,
-                'created_at'  => Carbon::now(),
+                'created_at' => Carbon::now(),
-                'updated_at'  => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
                 // 4
                 //'title'       => 'Terms and conditions',
-                'page_slug'   => 'home-welcome',
+                'page_slug' => 'home-welcome',
                 // 'description' => $faker->text($maxNbChars = 255),
                 'seo_title' => 'About',
                 'seo_keyword' => 'GBA, repository, about',
                 'seo_description' => 'About',
                 'status' => '1',
-                'created_by'  => 1,
+                'created_by' => 1,
-                'updated_by'  => 1,
+                'updated_by' => 1,
-                'created_at'  => Carbon::now(),
+                'created_at' => Carbon::now(),
-                'updated_at'  => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
         ]);
 
@@ -90,7 +90,22 @@ class PagesTableSeeder extends Seeder
                 'page_id' => 2, //imprint
                 'locale' => 'de',
                 'title' => 'Impressum',
-                'description' => '<p><strong>Für den Inhalt verantwortlich: hfjklög</strong></p><p>Geologische Bundesanstaltdsfsdf</p><p>Neulinggasse 38, 1030 Wien</p><p>» office@geologie.ac.at</p><p>&nbsp;</p><p>Telefon: +43-1-7125674</p><p>Fax: +43-1-7125674-56</p><p>&nbsp;</p><p>Technische Umsetzung und Betreuung</p><p>Geologische Bundesanstalt</p><p>Abteilung Geoinformation und Abteilung IT &amp; GIS</p><p>Neulinggasse 38, 1030 Wien</p><p>» repository@geologie.ac.at</p><p>&nbsp;</p><p>Bei technischen Problemen steht Ihnen das RDR-Team, erreichbar unter repository@geologie.ac.at, zur Seite.</p><p>&nbsp;</p><p>Hinweise und Haftungsausschluss</p><p>Eine Haftung oder Garantie für Aktualität, Richtigkeit und Vollständigkeit der zur Verfügung gestellten Informationen und Daten ist ausgeschlossen.</p><p>Dieser Hinweis gilt auch für alle anderen Website, auf die durch Hyperlinks verwiesen wird. Die Geologische Bundesanstalt ist für den Inhalt von Websites, die mittels einer solchen Verbindung erreicht werden, nicht verantwortlich.</p><p>&nbsp;</p><p>Bildernachweis</p><p>### Muss dann direkt auf der RDR Webpage ausgefüllt werden sobald diese existiert ###</p><p>&nbsp;</p>',
+                'description' => '<p><strong>Für den Inhalt verantwortlich:</strong></p>
+                <p>Geologische Bundesanstalt</p><p>Neulinggasse 38, 1030 Wien</p>
+                <p>email: office@geologie.ac.at</p>              
+                <p>Telefon: +43-1-7125674</p>
+                <p>Fax: +43-1-7125674-56</p>
+                <p>&nbsp;</p>
+                <p>Technische Umsetzung und Betreuung</p>
+                <p>Geologische Bundesanstalt</p>
+                <p>Abteilung Geoinformation und Abteilung IT &amp; GIS</p>
+                <p>Neulinggasse 38, 1030 Wien</p>
+                <p>email: repository@geologie.ac.at</p>
+                <p>&nbsp;</p>
+                <p>Bei technischen Problemen steht Ihnen das RDR-Team, erreichbar unter repository@geologie.ac.at, zur Seite.</p>
+                <p>&nbsp;</p><p>Hinweise und Haftungsausschluss</p>
+                <p>Eine Haftung oder Garantie für Aktualität, Richtigkeit und Vollständigkeit der zur Verfügung gestellten Informationen und Daten ist ausgeschlossen.</p>
+                <p>Dieser Hinweis gilt auch für alle anderen Website, auf die durch Hyperlinks verwiesen wird. Die Geologische Bundesanstalt ist für den Inhalt von Websites, die mittels einer solchen Verbindung erreicht werden, nicht verantwortlich.</p>',
             ],
             [
                 'page_id' => 2, //imprint
@@ -134,12 +149,12 @@ class PagesTableSeeder extends Seeder
                 'locale' => 'en',
                 'title' => 'Data Research Repository',
                 'description' => '<div>
-                <p>Theee library offers to publish electronically generated and qualified documents on its online publication system. 
+                <p>The library offers to publish electronically generated and qualified documents on its online publication system.
                 This service is for university members only and free of charge. After publication,
                 the texts are available worldwide on the Internet and will be archived permanently by the library.
                 The documents are indexed and made accessible in library catalogues and Web search engines.</p>
                 </div>',
             ],
-         ]);
+        ]);
     }
 }

database/seeds/RolesTableSeeder.php

@@ -60,7 +60,7 @@ class RolesTableSeeder extends Seeder
                 'role_id' => '3', //editor role
             ],
             [
-                'account_id' => '3', //Review
+                'account_id' => '4', //Review
                 'role_id' => '4', //reviewer role
             ],
         ]);

public/css/style.css

@@ -746,3 +746,29 @@ there.
 
 /* Larger than Desktop HD */
 @media (min-width: 1200px) {}
+
+#trynewsite {
+  /* background-color: rgb(178,34,34);
+  background-color: rgba(178,34,34,0.7); */
+  background-color: #00bfffcc;
+  width: 280px;
+  position: fixed;
+  top: 60px;
+  right: -64px;
+  padding: 10px;
+  text-align: center;
+  box-shadow: 1px 1px 5px grey;
+  -moz-transform: rotate(45deg);
+  -webkit-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  transform: rotate(45deg);
+  z-index:999;
+}
+
+#trynewsite span {
+  font-weight: bold;
+  /* font-size: 1.25em; */
+  text-decoration: none;
+  color:black;
+}

resources/views/layouts/app.blade.php

@@ -45,6 +45,9 @@
 </head>
 
 <body class="layout-home-html">
+    <div id="trynewsite">
+        <span>Repository Demo</span>
+    </div>
 
     <!-- Menu -->
     <header class="header">
@@ -66,7 +69,7 @@
                     </li>
                     <li>
                         <a class="pure-menu-item {{ Route::currentRouteName() == 'frontend.search.index' ? 'current' : '' }}"
-                            href="{{ route('frontend.search.index') }}">  SEARCH</a>
+                            href="{{ route('frontend.search.index') }}"> SEARCH</a>
                     </li>
 
                     <!-- <li><a href="#work">Work</a></li> -->
@@ -97,6 +100,14 @@
                             <i class="fas fa-sign-in-alt"></i> Login
                         </a>
                     </li>
+                    @else
+
+                    <li class="right">
+                        <a class="pure-menu-link" href="{{ route('logout') }}">
+                            <i class="fas fa-sign-out-alt"></i> LOG OUT
+                        </a>
+                    </li>
+
                     @endif
                 </ul>
             </div>