Merge remote-tracking branch 'mike/master' into dev

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;

view/js/mod_cards.js

@@ -0,0 +1,3 @@
+$(document).ready( function() {
+	$(".autotime").timeago();
+});

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]

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}}