harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make preview work fix some other nits

Browse Source
This commit is contained in:
friendica 2013-01-06 04:07:10 -08:00
parent 6d9d07bdde
commit 7cd014e93c
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/conversation.php
View File

@ -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;

1
include/queue.php
View File

@ -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){

19
js/main.js
View File

@ -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();
}

4
view/tpl/threaded_conversation.tpl
View File

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