From 877e0570ea7eb94e9698aab9147104f5251f55c9 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Sun, 26 Apr 2020 18:34:59 +0200
Subject: add bookmarks to media

---
 app/view/templates/backtopbar.php |  4 ++--
 app/view/templates/homemenu.php   | 40 ++++++--------------------------
 app/view/templates/mediamenu.php  | 48 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 36 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php
index 6aded61..a9dc553 100644
--- a/app/view/templates/backtopbar.php
+++ b/app/view/templates/backtopbar.php
@@ -34,9 +34,9 @@
 </span>
 
 
-<span id="shortcuts" class="hidephone">
+<span id="shortcuts">
     <?php foreach ($user->bookmark() as $bookmark) { ?>
-        <a href="<?= $this->url($bookmark->route(), $bookmark->params(), $bookmark->query()) ?>"><?= $bookmark->icon() ?> <?= $bookmark->id() ?></a>
+        <a href="<?= $this->url($bookmark->route(), $bookmark->params(), $bookmark->query()) ?>"><?= $bookmark->icon() ?><span class="hidephone"> <?= $bookmark->id() ?></span></a>
     <?php } ?>
 </span>
 
diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index 0848506..f3564f8 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -250,60 +250,34 @@
     <details class="hidephone" id="bookmarks">
         <summary>Bookmarks</summary>
         <div class="submenu">
-            <h2>Public</h2>
-            <?php if(!empty(Wcms\Config::bookmark())) { ?>
-            <form action="<?= $this->url('homebookmark') ?>" method="post">
-            <ul>
-            <?php foreach (Wcms\Config::bookmark() as $id => $query) { ?>  
-                <li>
-                <label for="public-bookmark_<?= $id ?>">
-                    <a href="<?= $query ?>" title="<?= $query ?>"><?= $id ?></a>
-                    </label>
-                    <?php if($user->issupereditor()) { ?>
-                        <input type="checkbox" name="id[]" value="<?= $id ?>" id="public-bookmark_<?= $id ?>">
-                    <?php } ?>
-                </li>
-            <?php } ?>
-            </ul>
-            <input type="hidden" name="action" value="del">
-            <input type="submit" value="delete selected">
-            </form>
-            <?php } elseif($user->issupereditor()) { ?>
-                <p>This will store your filters settings as a Bookmark that every editors users can use.</p>
-            <?php } else { ?>
-                <p>No public Bookmarks yet</p>
-            <?php } ?>
-            <?php if($user->issupereditor()) { ?>
-            <form action="<?= $this->url('homebookmark') ?>" method="post">
-                <input type="text" name="id" placeholder="bookmark id" minlength="1" maxlength="16">
-                <input type="hidden" name="query" value="<?= $opt->getadress() ?>">
-                <input type="submit" name="action" value="add">
-            </form>
-            <?php } ?>
             <h2>Personnal</h2>
             <?php if(!empty($user->bookmark())) { ?>
-            <form action="<?= $this->url('homebookmark') ?>" method="post">
+            <form action="<?= $this->url('userbookmark') ?>" method="post">
             <ul>
             <?php foreach ($user->bookmark() as $bookmark) { ?>
+                <?php if($bookmark->route() === 'home') { ?>
                 <li>
-                    <label for="bookmark_<?= $bookmark->id() ?>" title="<?= $bookmark->query() ?>"><?= $bookmark->id() ?></label>
                     <input type="checkbox" name="id[]" value="<?= $bookmark->id() ?>" id="bookmark_<?= $bookmark->id() ?>">
+                    <label for="bookmark_<?= $bookmark->id() ?>" title="<?= $bookmark->query() ?>"><?= $bookmark->id() ?></label>
                 </li>
+                <?php } ?>
             <?php } ?>
             </ul>
             <input type="hidden" name="action" value="del">
+            <input type="hidden" name="route" value="home">
             <input type="hidden" name="user" value="<?= $user->id() ?>">
             <input type="submit" value="delete selected">
             </form>
             <?php } else { ?>
                 <p>This will store your filters settings as a Bookmark that only you can use.</p>
             <?php } ?>
-            <form action="<?= $this->url('homebookmark') ?>" method="post">
+            <form action="<?= $this->url('userbookmark') ?>" method="post">
                 <select name="icon" id="icon">
                     <?= options(Wcms\Model::BOOKMARK_ICONS, null, true) ?>
                 </select>
                 <input type="text" name="id" placeholder="bookmark id" minlength="1" maxlength="16" required>
                 <input type="hidden" name="query" value="<?= $opt->getadress() ?>">
+                <input type="hidden" name="route" value="home">
                 <input type="hidden" name="user" value="<?= $user->id() ?>">
                 <input type="submit" name="action" value="add">
             </form>
diff --git a/app/view/templates/mediamenu.php b/app/view/templates/mediamenu.php
index 560025a..2a33b65 100644
--- a/app/view/templates/mediamenu.php
+++ b/app/view/templates/mediamenu.php
@@ -73,8 +73,54 @@
 
 
             <p>Use this code to print the content of the actual folder in a page</p>
-            <code><?= $mediaopt->getquery() ?></code>
+            <code><?= $mediaopt->getcode() ?></code>
         </div>
     </details>
 
+
+
+
+
+
+
+    <details class="hidephone" id="bookmarks">
+        <summary>Bookmarks</summary>
+        <div class="submenu">
+            <h2>Personnal</h2>
+            <?php if(!empty($user->bookmark())) { ?>
+            <form action="<?= $this->url('userbookmark') ?>" method="post">
+            <ul>
+            <?php foreach ($user->bookmark() as $bookmark) { ?>
+                <?php if($bookmark->route() === 'media') { ?>
+                <li>
+                    <input type="checkbox" name="id[]" value="<?= $bookmark->id() ?>" id="bookmark_<?= $bookmark->id() ?>">
+                    <label for="bookmark_<?= $bookmark->id() ?>" title="<?= $bookmark->query() ?>"><?= $bookmark->id() ?></label>
+                </li>
+                <?php } ?>
+            <?php } ?>
+            </ul>
+            <input type="hidden" name="action" value="del">
+            <input type="hidden" name="route" value="media">
+            <input type="hidden" name="user" value="<?= $user->id() ?>">
+            <input type="submit" value="delete selected">
+            </form>
+            <?php } else { ?>
+                <p>This will store your filters settings as a Bookmark that only you can use.</p>
+            <?php } ?>
+            <form action="<?= $this->url('userbookmark') ?>" method="post">
+                <select name="icon" id="icon">
+                    <?= options(Wcms\Model::BOOKMARK_ICONS, null, true) ?>
+                </select>
+                <input type="text" name="id" placeholder="bookmark id" minlength="1" maxlength="16" required>
+                <input type="hidden" name="query" value="<?= $mediaopt->getadress() ?>">
+                <input type="hidden" name="route" value="media">
+                <input type="hidden" name="user" value="<?= $user->id() ?>">
+                <input type="submit" name="action" value="add">
+            </form>
+        </div>
+    </details>
+
+
+
+
 </aside>
\ No newline at end of file
-- 
cgit v1.2.3