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

merge upstream

Browse Source
This commit is contained in:
friendica 2012-08-11 18:54:23 -07:00
parent cac2d40832
commit e80d69d25b
31 changed files with 255 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -399,6 +399,8 @@ if(! class_exists('App')) {
public $sourcename = ''; public $sourcename = '';
public $videowidth = 425; public $videowidth = 425;
public $videoheight = 350; public $videoheight = 350;
public $force_max_items = 0;
public $theme_thread_allow = true;
private $scheme; private $scheme;
private $hostname; private $hostname;

8
include/bb2diaspora.php
View File

@ -196,6 +196,14 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// The bbcode parser now handles youtube-links (and the other stuff) correctly. // The bbcode parser now handles youtube-links (and the other stuff) correctly.
// Additionally the html code is now fixed so that lists are now working. // Additionally the html code is now fixed so that lists are now working.
/**
* Transform #tags, strip off the [url] and replace spaces with underscore
*/
$Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match',
'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
), $Text);
// Converting images with size parameters to simple images. Markdown doesn't know it. // Converting images with size parameters to simple images. Markdown doesn't know it.
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);

27
include/conversation.php
View File

@ -303,6 +303,9 @@ function localize_item(&$item){
function count_descendants($item) { function count_descendants($item) {
$total = count($item['children']); $total = count($item['children']);
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE)
return 0;
if($total > 0) { if($total > 0) {
foreach($item['children'] as $child) { foreach($item['children'] as $child) {
$total += count_descendants($child); $total += count_descendants($child);
@ -316,7 +319,7 @@ function count_descendants($item) {
* Recursively prepare a thread for HTML * Recursively prepare a thread for HTML
*/ */
function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $thread_level=1) { function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) {
$result = array(); $result = array();
$wall_template = 'wall_thread.tpl'; $wall_template = 'wall_thread.tpl';
@ -334,10 +337,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
continue; continue;
} }
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
$nb_items --;
continue;
}
$items_seen++; $items_seen++;
$alike = array();
$dlike = array();
$comment = ''; $comment = '';
$template = $wall_template; $template = $wall_template;
$commentww = ''; $commentww = '';
@ -409,9 +415,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
if ($tag!="") $tags[] = bbcode($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']) : ''); $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']) : ''); $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
@ -530,6 +533,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
'$edurl' => t('Link'), '$edurl' => t('Link'),
'$edvideo' => t('Video'), '$edvideo' => t('Video'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$indent' => $indent,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '') '$ww' => (($mode === 'network') ? $commentww : '')
)); ));
@ -586,6 +590,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
'comment' => $comment, 'comment' => $comment,
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'thread_level' => $thread_level,
); );
$arr = array('item' => $item, 'output' => $tmp_item); $arr = array('item' => $item, 'output' => $tmp_item);
@ -599,7 +604,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$item_result['children'] = array(); $item_result['children'] = array();
if(count($item['children'])) { 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['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1));
} }
$item_result['private'] = $item['private']; $item_result['private'] = $item['private'];
$item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : ''); $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
@ -607,7 +612,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
/* /*
* I don't like this very much... * I don't like this very much...
*/ */
if(get_config('system','thread_allow')) { if(get_config('system','thread_allow') && $a->theme_thread_allow) {
$item_result['flatten'] = false; $item_result['flatten'] = false;
$item_result['threaded'] = true; $item_result['threaded'] = true;
} }
@ -831,6 +836,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))), 'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'thread_level' => 1,
); );
$arr = array('item' => $item, 'output' => $tmp_item); $arr = array('item' => $item, 'output' => $tmp_item);
@ -870,6 +876,11 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
foreach($items as $item) { foreach($items as $item) {
like_puller($a,$item,$alike,'like'); like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike'); like_puller($a,$item,$dlike,'dislike');
if($item['id'] == $item['parent']) {
$threads[] = $item;
}
} }
$comments_collapsed = false; $comments_collapsed = false;

25
include/notifier.php
View File

@ -18,6 +18,31 @@ require_once('include/html2plain.php');
* us by hosting providers. * us by hosting providers.
*/ */
/*
* The notifier is typically called with:
*
* proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
*
* where COMMAND is one of the following:
*
* activity (in diaspora.php, dfrn_confirm.php, profiles.php)
* comment-import (in diaspora.php, items.php)
* comment-new (in item.php)
* drop (in diaspora.php, items.php, photos.php)
* edit_post (in item.php)
* event (in events.php)
* expire (in items.php)
* like (in like.php, poke.php)
* mail (in message.php)
* suggest (in fsuggest.php)
* tag (in photos.php, poke.php, tagger.php)
* tgroup (in items.php)
* wall-new (in photos.php, item.php)
*
* and ITEM_ID is the id of the item in the database that needs to be sent to others.
*/
function notifier_run($argv, $argc){ function notifier_run($argv, $argc){
global $a, $db; global $a, $db;

22
include/template_processor.php
View File

@ -63,7 +63,7 @@
if ($b[0]=="$") $b = $this->_get_var($b); if ($b[0]=="$") $b = $this->_get_var($b);
$val = ($a == $b); $val = ($a == $b);
} else if (strpos($args[2],"!=")>0){ } else if (strpos($args[2],"!=")>0){
list($a,$b) = explode("!=",$args[2]); list($a,$b) = array_map("trim", explode("!=",$args[2]));
$a = $this->_get_var($a); $a = $this->_get_var($a);
if ($b[0]=="$") $b = $this->_get_var($b); if ($b[0]=="$") $b = $this->_get_var($b);
$val = ($a != $b); $val = ($a != $b);
@ -134,6 +134,26 @@
} }
/**
* DEBUG node
*
* {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
*
* replace node with <pre>var_dump($var, $var, ...);</pre>
*/
private function _replcb_debug($args){
$vars = array_map('trim', explode(" ",$args[2]));
$vars[] = $args[1];
$ret = "<pre>";
foreach ($vars as $var){
$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
$ret .= "\n";
}
$ret .= "</pre>";
return $ret;
}
private function _replcb_node($m) { private function _replcb_node($m) {
$node = $this->nodes[$m[1]]; $node = $this->nodes[$m[1]];
if (method_exists($this, "_replcb_".$node[1])){ if (method_exists($this, "_replcb_".$node[1])){

2
version.inc
View File

@ -1 +1 @@
2012-08-09.41 2012-08-11.43

6
view/theme/comix-plain/search_item.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -47,7 +47,7 @@
{{ endif }} {{ endif }}
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

8
view/theme/comix-plain/wall_item.tpl
View File

@ -1,11 +1,11 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /> <img src="$item.thumb" class="wall-item-photo$item.sparkle $item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
</a> </a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
@ -74,5 +74,5 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

8
view/theme/comix-plain/wallwall_item.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
@ -10,7 +10,7 @@
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> <img src="$item.thumb" class="wall-item-photo$item.sparkle $item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -80,6 +80,6 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

6
view/theme/comix/search_item.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -47,7 +47,7 @@
{{ endif }} {{ endif }}
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

8
view/theme/comix/wall_item.tpl
View File

@ -1,11 +1,11 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /> <img src="$item.thumb" class="wall-item-photo$item.sparkle $item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
</a> </a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
@ -74,5 +74,5 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

8
view/theme/comix/wallwall_item.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
@ -10,7 +10,7 @@
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle$item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> <img src="$item.thumb" class="wall-item-photo$item.sparkle $item.indent" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -80,6 +80,6 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

6
view/theme/dispy/search_item.tpl
View File

@ -1,5 +1,5 @@
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -47,7 +47,7 @@
{{ endif }} {{ endif }}
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

6
view/theme/dispy/wall_item.tpl
View File

@ -1,6 +1,6 @@
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -84,5 +84,5 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

6
view/theme/dispy/wallwall_item.tpl
View File

@ -1,6 +1,6 @@
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
@ -93,6 +93,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

13
view/theme/quattro/dark/style.css
View File

@ -1072,6 +1072,7 @@ section {
width: 710px; width: 710px;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
margin-top: 10px; margin-top: 10px;
background-color: #fce94f;
} }
.comment-edit-preview .contact-photo { .comment-edit-preview .contact-photo {
width: 32px; width: 32px;
@ -1965,25 +1966,23 @@ footer {
opacity: 0.3; opacity: 0.3;
filter: alpha(opacity=30); filter: alpha(opacity=30);
} }
[class^="comment-edit-bb"] { .comment-edit-bb {
list-style: none; list-style: none;
display: none; display: none;
margin: 0px 0 0px 60px; margin: 0px;
padding: 0px;
width: 75%; width: 75%;
} }
[class^="comment-edit-bb"] > li { .comment-edit-bb > li {
display: inline-block; display: inline-block;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
visibility: none; visibility: none;
} }
[class^="comment-edit-bb-end"] {
clear: both;
}
.editicon { .editicon {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
background-image: url(bbedit.png); background-image: url(icons/bbedit.png);
text-decoration: none; text-decoration: none;
} }
.editicon :hover { .editicon :hover {

13
view/theme/quattro/green/style.css
View File

@ -1072,6 +1072,7 @@ section {
width: 710px; width: 710px;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
margin-top: 10px; margin-top: 10px;
background-color: #ddffdd;
} }
.comment-edit-preview .contact-photo { .comment-edit-preview .contact-photo {
width: 32px; width: 32px;
@ -1965,25 +1966,23 @@ footer {
opacity: 0.3; opacity: 0.3;
filter: alpha(opacity=30); filter: alpha(opacity=30);
} }
[class^="comment-edit-bb"] { .comment-edit-bb {
list-style: none; list-style: none;
display: none; display: none;
margin: 0px 0 0px 60px; margin: 0px;
padding: 0px;
width: 75%; width: 75%;
} }
[class^="comment-edit-bb"] > li { .comment-edit-bb > li {
display: inline-block; display: inline-block;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
visibility: none; visibility: none;
} }
[class^="comment-edit-bb-end"] {
clear: both;
}
.editicon { .editicon {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
background-image: url(bbedit.png); background-image: url(icons/bbedit.png);
text-decoration: none; text-decoration: none;
} }
.editicon :hover { .editicon :hover {

15
view/theme/quattro/quattro.less
View File

@ -532,6 +532,7 @@ section {
color: @CommentBoxFullColor; color: @CommentBoxFullColor;
border: 1px solid @CommentBoxFullBorderColor; border: 1px solid @CommentBoxFullBorderColor;
} }
} }
.threaded .wall-item-comment-wrapper { margin-left: 0px; } .threaded .wall-item-comment-wrapper { margin-left: 0px; }
@ -540,6 +541,7 @@ section {
width: 710px; width: 710px;
border: 1px solid @Grey5; border: 1px solid @Grey5;
margin-top: 10px; margin-top: 10px;
background-color: @JotPreviewBackgroundColor;
.contact-photo { width: 32px; height: 32px; margin-left: 16px; .contact-photo { width: 32px; height: 32px; margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
@ -1328,25 +1330,24 @@ footer { height: 100px; display: table-row; }
/* edit buttons for comments */ /* edit buttons for comments */
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
[class^="comment-edit-bb"] { .comment-edit-bb {
list-style: none; list-style: none;
display: none; display: none;
margin: 0px 0 0px 60px; margin: 0px;
padding: 0px;
width: 75%; width: 75%;
} }
[class^="comment-edit-bb"] > li { .comment-edit-bb > li {
display: inline-block; display: inline-block;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
visibility: none; visibility: none;
} }
[class^="comment-edit-bb-end"] {
clear: both;
}
.editicon { .editicon {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
background-image: url(bbedit.png); background-image: url(icons/bbedit.png);
text-decoration: none; text-decoration: none;
:hover {background-color: #ccc;} :hover {background-color: #ccc;}
} }

18
view/theme/quattro/theme.php
View File

@ -42,11 +42,21 @@ function insertFormatting(comment,BBcode,id) {
return true; return true;
} }
function cmtBbOpen(id) { function showThread(id) {
$(".comment-edit-bb-" + id).show(); $("#collapsed-comments-" + id).show()
$("#collapsed-comments-" + id + " .collapsed-comments").show()
} }
function cmtBbClose(comment, id) { function hideThread(id) {
$(".comment-edit-bb-" + id).hide(); $("#collapsed-comments-" + id).hide()
$("#collapsed-comments-" + id + " .collapsed-comments").hide()
}
function cmtBbOpen(id) {
$("#comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$("#comment-edit-bb-" + id).hide();
} }
$(document).ready(function() { $(document).ready(function() {

13
view/theme/quattro/tpl/comment_item.tpl
View File

@ -10,8 +10,8 @@
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div> </div>
<div class="comment-edit-photo-end"></div> <ul id="comment-edit-bb-$id"
<ul class="comment-edit-bb-$id"> class="comment-edit-bb">
<li><a class="editicon boldbb shadow" <li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="$edbold" style="cursor: pointer;" title="$edbold"
onclick="insertFormatting('$comment','b', $id);"></a></li> onclick="insertFormatting('$comment','b', $id);"></a></li>
@ -37,8 +37,11 @@
style="cursor: pointer;" title="$edvideo" style="cursor: pointer;" title="$edvideo"
onclick="insertFormatting('$comment','video', $id);"></a></li> onclick="insertFormatting('$comment','video', $id);"></a></li>
</ul> </ul>
<div class="comment-edit-bb-end"></div> <textarea id="comment-edit-text-$id"
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea> class="comment-edit-text-empty"
name="body"
onFocus="commentOpen(this,$id) && cmtBbOpen($id);"
onBlur="commentClose(this,$id) && cmtBbClose($id);" >$comment</textarea>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>
@ -48,14 +51,12 @@
</select> </select>
{{ endif }} {{ endif }}
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
</div> </div>
<div class="comment-edit-end"></div>
</form> </form>
</div> </div>

2
view/theme/quattro/tpl/threaded_conversation.tpl
View File

@ -1,6 +1,8 @@
{{ for $threads as $item }} {{ for $threads as $item }}
<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}"> <div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
{{ if $item.type == tag }} {{ if $item.type == tag }}
{{ inc wall_item_tag.tpl }}{{ endinc }} {{ inc wall_item_tag.tpl }}{{ endinc }}
{{ else }} {{ else }}

8
view/theme/quattro/tpl/wall_item_tag.tpl
View File

@ -1,3 +1,5 @@
{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
<div class="wall-item-container item-tag $item.indent"> <div class="wall-item-container item-tag $item.indent">
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">
@ -18,8 +20,8 @@
</div> </div>
</div> </div>
{{ if $item.thread_level!=1 }}</div>{{ endif }}
{{ if $item.flatten }} {{ if $item.flatten }}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >$item.comment</div>
$item.comment
</div>
{{ endif }} {{ endif }}

47
view/theme/quattro/tpl/wall_thread.tpl
View File

@ -2,12 +2,24 @@
{{ else }} {{ else }}
{{if $item.comment_firstcollapsed}} {{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer"> <div class="hide-comments-outer">
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span> <span id="hide-comments-total-$item.id"
class="hide-comments-total">$item.num_comments</span>
<span id="hide-comments-$item.id"
class="hide-comments fakelink"
onclick="showHideComments($item.id);">$item.hide_text</span>
{{ if $item.thread_level==3 }} -
<span id="hide-thread-$item-id"
class="fakelink"
onclick="showThread($item.id);">expand</span> /
<span id="hide-thread-$item-id"
class="fakelink"
onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
</div> </div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}} {{endif}}
{{ endif }} {{ endif }}
{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span> <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
@ -93,35 +105,40 @@
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div> </div>
{{ if $item.threaded }}{{ if $item.comment }} {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.thread_level!=1 }}
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"></div> <div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper"> <div class="wall-item-comment-wrapper">
$item.comment $item.comment
</div> </div>
</div> </div>
{{ endif }}{{ endif }} {{ endif }}{{ endif }}{{ endif }}
</div> </div>
{{ for $item.children as $item }}
<div class="children"> {{ for $item.children as $child }}
{{ if $item.type == tag }} {{ if $item.type == tag }}
{{ inc wall_item_tag.tpl }}{{ endinc }} {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
{{ else }} {{ else }}
{{ inc $item.template }}{{ endinc }} {{ inc $item.template with $item=$child }}{{ endinc }}
{{ endif }} {{ endif }}
</div>
{{ endfor }} {{ endfor }}
{{ if $item.thread_level!=1 }}</div>{{ endif }}
{{if $mode == display}} {{if $mode == display}}
{{ else }} {{ else }}
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ endif }} {{ endif }}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}{{ endif }}{{ endif }}
{{ if $item.flatten }} {{ if $item.flatten }}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >$item.comment</div>
$item.comment
</div>
{{ endif }} {{ endif }}

45
view/theme/quattro/tpl/wallwall_thread.tpl
View File

@ -2,12 +2,25 @@
{{ else }} {{ else }}
{{if $item.comment_firstcollapsed}} {{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer"> <div class="hide-comments-outer">
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span> <span id="hide-comments-total-$item.id"
class="hide-comments-total">$item.num_comments</span>
<span id="hide-comments-$item.id"
class="hide-comments fakelink"
onclick="showHideComments($item.id);">$item.hide_text</span>
{{ if $item.thread_level==3 }} -
<span id="hide-thread-$item-id"
class="fakelink"
onclick="showThread($item.id);">expand</span> /
<span id="hide-thread-$item-id"
class="fakelink"
onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
</div> </div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}} {{endif}}
{{ endif }} {{ endif }}
{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span> <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
@ -101,34 +114,38 @@
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div> </div>
{{ if $item.threaded }}{{ if $item.comment }} {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"></div> <div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper"> <div class="wall-item-comment-wrapper">
$item.comment $item.comment
</div> </div>
</div> </div>
{{ endif }}{{ endif }} {{ endif }}{{ endif }}{{ endif }}
</div> </div>
{{ for $item.children as $item }} {{ for $item.children as $child }}
<div class="children"> {{ if $item.type == tag }}
{{ if $item.type == tag }} {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
{{ inc wall_item_tag.tpl }}{{ endinc }} {{ else }}
{{ else }} {{ inc $item.template with $item=$child }}{{ endinc }}
{{ inc $item.template }}{{ endinc }} {{ endif }}
{{ endif }}
</div>
{{ endfor }} {{ endfor }}
{{ if $item.thread_level!=1 }}</div>{{ endif }}
{{if $mode == display}} {{if $mode == display}}
{{ else }} {{ else }}
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ endif }} {{ endif }}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}{{ endif }}{{ endif }}
{{ if $item.flatten }} {{ if $item.flatten }}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >$item.comment</div>
$item.comment
</div>
{{ endif }} {{ endif }}

4
view/tpl/head.tpl
View File

@ -29,7 +29,9 @@ $head_js
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show(); $("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
return true;
} }
return false;
} }
function commentClose(obj,id) { function commentClose(obj,id) {
if(obj.value == '') { if(obj.value == '') {
@ -38,7 +40,9 @@ $head_js
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide(); $("#mod-cmnt-wrap-" + id).hide();
closeMenu("comment-edit-submit-wrapper-" + id); closeMenu("comment-edit-submit-wrapper-" + id);
return true;
} }
return false;
} }
function showHideCommentBox(id) { function showHideCommentBox(id) {

6
view/tpl/search_item.tpl
View File

@ -1,6 +1,6 @@
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -55,7 +55,7 @@
{{ endif }} {{ endif }}
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

6
view/tpl/wall_item.tpl
View File

@ -1,6 +1,6 @@
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
@ -75,5 +75,5 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

17
view/tpl/wall_thread.tpl
View File

@ -73,18 +73,20 @@
</div> </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div> <div class="wall-item-delete-end"></div>
{{ if $item.threaded }}
{{ if $item.comment }}
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
{{ endif }}
{{ endif }}
</div> </div>
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
{{ if $item.threaded }}
{{ if $item.comment }}
<div class="wall-item-comment-wrapper$item.indent" >
$item.comment
</div>
{{ endif }}
{{ endif }}
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end$item.indent" ></div>
</div> </div>
{{ for $item.children as $item }} {{ for $item.children as $item }}
@ -98,3 +100,4 @@
{{ endif }} {{ endif }}
</div> </div>
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}

6
view/tpl/wallwall_item.tpl
View File

@ -1,6 +1,6 @@
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
@ -81,6 +81,6 @@
$item.comment $item.comment
</div> </div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div> <div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>

22
view/tpl/wallwall_thread.tpl
View File

@ -6,8 +6,8 @@
{{endif}} {{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
@ -78,19 +78,21 @@
</div> </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div> <div class="wall-item-delete-end"></div>
{{ if $item.threaded }}
{{ if $item.comment }}
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
{{ endif }}
{{ endif }}
</div> </div>
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-outside-wrapper-end$item.indent" ></div>
{{ if $item.threaded }}
{{ if $item.comment }}
<div class="wall-item-comment-wrapper $item.indent" >
$item.comment
</div>
{{ endif }}
{{ endif }}
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div> </div>
{{ for $item.children as $item }} {{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }} {{ inc $item.template }}{{ endinc }}