theme 98: managetags. Menu cleanup

diff --git a/TODO b/TODO
index 4541d2616ccc46e370154cc3e05992b9148607ec..f9c384e8f38203f635411b614733b1549f00f50a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+* fix bulkedit
 * change multiple-attachment to a field which tells it is used for a image gallery
 * complete profile view. Groups still missing.
 * minimal theme

diff --git a/webclient/view/98/advancedsearch/advancedsearch.html b/webclient/view/98/advancedsearch/advancedsearch.html
index 359ac058b6bd46cbc102b81c0a67de8b8bde5033..aad8b148bc20f143a88bc2536ae1723953f76322 100644 (file)
--- a/webclient/view/98/advancedsearch/advancedsearch.html
+++ b/webclient/view/98/advancedsearch/advancedsearch.html
@@ -88,7 +88,7 @@
                        <table width="100">
                                <thead>
                                <tr>
-                                       <th>#</th>
+                                       <th>View</th>
                                        <?php
                                        foreach($TemplateData['collectionFields'] as $f) {
                                                if(in_array($f['id'],$TemplateData['loadedCollection']['advancedSearchTableFields'])) {
@@ -103,7 +103,7 @@
                                <?php foreach($TemplateData['entries']['results'] as $entryK=>$entry) { ?>
                                <tr>
                                        <td>
-                                               <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>" target=_blank>#</a>
+                                               <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">View</a>
                                        </td>
 
                                        <?php
@@ -140,7 +140,7 @@
                <table width="100%">
                        <thead>
                        <tr>
-                               <th>Name</th>
+                               <th width="100px">Name</th>
                                <th>Description</th>
                        </tr>
                        </thead>

diff --git a/webclient/view/98/collections/collections.html b/webclient/view/98/collections/collections.html
index da3e75ff28f615342bfe21354c6c7dcd56a2679f..7a52817e1a3444a1f193a152507023f9bfab2c9a 100644 (file)
--- a/webclient/view/98/collections/collections.html
+++ b/webclient/view/98/collections/collections.html
@@ -61,10 +61,10 @@
        <table width="100%">
                <thead>
                <tr>
-                       <th>Image</th>
+                       <th width="60px">Image</th>
                        <th>Title</th>
                        <th>Description</th>
-                       <th>View</th>
+                       <th width="60px">View</th>
                </tr>
                </thead>
                <tbody>
@@ -104,7 +104,7 @@
        <table width="100%">
                <thead>
                <tr>
-                       <th>Name</th>
+                       <th width="100px">Name</th>
                        <th>Description</th>
                </tr>
                </thead>

diff --git a/webclient/view/98/dashboard/dashboard.html b/webclient/view/98/dashboard/dashboard.html
index cf592f97d3764c6f609313246fd9670df75649c1..b99434ed8c5435791c958cc1277a5b7158ab3067 100644 (file)
--- a/webclient/view/98/dashboard/dashboard.html
+++ b/webclient/view/98/dashboard/dashboard.html
@@ -28,10 +28,10 @@
                <table width="100%">
                        <thead>
                                <tr>
-                                       <th>Image</th>
+                                       <th width="60px">Image</th>
                                        <th>Title</th>
                                        <th>Description</th>
-                                       <th>View</th>
+                                       <th width="60px">View</th>
                                </tr>
                        </thead>
                        <tbody>

diff --git a/webclient/view/98/managetags/managetags.html b/webclient/view/98/managetags/managetags.html
new file mode 100644 (file)
index 0000000..10ad22d
--- /dev/null
+++ b/webclient/view/98/managetags/managetags.html
@@ -0,0 +1,71 @@
+<?php if(!empty($TemplateData['loadedCollection'])) { ?>
+
+       <h3 class="uk-h3">Manage Tags in: <a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>"><?php echo $TemplateData['loadedCollection']['name']; ?></a></h3>
+       <p>
+               The actions are top down. If you choose to move and rename, only move will be executed.<br />
+               Deletion will remove without recover!<br />
+               If you rename and input an existing one a move will be done instead.<br />
+               Tag values are stored how they come and treated that way here (case sensitive).
+               In search they are case insensitive.
+       </p>
+
+       <?php if(!empty($TemplateData['tags'])) { ?>
+               <form method="post">
+                       <?php foreach($TemplateData['tags'] as $k=>$v) { ?>
+                       <div class="field-row">
+                               <h4 class="uk-heading-line"><?php echo $v['displayname']; ?></h4>
+                       </div>
+                       <div class="field-row">
+                               <label for="<?php echo $v['id']; ?>_use">Use</label>
+                               <select name="fdata[<?php echo $v['id']; ?>][use]" id="<?php echo $v['id']; ?>_use">
+                                       <option value="">Please select</option>
+                                       <?php foreach($v['entries'] as $ek=>$ev) { ?>
+                                       <option value="<?php echo $ev; ?>"><?php echo $ev; ?></option>
+                                       <?php } ?>
+                               </select>
+
+                               <label for="<?php echo $v['id']; ?>_move">Move to (rename to existing)</label>
+                               <select name="fdata[<?php echo $v['id']; ?>][move]" id="<?php echo $v['id']; ?>_move">
+                                       <option value="">Please select</option>
+                                       <?php foreach($v['entries'] as $ek=>$ev) { ?>
+                                       <option value="<?php echo $ev; ?>"><?php echo $ev; ?></option>
+                                       <?php } ?>
+                               </select>
+
+                               <label for="<?php echo $v['id']; ?>_rename" >Rename</label>
+                               <input type="text" autocomplete="off"
+                                      name="fdata[<?php echo $v['id']; ?>][rename]" id="<?php echo $v['id']; ?>_rename">
+
+                               <input type="checkbox" name="fdata[<?php echo $v['id']; ?>][doDelete]" value="1"
+                                      id="<?php echo $v['id']; ?>_doDelete">
+                               <label for="<?php echo $v['id']; ?>_doDelete">Delete</label>
+                       </div>
+                       <?php } ?>
+
+                       <div class="field-row">
+                               <input type="submit" name="submitForm" value="Save" />
+                       </div>
+               </form>
+       <?php } ?>
+
+<?php } else { ?>
+<h3>Please select a collection first</h3>
+<div class="sunken-panel">
+       <table width="100%">
+               <thead>
+               <tr>
+                       <th width="100px">Name</th>
+                       <th>Description</th>
+               </tr>
+               </thead>
+               <tbody>
+               <?php foreach($TemplateData['collections'] as $k=>$v) { ?>
+               <tr>
+                       <td><a href="index.php?p=managetags&collection=<?php echo $k; ?>"><?php echo $v['name']; ?></a></td>
+                       <td><?php echo $v['description']; ?></td>
+               <tr>
+                       <?php } ?>
+               </tbody>
+       </table>
+</div>
+<?php } ?>

diff --git a/webclient/view/98/system/menu.php b/webclient/view/98/system/menu.php
index e32bee27419d8a461cfbd23e7161880d9548d460..86f4b6b097e93b6db59c1e857050d96ab05644a7 100644 (file)
--- a/webclient/view/98/system/menu.php
+++ b/webclient/view/98/system/menu.php
@@ -29,19 +29,11 @@ $_menuManage = $Gorenest->get('manage', false, $_contextActions);
 ?>
 
 <menu role="tablist">
-
        <?php foreach($_menuShow as $entry) { ?>
                <li role="tab" <?php if($_requestMode == $entry['action']) echo 'aria-selected="true"'; ?>>
                        <a href="index.php?p=<?php echo $entry['action']; ?>"><?php echo $entry['text']; ?></a>
                </li>
-       <?php }
-       if(!empty($_menuManage)) {
-               foreach($_menuManage as $entry) { ?>
-                       <li role="tab" <?php if($_requestMode == $entry['action']) echo 'aria-selected="true"'; ?>>
-                               <a href="index.php?p=<?php echo $entry['action']; ?>"><?php echo $entry['text']; ?></a>
-                       </li>
-               <?php }
-       } ?>
+       <?php } ?>
        <li role="tab">
                <a href="index.php?p=auth">
                        <?php if($Doomguy->isSignedIn() === true) { echo "Logout"; } else { echo "Login"; } ?>
@@ -50,11 +42,20 @@ $_menuManage = $Gorenest->get('manage', false, $_contextActions);
        <li role="tab">
                <a id="showNavSearch" href="#" onclick="showNavSearch();">Search</a>
        </li>
-       <li role="tag" <?php if($_requestMode == 'advancedsearch') echo 'aria-selected="true"'; ?>>
+       <li role="tab" <?php if($_requestMode == 'advancedsearch') echo 'aria-selected="true"'; ?>>
                <a href="index.php?p=advancedsearch">Advanced search</a>
        </li>
+<?php if(!empty($_menuManage)) { ?>
+       <li role="tab"><a href="">Manage:</a></li>
+       <?php foreach($_menuManage as $entry) { ?>
+               <li role="tab" <?php if($_requestMode == $entry['action']) echo 'aria-selected="true"'; ?>>
+                       <a href="index.php?p=<?php echo $entry['action']; ?>"><?php echo $entry['text']; ?></a>
+               </li>
+       <?php } ?>
+<?php } ?>
 </menu>
 
+
 <dialog id="navSearchDialog" class="window">
        <div class="title-bar">
                <div class="title-bar-text">Search</div>

diff --git a/webclient/view/98/tags/tags.html b/webclient/view/98/tags/tags.html
index 8fd9d836f9d8c9a7faeff16fc6fc96e3176231ef..bcb4e110e3498c89fbcd2774593b29bad4d593a8 100644 (file)
--- a/webclient/view/98/tags/tags.html
+++ b/webclient/view/98/tags/tags.html
@@ -36,7 +36,7 @@
                <table width="100%">
                        <thead>
                        <tr>
-                               <th>Name</th>
+                               <th width="100px">Name</th>
                                <th>Description</th>
                        </tr>
                        </thead>