aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <andrewmanning@grid.reticu.li>2017-08-24 18:57:52 +0000
committerAndrew Manning <andrewmanning@grid.reticu.li>2017-08-24 18:57:52 +0000
commit90ec3340e44a3d3c69779f0db33ee49e864f326d (patch)
tree2b0bc859c3a7d31adcd1c9777d9868b9dbecdeda /view
parentcf2609530fcffdc7f5477336232b7cfde8b6403f (diff)
parentcdccf601320ec7e59f5d96438edac34d5ea30085 (diff)
downloadvolse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.tar.gz
volse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.tar.bz2
volse-hubzilla-90ec3340e44a3d3c69779f0db33ee49e864f326d.zip
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js3
-rw-r--r--view/js/mod_cards.js3
-rw-r--r--view/pdl/mod_cards.pdl5
-rw-r--r--view/tpl/cards.tpl9
4 files changed, 19 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js
index f20432735..fd3c8b08f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -380,8 +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-photos').length) {
+ if($('#live-photos').length || $('#live-cards').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href;
diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js
new file mode 100644
index 000000000..78b2e1bd0
--- /dev/null
+++ b/view/js/mod_cards.js
@@ -0,0 +1,3 @@
+$(document).ready( function() {
+ $(".autotime").timeago();
+}); \ No newline at end of file
diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
new file mode 100644
index 000000000..5546d97cb
--- /dev/null
+++ b/view/pdl/mod_cards.pdl
@@ -0,0 +1,5 @@
+[region=aside]
+[widget=categories][var=cards]1[/var][/widget]
+[widget=tasklist][/widget]
+[widget=notes][/widget]
+[/region]
diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl
new file mode 100644
index 000000000..a06e2fd22
--- /dev/null
+++ b/view/tpl/cards.tpl
@@ -0,0 +1,9 @@
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <h2>{{$title}}</h2>
+ </div>
+ <div id="live-cards"></div>
+ {{$editor}}
+ {{$content}}
+</div>
+ {{$pager}}