From d65f7ced3410b1e1a4b256dbbbf41aa3fa7b1450 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Thu, 30 Aug 2018 10:04:25 +0200
Subject: [PATCH] keep database\factories

---
 app/Library/Xml/DatasetExtension.php   | 7 ++++---
 database/factories/.gitkeep            | 0
 resources/views/layouts/app.blade.php  | 4 ++--
 resources/views/partials/nav.blade.php | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 database/factories/.gitkeep

diff --git a/app/Library/Xml/DatasetExtension.php b/app/Library/Xml/DatasetExtension.php
index 2791fa2..74f68c1 100644
--- a/app/Library/Xml/DatasetExtension.php
+++ b/app/Library/Xml/DatasetExtension.php
@@ -1,6 +1,8 @@
 <?php
 namespace App\Library\Xml;
 
+use App\Models\Title;
+
 /**
  * DatasetExtension short summary.
  *
@@ -13,12 +15,12 @@ trait DatasetExtension
 {
     protected $_externalFields = array(
         'TitleMain' => array(
-            'model' => 'App\Title',
+            'model' => Title::class,
             'options' => array('type' => 'main'),
             'fetch' => 'eager'
         ),
         'TitleAbstract' => array(
-            'model' => 'App\Title',
+            'model' => Title::class,
             'options' => array('type' => 'abstract'),
             'fetch' => 'eager'
         ),
@@ -53,7 +55,6 @@ trait DatasetExtension
         ),
     );
 
-
     protected $_internalFields = array();
 
     protected $_fields = array();
diff --git a/database/factories/.gitkeep b/database/factories/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 12a1215..18510b8 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -97,11 +97,11 @@
                     </p>-->
                 </div>
                 <div class="pure-u-1 pure-u-md-1-4 footer-funded">
-                @hasrole('administrator')
+                @role('administrator')
                     I'm an administrator!
                 @else
                     I'm not an administrator...
-                @endhasrole
+                @endrole
                 </div>
                 <div class="pure-u-1 pure-u-md-1-4 footer-funded">
                 </div>
diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php
index 7477ad6..8170b4e 100755
--- a/resources/views/partials/nav.blade.php
+++ b/resources/views/partials/nav.blade.php
@@ -92,10 +92,10 @@
                                 <a href="#" class="pure-menu-link">{{ Auth::user()->login }} <span class="fa fa-angle-down"></span></a>
                                 <ul class="pure-menu-children" role="menu">
                                     <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a> </li>
-                                     @hasrole('administrator')
+                                     @role('administrator')
                                     <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li>
                                     <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> EDIT ROLES</a></li>
-                                    @endhasrole
+                                    @endrole
                                     <li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i> LOG OUT</a></li>
                                 </ul>
                             </li>