mexon/friendica
1
0
Fork 0
Code Pull requests Activity

added missing "delete selected items" link

Browse source
This commit is contained in:
Fabio Comuni 2011-09-28 09:32:53 +02:00
parent 3ca3157e53
commit c120cc8ea9
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/conversation.php
View file

@ -136,8 +136,6 @@ function conversation(&$a, $items, $mode, $update) {
$cmnt_tpl = get_markup_template('comment_item.tpl'); $cmnt_tpl = get_markup_template('comment_item.tpl');
$tpl = get_markup_template('wall_item.tpl'); $tpl = get_markup_template('wall_item.tpl');
$wallwall = get_markup_template('wallwall_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(); $alike = array();
$dlike = array(); $dlike = array();
@ -197,9 +195,9 @@ function conversation(&$a, $items, $mode, $update) {
localize_item($item); localize_item($item);
if($mode === 'network-new') if($mode === 'network-new')
$t = $droptpl; $t = "#TODO:drop#"; //$droptpl;
else else
$t = $fakedrop; $t = "#TODO:fakedrop#"; //$fakedrop;
$drop = replace_macros($t,array('$id' => $item['id'])); $drop = replace_macros($t,array('$id' => $item['id']));
$lock = '<div class="wall-item-lock"></div>'; $lock = '<div class="wall-item-lock"></div>';
@ -391,13 +389,6 @@ function conversation(&$a, $items, $mode, $update) {
if($page_writeable) { if($page_writeable) {
if($toplevelpost) { 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( $likebuttons = array(
'like' => array( t("I like this \x28toggle\x29"), t("like")), 'like' => array( t("I like this \x28toggle\x29"), t("like")),
'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), '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 author collapsing is in force but didn't get closed, close it off now.
if($blowhard_count >= 3) /*if($blowhard_count >= 3)
$treads[$treadsid] .= '</div>'; $treads[$treadsid] .= '</div>';*/
$page_template = get_markup_template("conversation.tpl"); $page_template = get_markup_template("conversation.tpl");
$o .= replace_macros($page_template, array( $o .= replace_macros($page_template, array(
'$treads' => $treads, '$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; return $o;
} }

7
view/conversation.tpl
View file

@ -3,3 +3,10 @@
$tread $tread
</div> </div>
{{ endfor }} {{ 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 }}