aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/icons/10/link.pngbin0 -> 410 bytes
-rw-r--r--images/icons/16/link.pngbin0 -> 579 bytes
-rw-r--r--images/icons/22/link.pngbin0 -> 767 bytes
-rw-r--r--images/icons/48/link.pngbin0 -> 1685 bytes
-rw-r--r--images/icons/Makefile31
-rw-r--r--images/icons/link.pngbin0 -> 7459 bytes
-rw-r--r--images/icons/make.sh14
-rw-r--r--include/conversation.php554
-rw-r--r--mod/ping.php308
-rw-r--r--view/conversation.tpl7
-rw-r--r--view/like.tpl6
-rw-r--r--view/like_noshare.tpl5
-rw-r--r--view/search_item.tpl100
-rw-r--r--view/theme/dispy/search_item.tpl17
-rw-r--r--view/theme/dispy/wall_item.tpl37
-rw-r--r--view/theme/dispy/wallwall_item.tpl38
-rw-r--r--view/theme/duepuntozero/search_item.tpl54
-rw-r--r--view/theme/duepuntozero/wall_item.tpl24
-rw-r--r--view/theme/duepuntozero/wallwall_item.tpl24
-rw-r--r--view/theme/loozah/search_item.tpl52
-rw-r--r--view/theme/loozah/wall_item.tpl24
-rw-r--r--view/theme/loozah/wallwall_item.tpl24
-rw-r--r--view/theme/quattro/icons.less2
-rw-r--r--view/theme/quattro/quattro.less46
-rw-r--r--view/theme/quattro/style.css76
-rw-r--r--view/theme/testbubble/search_item.tpl17
-rw-r--r--view/theme/testbubble/wall_item.tpl27
-rw-r--r--view/theme/testbubble/wallwall_item.tpl33
-rw-r--r--view/wall_fake_drop.tpl2
-rw-r--r--view/wall_item.tpl32
-rw-r--r--view/wall_item_drop.tpl6
-rw-r--r--view/wallwall_item.tpl77
32 files changed, 1070 insertions, 567 deletions
diff --git a/images/icons/10/link.png b/images/icons/10/link.png
new file mode 100644
index 000000000..0619f4511
--- /dev/null
+++ b/images/icons/10/link.png
Binary files differ
diff --git a/images/icons/16/link.png b/images/icons/16/link.png
new file mode 100644
index 000000000..afec9cc30
--- /dev/null
+++ b/images/icons/16/link.png
Binary files differ
diff --git a/images/icons/22/link.png b/images/icons/22/link.png
new file mode 100644
index 000000000..e819ad3ac
--- /dev/null
+++ b/images/icons/22/link.png
Binary files differ
diff --git a/images/icons/48/link.png b/images/icons/48/link.png
new file mode 100644
index 000000000..b32eec529
--- /dev/null
+++ b/images/icons/48/link.png
Binary files differ
diff --git a/images/icons/Makefile b/images/icons/Makefile
new file mode 100644
index 000000000..39428d154
--- /dev/null
+++ b/images/icons/Makefile
@@ -0,0 +1,31 @@
+
+IMAGES=add.png edit.png gear.png info.png menu.png \
+ notify_off.png star.png delete.png feed.png group.png \
+ lock.png notice.png notify_on.png user.png link.png
+
+DESTS=10/ 16/ 22/ 48/ \
+ $(addprefix 10/, $(IMAGES)) \
+ $(addprefix 16/, $(IMAGES)) \
+ $(addprefix 22/, $(IMAGES)) \
+ $(addprefix 48/, $(IMAGES))
+
+all: $(DESTS)
+
+%/:
+ mkdir $@
+
+10/%.png: %.png
+ convert $< -resize 10x10 $@
+
+16/%.png: %.png
+ convert $< -resize 16x16 $@
+
+22/%.png: %.png
+ convert $< -resize 22x22 $@
+
+48/%.png: %.png
+ convert $< -resize 48x48 $@
+
+
+
+
diff --git a/images/icons/link.png b/images/icons/link.png
new file mode 100644
index 000000000..743bdf0f9
--- /dev/null
+++ b/images/icons/link.png
Binary files differ
diff --git a/images/icons/make.sh b/images/icons/make.sh
deleted file mode 100644
index 348117411..000000000
--- a/images/icons/make.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-sizes="10 16 22 48"
-
-for s in $sizes
-do
- echo "=[ ${s}x${s} ]===="
- [ -d $s ] || mkdir $s
- for f in *.png
- do
- convert $f -resize ${s}x${s} $s/$f
- echo -n "#"
- done
- echo
-done
-echo "Ok."
diff --git a/include/conversation.php b/include/conversation.php
index acbbc9bd5..ebe582f4c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -134,16 +134,17 @@ function conversation(&$a, $items, $mode, $update) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
- $like_tpl = get_markup_template('like.tpl');
- $noshare_tpl = get_markup_template('like_noshare.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();
+
+ // array with html for each thread (parent+comments)
+ $treads = array();
+ $treadsid = -1;
+
if(count($items)) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -154,6 +155,7 @@ function conversation(&$a, $items, $mode, $update) {
$tpl = get_markup_template('search_item.tpl');
foreach($items as $item) {
+ $treadsid++;
$comment = '';
$owner_url = '';
@@ -195,21 +197,30 @@ function conversation(&$a, $items, $mode, $update) {
$location = '<span class="smalltext">' . $coord . '</span>';
}
- $drop = '';
localize_item($item);
if($mode === 'network-new')
- $t = $droptpl;
+ $dropping = true;
else
- $t = $fakedrop;
+ $dropping = false;
+
+
+ $drop = array(
+ 'dropping' => $dropping,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
- $drop = replace_macros($t,array('$id' => $item['id']));
- $lock = '<div class="wall-item-lock"></div>';
- $star = '';
+ $star = false;
+ $isstarred = "unstarred";
+
+ $lock = false;
+ $likebuttons = false;
+ $shareable = false;
$body = prepare_body($item,true);
- $o .= replace_macros($tpl,array(
+ $treads[$treadsid] .= replace_macros($tpl,array(
'$id' => $item['item_id'],
'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'$profile_url' => $profile_link,
@@ -221,346 +232,349 @@ function conversation(&$a, $items, $mode, $update) {
'$title' => template_escape($item['title']),
'$body' => template_escape($body),
'$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' => '',
+ '$owner_name' => template_escape($owner_name),
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
- '$owner_name' => template_escape($owner_name),
+ '$plink' => get_plink($item),
+ '$edpost' => false,
+ '$isstarred' => $isstarred,
'$star' => $star,
'$drop' => $drop,
- '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+ '$vote' => $likebuttons,
+ '$like' => '',
+ '$dislike' => '',
+ '$comment' => '',
+ '$conv' => array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context')),
+ '$wait' => t('Please wait'),
));
}
- return $o;
}
+ else
+ {
+ // Normal View
+ // Figure out how many comments each parent has
+ // (Comments all have gravity of 6)
+ // Store the result in the $comments array
-
- // Normal View
-
-
- // Figure out how many comments each parent has
- // (Comments all have gravity of 6)
- // Store the result in the $comments array
-
- $comments = array();
- foreach($items as $item) {
- if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
- if(! x($comments,$item['parent']))
- $comments[$item['parent']] = 1;
- else
- $comments[$item['parent']] += 1;
+ $comments = array();
+ foreach($items as $item) {
+ if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
+ if(! x($comments,$item['parent']))
+ $comments[$item['parent']] = 1;
+ else
+ $comments[$item['parent']] += 1;
+ }
}
- }
- // map all the like/dislike activities for each parent item
- // Store these in the $alike and $dlike arrays
+ // map all the like/dislike activities for each parent item
+ // Store these in the $alike and $dlike arrays
- foreach($items as $item) {
- like_puller($a,$item,$alike,'like');
- like_puller($a,$item,$dlike,'dislike');
- }
+ foreach($items as $item) {
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
+ }
- $comments_collapsed = false;
- $blowhard = 0;
- $blowhard_count = 0;
+ $comments_collapsed = false;
+ $blowhard = 0;
+ $blowhard_count = 0;
- // array with html for each thread (parent+comments)
- $treads = array();
- $treadsid = -1;
- foreach($items as $item) {
+ foreach($items as $item) {
- $comment = '';
- $template = $tpl;
- $commentww = '';
- $sparkle = '';
- $owner_url = $owner_photo = $owner_name = '';
+ $comment = '';
+ $template = $tpl;
+ $commentww = '';
+ $sparkle = '';
+ $owner_url = $owner_photo = $owner_name = '';
- // We've already parsed out like/dislike for special treatment. We can ignore them now
+ // We've already parsed out like/dislike for special treatment. We can ignore them now
- if(((activity_match($item['verb'],ACTIVITY_LIKE))
- || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
- && ($item['id'] != $item['parent']))
- continue;
+ if(((activity_match($item['verb'],ACTIVITY_LIKE))
+ || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
+ && ($item['id'] != $item['parent']))
+ continue;
- $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
- $toplevelprivate = false;
+ $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+ $toplevelprivate = false;
- // Take care of author collapsing and comment collapsing
- // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
- // If there are more than two comments, squash all but the last 2.
-
- if($toplevelpost) {
- $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
- $item_writeable = (($item['writable'] || $item['self']) ? true : false);
-
- /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
- $blowhard_count ++;
- if($blowhard_count == 3) {
- $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
- . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >'
- . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-'
- . $item['parent'] . '" style="display: none;" >';
+ // Take care of author collapsing and comment collapsing
+ // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+ // If there are more than two comments, squash all but the last 2.
+
+ if($toplevelpost) {
+ $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
+ $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+ /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+ $blowhard_count ++;
+ if($blowhard_count == 3) {
+ $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
+ . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >'
+ . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-'
+ . $item['parent'] . '" style="display: none;" >';
+ }
}
+ else {
+ $blowhard = $item['cid'];
+ if($blowhard_count >= 3)
+ $o .= '</div>';
+ $blowhard_count = 0;
+ }*/
+
+ $comments_seen = 0;
+ $comments_collapsed = false;
+
+ $treadsid++;
+ $treads[$treadsid] = "";
}
else {
- $blowhard = $item['cid'];
- if($blowhard_count >= 3)
- $o .= '</div>';
- $blowhard_count = 0;
- }*/
-
- $comments_seen = 0;
- $comments_collapsed = false;
-
- $treadsid++;
- $treads[$treadsid] = "";
- }
- else {
- // prevent private email from leaking into public conversation
- if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
- continue;
- $comments_seen ++;
- }
-
- $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
- $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
-
- if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
- if(! $comments_collapsed) {
- $treads[$treadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent']
- . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >'
- . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
- . '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
- $comments_collapsed = true;
+ // prevent private email from leaking into public conversation
+ if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+ continue;
+ $comments_seen ++;
+ }
+
+ $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+ $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+
+ if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+ if(! $comments_collapsed) {
+ $treads[$treadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent']
+ . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >'
+ . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
+ . '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+ $comments_collapsed = true;
+ }
+ }
+ if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+ $treads[$treadsid] .= '</div>';
}
- }
- if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
- $treads[$treadsid] .= '</div>';
- }
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
- $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
- || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
- ? t('Private Message')
- : false);
+ $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+ ? t('Private Message')
+ : false);
- // Top-level wall post not written by the wall owner (wall-to-wall)
- // First figure out who owns it.
+ // Top-level wall post not written by the wall owner (wall-to-wall)
+ // First figure out who owns it.
- $osparkle = '';
+ $osparkle = '';
- if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
+ if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
- if($item['wall']) {
+ 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 on the left of the wall-to-wall notice.
+ // 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 on the left of the wall-to-wall notice.
- $owner_url = $a->page_contact['url'];
- $owner_photo = $a->page_contact['thumb'];
- $owner_name = $a->page_contact['name'];
- $template = $wallwall;
- $commentww = 'ww';
- }
- if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-
- // Could be anybody.
-
- $owner_url = $item['owner-link'];
- $owner_photo = $item['owner-avatar'];
- $owner_name = $item['owner-name'];
- $template = $wallwall;
- $commentww = 'ww';
- // If it is our contact, use a friendly redirect link
- if((link_compare($item['owner-link'],$item['url']))
- && ($item['network'] === 'dfrn')) {
- $owner_url = $redirect_url;
- $osparkle = ' sparkle';
+ $owner_url = $a->page_contact['url'];
+ $owner_photo = $a->page_contact['thumb'];
+ $owner_name = $a->page_contact['name'];
+ $template = $wallwall;
+ $commentww = 'ww';
+ }
+ if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+
+ // Could be anybody.
+
+ $owner_url = $item['owner-link'];
+ $owner_photo = $item['owner-avatar'];
+ $owner_name = $item['owner-name'];
+ $template = $wallwall;
+ $commentww = 'ww';
+ // If it is our contact, use a friendly redirect link
+ if((link_compare($item['owner-link'],$item['url']))
+ && ($item['network'] === 'dfrn')) {
+ $owner_url = $redirect_url;
+ $osparkle = ' sparkle';
+ }
}
}
- }
- $likebuttons = '';
- $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
+ $likebuttons = '';
+ $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
- 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')
- ));
+ if($page_writeable) {
+ if($toplevelpost) {
+ $likebuttons = 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) $likebuttons['share'] = array( t('Share this'), t('share'));
+ }
+
+ if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
+ $comment = replace_macros($cmnt_tpl,array(
+ '$return_path' => '',
+ '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+ '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+ '$id' => $item['item_id'],
+ '$parent' => $item['parent'],
+ '$profile_uid' => $profile_owner,
+ '$mylink' => $a->contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $a->contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$ww' => (($mode === 'network') ? $commentww : '')
+ ));
+ }
}
- if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
- $comment = replace_macros($cmnt_tpl,array(
- '$return_path' => '',
- '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
- '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
- '$id' => $item['item_id'],
- '$parent' => $item['parent'],
- '$profile_uid' => $profile_owner,
- '$mylink' => $a->contact['url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $a->contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$ww' => (($mode === 'network') ? $commentww : '')
- ));
+ $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
+ ? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
+ : False);
+
+
+ $drop = '';
+ $dropping = false;
+
+ if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $dropping = true;
+
+ $drop = array(
+ 'dropping' => $dropping,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
+
+ $star = false;
+ $starred = "unstarred";
+ if ($profile_owner == local_user() && $toplevelpost) {
+ $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'),
+ );
}
- }
- $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
- ? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
- . '" title="' . t('Edit') . '"></a>'
- : '');
- $drop = '';
- $dropping = false;
+ $photo = $item['photo'];
+ $thumb = $item['thumb'];
- if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
- $dropping = true;
+ // Post was remotely authored.
- $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
- $star = false;
+ $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- if ($profile_owner == local_user() && $toplevelpost) {
- $isstarred = (($item['starred']) ? "starred" : "unstarred");
+ $sp = false;
+ $profile_link = best_link_url($item,$sp);
+ if($sp)
+ $sparkle = ' sparkle';
- $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'),
- );
- }
+ if($profile_link === 'mailbox')
+ $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'] : $thumb);
- $photo = $item['photo'];
- $thumb = $item['thumb'];
- // Post was remotely authored.
- $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
- $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
+ $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+ $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $sp = false;
- $profile_link = best_link_url($item,$sp);
- if($sp)
- $sparkle = ' sparkle';
+ $location = (($item['location']) ? '<a target="map" title="' . $item['location']
+ . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+ $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord']
+ . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+ if($coord) {
+ if($location)
+ $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+ else
+ $location = '<span class="smalltext">' . $coord . '</span>';
+ }
- if($profile_link === 'mailbox')
- $profile_link = '';
+ $indent = (($toplevelpost) ? '' : ' comment');
- $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'] : $thumb);
+ if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+ $indent .= ' shiny';
+ //
+ localize_item($item);
+ // Build the HTML
+ $body = prepare_body($item,true);
- $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
- $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+ $tmp_item = replace_macros($template,array(
+ '$body' => 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'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+ '$to' => t('to'),
+ '$wall' => t('Wall-to-Wall'),
+ '$vwall' => t('via Wall-To-Wall:'),
+ '$profile_url' => $profile_link,
+ '$item_photo_menu' => item_photo_menu($item),
+ '$name' => template_escape($profile_name),
+ '$thumb' => $profile_avatar,
+ '$osparkle' => $osparkle,
+ '$sparkle' => $sparkle,
+ '$title' => template_escape($item['title']),
+ '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? 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,
+ '$drop' => $drop,
+ '$vote' => $likebuttons,
+ '$like' => $like,
+ '$dislike' => $dislike,
+ '$comment' => $comment,
+ '$wait' => t('Please wait'),
- $location = (($item['location']) ? '<a target="map" title="' . $item['location']
- . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
- $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord']
- . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
- if($coord) {
- if($location)
- $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
- else
- $location = '<span class="smalltext">' . $coord . '</span>';
- }
+ ));
- $indent = (($toplevelpost) ? '' : ' comment');
-
- if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
- $indent .= ' shiny';
-
- //
- localize_item($item);
-
- // Build the HTML
-
- $body = prepare_body($item,true);
-
-
- $tmp_item = replace_macros($template,array(
- '$body' => 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'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
- '$to' => t('to'),
- '$wall' => t('Wall-to-Wall'),
- '$vwall' => t('via Wall-To-Wall:'),
- '$profile_url' => $profile_link,
- '$item_photo_menu' => item_photo_menu($item),
- '$name' => template_escape($profile_name),
- '$thumb' => $profile_avatar,
- '$osparkle' => $osparkle,
- '$sparkle' => $sparkle,
- '$title' => template_escape($item['title']),
- '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? 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,
- '$drop' => $drop,
- '$vote' => $likebuttons,
- '$like' => $like,
- '$dislike' => $dislike,
- '$comment' => $comment
-
- ));
-
-
- $arr = array('item' => $item, 'output' => $tmp_item);
- call_hooks('display_item', $arr);
-
- $treads[$treadsid] .= $arr['output'];
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $treads[$treadsid] .= $arr['output'];
+ }
}
}
// 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/mod/ping.php b/mod/ping.php
index d11af2e0e..30f1dc837 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -4,182 +4,184 @@ require_once("include/datetime.php");
function ping_init(&$a) {
- if(! local_user())
- xml_status(0);
-
-
- $comments = array();
- $likes = array();
- $dislikes = array();
- $friends = array();
-
- $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
- `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
- FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
- WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
- `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0",
- intval(local_user())
- );
-
- $network = count($r);
- foreach ($r as $it) {
- switch($it['verb']){
- case ACTIVITY_LIKE:
- $likes[] = $it;
- break;
- case ACTIVITY_DISLIKE:
- $dislikes[] = $it;
- break;
- case ACTIVITY_FRIEND:
- $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
- $obj = parse_xml_string($xmlhead.$it['object']);
- $it['fname'] = $obj->title;
- $friends[] = $it;
- break;
- default:
- if ($it['parent']!=$it['id']) $comments[] = $it;
+ header("Content-type: text/xml");
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+ <result>";
+
+ if(local_user()){
+
+
+ $comments = array();
+ $likes = array();
+ $dislikes = array();
+ $friends = array();
+
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
+ `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
+ FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0",
+ intval(local_user())
+ );
+
+ $network = count($r);
+ foreach ($r as $it) {
+ switch($it['verb']){
+ case ACTIVITY_LIKE:
+ $likes[] = $it;
+ break;
+ case ACTIVITY_DISLIKE:
+ $dislikes[] = $it;
+ break;
+ case ACTIVITY_FRIEND:
+ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+ $obj = parse_xml_string($xmlhead.$it['object']);
+ $it['fname'] = $obj->title;
+ $friends[] = $it;
+ break;
+ default:
+ if ($it['parent']!=$it['id']) $comments[] = $it;
+ }
}
- }
- $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
- `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
- FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
- WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
- `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1",
- intval(local_user())
- );
- $home = count($r);
- foreach ($r as $it) {
- switch($it['verb']){
- case ACTIVITY_LIKE:
- $likes[] = $it;
- break;
- case ACTIVITY_DISLIKE:
- $dislikes[] = $it;
- break;
- case ACTIVITY_FRIEND:
- $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
- $obj = parse_xml_string($xmlhead.$it['object']);
- $it['fname'] = $obj->title;
- $friends[] = $it;
- break;
- default:
- if ($it['parent']!=$it['id']) $comments[] = $it;
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
+ `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
+ FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1",
+ intval(local_user())
+ );
+ $home = count($r);
+ foreach ($r as $it) {
+ switch($it['verb']){
+ case ACTIVITY_LIKE:
+ $likes[] = $it;
+ break;
+ case ACTIVITY_DISLIKE:
+ $dislikes[] = $it;
+ break;
+ case ACTIVITY_FRIEND:
+ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+ $obj = parse_xml_string($xmlhead.$it['object']);
+ $it['fname'] = $obj->title;
+ $friends[] = $it;
+ break;
+ default:
+ if ($it['parent']!=$it['id']) $comments[] = $it;
+ }
}
- }
- $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`,
- `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
- FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
- WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
- intval(local_user())
- );
- $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`,
- `contact`.`name`, `contact`.`url`, `contact`.`photo`
- FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
- WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
- intval(local_user())
- );
-
- $intro = $intros1[0]['total'] + $intros2[0]['total'];
- if ($intros1[0]['total']==0) $intros1=Array();
- if ($intros2[0]['total']==0) $intros2=Array();
- $intros = $intros1+$intros2;
-
+ $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`,
+ `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
+ FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+ WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
+ intval(local_user())
+ );
+ $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`,
+ `contact`.`name`, `contact`.`url`, `contact`.`photo`
+ FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+ WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
+ intval(local_user())
+ );
+
+ $intro = $intros1[0]['total'] + $intros2[0]['total'];
+ if ($intros1[0]['total']==0) $intros1=Array();
+ if ($intros2[0]['total']==0) $intros2=Array();
+ $intros = $intros1+$intros2;
+
+
+
+ $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
+ $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail`
+ WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
+ intval(local_user()),
+ dbesc($myurl)
+ );
+ $mail = $mails[0]['total'];
+
+ if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
+ $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
+ $register = $regs[0]['total'];
+ } else {
+ $register = "0";
+ }
- $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
- $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail`
- WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
- intval(local_user()),
- dbesc($myurl)
- );
- $mail = $mails[0]['total'];
-
- if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
- $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
- $register = $regs[0]['total'];
- } else {
- $register = "0";
- }
+ function xmlize($href, $name, $url, $photo, $date, $message){
+ $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
+ return sprintf ( $notsxml,
+ $href, $name, $url, $photo, $date, $message
+ );
+ }
+
+
+ echo "<intro>$intro</intro>
+ <mail>$mail</mail>
+ <net>$network</net>
+ <home>$home</home>";
+ if ($register!=0) echo "<register>$register</register>";
+
+ $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends);
+
+ echo ' <notif count="'.$tot.'">';
+ if ($intro>0){
+ foreach ($intros as $i) {
+ echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
+ };
+ }
+ if ($mail>0){
+ foreach ($mails as $i) {
+ echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message") );
+ };
+ }
+ if ($register>0){
+ foreach ($regs as $i) {
+ echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration") );
+ };
+ }
+ if (count($comments)){
+ foreach ($comments as $i) {
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} commented %s's post"), $i['pname'] ) );
+ };
+ }
+ if (count($likes)){
+ foreach ($likes as $i) {
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} like %s's post"), $i['pname'] ) );
+ };
+ }
+ if (count($dislikes)){
+ foreach ($dislikes as $i) {
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} dislike %s's post"), $i['pname'] ) );
+ };
+ }
+ if (count($friends)){
+ foreach ($friends as $i) {
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['fname'] ) );
+ };
+ }
- function xmlize($href, $name, $url, $photo, $date, $message){
- $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
- return sprintf ( $notsxml,
- $href, $name, $url, $photo, $date, $message
- );
- }
-
- header("Content-type: text/xml");
- echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
- <result>
- <intro>$intro</intro>
- <mail>$mail</mail>
- <net>$network</net>
- <home>$home</home>";
- if ($register!=0) echo "<register>$register</register>";
-
- $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends);
-
- echo ' <notif count="'.$tot.'">';
- if ($intro>0){
- foreach ($intros as $i) {
- echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
- };
- }
- if ($mail>0){
- foreach ($mails as $i) {
- echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message") );
- };
- }
- if ($register>0){
- foreach ($regs as $i) {
- echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration") );
- };
- }
- if (count($comments)){
- foreach ($comments as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} commented %s's post"), $i['pname'] ) );
- };
- }
- if (count($likes)){
- foreach ($likes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} like %s's post"), $i['pname'] ) );
- };
- }
- if (count($dislikes)){
- foreach ($dislikes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} dislike %s's post"), $i['pname'] ) );
- };
- }
- if (count($friends)){
- foreach ($friends as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['fname'] ) );
- };
+ echo " </notif>";
}
-
-
- echo " </notif>";
-
echo " <sysmsgs>";
+
if(x($_SESSION,'sysmsg')){
foreach ($_SESSION['sysmsg'] as $m){
echo "<notice>".($m)."</notice>";
}
- $_SESSION['sysmsg']=array();
+ //$_SESSION['sysmsg']=array();
unset($_SESSION['sysmsg']);
}
if(x($_SESSION,'sysmsg_info')){
foreach ($_SESSION['sysmsg_info'] as $m){
echo "<info>".($m)."</info>";
}
- $_SESSION['sysmsg_info']=array();
+ //$_SESSION['sysmsg_info']=array();
unset($_SESSION['sysmsg_info']);
}
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 }}
diff --git a/view/like.tpl b/view/like.tpl
deleted file mode 100644
index f4f2e1671..000000000
--- a/view/like.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
- <a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
- <a href="#" class="icon recycle wall-item-share-buttons" title="$share" onclick="jotShare($id); return false"></a>
- <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- </div>
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
deleted file mode 100644
index 2c467c3c2..000000000
--- a/view/like_noshare.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
- <a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
- <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- </div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index e045fc328..616eaf110 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,45 +1,71 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
- <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <div class="wall-item-info" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+<div class="wall-item-decor">
+ <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+ {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+<div class="wall-item-container $indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="wall-item-photo-wrapper"
+ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+ onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
- <ul>
- $item_photo_menu
- </ul>
- </div>
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- $lock
- <div class="wall-item-location" id="wall-item-location-$id">$location</div>
- </div>
- </div>
- <div class="wall-item-author">
- <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+ <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
+ $item_photo_menu
+ </ul>
- </div>
- <div class="wall-item-content" id="wall-item-content-$id" >
- <div class="wall-item-title" id="wall-item-title-$id">$title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ </div>
+ <div class="wall-item-location">$location</div>
</div>
- <div class="wall-item-tools" id="wall-item-tools-$id">
- $drop
+ <div class="wall-item-content">
+ {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+ $body
</div>
</div>
- <div class="wall-item-wrapper-end"></div>
-
-
- <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ {{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+ </div>
+ <div class="wall-item-actions">
+ <div class="wall-item-actions-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+ </div>
+
+ <div class="wall-item-actions-social">
+ {{ if $star }}
+ <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
+ <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
+ {{ endif }}
+
+ {{ if $vote }}
+ <a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
+ <a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+ {{ endif }}
+
+ {{ if $vote.share }}
+ <a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+ {{ endif }}
+
+ {{ if $conv }}
+ <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+ {{ if $drop.dropping }}
+ <input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" />
+ <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
</div>
-
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 39c74ef81..3d841ab08 100644
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -16,9 +16,16 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $drop
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
@@ -36,5 +43,9 @@
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>
- <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
+ <div class="wall-item-conv" id="wall-item-conv-$id" >
+ {{ if $conv }}
+ <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+ {{ endif }}
+ </div>
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 1f5cbcaeb..f555ed813 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -17,17 +17,34 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- {{ if $star }}
- <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
- {{ endif }}
- $vote
- {{ if $plink }}
- <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- $edpost
- $drop
+ {{ if $star }}
+ <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+ {{ endif }}
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
+ {{ if $plink }}
+ <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+ {{ endif }}
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index add2cd5a0..9e6ea40a1 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -22,17 +22,35 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- {{ if $star }}
- <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
- {{ endif }}
- $vote
- {{ if $plink }}
- <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- $edpost
- $drop
+ {{ if $star }}
+ <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+ {{ endif }}
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
+ {{ if $plink }}
+ <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+ {{ endif }}
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
+
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
new file mode 100644
index 000000000..b4a1c82cb
--- /dev/null
+++ b/view/theme/duepuntozero/search_item.tpl
@@ -0,0 +1,54 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+ <div class="wall-item-info" id="wall-item-info-$id">
+ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
+ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+ onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+ <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+ <ul>
+ $item_photo_menu
+ </ul>
+ </div>
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+ </div>
+ </div>
+ <div class="wall-item-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$id" >
+ <div class="wall-item-title" id="wall-item-title-$id">$title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ </div>
+ <div class="wall-item-tools" id="wall-item-tools-$id">
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
+ </div>
+ </div>
+ <div class="wall-item-wrapper-end"></div>
+
+
+ <div class="wall-item-conv" id="wall-item-conv-$id" >
+ {{ if $conv }}
+ <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+ {{ endif }}
+ </div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 32820fb7c..d264d3999 100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -16,7 +16,8 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
@@ -31,15 +32,30 @@
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
- $edpost
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
{{ endif }}
- $drop
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 58d5e16f6..aaa542760 100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -21,7 +21,8 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
@@ -35,15 +36,30 @@
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
- $edpost
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
{{ endif }}
- $drop
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/loozah/search_item.tpl b/view/theme/loozah/search_item.tpl
new file mode 100644
index 000000000..17dc6233c
--- /dev/null
+++ b/view/theme/loozah/search_item.tpl
@@ -0,0 +1,52 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+ <div class="wall-item-info" id="wall-item-info-$id">
+ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
+ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+ onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+ <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+ <ul>
+ $item_photo_menu
+ </ul>
+ </div>
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+ </div>
+ </div>
+ <div class="wall-item-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$id" >
+ <div class="wall-item-title" id="wall-item-title-$id">$title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ </div>
+ <div class="wall-item-tools" id="wall-item-tools-$id">
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
+ </div>
+ </div>
+ <div class="wall-item-wrapper-end"></div>
+
+
+ <div class="wall-item-conv" id="wall-item-conv-$id" >
+ {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
+ </div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
index a4508b067..e2b7c9c5a 100644
--- a/view/theme/loozah/wall_item.tpl
+++ b/view/theme/loozah/wall_item.tpl
@@ -16,7 +16,8 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- $lock
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
@@ -31,15 +32,30 @@
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
- $edpost
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
{{ endif }}
- $drop
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
index daad6ad14..aaa542760 100644
--- a/view/theme/loozah/wallwall_item.tpl
+++ b/view/theme/loozah/wallwall_item.tpl
@@ -21,7 +21,8 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- $lock
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
@@ -35,15 +36,30 @@
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
- $edpost
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
{{ endif }}
- $drop
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index c5dc1937b..525ca48d8 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -44,7 +44,7 @@
}
&.s48 {
width:48px; height: 48px;
- .icons(22);
+ .icons(48);
}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 95dd61adb..1be65ea91 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -21,10 +21,18 @@ body {
-webkit-border-radius: @arguments;
border-radius: @arguments;
}
-
.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
+.opaque(@v: 0.5){
+ opacity: @v;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+
a, a:link { color: @Link; text-decoration: none; }
a:visited { color: @LinkVisited; text-decoration: none; }
a:hover {color: @LinkHover; text-decoration: underline; }
@@ -257,7 +265,7 @@ section {
/* wall item */
.tread-wrapper {
- background-color: @ThreadBackgroundColor;
+ background-color: @ThreadBackgroundColor;
position: relative;
padding: 10px;
margin-bottom: 20px;
@@ -268,7 +276,6 @@ section {
.wall-item-container {
display: table;
width: 780px;
- margin-bottom: 10px;
.wall-item-item,
.wall-item-bottom { display: table-row; }
@@ -290,22 +297,51 @@ section {
.wall-item-photo-menu { display: none; }
}
+ .wall-item-location {
+ word-wrap: break-word;
+ width: 50px;
+ }
.wall-item-content {
display: table-cell;
- font-size: 12px;
+ font-size: 16px;
max-width: 720px;
word-wrap: break-word;
}
.wall-item-content img { max-width: 710px; }
.wall-item-links,
- .wall-item-actions { display: table-cell; }
+ .wall-item-actions {
+ display: table-cell;
+ vertical-align: middle;
+
+ .icon {
+ .opaque(0.5);
+ }
+ .icon:hover {
+ .opaque(1.0);
+ }
+ }
.wall-item-ago { padding-right: 40px; }
+ .wall-item-name { font-weight: bold; }
+
+ .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; }
+ .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em;
+ a { margin-right: 3em; }
+ }
+ .wall-item-actions-tools { float: right; width: 25%;
+ a { float: right; }
+ input { float: right; }
+ }
}
+
+
+
.wall-item-container.comment {
+ margin-top: 50px;
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}
.wall-item-photo-menu-button {
top: 13px !important;
left: 10px !important;
}
+ .wall-item-links { padding-left: 12px; }
}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ad50ee327..4d9e12540 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -121,34 +121,34 @@
height: 48px;
}
.icon.s48.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
+ background-image: url("../../../images/icons/48/notify_off.png");
}
.icon.s48.gear {
- background-image: url("../../../images/icons/22/gear.png");
+ background-image: url("../../../images/icons/48/gear.png");
}
.icon.s48.add {
- background-image: url("../../../images/icons/22/add.png");
+ background-image: url("../../../images/icons/48/add.png");
}
.icon.s48.delete {
- background-image: url("../../../images/icons/22/delete.png");
+ background-image: url("../../../images/icons/48/delete.png");
}
.icon.s48.edit {
- background-image: url("../../../images/icons/22/edit.png");
+ background-image: url("../../../images/icons/48/edit.png");
}
.icon.s48.star {
- background-image: url("../../../images/icons/22/star.png");
+ background-image: url("../../../images/icons/48/star.png");
}
.icon.s48.menu {
- background-image: url("../../../images/icons/22/menu.png");
+ background-image: url("../../../images/icons/48/menu.png");
}
.icon.s48.link {
- background-image: url("../../../images/icons/22/link.png");
+ background-image: url("../../../images/icons/48/link.png");
}
.icon.s48.lock {
- background-image: url("../../../images/icons/22/lock.png");
+ background-image: url("../../../images/icons/48/lock.png");
}
.icon.s48.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
+ background-image: url("../../../images/icons/48/unlock.png");
}
/* global */
body {
@@ -507,7 +507,6 @@ section {
.wall-item-container {
display: table;
width: 780px;
- margin-bottom: 10px;
}
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
@@ -534,9 +533,13 @@ section {
.wall-item-container .wall-item-info .wall-item-photo-menu {
display: none;
}
+.wall-item-container .wall-item-location {
+ word-wrap: break-word;
+ width: 50px;
+}
.wall-item-container .wall-item-content {
display: table-cell;
- font-size: 12px;
+ font-size: 16px;
max-width: 720px;
word-wrap: break-word;
}
@@ -545,10 +548,56 @@ section {
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
+ vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
}
.wall-item-container .wall-item-ago {
padding-right: 40px;
}
+.wall-item-container .wall-item-name {
+ font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+ float: left;
+ width: 25%;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social {
+ float: left;
+ width: 50%;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social a {
+ margin-right: 3em;
+}
+.wall-item-container .wall-item-actions-tools {
+ float: right;
+ width: 25%;
+}
+.wall-item-container .wall-item-actions-tools a {
+ float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+ float: right;
+}
+.wall-item-container.comment {
+ margin-top: 50px;
+}
.wall-item-container.comment .wall-item-photo {
width: 32px;
height: 32px;
@@ -558,3 +607,6 @@ section {
top: 13px !important;
left: 10px !important;
}
+.wall-item-container.comment .wall-item-links {
+ padding-left: 12px;
+}
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index 76fbee6ba..7e5bfbe71 100644
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
@@ -16,9 +16,16 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $drop
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
@@ -32,8 +39,10 @@
</div>
</div>
- <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
+ <div class="wall-item-conv" id="wall-item-conv-$id" >
+ {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
+ </div>
<div class="wall-item-wrapper-end"></div>
</div>
-<div class="wall-item-outside-wrapper-end$indent" ></div> \ No newline at end of file
+<div class="wall-item-outside-wrapper-end$indent" ></div>
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 47f062aff..70ec00dd9 100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -18,7 +18,10 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
@@ -26,16 +29,32 @@
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
- $edpost
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
{{ endif }}
- $drop
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
+
+
</div>
<div class="wall-item-author">
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index 4fe677ab4..8819103a3 100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -22,12 +22,35 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">$lock</div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
- $plink
- $edpost
- $drop
+ {{ if $vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+ {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+ {{ endif }}
+ {{ if $plink }}
+ <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+
+ {{ if $star }}
+ <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+ {{ endif }}
+
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+ {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ </div>
+ {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
diff --git a/view/wall_fake_drop.tpl b/view/wall_fake_drop.tpl
deleted file mode 100644
index db34441d5..000000000
--- a/view/wall_fake_drop.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >&nbsp;</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 39cb33f0f..7db8b8697 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -2,6 +2,7 @@
<div class="wall-item-decor">
<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
{{ endif }}
<div class="wall-item-container $indent">
@@ -31,12 +32,37 @@
{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions">
- <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+ <div class="wall-item-actions-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+ </div>
+ <div class="wall-item-actions-social">
{{ if $star }}
- <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
- <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
+ <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
+ <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
+ {{ endif }}
+
+ {{ if $vote }}
+ <a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
+ <a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
{{ endif }}
+
+ {{ if $vote.share }}
+ <a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $drop.dropping }}
+ <input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" />
+ <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+ </div>
+
</div>
</div>
</div>
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
deleted file mode 100644
index 30fa6c335..000000000
--- a/view/wall_item_drop.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-
- <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-</div>
-<input type="checkbox" onclick="checkboxhighlight(this);" title="$select" class="item-select" name="itemselected[]" value="$id" />
-<div class="wall-item-delete-end"></div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index cac036d06..35bea4a86 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,4 +1,4 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
+{#<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info wallwall" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
@@ -51,5 +51,80 @@
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>
+</div> #}
+
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+ <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+ {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
+{{ endif }}
+<div class="wall-item-container $indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+ <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
+ <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
+ </a>
+ </div>
+ <div class="wall-item-photo-wrapper wwfrom"
+ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+ onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+ <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
+ $item_photo_menu
+ </ul>
+
+ </div>
+ <div class="wall-item-location">$location</div>
+ </div>
+ <div class="wall-item-content">
+ {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+ $body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ {{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+ </div>
+ <div class="wall-item-actions">
+ <div class="wall-item-actions-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+ <br/>$to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall
+
+ </div>
+
+ <div class="wall-item-actions-social">
+ {{ if $star }}
+ <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
+ <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
+ {{ endif }}
+
+ {{ if $vote }}
+ <a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
+ <a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+ {{ endif }}
+
+ {{ if $vote.share }}
+ <a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+ {{ if $drop.dropping }}
+ <input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" />
+ <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
+</div>