From 7d0865fdaba6a646c1104c6e0dc28d1661cc7db5 Mon Sep 17 00:00:00 2001
From: danpros <dan@danpros.com>
Date: Sat, 27 Jan 2024 22:50:32 +0700
Subject: [PATCH] Cleanup

---
 system/admin/views/static-pages.html.php    | 10 ++++++----
 system/admin/views/static-subpages.html.php |  6 +++++-
 system/admin/views/user-draft.html.php      |  4 ++--
 system/includes/functions.php               |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/system/admin/views/static-pages.html.php b/system/admin/views/static-pages.html.php
index a2d129b..a825978 100644
--- a/system/admin/views/static-pages.html.php
+++ b/system/admin/views/static-pages.html.php
@@ -34,7 +34,9 @@ $(function() {
         <thead>
         <tr class="head" id="head">
             <th><?php echo i18n('Title');?> </th>
-            <th><?php echo i18n('Description');?></th>
+            <?php if (config("views.counter") == "true"): ?>
+                <th><?php echo i18n('Views');?></th>
+            <?php endif; ?>
             <th><?php echo i18n('Operations');?></th>
             <th>Sub <?php echo i18n('pages');?></th>
         </tr>
@@ -45,15 +47,15 @@ $(function() {
             <?php $dr = find_draft_subpage($p->slug);?>
             <tr id="<?php echo $p->md;?>" class="sort-item" style="cursor:move;">
                 <td><a href="<?php echo site_url();?>admin/pages/<?php echo $p->slug;?>"><?php echo $p->title;?></a></td>
-                <td><?php echo shorten($p->description, '50');?>...</td>
-                <td><a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/add?destination=admin/pages/<?php echo $p->slug;?>"><?php echo i18n('Add_sub');?></a> <a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/edit?destination=admin/pages"><?php echo i18n('Edit');?></a> <?php if (empty($dd) && empty($dr)):?><a class="btn btn-danger btn-xs" href="<?php echo $p->url;?>/delete?destination=admin/pages"><?php echo i18n('Delete');?></a><?php endif;?></td>
+                <td><?php echo $p->views;?></td>
+                <td><a class="btn btn-primary btn-xs" href="<?php echo site_url();?>admin/pages/<?php echo $p->slug;?>"><?php echo i18n('page');?> <?php echo i18n('settings');?></a> <a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/add?destination=admin/pages/<?php echo $p->slug;?>"><?php echo i18n('Add_sub');?></a> <a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/edit?destination=admin/pages"><?php echo i18n('Edit');?></a> <?php if (empty($dd) && empty($dr)):?><a class="btn btn-danger btn-xs" href="<?php echo $p->url;?>/delete?destination=admin/pages"><?php echo i18n('Delete');?></a><?php endif;?></td>
                 <td>
-                    <div><a class="btn btn-primary btn-xs" href="<?php echo site_url();?>admin/pages/<?php echo $p->slug;?>"><?php echo i18n('page');?> <?php echo i18n('settings');?></a></div><hr>
                     <?php foreach ($dd as $sp):?>                            
                     <div class="row">
                         <div class="col-sm">
                             <span><a target="_blank" href="<?php echo $sp->url;?>"><?php echo $sp->title;?></a></span>
                         </div>
+                        <div class="col-sm"><i class="fa fa-line-chart" aria-hidden="true"></i> <?php echo $sp->views;?></div>
                         <div class="col-sm">
                             <span><a class="btn btn-primary btn-xs" href="<?php echo $sp->url;?>/edit?destination=admin/pages/<?php echo $sp->parentSlug;?>"><?php echo i18n('Edit');?></a> <a class="btn btn-danger btn-xs" href="<?php echo $sp->url;?>/delete?destination=admin/pages/<?php echo $sp->parentSlug;?>"><?php echo i18n('Delete');?></a></span>
                         </div>
diff --git a/system/admin/views/static-subpages.html.php b/system/admin/views/static-subpages.html.php
index b912a61..fb1f956 100644
--- a/system/admin/views/static-subpages.html.php
+++ b/system/admin/views/static-subpages.html.php
@@ -46,6 +46,9 @@ $(function() {
         <tr class="head">
             <th><?php echo i18n('Title');?></th>
             <th><?php echo i18n('Description');?></th>
+            <?php if (config("views.counter") == "true"): ?>
+                <th><?php echo i18n('Views');?></th>
+            <?php endif; ?>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         </thead>
@@ -54,7 +57,8 @@ $(function() {
             <tr id="<?php echo $sp->parent;?>/<?php echo $sp->md;?>" style="cursor:move;">
                 <td><a href="<?php echo $sp->url ?>"><?php echo $sp->title ?></a></td>
                 <td><?php echo $sp->description;?></td>
-                <td>                                <span><a class="btn btn-primary btn-xs" href="<?php echo $sp->url;?>/edit?destination=admin/pages/<?php echo $static->slug;?>"><?php echo i18n('Edit');?></a> <a class="btn btn-danger btn-xs" href="<?php echo $sp->url;?>/delete?destination=admin/pages/<?php echo $static->slug;?>"><?php echo i18n('Delete');?></a></span></td>
+                <td><?php echo $sp->views;?></td>
+                <td><span><a class="btn btn-primary btn-xs" href="<?php echo $sp->url;?>/edit?destination=admin/pages/<?php echo $static->slug;?>"><?php echo i18n('Edit');?></a> <a class="btn btn-danger btn-xs" href="<?php echo $sp->url;?>/delete?destination=admin/pages/<?php echo $static->slug;?>"><?php echo i18n('Delete');?></a></span></td>
                         
             </tr>
         <?php endforeach; ?>
diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php
index 3d74e91..87bd8fe 100644
--- a/system/admin/views/user-draft.html.php
+++ b/system/admin/views/user-draft.html.php
@@ -55,7 +55,7 @@
     <table class="table post-list">
         <tr class="head">
             <th><?php echo i18n('Title');?></th>
-            <th><?php echo i18n('Created');?></th>
+            <th><?php echo i18n('Edit');?></th>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php foreach ($draftPages as $d): ?>
@@ -76,7 +76,7 @@
     <table class="table post-list">
         <tr class="head">
             <th><?php echo i18n('Title');?></th>
-            <th><?php echo i18n('Created');?></th>
+            <th><?php echo i18n('Edit');?></th>
             <th><?php echo i18n('Operations');?></th>
             <th><?php echo i18n('Static_pages');?></th>
         </tr>
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 531a189..d571d83 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -136,7 +136,7 @@ function get_draft_subpages($static = null)
             if (isset($y[1])) {
                 $z = $y[1];
             } else {
-                $z = $x;
+                $z = $y[0];
             }
             if ($z == $static) {
                 return true;