start screen styling

diff --git a/ChangeLog b/ChangeLog
index cb4b2d3ec6e3aa9b93499a3792d00625de6a680d..c983c91f787aebc9b27a81d0c889c4b8338f9bfa 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 version 2.2alpha - Guardian of Ice - (tba)
 
+       * email import
+       * code cleanups
+       * using mysql transactions if needed
+
 
 version 2.1alpha - Guardian of Fire - (2019-09-29)
 

diff --git a/TODO b/TODO
index e330346fe1671e1b74726de1b55f27a48cb1ce62..8dfa88062aba48293a0ff90c3808a9d6f7dcc103 100755 (executable)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 TODO / Feature list
 ==========================================================================
-+ SQL transactions.
-+ edit area
 + theme support
 + bookmark js snippet
 + snapshots
@@ -9,4 +7,5 @@ TODO / Feature list
 + private links
 + more "secure" user authentication
 ++ multiple user accounts and stuff
-+ sorting
\ No newline at end of file
++ sorting
++ paging

diff --git a/documentation/insipid-edit-me.sql b/documentation/insipid-edit-me.sql
index 0648e71e2179f90477a4bffa76289e9d2a261767..36063145033da0e06489ec2e82411d0ea839b4e4 100644 (file)
--- a/documentation/insipid-edit-me.sql
+++ b/documentation/insipid-edit-me.sql
@@ -100,7 +100,24 @@ CREATE TABLE `#REPLACE_ME#_tagrelation` (
 --
 DROP TABLE IF EXISTS `#REPLACE_ME#_combined`;
 
-CREATE VIEW `#REPLACE_ME#_combined`  AS  select `#REPLACE_ME#_link`.`id` AS `id`,`#REPLACE_ME#_link`.`link` AS `link`,`#REPLACE_ME#_link`.`created` AS `created`,`#REPLACE_ME#_link`.`status` AS `status`,`#REPLACE_ME#_link`.`description` AS `description`,`#REPLACE_ME#_link`.`title` AS `title`,`#REPLACE_ME#_link`.`image` AS `image`,`#REPLACE_ME#_link`.`hash` AS `hash`,`#REPLACE_ME#_tag`.`name` AS `tag`,`#REPLACE_ME#_tag`.`id` AS `tagId`,`#REPLACE_ME#_category`.`name` AS `category`,`#REPLACE_ME#_category`.`id` AS `categoryId` from ((((`#REPLACE_ME#_link` left join `#REPLACE_ME#_tagrelation` on((`#REPLACE_ME#_tagrelation`.`linkid` = `#REPLACE_ME#_link`.`id`))) left join `#REPLACE_ME#_tag` on((`#REPLACE_ME#_tag`.`id` = `#REPLACE_ME#_tagrelation`.`tagid`))) left join `#REPLACE_ME#_categoryrelation` on((`#REPLACE_ME#_categoryrelation`.`linkid` = `#REPLACE_ME#_link`.`id`))) left join `#REPLACE_ME#_category` on((`#REPLACE_ME#_category`.`id` = `#REPLACE_ME#_categoryrelation`.`categoryid`))) ;
+CREATE VIEW `#REPLACE_ME#_combined` AS
+select `#REPLACE_ME#_link`.`id` AS `id`,
+`#REPLACE_ME#_link`.`link` AS `link`,
+`#REPLACE_ME#_link`.`created` AS `created`,
+`#REPLACE_ME#_link`.`status` AS `status`,
+`#REPLACE_ME#_link`.`description` AS `description`,
+`#REPLACE_ME#_link`.`title` AS `title`,
+`#REPLACE_ME#_link`.`image` AS `image`,
+`#REPLACE_ME#_link`.`hash` AS `hash`,
+`#REPLACE_ME#_tag`.`name` AS `tag`,
+`#REPLACE_ME#_tag`.`id` AS `tagId`,
+`#REPLACE_ME#_category`.`name` AS `category`,
+`#REPLACE_ME#_category`.`id` AS `categoryId`
+from ((((`#REPLACE_ME#_link`
+left join `#REPLACE_ME#_tagrelation` on((`#REPLACE_ME#_tagrelation`.`linkid` = `#REPLACE_ME#_link`.`id`)))
+left join `#REPLACE_ME#_tag` on((`#REPLACE_ME#_tag`.`id` = `#REPLACE_ME#_tagrelation`.`tagid`)))
+left join `#REPLACE_ME#_categoryrelation` on((`#REPLACE_ME#_categoryrelation`.`linkid` = `#REPLACE_ME#_link`.`id`)))
+left join `#REPLACE_ME#_category` on((`#REPLACE_ME#_category`.`id` = `#REPLACE_ME#_categoryrelation`.`categoryid`))) ;
 
 --
 -- Indexes for dumped tables

diff --git a/webroot/view/home.inc.php b/webroot/view/home.inc.php
index 118df57892e6a163531db89c4acd5cc2ad6c2412..9a9df72be012ef8498993157c0aafe6a63136a30 100644 (file)
--- a/webroot/view/home.inc.php
+++ b/webroot/view/home.inc.php
@@ -187,5 +187,5 @@ if(isset($_POST['data']) && !empty($_POST['data']) && isset($_POST['addnewone'])
 
 $existingCategories = $Management->categories();
 $existingTags = $Management->tags();
-$latestLinks = $Management->latestLinks();
+$latestLinks = $Management->latestLinks(20);
 $orderedCategories = $Management->categoriesByDateAdded();

diff --git a/webroot/view/home.php b/webroot/view/home.php
index dbe2b16f02548cdcb548022d907f630cd400906e..81bc0491e3e0e28b55eb0d8a043406919479b6f8 100644 (file)
--- a/webroot/view/home.php
+++ b/webroot/view/home.php
@@ -35,7 +35,7 @@
                                <div class="field has-addons">
                                        <div class="control is-expanded">
                                                <div class="control has-icons-left">
-                                                       <input class="input" type="text" name="data[searchfield]" placeholder="Search your bookmarks">
+                                                       <input class="input" type="text" name="data[searchfield]" placeholder="Search your bookmarks or add a new one">
                                                        <span class="icon is-small is-left">
                                                                <i class="ion-link"></i>
                                                        </span>
@@ -206,9 +206,14 @@
                        <div class="content">
                                <h4><a href="index.php?p=overview&m=all">Last added</a></h4>
 <?php if(!empty($latestLinks)) { ?>
-                               <div class="tags">
+                               <div class="field is-grouped is-grouped-multiline">
 <?php foreach ($latestLinks as $ll) { ?>
-                                       <a class="" href="<?php echo $ll['link']; ?>" target="_blank"><?php echo $ll['title']; ?></a>
+                                       <div class="control">
+                                               <div class="tags has-addons">
+                                               <a class="tag is-link" href="<?php echo $ll['link']; ?>" target="_blank"><?php echo $ll['title']; ?></a>
+                                               <a class="tag is-info">x</a>
+                                               </div>
+                                       </div>
 <?php } ?>
                                </div>
 <?php } ?>
@@ -228,11 +233,11 @@
                <div class="column is-one-quarter">
                        <div class="content">
                                <h4><a href="?p=overview&m=category&id=<?php echo urlencode($v['id']); ?>"><?php echo $v['name']; ?></a></h4>
-                               <div class="tags">
+                               <ul>
 <?php foreach ($links as $link) { ?>
-                                       <a class="" href="<?php echo $link['link']; ?>" target="_blank"><?php echo $link['title']; ?></a>
+                                       <li><a class="" href="<?php echo $link['link']; ?>" target="_blank"><?php echo $link['title']; ?></a></li>
 <?php } ?>
-                               </div>
+                               </ul>
                        </div>
                </div>
 <?php