aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php2
-rw-r--r--include/conversation.php391
-rwxr-xr-xinclude/items.php4
-rw-r--r--include/network.php1
-rw-r--r--include/plugin.php61
-rw-r--r--include/text.php2
-rw-r--r--index.php32
-rw-r--r--mod/admin.php3
-rw-r--r--mod/item.php7
-rw-r--r--mod/notes.php8
-rw-r--r--version.inc2
-rw-r--r--view/theme/darkzero/css/style.css3
-rw-r--r--view/theme/duepuntozero/css/style.css8
-rwxr-xr-xview/theme/duepuntozero/tpl/comment_item.tpl3
-rw-r--r--view/theme/quattro/dark/style.css3
-rw-r--r--view/theme/quattro/green/style.css3
-rw-r--r--view/theme/quattro/quattro.less2
-rw-r--r--view/theme/quattro/wall_item_tag.tpl4
-rw-r--r--view/tpl/admin_site.tpl1
-rw-r--r--view/tpl/comment_item.tpl3
-rw-r--r--view/tpl/head.tpl41
21 files changed, 529 insertions, 55 deletions
diff --git a/boot.php b/boot.php
index 921df5593..00acdf078 100644
--- a/boot.php
+++ b/boot.php
@@ -382,6 +382,8 @@ if(! class_exists('App')) {
public $plugins;
public $apps = array();
public $identities;
+ public $css_sources = array();
+ public $js_sources = array();
public $nav_sel;
diff --git a/include/conversation.php b/include/conversation.php
index a1188d0c6..f1f6c83fe 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -298,6 +298,334 @@ function localize_item(&$item){
}
/**
+ * Count the total of comments on this item and its desendants
+ */
+function count_descendants($item) {
+ $total = count($item['children']);
+
+ if($total > 0) {
+ foreach($item['children'] as $child) {
+ $total += count_descendants($child);
+ }
+ }
+
+ return $total;
+}
+
+/**
+ * Recursively prepare a thread for HTML
+ */
+
+function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $thread_level=1) {
+ $result = array();
+
+ $wall_template = 'wall_thread.tpl';
+ $wallwall_template = 'wallwall_thread.tpl';
+ $items_seen = 0;
+ $nb_items = count($items);
+
+ $total_children = $nb_items;
+
+ foreach($items as $item) {
+ // prevent private email reply to public conversation from leaking.
+ if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+ // Don't count it as a visible item
+ $nb_items--;
+ continue;
+ }
+
+ $items_seen++;
+
+ $alike = array();
+ $dlike = array();
+ $comment = '';
+ $template = $wall_template;
+ $commentww = '';
+ $sparkle = '';
+ $owner_url = $owner_photo = $owner_name = '';
+ $buttons = '';
+ $dropping = false;
+ $star = false;
+ $isstarred = "unstarred";
+ $photo = $item['photo'];
+ $thumb = $item['thumb'];
+ $indent = '';
+ $osparkle = '';
+ $lastcollapsed = false;
+ $firstcollapsed = false;
+ $total_children += count_descendants($item);
+
+ $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+ $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+ $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+ $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+ ? t('Private Message')
+ : false);
+ $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+ $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
+ if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+ $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+ else
+ $edpost = false;
+ if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $dropping = true;
+
+ $drop = array(
+ 'dropping' => $dropping,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
+
+ $filer = (($profile_owner == local_user()) ? t("save to folder") : false);
+
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+ $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
+ if($item['author-link'] && (! $item['author-name']))
+ $profile_name = $item['author-link'];
+
+ $sp = false;
+ $profile_link = best_link_url($item,$sp);
+ if($profile_link === 'mailbox')
+ $profile_link = '';
+ if($sp)
+ $sparkle = ' sparkle';
+ else
+ $profile_link = zrl($profile_link);
+
+ $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+ if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+ $profile_avatar = $a->contacts[$normalised]['thumb'];
+ else
+ $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
+
+ $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+ call_hooks('render_location',$locate);
+ $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+
+ $tags=array();
+ foreach(explode(',',$item['tag']) as $tag){
+ $tag = trim($tag);
+ if ($tag!="") $tags[] = bbcode($tag);
+ }
+
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
+
+ $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+ $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+
+ if($toplevelpost) {
+ if((! $item['self']) && ($mode !== 'profile')) {
+ if($item['wall']) {
+
+ // On the network page, I am the owner. On the display page it will be the profile owner.
+ // This will have been stored in $a->page_contact by our calling page.
+ // Put this person as the wall owner of the wall-to-wall notice.
+
+ $owner_url = zrl($a->page_contact['url']);
+ $owner_photo = $a->page_contact['thumb'];
+ $owner_name = $a->page_contact['name'];
+ $template = $wallwall_template;
+ $commentww = 'ww';
+ }
+ }
+ else if($item['owner-link']) {
+
+ $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+ $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+ $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+ if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+
+ // The author url doesn't match the owner (typically the contact)
+ // and also doesn't match the contact alias.
+ // The name match is a hack to catch several weird cases where URLs are
+ // all over the park. It can be tricked, but this prevents you from
+ // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+ // well that it's the same Bob Smith.
+
+ // But it could be somebody else with the same name. It just isn't highly likely.
+
+
+ $owner_url = $item['owner-link'];
+ $owner_photo = $item['owner-avatar'];
+ $owner_name = $item['owner-name'];
+ $template = $wallwall_template;
+ $commentww = 'ww';
+ // If it is our contact, use a friendly redirect link
+ if((link_compare($item['owner-link'],$item['url']))
+ && ($item['network'] === NETWORK_DFRN)) {
+ $owner_url = $redirect_url;
+ $osparkle = ' sparkle';
+ }
+ else
+ $owner_url = zrl($owner_url);
+ }
+ }
+ if($profile_owner == local_user()) {
+ $isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+ $star = array(
+ 'do' => t("add star"),
+ 'undo' => t("remove star"),
+ 'toggle' => t("toggle star status"),
+ 'classdo' => (($item['starred']) ? "hidden" : ""),
+ 'classundo' => (($item['starred']) ? "" : "hidden"),
+ 'starred' => t('starred'),
+ 'tagger' => t("add tag"),
+ 'classtagger' => "",
+ );
+ }
+ } else {
+ $indent = 'comment';
+ // Collapse comments
+ if(($nb_items > 2) || ($thread_level > 2)) {
+ if($items_seen == 1) {
+ $firstcollapsed = true;
+ }
+ if($thread_level > 2) {
+ if($items_seen == $nb_items)
+ $lastcollapsed = true;
+ }
+ else if($items_seen == ($nb_items - 2)) {
+ $lastcollapsed = true;
+ }
+ }
+ }
+
+ if($page_writeable) {
+ $buttons = array(
+ 'like' => array( t("I like this \x28toggle\x29"), t("like")),
+ 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+ );
+ if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
+
+
+ if($show_comment_box) {
+ $qc = $qcomment = null;
+
+ if(in_array('qcomment',$a->plugins)) {
+ $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+ $qcomment = (($qc) ? explode("\n",$qc) : null);
+ }
+ $comment = replace_macros($cmnt_tpl,array(
+ '$return_path' => '',
+ '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+ '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+ '$id' => $item['item_id'],
+ '$parent' => $item['item_id'],
+ '$qcomment' => $qcomment,
+ '$profile_uid' => $profile_owner,
+ '$mylink' => $a->contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $a->contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$edbold' => t('Bold'),
+ '$editalic' => t('Italic'),
+ '$eduline' => t('Underline'),
+ '$edquote' => t('Quote'),
+ '$edcode' => t('Code'),
+ '$edimg' => t('Image'),
+ '$edurl' => t('Link'),
+ '$edvideo' => t('Video'),
+ '$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
+ '$ww' => (($mode === 'network') ? $commentww : '')
+ ));
+ }
+ }
+
+ if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+ $indent .= ' shiny';
+
+ localize_item($item);
+
+ $body = prepare_body($item,true);
+
+ $tmp_item = array(
+ // collapse comments in template. I don't like this much...
+ 'comment_firstcollapsed' => $firstcollapsed,
+ 'comment_lastcollapsed' => $lastcollapsed,
+ // template to use to render item (wall, walltowall, search)
+ 'template' => $template,
+
+ 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+ 'tags' => $tags,
+ 'body' => template_escape($body),
+ 'text' => strip_tags(template_escape($body)),
+ 'id' => $item['item_id'],
+ 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+ 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+ 'to' => t('to'),
+ 'wall' => t('Wall-to-Wall'),
+ 'vwall' => t('via Wall-To-Wall:'),
+ 'profile_url' => $profile_link,
+ 'item_photo_menu' => item_photo_menu($item),
+ 'name' => template_escape($profile_name),
+ 'thumb' => $profile_avatar,
+ 'osparkle' => $osparkle,
+ 'sparkle' => $sparkle,
+ 'title' => template_escape($item['title']),
+ 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+ 'lock' => $lock,
+ 'location' => template_escape($location),
+ 'indent' => $indent,
+ 'owner_url' => $owner_url,
+ 'owner_photo' => $owner_photo,
+ 'owner_name' => template_escape($owner_name),
+ 'plink' => get_plink($item),
+ 'edpost' => $edpost,
+ 'isstarred' => $isstarred,
+ 'star' => $star,
+ 'filer' => $filer,
+ 'drop' => $drop,
+ 'vote' => $buttons,
+ 'like' => $like,
+ 'dislike' => $dislike,
+ 'comment' => $comment,
+ 'previewing' => $previewing,
+ 'wait' => t('Please wait'),
+ );
+
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $item_result = $arr['output'];
+ if($firstcollapsed) {
+ $item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+ $item_result['hide_text'] = t('show more');
+ }
+
+ $item_result['children'] = array();
+ if(count($item['children'])) {
+ $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1));
+ }
+ $item_result['private'] = $item['private'];
+ $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
+
+ /*
+ * I don't like this very much...
+ */
+ if(get_config('system','thread_allow')) {
+ $item_result['flatten'] = false;
+ $item_result['threaded'] = true;
+ }
+ else {
+ $item_result['flatten'] = true;
+ $item_result['threaded'] = false;
+ if(!$toplevelpost) {
+ $item_result['comment'] = false;
+ }
+ }
+
+ $result[] = $item_result;
+ }
+
+ return $result;
+}
+
+/**
* "Render" a conversation or list of items for HTML display.
* There are two major forms of display:
* - Sequential or unthreaded ("New Item View" or search results)
@@ -376,7 +704,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
// array with html for each thread (parent+comments)
$threads = array();
$threadsid = -1;
-
+
+ $page_template = get_markup_template("conversation.tpl");
+
if($items && count($items)) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -1224,12 +1554,55 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
}
+function get_item_children($arr, $parent) {
+ $children = array();
+ foreach($arr as $item) {
+ if($item['id'] != $item['parent']) {
+ if(get_config('system','thread_allow')) {
+ // Fallback to parent-uri if thr-parent is not set
+ $thr_parent = $item['thr-parent'];
+ if($thr_parent == '')
+ $thr_parent = $item['parent-uri'];
+
+ if($thr_parent == $parent['uri']) {
+ $item['children'] = get_item_children($arr, $item);
+ $children[] = $item;
+ }
+ }
+ else if($item['parent'] == $parent['id']) {
+ $children[] = $item;
+ }
+ }
+ }
+ return $children;
+}
+
+function sort_item_children($items) {
+ $result = $items;
+ usort($result,'sort_thr_created_rev');
+ foreach($result as $k => $i) {
+ if(count($result[$k]['children'])) {
+ $result[$k]['children'] = sort_item_children($result[$k]['children']);
+ }
+ }
+ return $result;
+}
+
+function add_children_to_list($children, &$arr) {
+ foreach($children as $y) {
+ $arr[] = $y;
+ if(count($y['children']))
+ add_children_to_list($y['children'], $arr);
+ }
+}
+
function conv_sort($arr,$order) {
if((!(is_array($arr) && count($arr))))
return array();
$parents = array();
+ $children = array();
foreach($arr as $x)
if($x['id'] == $x['parent'])
@@ -1242,21 +1615,22 @@ function conv_sort($arr,$order) {
if(count($parents))
foreach($parents as $i=>$_x)
- $parents[$i]['children'] = array();
+ $parents[$i]['children'] = get_item_children($arr, $_x);
- foreach($arr as $x) {
+ /*foreach($arr as $x) {
if($x['id'] != $x['parent']) {
$p = find_thread_parent_index($parents,$x);
if($p !== false)
$parents[$p]['children'][] = $x;
}
- }
+ }*/
if(count($parents)) {
foreach($parents as $k => $v) {
if(count($parents[$k]['children'])) {
- $y = $parents[$k]['children'];
+ $parents[$k]['children'] = sort_item_children($parents[$k]['children']);
+ /*$y = $parents[$k]['children'];
usort($y,'sort_thr_created_rev');
- $parents[$k]['children'] = $y;
+ $parents[$k]['children'] = $y;*/
}
}
}
@@ -1266,8 +1640,9 @@ function conv_sort($arr,$order) {
foreach($parents as $x) {
$ret[] = $x;
if(count($x['children']))
- foreach($x['children'] as $y)
- $ret[] = $y;
+ add_children_to_list($x['children'], $ret);
+ /*foreach($x['children'] as $y)
+ $ret[] = $y;*/
}
}
diff --git a/include/items.php b/include/items.php
index 7e49f4b82..7b454a542 100755
--- a/include/items.php
+++ b/include/items.php
@@ -959,6 +959,8 @@ function item_store($arr,$force_parent = false) {
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : '');
$arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 );
+
+ $arr['thr-parent'] = $arr['parent-uri'];
if($arr['parent-uri'] === $arr['uri']) {
$parent_id = 0;
$parent_deleted = 0;
@@ -984,7 +986,6 @@ function item_store($arr,$force_parent = false) {
// and re-attach to the conversation parent.
if($r[0]['uri'] != $r[0]['parent-uri']) {
- $arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $r[0]['parent-uri'];
$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
ORDER BY `id` ASC LIMIT 1",
@@ -1026,7 +1027,6 @@ function item_store($arr,$force_parent = false) {
if($force_parent) {
logger('item_store: $force_parent=true, reply converted to top-level post.');
$parent_id = 0;
- $arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $arr['uri'];
$arr['gravity'] = 0;
}
diff --git a/include/network.php b/include/network.php
index 8617c1f44..6b9557234 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1169,3 +1169,4 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
return($xml_array);
}
+
diff --git a/include/plugin.php b/include/plugin.php
index 22745835d..a6780d701 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -402,3 +402,64 @@ function upgrade_bool_message($bbcode = false) {
$x = upgrade_link($bbcode);
return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
}
+
+
+
+function head_add_css($src,$media = 'screen') {
+ get_app()->css_sources[] = array($src,$type);
+
+}
+
+function head_get_css() {
+ $str = '';
+ $sources = get_app()->css_sources;
+ if(count($sources))
+ foreach($sources as $source)
+ $str .= format_css_if_exists($source);
+ return $str;
+}
+
+function format_css_if_exists($source) {
+
+ if(strpos($source[0],'/') !== false)
+ $path = $source[0];
+ elseif(file_exists('view/theme/'. current_theme() . '/css/' . $source[0]))
+ $path = 'view/theme/'. current_theme() . '/css/' . $source[0];
+ elseif(file_exists('view/theme/'. get_app()->theme_info['extends'] . '/css/' . $source[0]))
+ $path = 'view/theme/'. get_app()->theme_info['extends'] . '/css/' . $source[0];
+ elseif(file_exists('view/css/' . $source[0]))
+ $path = 'view/css/' . $source[0];
+ if($path)
+ return '<link rel="stylesheet" href="' . $path . '" type="text/css" media="' . $source[1] . '" />';
+
+}
+
+
+function head_add_js($src) {
+ get_app()->js_sources[] = $src;
+}
+
+function head_get_js() {
+ $str = '';
+ $sources = get_app()->js_sources;
+ if(count($sources))
+ foreach($sources as $source)
+ $str .= format_js_if_exists($source);
+ return $str;
+}
+
+function format_js_if_exists($source) {
+
+ if(strpos($source,'/') !== false)
+ $path = $source;
+ elseif(file_exists('view/theme/'. current_theme() . '/js/' . $source))
+ $path = 'view/theme/'. current_theme() . '/js/' . $source;
+ elseif(file_exists('view/theme/'. get_app()->theme_info['extends'] . '/js/' . $source))
+ $path = 'view/theme/'. get_app()->theme_info['extends'] . '/js/' . $source;
+ elseif(file_exists('view/js/' . $source))
+ $path = 'view/js/' . $source[0];
+ if($path)
+ return '<script src="' . $source . '" />';
+
+}
+
diff --git a/include/text.php b/include/text.php
index c7030ad7b..569a4f8db 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1705,4 +1705,4 @@ function check_webbie($arr) {
}
return '';
}
- \ No newline at end of file
+
diff --git a/index.php b/index.php
index 2c545922b..02d853d06 100644
--- a/index.php
+++ b/index.php
@@ -309,26 +309,6 @@ if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
}
-/**
- *
- * Report anything which needs to be communicated in the notification area (before the main body)
- *
- */
-
-/*if(x($_SESSION,'sysmsg')) {
- $a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
- . ((x($a->page,'content')) ? $a->page['content'] : '');
- $_SESSION['sysmsg']="";
- unset($_SESSION['sysmsg']);
-}
-if(x($_SESSION,'sysmsg_info')) {
- $a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
- . ((x($a->page,'content')) ? $a->page['content'] : '');
- $_SESSION['sysmsg_info']="";
- unset($_SESSION['sysmsg_info']);
-}*/
-
-
call_hooks('page_end', $a->page['content']);
@@ -371,6 +351,17 @@ if(! file_exists($module_css))
if(! file_exists($module_css))
$module_css = null;
+
+$module_js = 'view/theme/' . current_theme() . '/js/mod_' . $a->module . '.js';
+
+if(! file_exists($module_js))
+ $module_js = str_replace('theme/' . current_theme() . '/', '', $module_js);
+
+if(! file_exists($module_js))
+ $module_js = null;
+
+
+
$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
if($interval < 10000)
$interval = 40000;
@@ -389,6 +380,7 @@ if(! file_exists($module_css))
'$update_interval' => $interval,
'$page_css' => $a->get_baseurl() . '/' . $page_css,
'$module_css' => (($module_css) ? $a->get_baseurl() . '/' . $module_css : null),
+ '$module_js' => (($module_js) ? $a->get_baseurl() . '/' . $module_js : null),
'$stylesheet' => current_theme_url(),
'$theme' => current_theme(),
diff --git a/mod/admin.php b/mod/admin.php
index 44010efda..37c980c78 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -250,6 +250,7 @@ function admin_page_site_post(&$a){
$block_public = ((x($_POST,'block_public')) ? True : False);
$force_publish = ((x($_POST,'publish_all')) ? True : False);
$global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : '');
+ $thread_allow = ((x($_POST,'thread_allow')) ? True : False);
$no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False);
$no_openid = !((x($_POST,'no_openid')) ? True : False);
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
@@ -342,6 +343,7 @@ function admin_page_site_post(&$a){
} else {
set_config('system','directory_submit_url', $global_directory);
}
+ set_config('system','thread_allow', $thread_allow);
set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid);
@@ -442,6 +444,7 @@ function admin_page_site(&$a) {
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
'$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
+ '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
diff --git a/mod/item.php b/mod/item.php
index 87f7f75d9..757506bc4 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -92,6 +92,7 @@ function item_post(&$a) {
// if this isn't the real parent of the conversation, find it
if($r !== false && count($r)) {
$parid = $r[0]['parent'];
+ $parent_uri = $r[0]['uri'];
if($r[0]['id'] != $r[0]['parent']) {
$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
intval($parid)
@@ -109,7 +110,7 @@ function item_post(&$a) {
$parent = $r[0]['id'];
// multi-level threading - preserve the info but re-parent to our single level threading
- if(($parid) && ($parid != $parent))
+ //if(($parid) && ($parid != $parent))
$thr_parent = $parent_uri;
if($parent_item['contact-id'] && $uid) {
@@ -549,6 +550,10 @@ function item_post(&$a) {
$uri = item_new_uri($a->get_hostname(),$profile_uid);
+ // Fallback so that we alway have a thr-parent
+ if(!$thr_parent)
+ $thr_parent = $uri;
+
$datarray = array();
$datarray['uid'] = $profile_uid;
$datarray['type'] = $post_type;
diff --git a/mod/notes.php b/mod/notes.php
index 625bbd2ee..afaa60f70 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -129,9 +129,13 @@ function notes_content(&$a,$update = false) {
intval(local_user()),
dbesc($parents_str)
);
- }
- $o .= conversation($a,$r,'notes',$update);
+ if(count($r)) {
+ $items = conv_sort($r,"`commented`");
+
+ $o .= conversation($a,$items,'notes',$update);
+ }
+ }
$o .= paginate($a);
diff --git a/version.inc b/version.inc
index d4d581d9b..e30502b2a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-08-08.40
+2012-08-09.41
diff --git a/view/theme/darkzero/css/style.css b/view/theme/darkzero/css/style.css
index e01e14252..292c3dc4a 100644
--- a/view/theme/darkzero/css/style.css
+++ b/view/theme/darkzero/css/style.css
@@ -28,7 +28,8 @@ background: #444;
}
.wall-item-tools { background-color: #444444; background-image: none;}
-.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #444444; }
+.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
.comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; }
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 544820b68..beeaccb41 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -934,8 +934,12 @@ input#dfrn-url {
}
-.wall-item-content-wrapper.comment {
+.tread-wrapper .tread-wrapper {
margin-left: 50px;
+}
+
+.wall-item-content-wrapper.comment {
+# margin-left: 50px;
background: #EEEEEE;
}
@@ -1175,9 +1179,7 @@ input#dfrn-url {
}
.comment-wwedit-wrapper {
- margin-top: 15px;
background: #f3f3f3;
- margin-left: 50px;
}
.comment-edit-photo {
diff --git a/view/theme/duepuntozero/tpl/comment_item.tpl b/view/theme/duepuntozero/tpl/comment_item.tpl
index ea24d95cc..63c05f335 100755
--- a/view/theme/duepuntozero/tpl/comment_item.tpl
+++ b/view/theme/duepuntozero/tpl/comment_item.tpl
@@ -1,5 +1,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
- <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+ <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+ <form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
<input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" />
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 38dd3dcea..d397a9305 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1065,6 +1065,9 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.threaded .wall-item-comment-wrapper {
+ margin-left: 0px;
+}
.comment-edit-preview {
width: 710px;
border: 1px solid #2d2d2d;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index a7d1f10b8..fdab77eb7 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1065,6 +1065,9 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.threaded .wall-item-comment-wrapper {
+ margin-left: 0px;
+}
.comment-edit-preview {
width: 710px;
border: 1px solid #2d2d2d;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 1bd0fae0a..a3ab8107b 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -534,6 +534,8 @@ section {
}
}
+.threaded .wall-item-comment-wrapper { margin-left: 0px; }
+
.comment-edit-preview {
width: 710px;
border: 1px solid @Grey5;
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
index 926fc929d..205fcfebc 100644
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -13,11 +13,13 @@
<div class="wall-item-location">$item.location</div>
</div>
<div class="wall-item-content">
- $item.body
+ $item.ago $item.body
</div>
</div>
</div>
+{{ if $item.flatten }}
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
+{{ endif }}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 3ca03262d..e918ff787 100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -71,6 +71,7 @@
{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index a1d4e1043..b2be6f94e 100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,5 +1,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
- <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+ <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+ <form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
<input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" />
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 34efa1bd8..7853361d9 100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -20,22 +20,28 @@
title="Search in Friendica" />
<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
-<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/jquery.timeago.js"></script>
-<script type="text/javascript" src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
-<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script src="$baseurl/js/jquery.js" ></script>
+<script src="$baseurl/js/jquery.textinputs.js" ></script>
+<script src="$baseurl/js/fk.autocomplete.js" ></script>
+<script src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script src="$baseurl/library/jquery.timeago.js"></script>
+<script src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
+<script src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script src="$baseurl/js/acl.js" ></script>
+<script src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script src="$baseurl/js/main.js" ></script>
+
+{{ if $module_js }}
+<script src="$module_js" ></script>
+{{ endif }}
<script src="$baseurl/library/jslider/bin/jquery.slider.min.js"></script>
+
+
<script>
var updateInterval = $update_interval;
@@ -61,6 +67,15 @@
}
}
+ function showHideCommentBox(id) {
+ if( $('#comment-edit-form-' + id).is(':visible')) {
+ $('#comment-edit-form-' + id).hide();
+ }
+ else {
+ $('#comment-edit-form-' + id).show();
+ }
+ }
+
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 01:06:06 +0000