make preview work fix some other nits
This commit is contained in:
parent
6d9d07bdde
commit
7cd014e93c
@ -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;
|
||||
|
||||
|
||||
|
@ -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){
|
||||
|
||||
|
@ -156,6 +156,7 @@
|
||||
|
||||
/* popup menus */
|
||||
function close_last_popup_menu() {
|
||||
|
||||
if(last_popup_menu) {
|
||||
last_popup_menu.hide();
|
||||
last_popup_button.removeClass("selected");
|
||||
@ -547,8 +548,6 @@ function updateConvItems(mode,data) {
|
||||
});
|
||||
|
||||
$("#nav-notifications-menu").show();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -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>
|
||||
|
||||
|
Reference in New Issue
Block a user