Overall improvements

nova-framework · May 12, 2019 · 797cf51 · 797cf51
1 parent 3a2e904
commit 797cf51
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '1.0.1');
+define('VERSION', '1.0.2');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Contacts/Database/Seeds/ContactsTableSeeder.php b/modules/Contacts/Database/Seeds/ContactsTableSeeder.php
@@ -28,7 +28,7 @@ public function run()
             'id'          => 1,
             'name'        => 'Site Contact',
             'email'       => 'admin@novaframework.local',
-            'path'        => 'content/contact-us',
+            'path'        => 'contact-us',
             'description' => 'The default site-wide Contact',
 
             //

diff --git a/modules/Content/Views/Admin/Comments/Index.php b/modules/Content/Views/Admin/Comments/Index.php
@@ -44,7 +44,7 @@
                 </td>
                 <td style="text-align: left; vertical-align: top;" width="35%"><?= nl2br(e($comment->content)); ?></td>
                 <td style="text-align: center; vertical-align: top; font-weight: bold;" width="20%">
-                    <a target="_blank" href="<?= site_url('content/' .$comment->post->name); ?>" title="<?= __d('content', 'View the Post'); ?>"><?= $comment->post->title; ?></a>
+                    <a target="_blank" href="<?= site_url($comment->post->name); ?>" title="<?= __d('content', 'View the Post'); ?>"><?= $comment->post->title; ?></a>
                 </td>
                 <td style="text-align: center; vertical-align: top;" width="15%"><?= $comment->created_at->formatLocalized(__d('content', '%d %b %Y, %R')); ?></td>
                 <td style="text-align: right; vertical-align: middle; padding-bottom: 30px;" width="10%">

diff --git a/modules/Content/Views/Admin/Posts/Edit.php b/modules/Content/Views/Admin/Posts/Edit.php
@@ -163,7 +163,7 @@ function contentEditorInsertMedia(url, type, upload) {
                     <div class="btn-group" role="group" aria-label="...">
                         <a class="btn btn-sm btn-danger" href="#" data-toggle="modal" data-target="#modal-delete-revision-dialog" data-id="<?= $revision->id; ?>" title="<?= __d('content', 'Delete this revision'); ?>" role="button"><i class="fa fa-remove"></i></a>
                         <a class="btn btn-sm btn-success" href="#" data-toggle="modal" data-target="#modal-restore-revision-dialog" data-id="<?= $revision->id; ?>" data-version="<?= $version; ?>" title="<?= __d('content', 'Restore this revision'); ?>" role="button"><i class="fa fa-repeat"></i></a>
-                        <a class="btn btn-sm btn-warning" href="<?= site_url('content/{0}', $revision->slug); ?>" title="<?= __d('content', 'View this revision'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
+                        <a class="btn btn-sm btn-warning" href="<?= site_url($revision->slug); ?>" title="<?= __d('content', 'View this revision'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
                     </div>
                 </td>
             </tr>

diff --git a/modules/Content/Views/Admin/Posts/Index.php b/modules/Content/Views/Admin/Posts/Index.php
@@ -42,7 +42,7 @@
                     <div class="btn-group" role="group" aria-label="...">
                         <a class="btn btn-sm btn-danger" href="#" data-toggle="modal" data-target="#modal-delete-dialog" data-id="<?= $post->id; ?>" title="<?= $postType->label('deleteItem'); ?>" role="button"><i class="fa fa-remove"></i></a>
                         <a class="btn btn-sm btn-success" href="<?= site_url('admin/content/{0}/edit', $post->id); ?>" title="<?= $postType->label('editItem'); ?>" role="button"><i class="fa fa-pencil"></i></a>
-                        <a class="btn btn-sm btn-warning" href="<?= site_url('content/{0}', $post->slug); ?>" title="<?= $postType->label('viewItem'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
+                        <a class="btn btn-sm btn-warning" href="<?= site_url($post->slug); ?>" title="<?= $postType->label('viewItem'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
                     </div>
                 </td>
             </tr>

diff --git a/modules/Content/Views/Admin/Posts/Revisions.php b/modules/Content/Views/Admin/Posts/Revisions.php
@@ -43,7 +43,7 @@
                     <div class="btn-group" role="group" aria-label="...">
                         <a class="btn btn-sm btn-danger" href="#" data-toggle="modal" data-target="#modal-delete-revision-dialog" data-id="<?= $revision->id; ?>" title="<?= __d('content', 'Delete this revision'); ?>" role="button"><i class="fa fa-remove"></i></a>
                         <a class="btn btn-sm btn-success" href="#" data-toggle="modal" data-target="#modal-restore-revision-dialog" data-id="<?= $revision->id; ?>" data-version="<?= $version; ?>" title="<?= __d('content', 'Restore this revision'); ?>" role="button"><i class="fa fa-repeat"></i></a>
-                        <a class="btn btn-sm btn-warning" href="<?= site_url('content/{0}', $revision->slug); ?>" title="<?= __d('content', 'View this revision'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
+                        <a class="btn btn-sm btn-warning" href="<?= site_url($revision->slug); ?>" title="<?= __d('content', 'View this revision'); ?>" target="_blank" role="button"><i class="fa fa-search"></i></a>
                     </div>
                 </td>
             </tr>

diff --git a/modules/Content/Views/Blocks/Archives.php b/modules/Content/Views/Blocks/Archives.php
@@ -2,7 +2,7 @@
 <?php foreach ($items as $name => $count) { ?>
 <div style="padding: 10px 0 10px 0; border-bottom: 1px solid #eee;">
     <?php list ($year, $month) = explode('/', $name); ?>
-    <a class="pull-left" href="<?= url('content/archive', array($year, $month)); ?>"><?= Carbon\Carbon::parse($name .'/1')->formatLocalized($format); ?></a> <span class="pull-right"><?= $count; ?></span>
+    <a class="pull-left" href="<?= url('archive', array($year, $month)); ?>"><?= Carbon\Carbon::parse($name .'/1')->formatLocalized($format); ?></a> <span class="pull-right"><?= $count; ?></span>
     <div class="clearfix"></div>
 </div>
 <?php } ?>
diff --git a/modules/Content/Views/Blocks/Categories.php b/modules/Content/Views/Blocks/Categories.php
@@ -1,6 +1,6 @@
 <?php foreach ($categories as $category) { ?>
 <div style="padding: 10px 0 10px 0; border-bottom: 1px solid #eee;">
-    <a class="pull-left" href="<?= site_url('content/category/' .$category->slug); ?>"><?= $category->name; ?></a> <span class="pull-right"><?= $category->count; ?></span>
+    <a class="pull-left" href="<?= site_url('category/' .$category->slug); ?>"><?= $category->name; ?></a> <span class="pull-right"><?= $category->count; ?></span>
     <div class="clearfix"></div>
 </div>
 <?php } ?>
diff --git a/modules/Content/Views/Content/Index.php b/modules/Content/Views/Content/Index.php
@@ -28,7 +28,7 @@
 <div class="pull-right" style="font-weight: bold;"><span class="fa fa-folder-open-o"></span>
 <?php ob_start(); ?>
 <?php foreach ($categories as $category) { ?>
-<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('content/category/' .$category->slug); ?>"><?= $category->name; ?></a>
+<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('category/' .$category->slug); ?>"><?= $category->name; ?></a>
 <?php $count++; ?>
 <?php } ?>
 <?= preg_replace('~>\s,\s<~m', '>, <', ob_get_clean()); ?>
@@ -53,14 +53,14 @@
 <div class="pull-left"><i class="fa fa-tags"></i>
 <?php ob_start(); ?>
 <?php foreach ($tags as $tag) { ?>
-<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('content/tag/' .$tag->slug); ?>"><?= $tag->name; ?></a>
+<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('tag/' .$tag->slug); ?>"><?= $tag->name; ?></a>
 <?php $count++; ?>
 <?php } ?>
 <?= preg_replace('~>\s,\s<~m', '>, <', ob_get_clean()); ?>
 </div>
 <?php } ?>
 
-<a class="btn btn-xs btn-default col-md-2 pull-right" href="<?= site_url('content/' .$post->name); ?>" title="<?= __d('content', 'View this Post'); ?>" role="button"><?= __d('content', 'Read more ...'); ?></a>
+<a class="btn btn-xs btn-default col-md-2 pull-right" href="<?= site_url($post->name); ?>" title="<?= __d('content', 'View this Post'); ?>" role="button"><?= __d('content', 'Read more ...'); ?></a>
 
 <div class="clearfix"></div>
 <br>

diff --git a/modules/Content/Views/Content/Post.php b/modules/Content/Views/Content/Post.php
@@ -26,7 +26,7 @@
 <div class="pull-right" style="font-weight: bold;"><span class="fa fa-folder-open-o"></span>
 <?php ob_start(); ?>
 <?php foreach ($categories as $category) { ?>
-<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('content/category/' .$category->slug); ?>"><?= $category->name; ?></a>
+<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('category/' .$category->slug); ?>"><?= $category->name; ?></a>
 <?php $count++; ?>
 <?php } ?>
 <?= preg_replace('~>\s,\s<~m', '>, <', ob_get_clean()); ?>
@@ -55,7 +55,7 @@
 <div class="pull-left"><i class="fa fa-tags"></i>
 <?php ob_start(); ?>
 <?php foreach ($tags as $tag) { ?>
-<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('content/tag/' .$tag->slug); ?>"><?= $tag->name; ?></a>
+<?= ($count > 0) ? ', ' : ''; ?><a href="<?= site_url('tag/' .$tag->slug); ?>"><?= $tag->name; ?></a>
 <?php $count++; ?>
 <?php } ?>
 <?= preg_replace('~>\s,\s<~m', '>, <', ob_get_clean()); ?>