aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-06 04:07:10 -0800
committerfriendica <info@friendica.com>2013-01-06 04:07:10 -0800
commit7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b (patch)
tree0cc189a3ae09f27204574dd56fc0294eec4d873d
parent6d9d07bdde4284906c1e0f1d2d7a05c87ed3d6e1 (diff)
downloadvolse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.tar.gz
volse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.tar.bz2
volse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.zip
make preview work fix some other nits
-rw-r--r--include/conversation.php8
-rw-r--r--include/queue.php1
-rw-r--r--js/main.js19
-rw-r--r--view/tpl/threaded_conversation.tpl4
4 files changed, 20 insertions, 12 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ea2f84cbf..7ad231b58 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -472,7 +472,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$page_template = get_markup_template("conversation.tpl");
- if($items && count($items)) {
+ if($items) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -696,6 +696,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$threads = null;
}
+ if($page_mode === 'preview')
+ logger('preview: ' . print_r($threads,true));
+
$o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state),
'$live_update' => $live_update_div,
@@ -707,6 +710,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
));
+ if($page_mode === 'preview')
+ logger('preview: ' . $o);
+
return $o;
diff --git a/include/queue.php b/include/queue.php
index 5467f2c20..c74a08ac9 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,6 +2,7 @@
require_once("boot.php");
require_once('include/cli_startup.php');
require_once('include/queue_fn.php');
+require_once('include/zot.php');
function queue_run($argv, $argc){
diff --git a/js/main.js b/js/main.js
index 684a1d154..b184cd429 100644
--- a/js/main.js
+++ b/js/main.js
@@ -156,14 +156,15 @@
/* popup menus */
function close_last_popup_menu() {
+
if(last_popup_menu) {
- last_popup_menu.hide();
- last_popup_button.removeClass("selected");
- last_popup_menu = null;
- last_popup_button = null;
- }
- }
- $('a[rel^=#]').click(function(e){
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ }
+ }
+ $('a[rel^=#]').click(function(e){
close_last_popup_menu();
menu = $( $(this).attr('rel') );
e.preventDefault();
@@ -181,7 +182,7 @@
return false;
});
$('html').click(function() {
- close_last_popup_menu();
+ close_last_popup_menu();
});
// fancyboxes
@@ -547,8 +548,6 @@ function updateConvItems(mode,data) {
});
$("#nav-notifications-menu").show();
-
-
}
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index f60839e49..e91c49bb1 100644
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,6 +1,8 @@
-{{ for $threads as $item }}
+{{ for $threads as $xyz }}
+{{ for $xyz.items as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
+{{ endfor }}
<div id="conversation-end"></div>