sort out the 'delete selected' mess

diff --git a/boot.php b/boot.php
index be7491c273a2a43b9c72ebafb68bb1e41b33135b..55aa7eabcb931d4b75bdae4e0e66a08f4f3c6014 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1476' );
+define ( 'FRIENDICA_VERSION',      '3.0.1477' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/include/conversation.php b/include/conversation.php
index 4026923d854703488b9213138bdf4770b53b5db6..57fe0d66e692fe42ad5c0b423da094c115dc60db 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -351,381 +351,6 @@ function visible_activity($item) {
 }
 
 
-/**
- * Recursively prepare a thread for HTML
- */
-
-function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $previewing, $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) {
-               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
-                       // Don't count it as a visible item
-                       $nb_items--;
-                       $total_children --;
-               }
-               if(! visible_activity($item)) {
-                       $nb_items --;
-                       $total_children --;
-               }
-       }
-
-       foreach($items as $item) {
-               // prevent private email reply to public conversation from leaking.
-               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
-                       continue;
-               }
-
-               if(! visible_activity($item)) {
-                       continue;
-               }
-
-               $items_seen++;
-
-               $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 = '';
-               $visiting = false;
-               $lastcollapsed = false;
-               $firstcollapsed = false;
-               $total_children += count_descendants($item);
-
-               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
-
-               if($item['uid'] == local_user())
-                       $dropping = true;
-               elseif(is_array($_SESSION['remote'])) {
-                       foreach($_SESSION['remote'] as $visitor) {
-                               if($visitor['cid'] == $item['contact-id']) {
-                                       $dropping = true;
-                                       $visiting = true;
-                                       break;
-                               }
-                       }
-               }
-
-               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
-
-               // This will allow us to comment on wall-to-wall items owned by our friends
-               // and community forums even if somebody else wrote the post.
-
-               if($visiting && $mode == 'profile')
-                       $item_writeable = true;
-
-               $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;
-
-               $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();
-               $hashtags = array();
-               $mentions = array();
-               foreach(explode(',',$item['tag']) as $tag){
-                       $tag = trim($tag);
-                       if ($tag!="") {
-                               $t = bbcode($tag);
-                               $tags[] = $t;
-                               if($t[0] == '#')
-                                       $hashtags[] = $t;
-                               elseif($t[0] == '@')
-                                       $mentions[] = $t;
-                       }
-
-               }
-
-               $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'];
-                                       $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'];
-                                               $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(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
-                       $comments_threaded = true;
-               }
-               else {
-                       $comments_threaded = false;
-               }
-
-               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' => '',
-                                       '$threaded' => $comments_threaded,
-                                       '$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'),
-                                       '$indent' => $indent,
-                                       '$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);
-
-               list($categories,$folders) = get_cats_and_terms($item);
-
-               $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' => template_escape($tags),
-                       'hashtags' => template_escape($hashtags),
-                       'mentions' => template_escape($mentions),
-                       'txt_cats' => t('Categories:'),
-                       'txt_folders' => t('Filed under:'),
-                       'has_cats' => ((count($categories)) ? 'true' : ''),
-                       'has_folders' => ((count($folders)) ? 'true' : ''),
-                       'categories' => $categories,
-                       'folders' => $folders,
-                       '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']),
-                       'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
-
-                       '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'),
-                       'thread_level' => $thread_level,
-               );
-
-               $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['hidden_comments_num'] = $total_children;
-                       $item_result['hidden_comments_text'] = tt('comment', 'comments', $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, $alike, $dlike, $previewing, ($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') && $a->theme_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:
@@ -885,6 +510,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
                                $drop = array(
                                        'dropping' => $dropping,
+                                       'pagedrop' => $page_dropping,
                                        'select' => t('Select'),
                                        'delete' => t('Delete'),
                                );
@@ -900,7 +526,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 
                                list($categories, $folders) = get_cats_and_terms($item);
-                               //$tmp_item = replace_macros($tpl,array(
+
                                $tmp_item = array(
                                        'template' => $tpl,
                                        'id' => (($preview) ? 'P0' : $item['item_id']),
@@ -983,6 +609,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        continue;
                                }
 
+                               $item['pagedrop'] = $page_dropping;
+
                                if($item['id'] == $item['parent']) {
                                        $item_object = new Item($item);
                                        $conv->add_thread($item_object);

diff --git a/object/Item.php b/object/Item.php
index e039968bd76d73b3d1679b0ccc24973555bcc192..a0adb1346f2e94439e905791185190350046e180 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -112,6 +112,7 @@ class Item extends BaseObject {
 
                $drop = array(
                        'dropping' => $dropping,
+                       'pagedrop' => $item['pagedrop'],
                        'select' => t('Select'), 
                        'delete' => t('Delete'),
                );

diff --git a/util/messages.po b/util/messages.po
index 21a52cb0bffb398d816bb41b0833f20aebd34216..3175f59a0e83771ba4ecee9ae992c9a9f12c3202 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1476\n"
+"Project-Id-Version: 3.0.1477\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 10:00-0700\n"
+"POT-Creation-Date: 2012-09-25 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -170,13 +170,13 @@ msgstr ""
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
-#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:65
+#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:609 ../../object/Item.php:559
+#: ../../include/conversation.php:607 ../../object/Item.php:559
 msgid "Submit"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1311
+#: ../../include/conversation.php:1307
 msgid "Cancel"
 msgstr ""
 
@@ -578,51 +578,51 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1356 ../../mod/content.php:667
-#: ../../include/conversation.php:583 ../../object/Item.php:195
+#: ../../include/conversation.php:581 ../../object/Item.php:195
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1357 ../../mod/content.php:668
-#: ../../include/conversation.php:584 ../../object/Item.php:196
+#: ../../include/conversation.php:582 ../../object/Item.php:196
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1272
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1268
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:845
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:688
-#: ../../include/conversation.php:948 ../../include/conversation.php:1291
+#: ../../mod/message.php:481 ../../include/conversation.php:686
+#: ../../include/conversation.php:944 ../../include/conversation.php:1287
 #: ../../object/Item.php:257
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
 #: ../../mod/photos.php:1448 ../../mod/content.php:690
-#: ../../include/conversation.php:606 ../../object/Item.php:556
+#: ../../include/conversation.php:604 ../../object/Item.php:556
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
 #: ../../mod/photos.php:1450 ../../mod/content.php:692
-#: ../../include/conversation.php:608 ../../boot.php:574
+#: ../../include/conversation.php:606 ../../boot.php:574
 #: ../../object/Item.php:558
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:702 ../../include/conversation.php:618
-#: ../../include/conversation.php:1309 ../../object/Item.php:568
+#: ../../mod/content.php:702 ../../include/conversation.php:616
+#: ../../include/conversation.php:1305 ../../object/Item.php:568
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
 #: ../../mod/content.php:723 ../../mod/settings.php:606
 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:448 ../../include/conversation.php:893
+#: ../../include/conversation.php:448 ../../include/conversation.php:889
 #: ../../object/Item.php:116
 msgid "Delete"
 msgstr ""
@@ -689,7 +689,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1258
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1254
 msgid "Post to Email"
 msgstr ""
 
@@ -701,17 +701,17 @@ msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1273
+#: ../../include/conversation.php:1269
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1275
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1271
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1277
+#: ../../include/conversation.php:1273
 msgid "Insert web link"
 msgstr ""
 
@@ -727,35 +727,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1283
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1279
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1285
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1281
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1292
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1288
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1301
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1297
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1302
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1298
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1288
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1284
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1290
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1286
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1304
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1300
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1297,31 +1297,31 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:722
-#: ../../include/conversation.php:447 ../../include/conversation.php:892
+#: ../../include/conversation.php:447 ../../include/conversation.php:888
 #: ../../object/Item.php:115
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:815
-#: ../../mod/content.php:816 ../../include/conversation.php:656
-#: ../../include/conversation.php:657 ../../include/conversation.php:911
+#: ../../mod/content.php:816 ../../include/conversation.php:654
+#: ../../include/conversation.php:655 ../../include/conversation.php:907
 #: ../../object/Item.php:226 ../../object/Item.php:227
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:827
-#: ../../include/conversation.php:670 ../../include/conversation.php:931
+#: ../../include/conversation.php:668 ../../include/conversation.php:927
 #: ../../object/Item.php:239
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:946
+#: ../../mod/content.php:480 ../../include/conversation.php:942
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:697
+#: ../../mod/content.php:586 ../../include/conversation.php:695
 #: ../../object/Item.php:276
 #, php-format
 msgid "%d comment"
@@ -1330,7 +1330,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../mod/content.php:588 ../../include/text.php:1443
-#: ../../include/conversation.php:699 ../../object/Item.php:278
+#: ../../include/conversation.php:697 ../../object/Item.php:278
 #: ../../object/Item.php:291
 msgid "comment"
 msgid_plural "comments"
@@ -1339,92 +1339,92 @@ msgstr[1] ""
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:700
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:698
 #: ../../boot.php:575 ../../object/Item.php:279
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:667 ../../include/conversation.php:583
+#: ../../mod/content.php:667 ../../include/conversation.php:581
 #: ../../object/Item.php:195
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:584
+#: ../../mod/content.php:668 ../../include/conversation.php:582
 #: ../../object/Item.php:196
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../include/conversation.php:586
+#: ../../mod/content.php:670 ../../include/conversation.php:584
 #: ../../object/Item.php:198
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../include/conversation.php:586
+#: ../../mod/content.php:670 ../../include/conversation.php:584
 #: ../../object/Item.php:198
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:610
+#: ../../mod/content.php:694 ../../include/conversation.php:608
 #: ../../object/Item.php:560
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:611
+#: ../../mod/content.php:695 ../../include/conversation.php:609
 #: ../../object/Item.php:561
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:612
+#: ../../mod/content.php:696 ../../include/conversation.php:610
 #: ../../object/Item.php:562
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:613
+#: ../../mod/content.php:697 ../../include/conversation.php:611
 #: ../../object/Item.php:563
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:614
+#: ../../mod/content.php:698 ../../include/conversation.php:612
 #: ../../object/Item.php:564
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:615
+#: ../../mod/content.php:699 ../../include/conversation.php:613
 #: ../../object/Item.php:565
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../include/conversation.php:616
+#: ../../mod/content.php:700 ../../include/conversation.php:614
 #: ../../object/Item.php:566
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../include/conversation.php:617
+#: ../../mod/content.php:701 ../../include/conversation.php:615
 #: ../../object/Item.php:567
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:735 ../../include/conversation.php:547
+#: ../../mod/content.php:735 ../../include/conversation.php:545
 #: ../../object/Item.php:179
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../include/conversation.php:548
+#: ../../mod/content.php:736 ../../include/conversation.php:546
 #: ../../object/Item.php:180
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../include/conversation.php:549
+#: ../../mod/content.php:737 ../../include/conversation.php:547
 #: ../../object/Item.php:181
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:740 ../../include/conversation.php:552
+#: ../../mod/content.php:740 ../../include/conversation.php:550
 #: ../../object/Item.php:184
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:741 ../../include/conversation.php:553
+#: ../../mod/content.php:741 ../../include/conversation.php:551
 #: ../../object/Item.php:185
 msgid "add tag"
 msgstr ""
@@ -1434,17 +1434,17 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../include/conversation.php:658
+#: ../../mod/content.php:817 ../../include/conversation.php:656
 #: ../../object/Item.php:228
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:818 ../../include/conversation.php:659
+#: ../../mod/content.php:818 ../../include/conversation.php:657
 #: ../../object/Item.php:229
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../include/conversation.php:660
+#: ../../mod/content.php:819 ../../include/conversation.php:658
 #: ../../object/Item.php:230
 msgid "via Wall-To-Wall:"
 msgstr ""
@@ -2695,7 +2695,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1209 ../../include/conversation.php:1226
+#: ../../include/conversation.php:1205 ../../include/conversation.php:1222
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -4420,8 +4420,8 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1213
-#: ../../include/conversation.php:1230
+#: ../../mod/filer.php:29 ../../include/conversation.php:1209
+#: ../../include/conversation.php:1226
 msgid "Save to Folder:"
 msgstr ""
 
@@ -6951,19 +6951,23 @@ msgstr ""
 msgid "Popular Channels"
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:36
+#: ../../addon/fromapp/fromapp.php:38
 msgid "Fromapp settings updated."
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:57
+#: ../../addon/fromapp/fromapp.php:64
 msgid "FromApp Settings"
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:59
+#: ../../addon/fromapp/fromapp.php:66
 msgid ""
 "The application name you would like to show your posts originating from."
 msgstr ""
 
+#: ../../addon/fromapp/fromapp.php:70
+msgid "Use this application name even if another application was used."
+msgstr ""
+
 #: ../../addon/blogger/blogger.php:42
 msgid "Post to blogger"
 msgstr ""
@@ -8519,34 +8523,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1110
+#: ../../include/Contact.php:220 ../../include/conversation.php:1106
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1104
+#: ../../include/Contact.php:221 ../../include/conversation.php:1100
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1105
+#: ../../include/Contact.php:222 ../../include/conversation.php:1101
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1106
+#: ../../include/Contact.php:223 ../../include/conversation.php:1102
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1103
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1108
+#: ../../include/conversation.php:1104
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1105
 msgid "Send PM"
 msgstr ""
 
@@ -8564,120 +8568,120 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:647 ../../include/conversation.php:923
+#: ../../include/conversation.php:645 ../../include/conversation.php:919
 #: ../../object/Item.php:217
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:648 ../../include/conversation.php:924
+#: ../../include/conversation.php:646 ../../include/conversation.php:920
 #: ../../object/Item.php:218
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1002
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:1006
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:1168
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1168
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1168
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:1174
+#: ../../include/conversation.php:1170
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1180
+#: ../../include/conversation.php:1176
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1183
+#: ../../include/conversation.php:1179
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1184
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1208 ../../include/conversation.php:1225
+#: ../../include/conversation.php:1204 ../../include/conversation.php:1221
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1210 ../../include/conversation.php:1227
+#: ../../include/conversation.php:1206 ../../include/conversation.php:1223
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1211 ../../include/conversation.php:1228
+#: ../../include/conversation.php:1207 ../../include/conversation.php:1224
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1212 ../../include/conversation.php:1229
+#: ../../include/conversation.php:1208 ../../include/conversation.php:1225
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1214 ../../include/conversation.php:1231
+#: ../../include/conversation.php:1210 ../../include/conversation.php:1227
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1274
+#: ../../include/conversation.php:1270
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1276
+#: ../../include/conversation.php:1272
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1278
+#: ../../include/conversation.php:1274
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1279
+#: ../../include/conversation.php:1275
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1280
+#: ../../include/conversation.php:1276
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1277
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1282
+#: ../../include/conversation.php:1278
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1284
+#: ../../include/conversation.php:1280
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1286
+#: ../../include/conversation.php:1282
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1293
+#: ../../include/conversation.php:1289
 msgid "permissions"
 msgstr ""
 

diff --git a/view/search_item.tpl b/view/search_item.tpl
index de3c58839cd70ea8315c7572c34bf494d8e4735e..dfdee1fabcc4c5812bfd936093aad34775dfdc73 100644 (file)
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -44,7 +44,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>

diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl
index 828e1065b4d3cd9b81d5572c585a42a57d1ca56a..cf1c388cd256341f82043a90382920cb257b221f 100644 (file)
--- a/view/theme/comix-plain/search_item.tpl
+++ b/view/theme/comix-plain/search_item.tpl
@@ -34,7 +34,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>

diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
index 828e1065b4d3cd9b81d5572c585a42a57d1ca56a..cf1c388cd256341f82043a90382920cb257b221f 100644 (file)
--- a/view/theme/comix/search_item.tpl
+++ b/view/theme/comix/search_item.tpl
@@ -34,7 +34,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>

diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index c953228104d4ca5ef8904bebbfa15fce83bfa660..d0c83c37a31baf5ecf55d9d03a051aca10c4744f 100644 (file)
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
@@ -86,8 +86,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
index 48468417610efba9605e5b940ce3618843ba6e01..95d30602d5f87908a68f91de000e27efd0aba017 100644 (file)
--- a/view/theme/diabook/wall_thread.tpl
+++ b/view/theme/diabook/wall_thread.tpl
@@ -93,8 +93,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 3e997ad7a3f5ba3ed32ef5bfcdd6ca44c1d12bbf..0d9721fe70bf6e9a40f31f298d84b2d17140b6fa 100644 (file)
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -44,7 +44,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>

diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
index 3f06e539b60186b36a463e0829e2f6911421e620..0883f88c2e52e3d94e39aa396109c80e6ff2d758 100644 (file)
--- a/view/theme/dispy/wall_thread.tpl
+++ b/view/theme/dispy/wall_thread.tpl
@@ -76,7 +76,7 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 
                        <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                               {{ 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.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
                        </li>
                        </ul>
                        <div class="wall-item-delete-end"></div>

diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl
index 35572caa0455e0ca344046d5d01d56f50e89b573..737f1649e1245591ee8231ce33c58ce49874c88d 100644 (file)
--- a/view/theme/facepark/search_item.tpl
+++ b/view/theme/facepark/search_item.tpl
@@ -34,7 +34,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>

diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl
index 3af6aaa11182f5a77006e9f5b6b9b636e4ebc744..76208360bc5bb33f6300a36ea8d30f9a0ba01103 100644 (file)
--- a/view/theme/frost-mobile/wall_thread.tpl
+++ b/view/theme/frost-mobile/wall_thread.tpl
@@ -77,7 +77,7 @@
                        <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        <!--</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.pagedrop }}<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>
        </div>  

diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl
index a60c926fa13d7921736260fd2731c5e522a781ff..72089ec223dca81376ef7ece693f533245a9b667 100644 (file)
--- a/view/theme/frost/wall_thread.tpl
+++ b/view/theme/frost/wall_thread.tpl
@@ -78,7 +78,7 @@
                        <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        <!--</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.pagedrop }}<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>
        </div>  

diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
index e207484dc824321f7517986f8e9f43e491a890c6..55868e5483d80ef6eb9111b00aa2b6bd2b215cfc 100644 (file)
--- a/view/theme/quattro/search_item.tpl
+++ b/view/theme/quattro/search_item.tpl
@@ -64,8 +64,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index 2500fbcceeb96cb21523188c8c9ebd5e4bbc50db..3221311fc7d4225e6055098413b7aa111c01374e 100644 (file)
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -103,8 +103,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
index 8cf08df8b22e4ae3d6cc4da7cfefa8a0bde739c6..5349c0026156112650100c4fa44f34cb7dc7d817 100644 (file)
--- a/view/theme/smoothly/search_item.tpl
+++ b/view/theme/smoothly/search_item.tpl
@@ -25,7 +25,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
                <div class="wall-item-content" id="wall-item-content-$item.id" >

diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index 09799e881f07d33b9732caa289ef972cf29a7b8a..e57fba30e23b7c21bd86e9ae959ea5a07f4a0650 100644 (file)
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -113,7 +113,7 @@
                                {{ endif }}
                        </div>
 
-                       {{ if $item.drop.dropping }}
+                       {{ if $item.drop.pagedrop }}
                        <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>

diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index 4b70ab98d16ec178935b51f3b11a6f4071bf46aa..058986bf68993596332fc2c1a6d9b3dc3db3ec41 100644 (file)
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
@@ -24,7 +24,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
                <div class="wall-item-content" id="wall-item-content-$item.id" >

diff --git a/view/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl
index 6d6c8453ed63530427d6838b5fc7599f8b0a9a70..4b6f25d0502e0d44cc6463f82e125637347429fe 100644 (file)
--- a/view/theme/testbubble/wall_thread.tpl
+++ b/view/theme/testbubble/wall_thread.tpl
@@ -70,7 +70,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
                <div class="wall-item-author">

diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index fb87d76615c9cc461199a639a7667f77f1e38183..65c5f64a3d41067e8110a2cb0d4d30be91759b91 100644 (file)
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
@@ -70,8 +70,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 849d85402a4ba59db0da67d6ed26c26e8744eb9a..becf868e7907a68463f40954b7605c1eb5883440 100644 (file)
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -99,8 +99,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}

diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index b42399e2dfe1a4d52c3995fa323a785dfdc885c8..a67334e33f41d65b2af7ca1a23a7e47607808bc5 100644 (file)
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -87,7 +87,7 @@
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </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.pagedrop }}<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>
        </div>