Maps stuff

owlchester · Aug 16, 2020 · 5625da8 · 5625da8
1 parent 7db12a9
commit 5625da8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/public/js/app.js b/public/js/app.js
@@ -76596,6 +76596,10 @@ $(document).ready(function () {
     treeViewInit('abilities');
   }
 
+  if ($('#maps').length > 0) {
+    treeViewInit('maps');
+  }
+
   manageTabs();
   manageDashboardNotifications(); // Live search on forms
 

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/js/abilities.js": "/js/abilities.js?id=a4777ab104e3649cc8ad",
     "/js/api.js": "/js/api.js?id=cb055490082e0c69bb61",
-    "/js/app.js": "/js/app.js?id=3531006a33fbe5d046b5",
+    "/js/app.js": "/js/app.js?id=50ab2f0cfd41f369410d",
     "/css/bootstrap.css": "/css/bootstrap.css?id=f28aeee238326cd7c477",
     "/css/vendor.css": "/css/vendor.css?id=86f3141dc39a1f0e35d5",
     "/css/app.css": "/css/app.css?id=64326bc0b700c25ca8f0",
@@ -30,7 +30,7 @@
     "/js/conversation.js": "/js/conversation.js?id=c38d9a1657a963f67e7c",
     "/js/dashboard.js": "/js/dashboard.js?id=1b080e578ebed36d109b",
     "/js/datagrids.js": "/js/datagrids.js?id=f4f885bd722b3d2d4e24",
-    "/js/editors/summernote.js": "/js/editors/summernote.js?id=9d3f4d4300205db48bd3",
+    "/js/editors/summernote.js": "/js/editors/summernote.js?id=5192585d539f430223ff",
     "/js/entity.js": "/js/entity.js?id=935567e8ab5c96153b9b",
     "/js/lfgm.js": "/js/lfgm.js?id=9ca29667d9e9bf32d991",
     "/js/location/map.js": "/js/location/map.js?id=de6f5ef6400ed10e6c1e",

diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
@@ -146,6 +146,9 @@ $(document).ready(function() {
     if ($('#abilities').length > 0) {
         treeViewInit('abilities');
     }
+    if ($('#maps').length > 0) {
+        treeViewInit('maps');
+    }
 
     manageTabs();
     manageDashboardNotifications();

diff --git a/resources/views/cruds/tree.blade.php b/resources/views/cruds/tree.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.app', [
     'title' => trans($name . '.index.title', ['name' => CampaignLocalization::getCampaign()->name]),
-    'description' => trans($name . '.index.description',  ['name' => CampaignLocalization::getCampaign()->name]),
+    'description' => null,
     'breadcrumbs' => [
         ['url' => route($name . '.index'), 'label' => trans($name . '.index.title')]
     ],

diff --git a/resources/views/locations/panels/families.blade.php b/resources/views/locations/panels/families.blade.php
@@ -39,8 +39,8 @@
         </div>
 
         <?php  $r = $model->allFamilies()->filter($filters)->simpleSort($datagridSorter)->with(['location', 'family', 'entity', 'entity.tags'])->paginate(); ?>
-        <p class="export-{{ $r->count() === 0 ? 'visible export-hidden' : 'visible' }}">{{ trans('locations.show.tabs.characters') }}</p>
-        <table id="characters" class="table table-hover margin-top {{ $r->count() === 0 ? 'export-hidden' : '' }}">
+        <p class="export-{{ $r->count() === 0 ? 'visible export-hidden' : 'visible' }}">{{ trans('locations.show.tabs.families') }}</p>
+        <table id="families" class="table table-hover margin-top {{ $r->count() === 0 ? 'export-hidden' : '' }}">
             <tbody><tr>
                 <th class="avatar"><br /></th>
                 <th>{{ trans('families.fields.name') }}</th>
@@ -54,7 +54,7 @@
             @foreach ($r as $family)
                 <tr>
                     <td>
-                        <a class="entity-image" style="background-image: url('{{ $family->getImageUrl(40) }}');" title="{{ $family->name }}" href="{{ route('characters.show', $family->id) }}"></a>
+                        <a class="entity-image" style="background-image: url('{{ $family->getImageUrl(40) }}');" title="{{ $family->name }}" href="{{ route('families.show', $family->id) }}"></a>
                     </td>
                     <td>
                         {!! $family->tooltipedLink() !!}
@@ -73,7 +73,7 @@
                     </td>
                     <td>{{ $family->type }}</td>
                     <td class="text-right">
-                        <a href="{{ route('characters.show', [$family]) }}" class="btn btn-xs btn-primary">
+                        <a href="{{ route('families.show', [$family]) }}" class="btn btn-xs btn-primary">
                             <i class="fa fa-eye" aria-hidden="true"></i> {{ trans('crud.view') }}
                         </a>
                     </td>