Better paths for images and editor links

diff --git a/cx/lib/images.php b/cx/lib/images.php
index ea29f747938ca936df675143564bf0a03f37aba5..358a1ba7f5e5cea6a5466c60a96ce36848b4f178 100644 (file)
--- a/cx/lib/images.php
+++ b/cx/lib/images.php
@@ -17,6 +17,11 @@ class Image {
                $this->alt_text = $dict['image_alt_text'];
                $this->url = $this->uid . '.' . $dict['image_type'];
        }
+
+       public function get_permalink_path() {
+               $permalink = '/data/images/' . $this->url;
+               return $permalink;
+       }
 }
 
 function cx_images_add_image($site_id, $alt_text, $image_path, $image_original_filename) {

diff --git a/cx/lib/markdown.php b/cx/lib/markdown.php
index aab58d59e005f0d5006e7918cbc2cbb4cbd20b74..b79fb85a35f11874aa340118e42c621f022a1904 100644 (file)
--- a/cx/lib/markdown.php
+++ b/cx/lib/markdown.php
@@ -20,14 +20,12 @@ class ExtendedParsedown extends Parsedown {
                                return;
                        }
 
-                       $permalink = '/data/images/' . $image->url;
-
                        return array(
                                'extent' => strlen($matches[0]) + 1, 
                                'element' => array(
                                        'name' => 'img',
                                        'attributes' => array(
-                                               'src' => cx_url_site($permalink),
+                                               'src' => cx_url_site($image->get_permalink_path()),
                                                'alt' => $image->alt_text,
                                        ),
                                ),

diff --git a/cx/lib/posts.php b/cx/lib/posts.php
index 326d81c470585f90848e59d57b2ab2ffcbd339d8..4d122dfe642ff2fb087af6a49b9c818138b2a4fc 100644 (file)
--- a/cx/lib/posts.php
+++ b/cx/lib/posts.php
@@ -46,8 +46,11 @@ class Post {
        }
 
        public function get_permalink_path() {
-               $post_permalink = $this->is_page ? '/' . $this->slug : '/' . date('Y', $this->date) . '/' . date('m', $this->date) . '/' . $this->slug;
-               return $post_permalink;
+               $permalink = '/' . $this->slug;
+               if ($this->is_page == false) {
+                       $permalink = '/' . date('Y', $this->date) . '/' . date('m', $this->date) . '/' . $this->slug;
+               }
+               return $permalink;
        }
 
        public function get_metadata() {

diff --git a/cx/templates/admin/pages/main.php b/cx/templates/admin/pages/main.php
index 14ea9c40069c6d0f8e6a70a54fb972d41128bccc..f9ab483143643c2627ae0a89aa3abc360e719995 100644 (file)
--- a/cx/templates/admin/pages/main.php
+++ b/cx/templates/admin/pages/main.php
@@ -4,9 +4,9 @@
 <table>
 <?php foreach (cx_posts_get(include_drafts: true) as $post): ?>
 <tr>
- <td class="fill"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id); ?>"><?= $post->title ?></a></td>
- <td class="hug"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id); ?>">Edit</a></td>
- <td class="hug"><a href="<?= cx_url_admin('/posts/delete?id=' . $post->id); ?>">Delete</a></td>
+ <td class="fill"><a href="<?= cx_url_site($post->get_permalink_path()) ?>"><?= $post->title ?></a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id) ?>">Edit</a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/posts/delete?id=' . $post->id) ?>">Delete</a></td>
 </tr>
 <?php endforeach; ?>
 </table>
@@ -15,9 +15,9 @@
 <table>
 <?php foreach (cx_pages_get(navigation_only: false, include_drafts: true) as $post): ?>
 <tr>
- <td class="fill"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id); ?>"><?= $post->title ?></a></td>
- <td class="hug"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id); ?>">Edit</a></td>
- <td class="hug"><a href="<?= cx_url_admin('/posts/delete?id=' . $post->id); ?>">Delete</a></td>
+ <td class="fill"><a href="<?= cx_url_site($post->get_permalink_path()) ?>"><?= $post->title ?></a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/posts/edit?id=' . $post->id) ?>">Edit</a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/posts/delete?id=' . $post->id) ?>">Delete</a></td>
 </tr>
 <?php endforeach; ?>
 </table>
@@ -26,9 +26,9 @@
 <table>
 <?php foreach (cx_images_get() as $image): ?>
 <tr>
- <td class="fill"><a href="<?= $image->url ?>"><?= $image->url ?></a></td>
- <td class="hug"><a href="<?= cx_url_admin('/images/edit?id=' . $image->id); ?>">Edit</a></td>
- <td class="hug"><a href="<?= cx_url_admin('/images/delete?id=' . $image->id); ?>">Delete</a></td>
+ <td class="fill"><a href="<?= cx_url_site($image->get_permalink_path()) ?>"><?= $image->url ?></a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/images/edit?id=' . $image->id) ?>">Edit</a></td>
+ <td class="hug"><a href="<?= cx_url_admin('/images/delete?id=' . $image->id) ?>">Delete</a></td>
 </tr>
 <?php endforeach; ?>
 </table>

diff --git a/cx/templates/public/pages/base.php b/cx/templates/public/pages/base.php
index 5caac0dd596660e950409972449f6427822913bd..7629caed06ba1e4648e9ca5583527208b2bfe8a1 100644 (file)
--- a/cx/templates/public/pages/base.php
+++ b/cx/templates/public/pages/base.php
@@ -52,7 +52,7 @@
 <li><a href="<?= cx_url('/'); ?>">Home</a></li>
 
 <?php foreach (cx_pages_get() as $page): ?>
-<li><a href="<?= cx_url('/' . $page->slug); ?>"><?= $page->title ?></a></li>
+<li><a href="<?= cx_url($page->get_permalink_path()); ?>"><?= $page->title ?></a></li>
 <?php endforeach; ?>
 </ul>
 

diff --git a/cx/templates/public/pages/list.php b/cx/templates/public/pages/list.php
index 0f02a71fd33b5d806743a2f8822454877b3d5ceb..3069f7202e23958880860a271ecbee08500ba90d 100644 (file)
--- a/cx/templates/public/pages/list.php
+++ b/cx/templates/public/pages/list.php
@@ -17,7 +17,7 @@
 
        <p>
                <?php $number_of_pages = ceil(cx_posts_count() / $posts_per_page); ?>
-               <?php if($page_number + 1 < $number_of_pages): ?><a href="<?= cx_url_page($page_number, 1) ?>">Older Posts</a><?php endif; ?>
-               <?php if($page_number > 0): ?><a href="<?= cx_url_page($page_number, -1) ?>">Newer Posts</a><?php endif; ?>
+               <?php if($page_number + 1 < $number_of_pages): ?><a href="<?= cx_url_page($page_number, 1) ?>">&larr; Older Posts</a><?php endif; ?>
+               <?php if($page_number > 0): ?><a href="<?= cx_url_page($page_number, -1) ?>">Newer Posts &rarr;</a><?php endif; ?>
        </p>
 </main>