aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-09-28 09:32:53 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-09-28 09:32:53 +0200
commitc120cc8ea9cf3e0be224ed5d87f2a571c5516f4d (patch)
tree19c07eba91bebefe8295fbe4151e61fd84898b4f
parent3ca3157e53d9a37f5fee6ef6c459d61b453cca72 (diff)
downloadvolse-hubzilla-c120cc8ea9cf3e0be224ed5d87f2a571c5516f4d.tar.gz
volse-hubzilla-c120cc8ea9cf3e0be224ed5d87f2a571c5516f4d.tar.bz2
volse-hubzilla-c120cc8ea9cf3e0be224ed5d87f2a571c5516f4d.zip
added missing "delete selected items" link
-rw-r--r--include/conversation.php21
-rw-r--r--view/conversation.tpl7
2 files changed, 12 insertions, 16 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 8dcc1bff4..263c820ff 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -136,8 +136,6 @@ function conversation(&$a, $items, $mode, $update) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
$tpl = get_markup_template('wall_item.tpl');
$wallwall = get_markup_template('wallwall_item.tpl');
- $droptpl = get_markup_template('wall_item_drop.tpl');
- $fakedrop = get_markup_template('wall_fake_drop.tpl');
$alike = array();
$dlike = array();
@@ -197,9 +195,9 @@ function conversation(&$a, $items, $mode, $update) {
localize_item($item);
if($mode === 'network-new')
- $t = $droptpl;
+ $t = "#TODO:drop#"; //$droptpl;
else
- $t = $fakedrop;
+ $t = "#TODO:fakedrop#"; //$fakedrop;
$drop = replace_macros($t,array('$id' => $item['id']));
$lock = '<div class="wall-item-lock"></div>';
@@ -391,13 +389,6 @@ function conversation(&$a, $items, $mode, $update) {
if($page_writeable) {
if($toplevelpost) {
- /*$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
- '$id' => $item['id'],
- '$likethis' => t("I like this \x28toggle\x29"),
- '$nolike' => t("I don't like this \x28toggle\x29"),
- '$share' => t('Share'),
- '$wait' => t('Please wait')
- ))*/
$likebuttons = array(
'like' => array( t("I like this \x28toggle\x29"), t("like")),
'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
@@ -558,16 +549,14 @@ function conversation(&$a, $items, $mode, $update) {
// if author collapsing is in force but didn't get closed, close it off now.
- if($blowhard_count >= 3)
- $treads[$treadsid] .= '</div>';
+ /*if($blowhard_count >= 3)
+ $treads[$treadsid] .= '</div>';*/
$page_template = get_markup_template("conversation.tpl");
$o .= replace_macros($page_template, array(
'$treads' => $treads,
- '$dropping' => $dropping,
+ '$dropping' => ($dropping?t('Delete Selected Items'):False),
));
- //if($dropping)
- // $o .= '<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"><div id="item-delete-selected-icon" class="icon drophide" title="' . t('Delete Selected Items') . '" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div><div id="item-delete-selected-desc" >' . t('Delete Selected Items') . '</div></div><div id="item-delete-selected-end"></div>';
return $o;
}
diff --git a/view/conversation.tpl b/view/conversation.tpl
index 339302638..e509ddb22 100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -3,3 +3,10 @@
$tread
</div>
{{ endfor }}
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+ <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+ <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}