From e084b776eee9f1fc66e3f4a37b92ec70ccc49286 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 00:01:02 -0700
Subject: cards feature

---
 view/pdl/mod_cards.pdl | 2 ++
 view/tpl/cards.tpl     | 8 ++++++++
 view/tpl/jot.tpl       | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 view/pdl/mod_cards.pdl
 create mode 100644 view/tpl/cards.tpl

(limited to 'view')

diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
new file mode 100644
index 000000000..2d87136c9
--- /dev/null
+++ b/view/pdl/mod_cards.pdl
@@ -0,0 +1,2 @@
+[region=aside]
+[widget=categories][var=cards]1[/var][/widget][/region]
diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl
new file mode 100644
index 000000000..ae382a97f
--- /dev/null
+++ b/view/tpl/cards.tpl
@@ -0,0 +1,8 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	{{$editor}}
+	{{$content}}
+</div>
+	{{$pager}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 39ba9e59b..8e8070402 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -27,7 +27,7 @@
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
 
-		{{if $webpage}}
+		{{if $webpage && $webpage != 6 }}
 		<div id="jot-pagetitle-wrap" class="jothidden">
 			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
 		</div>
@@ -35,7 +35,7 @@
 		<div id="jot-title-wrap" class="jothidden">
 			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
 		</div>
-		{{if $catsenabled}}
+		{{if $catsenabled || $webpage == 6 }}
 		<div id="jot-category-wrap" class="jothidden">
 			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
-- 
cgit v1.2.3


From 3b68df1be6173cbcc50386efc0161ece2015112d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 17:46:20 -0700
Subject: several card enhancements

---
 view/tpl/jot.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 8e8070402..39ba9e59b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -27,7 +27,7 @@
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
 
-		{{if $webpage && $webpage != 6 }}
+		{{if $webpage}}
 		<div id="jot-pagetitle-wrap" class="jothidden">
 			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
 		</div>
@@ -35,7 +35,7 @@
 		<div id="jot-title-wrap" class="jothidden">
 			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
 		</div>
-		{{if $catsenabled || $webpage == 6 }}
+		{{if $catsenabled}}
 		<div id="jot-category-wrap" class="jothidden">
 			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
-- 
cgit v1.2.3


From bf7b0b11ef7a8d110f2fc2a5967d8178183d9435 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 20:16:08 -0700
Subject: add autotime to cards

---
 view/js/mod_cards.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 view/js/mod_cards.js

(limited to 'view')

diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js
new file mode 100644
index 000000000..477cd61ed
--- /dev/null
+++ b/view/js/mod_cards.js
@@ -0,0 +1,4 @@
+$(document).ready( function() {
+	$("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime").timeago();
+	$("> .shared_header .autotime").timeago();
+});
\ No newline at end of file
-- 
cgit v1.2.3


From c9745a41295337444832f0c787d0dd4fb3425e1f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 20:19:52 -0700
Subject: apply autotime to all autotime classed elements when static loading a
 page

---
 view/js/mod_cards.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js
index 477cd61ed..78b2e1bd0 100644
--- a/view/js/mod_cards.js
+++ b/view/js/mod_cards.js
@@ -1,4 +1,3 @@
 $(document).ready( function() {
-	$("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime").timeago();
-	$("> .shared_header .autotime").timeago();
+	$(".autotime").timeago();
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 4450170790de3999dc9c6f8876074e76edee8241 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 21:26:09 -0700
Subject: partial support (unfinished) for ajax loading cards with liveupdate;
 page still functions even though this isn't finished

---
 view/js/main.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index f20432735..bbdb0759b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -380,6 +380,7 @@ function NavUpdate() {
 				if($('#live-pubstream').length)  { src = 'pubstream'; liveUpdate(); }
 				if($('#live-display').length)    { src = 'display'; liveUpdate(); }
 				if($('#live-search').length)     { src = 'search'; liveUpdate(); }
+				if($('#live-cards').length)      { src = 'cards'; liveUpdate(); }
 
 				if($('#live-photos').length) {
 					if(liking) {
-- 
cgit v1.2.3


From 186f85483fe3ab45281c442b2b275448c5230c4f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 22:17:15 -0700
Subject: cards: make likes reload page

---
 view/js/main.js    | 4 ++--
 view/tpl/cards.tpl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index bbdb0759b..fd3c8b08f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -380,9 +380,9 @@ function NavUpdate() {
 				if($('#live-pubstream').length)  { src = 'pubstream'; liveUpdate(); }
 				if($('#live-display').length)    { src = 'display'; liveUpdate(); }
 				if($('#live-search').length)     { src = 'search'; liveUpdate(); }
-				if($('#live-cards').length)      { src = 'cards'; liveUpdate(); }
+				// if($('#live-cards').length)      { src = 'cards'; liveUpdate(); }
 
-				if($('#live-photos').length) {
+				if($('#live-photos').length || $('#live-cards').length) {
 					if(liking) {
 						liking = 0;
 						window.location.href=window.location.href;
diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl
index ae382a97f..a06e2fd22 100644
--- a/view/tpl/cards.tpl
+++ b/view/tpl/cards.tpl
@@ -2,6 +2,7 @@
 	<div class="section-title-wrapper">
 		<h2>{{$title}}</h2>
 	</div>
+	<div id="live-cards"></div>
 	{{$editor}}
 	{{$content}}
 </div>
-- 
cgit v1.2.3


From 1c4629f5e1b7733472e2f721e5a4080734b9e2d5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 23 Aug 2017 23:37:45 -0700
Subject: add tasklist and notes to cards page

---
 view/pdl/mod_cards.pdl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
index 2d87136c9..5546d97cb 100644
--- a/view/pdl/mod_cards.pdl
+++ b/view/pdl/mod_cards.pdl
@@ -1,2 +1,5 @@
 [region=aside]
-[widget=categories][var=cards]1[/var][/widget][/region]
+[widget=categories][var=cards]1[/var][/widget]
+[widget=tasklist][/widget]
+[widget=notes][/widget]
+[/region]
-- 
cgit v1.2.3