From: Banana <banana@ironhide>
Date: Thu, 3 Oct 2019 15:22:21 +0000 (+0200)
Subject: start screen styling
X-Git-Tag: 2.2_2019-12-27~29
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=47132c029da6b7eea323e93abcd4b24bb4c146af;p=insipid.git

start screen styling
---

diff --git a/ChangeLog b/ChangeLog
index cb4b2d3..c983c91 100755
--- 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 e330346..8dfa880 100755
--- 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 0648e71..3606314 100644
--- 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 118df57..9a9df72 100644
--- 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 dbe2b16..81bc049 100644
--- 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