Merge pull request #141 from CatoTH/master

Private messages - tabindex

diff --git a/include/diaspora.php b/include/diaspora.php
index dca857a19833369cf9f5d43eca1e41e8e5820b41..19bba52168367c8e07789749469f7615e8957612 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1159,6 +1159,48 @@ function diaspora_comment($importer,$xml,$msg) {
 
                proc_run('php','include/notifier.php','comment',$message_id);
        }
+
+       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+               dbesc($parent_item['uri']),
+               intval($importer['uid'])
+       );
+
+       if(count($myconv)) {
+               $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+
+               foreach($myconv as $conv) {
+
+                       // now if we find a match, it means we're in this conversation
+       
+                       if(! link_compare($conv['author-link'],$importer_url))
+                               continue;
+
+                       require_once('include/enotify.php');
+                                                               
+                       $conv_parent = $conv['parent'];
+
+                       notification(array(
+                               'type'         => NOTIFY_COMMENT,
+                               'notify_flags' => $importer['notify-flags'],
+                               'language'     => $importer['language'],
+                               'to_name'      => $importer['username'],
+                               'to_email'     => $importer['email'],
+                               'uid'          => $importer['uid'],
+                               'item'         => $datarray,
+                               'link'             => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                               'source_name'  => $datarray['author-name'],
+                               'source_link'  => $datarray['author-link'],
+                               'source_photo' => $datarray['author-avatar'],
+                               'verb'         => ACTIVITY_POST,
+                               'otype'        => 'item',
+                               'parent'       => $conv_parent,
+
+                       ));
+
+                       // only send one notification
+                       break;
+               }
+       }
        return;
 }
 

diff --git a/include/items.php b/include/items.php
index 68acb45f9b6fc7bbf86183316421dd3587b2bf3d..5e1fec55785d55e41611a439ee93f4e0de8e0c93 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -2026,6 +2026,7 @@ function local_delivery($importer,$data) {
                                        if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
                                                $xo = parse_xml_string($item['object'],false);
                                                $xt = parse_xml_string($item['target'],false);
+
                                                if($xt->type === ACTIVITY_OBJ_NOTE) {
                                                        $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
                                                                dbesc($xt->id),

diff --git a/include/text.php b/include/text.php
index d34fd7fbeec35bcacfb5a1bd2fa201a3e770d692..cdf82ca87dfe7f4e48c7df146ea9e293c186d0e9 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -638,7 +638,7 @@ if(! function_exists('search')) {
 function search($s,$id='search-box',$url='/search',$save = false) {
        $a = get_app();
        $o  = '<div id="' . $id . '">';
-       $o .= '<form action="' . $a->get_baseurl() . $url . '" method="get" >';
+       $o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
        $o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
        $o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
        if($save)

diff --git a/mod/item.php b/mod/item.php
index 98cfb4338512bc57d7de2fb6ea5d44658975363d..07b4bfef7665990ade9f16305dfa6b97ddbd6b3d 100755 (executable)
--- a/mod/item.php
+++ b/mod/item.php
@@ -832,129 +832,129 @@ function item_content(&$a) {
  */
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
        //is it a hash tag? 
-       if(strpos($tag,'#') === 0) {\r
+       if(strpos($tag,'#') === 0) {
                //if the tag is replaced...
                if(strpos($tag,'[url='))
-                       //...do nothing\r
-                       continue;
-               //base tag has the tags name only\r
-               $basetag = str_replace('_',' ',substr($tag,1));\r
+                       //...do nothing
+                       return;
+               //base tag has the tags name only
+               $basetag = str_replace('_',' ',substr($tag,1));
                //create text for link
                $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-               //replace tag by the link\r
-               $body = str_replace($tag, $newtag, $body);\r
+               //replace tag by the link
+               $body = str_replace($tag, $newtag, $body);
        
-               //is the link already in str_tags?\r
-               if(! stristr($str_tags,$newtag)) {\r
+               //is the link already in str_tags?
+               if(! stristr($str_tags,$newtag)) {
                        //append or set str_tags
-                       if(strlen($str_tags))\r
-                               $str_tags .= ',';\r
-                       $str_tags .= $newtag;\r
-               }\r
-               return;\r
+                       if(strlen($str_tags))
+                               $str_tags .= ',';
+                       $str_tags .= $newtag;
+               }
+               return;
        }
-       //is it a person tag? \r
-       if(strpos($tag,'@') === 0) {\r
+       //is it a person tag? 
+       if(strpos($tag,'@') === 0) {
                //is it already replaced? 
-               if(strpos($tag,'[url='))\r
-                       continue;\r
-               $stat = false;\r
+               if(strpos($tag,'[url='))
+                       continue;
+               $stat = false;
                //get the person's name
                $name = substr($tag,1);
-               //is it a link or a full dfrn address? \r
-               if((strpos($name,'@')) || (strpos($name,'http://'))) {\r
-                       $newname = $name;\r
+               //is it a link or a full dfrn address? 
+               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                       $newname = $name;
                        //get the profile links
-                       $links = @lrdd($name);\r
-                       if(count($links)) {\r
+                       $links = @lrdd($name);
+                       if(count($links)) {
                                //for all links, collect how is to inform and how's profile is to link
-                               foreach($links as $link) {\r
-                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')\r
-                                               $profile = $link['@attributes']['href'];\r
-                                       if($link['@attributes']['rel'] === 'salmon') {\r
-                                               if(strlen($inform))\r
-                                                       $inform .= ',';\r
-                                               $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);\r
-                                       }\r
-                               }\r
-                       }\r
-               } else { //if it is a name rather than an address\r
-                       $newname = $name;\r
-                       $alias = '';\r
+                               foreach($links as $link) {
+                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+                                               $profile = $link['@attributes']['href'];
+                                       if($link['@attributes']['rel'] === 'salmon') {
+                                               if(strlen($inform))
+                                                       $inform .= ',';
+                                               $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+                                       }
+                               }
+                       }
+               } else { //if it is a name rather than an address
+                       $newname = $name;
+                       $alias = '';
                        $tagcid = 0;
-                       //is it some generated name?\r
-                       if(strrpos($newname,'+')) {\r
+                       //is it some generated name?
+                       if(strrpos($newname,'+')) {
                                //get the id
-                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));\r
+                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
                                //remove the next word from tag's name
-                               if(strpos($name,' ')) {\r
+                               if(strpos($name,' ')) {
                                        $name = substr($name,0,strpos($name,' '));
-                               }\r
+                               }
                        }
                        if($tagcid) { //if there was an id
-                               //select contact with that id from the logged in user's contact list\r
-                               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",\r
-                                               intval($tagcid),\r
+                               //select contact with that id from the logged in user's contact list
+                               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                               intval($tagcid),
                                                intval($profile_uid)
-                               );\r
+                               );
                        } elseif(strstr($name,'_') || strstr($name,' ')) { //no id
-                               //get the real name\r
-                               $newname = str_replace('_',' ',$name);\r
+                               //get the real name
+                               $newname = str_replace('_',' ',$name);
                                //select someone from this user's contacts by name
-                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",\r
-                                               dbesc($newname),\r
-                                               intval($profile_uid)\r
-                               );\r
+                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($newname),
+                                               intval($profile_uid)
+                               );
                        } else {
-                               //select someone by attag or nick and the name passed in\r
-                               $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",\r
-                                               dbesc($name),\r
-                                               dbesc($name),\r
-                                               intval($profile_uid)\r
-                               );\r
+                               //select someone by attag or nick and the name passed in
+                               $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+                                               dbesc($name),
+                                               dbesc($name),
+                                               intval($profile_uid)
+                               );
                        }
-                       //$r is set, if someone could be selected\r
-                       if(count($r)) {\r
+                       //$r is set, if someone could be selected
+                       if(count($r)) {
                                $profile = $r[0]['url'];
-                               //set newname to nick, find alias\r
-                               if($r[0]['network'] === 'stat') {\r
-                                       $newname = $r[0]['nick'];\r
-                                       $stat = true;\r
-                                       if($r[0]['alias'])\r
-                                               $alias = $r[0]['alias'];\r
-                               }\r
-                               else\r
-                                       $newname = $r[0]['name'];\r
+                               //set newname to nick, find alias
+                               if($r[0]['network'] === 'stat') {
+                                       $newname = $r[0]['nick'];
+                                       $stat = true;
+                                       if($r[0]['alias'])
+                                               $alias = $r[0]['alias'];
+                               }
+                               else
+                                       $newname = $r[0]['name'];
                                //add person's id to $inform
-                               if(strlen($inform))\r
-                                       $inform .= ',';\r
-                               $inform .= 'cid:' . $r[0]['id'];\r
-                       }\r
+                               if(strlen($inform))
+                                       $inform .= ',';
+                               $inform .= 'cid:' . $r[0]['id'];
+                       }
                }
-               //if there is an url for this persons profile\r
-               if(isset($profile)) {\r
+               //if there is an url for this persons profile
+               if(isset($profile)) {
                        //create profile link
-                       $profile = str_replace(',','%2c',$profile);\r
-                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';\r
-                       $body = str_replace('@' . $name, $newtag, $body);\r
+                       $profile = str_replace(',','%2c',$profile);
+                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';
+                       $body = str_replace('@' . $name, $newtag, $body);
                        //append tag to str_tags
-                       if(! stristr($str_tags,$newtag)) {\r
-                               if(strlen($str_tags))\r
-                                       $str_tags .= ',';\r
-                               $str_tags .= $newtag;\r
-                       }\r
-       \r
-                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't\r
-                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.\r
-       \r
-                       if(strlen($alias)) {\r
-                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';\r
-                               if(! stristr($str_tags,$newtag)) {\r
-                                       if(strlen($str_tags))\r
-                                               $str_tags .= ',';\r
-                                       $str_tags .= $newtag;\r
-                               }\r
-                       }\r
-               }\r
+                       if(! stristr($str_tags,$newtag)) {
+                               if(strlen($str_tags))
+                                       $str_tags .= ',';
+                               $str_tags .= $newtag;
+                       }
+       
+                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't
+                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+       
+                       if(strlen($alias)) {
+                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';
+                               if(! stristr($str_tags,$newtag)) {
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= $newtag;
+                               }
+                       }
+               }
        }
 }

diff --git a/mod/network.php b/mod/network.php
index d0f1733f46120e5c6cec659491ddda9cc17b8398..9ec8c23b5904ed81850afb2ee8a8986e19b0c07c 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -90,7 +90,7 @@ function saved_searches($search) {
        $o = replace_macros($tpl, array(
                '$title'         => t('Saved Searches'),
                '$add'           => t('add'),
-               '$searchbox' => search($search,'netsearch-box',$a->get_baseurl(true) . $srchurl,true),
+               '$searchbox' => search($search,'netsearch-box',$srchurl,true),
                '$saved'         => $saved,
        ));
        

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index d1ec4efd7372d3306ea18e3154ccfdb91567c613..b4aefbbf23068db8ff09c63f110ce64a1ba9eb73 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -123,9 +123,6 @@ a {
     text-decoration: none;
     margin-bottom: 1px;
 }
-/*a:hover {                 */
-/*    text-decoration: none;*/
-/*}*/
 a:hover img {
     text-decoration: none;
 }
@@ -778,6 +775,15 @@ aside #viewcontacts {
 #profile-jot-text_ifr {
        width:99.900002% !important;
 }
+[id$="jot-text_ifr"] {
+       width: 99.900002% !important;
+       color: #2e2f2e;
+       background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+       color: #2e2f2e;
+       background: #eec;
+}
 #profile-attach-wrapper,
 #profile-audio-wrapper,
 #profile-link-wrapper,
@@ -1527,7 +1533,6 @@ div[id$="wrapper"] br {
 }
 .mail-list-subject {
     font-size: 1.2em;
-       font-weight: bold;
 }
 .mail-list-delete-wrapper {
     float: right;
@@ -1751,23 +1756,23 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-       /*background: #111;*/
-       /*border-radius: 5px 5px 0px 0px;*/
-       /*margin: 0px 0px 0px 0px;*/
-       /*width: 100px;*/
-       /*height: 25px;*/
-       /*position: absolute;*/
+       /*background: #111;
+       border-radius: 5px 5px 0px 0px;
+       margin: 0px 0px 0px 0px;
+       width: 100px;
+       height: 25px;
+       position: absolute;*/
        display: none;
-       /*left: 35%;*/
-       /*top: 41%;*/
-       /*cursor: pointer;*/
-}
-/*.profile-edit-side-div:hover {*/
-       /*display: block;*/
-/*}*/
-/*.profile-edit-side-link {*/
-       /*margin: 3px 0px 0px 70px;*/
-/*}*/
+       /*left: 35%;
+       top: 41%;
+       cursor: pointer;*/
+}
+/*.profile-edit-side-div:hover {
+       display: block;
+}
+.profile-edit-side-link {
+       margin: 3px 0px 0px 70px;
+}*/
 #profiles-menu-trigger {
        margin: 0px 0px 0px 25px;
 }
@@ -2123,12 +2128,12 @@ div[id$="wrapper"] br {
     border-bottom: 1px solid #000;
 }
 #adminpage dt {
-    width: 200px;
+    width: 250px;
     float: left;
     font-weight: bold;
 }
 #adminpage dd {
-       margin-left: 200px;
+       margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
@@ -2590,8 +2595,8 @@ footer {
     margin-top: 30px;
     overflow: auto;
 }
-/*#acl-list-content {*/
-/*}*/
+/*#acl-list-content {
+}*/
 .acl-list-item {
        border: 1px solid #eec;
     display: block;

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index c0611ce83daa3a517114c1c94e419641a49a2f52..0134b1f91b91c579bc1e82c62527bf4df840c04c 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -64,7 +64,7 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
-       // notifications
+       // click outside notifications menu closes it
        $('html').click(function() {
                $('#nav-notifications-linkmenu').removeClass('selected');
                document.getElementById("nav-notifications-menu").style.display = "none";
@@ -74,6 +74,7 @@ $(document).ready(function() {
                event.stopPropagation();
        });
 
+       // main function in toolbar functioning
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -87,15 +88,20 @@ $(document).ready(function() {
             });
         }
     };
+       // our trigger for the toolbar button
     $('.floaterflip').click(function() {
         toggleToolbar();
         return false;
     });
 
+       // (attempt) to change the text colour in a top post
        $('#profile-jot-text').focusin(function() {
                $(this).css({color: '#eec'});
        });
 
+       // make auto-complete work in more places
+       $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+
 /*     $('#profile-photo-wrapper').mouseover(function() {
                $('.profile-edit-side-div').css({display: 'block'});
        }).mouseout(function() {

diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index fbf354b47566cf1184155d5093e0e42accd7d88c..04968bd07d2206eedcbe121190ee7a67b9b16d16 100644 (file)
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -20,9 +20,11 @@
        </div>
        <div class="contact-entry-photo-end" ></div>
                <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
        <div class="contact-entry-details" id="contact-entry-url-$contact.id" >
                <a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
        <div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
        <div class="contact-entry-end" ></div>
 </div>
+

diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
index 516d70d5b4c1a1ac24c5a3b1b0c28b3dc04b3f1b..10ecec2e8536c22ae944b5c010ca6b38364b3a7c 100644 (file)
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -1,5 +1,5 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
 
 <div id="sidebar-group-list">
        <ul id="sidebar-group-ul">
@@ -9,7 +9,7 @@
                                {{ if $group.edit }}
                                        <a 
                         class="groupsideedit"
-                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
                                {{ endif }}
                                {{ if $group.cid }}
                                        <input type="checkbox" 

diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index 793af6fd2dbd93ecc2771f9899f848ed15da0d0e..f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf 100644 (file)
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -74,25 +74,6 @@
                }
        }
 
-    $(document).ready(function() {
-        function toggleToolbar() {
-            if ( $('#nav-floater').is(':visible') ) {
-                $('#nav-floater').slideUp('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-210px -60px' 
-                });
-            } else {
-                $('#nav-floater').slideDown('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-190px -60px'
-                });
-            }
-        };
-        $('.floaterflip').click(function() {
-            toggleToolbar();
-            return false;
-        });
-    });
 
 </script>
 

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 43dcdbb8415d4c115e87b8a22d5e4cde77d1d38b..4c8f59d7969bd2348ebbacf1d3daa26da4f6f4e2 100644 (file)
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -114,6 +114,7 @@ function enableOnUser(){
        $(this).val("");
        initEditor();
 }
+
 </script>
 <script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
 <script type="text/javascript">
@@ -121,6 +122,7 @@ function enableOnUser(){
        var addtitle = '$addtitle';
 
        $(document).ready(function() {
+               
                /* enable tinymce on focus and click */
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
@@ -261,6 +263,18 @@ function enableOnUser(){
                }
        }
 
+       function itemFiler(id) {
+               reply = prompt("$fileas");
+               if(reply && reply.length) {
+                       commentBusy = true;
+                       $('body').css('cursor', 'wait');
+                       $.get('filer/' + id + '?term=' + reply);
+                       if(timer) clearTimeout(timer);
+                       timer = setTimeout(NavUpdate,3000);
+                       liking = 1;
+               }
+       }
+
        function jotClearLocation() {
                $('#jot-coord').val('');
                $('#profile-nolocation-wrapper').hide();

diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index f6e399ef522aa03db7ca4eb56844bc5208a33d9d..11469dc6611f15c63567dbcf5f08c01414c0fed6 100644 (file)
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -57,14 +57,6 @@ works -->
         </li>
         {{ endif }}
 
-{{ if $userinfo }}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{ for $nav.usermenu as $usermenu }}
-                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-            {{ endfor }}
-        </ul>
-{{ endif }}
-
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
@@ -94,6 +86,14 @@ works -->
         </ul>
     </div>
 
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
     <div id="notifications">
         {{ if $nav.home }}
         <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>

diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl
old mode 100755 (executable)
new mode 100644 (file)
index b0cb889..b322717
--- a/view/theme/dispy/nets.tpl
+++ b/view/theme/dispy/nets.tpl
@@ -4,7 +4,7 @@
        <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
        <ul class="nets-ul">
        {{ for $nets as $net }}
-       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
        {{ endfor }}
        </ul>
 </div>

diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 4582751..f1209ec
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -17,7 +17,7 @@
 </div>
 
 <div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
+<div id="photo-caption">$desc</div>
 {{ if $tags }}
 <div id="in-this-photo-text">$tags.0</div>
 <div id="in-this-photo">$tags.1</div>

diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index 0c289d982b41c43d3f5eb98c24eb6a89ef1a23aa..350a6ce4a9978e0919911fa529e94ab759ff27f7 100644 (file)
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -1,12 +1,29 @@
 <div class="vcard">
 
+       {{ if $profile.edit }}
+       <div class="action">
+       <span class="icon-profile-edit"></span>
+       <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+       <ul id="profiles-menu" class="menu-popup">
+               {{ for $profile.menu.entries as $e }}
+               <li>
+                       <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+               </li>
+               {{ endfor }}
+               <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+               <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+               
+       </ul>
+       </div>
+       {{ endif }}
+
        <div class="fn label">$profile.name</div>
-       
+
        {{ if $pdesc }}
     <div class="title">$profile.pdesc</div>
     {{ endif }}
        <div id="profile-photo-wrapper">
-    <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
+               <img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
     </div>
 
        {{ if $location }}
@@ -15,10 +32,11 @@
                <div class="adr">
                        {{ if $profile.address }}
             <div class="street-address">$profile.address</div>{{ endif }}
-                       <span class="city-state-zip">$profile.zip</span>
-            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-            <span class="region">$profile.region</span>
-            <span class="postal-code">$profile.postal-code</span>
+                       <span class="city-state-zip">
+                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+                               <span class="region">$profile.region</span>
+                               <span class="postal-code">$profile.postal-code</span>
+                       </span>
                        {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
                </div>
                </div>

diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
old mode 100755 (executable)
new mode 100644 (file)
index e2aae1e..63a85dd
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ b/view/theme/dispy/saved_searches_aside.tpl
@@ -1,4 +1,4 @@
-<div class="widget" id="saved-search-list">
+<div id="saved-search-list" class="widget">
        <h3 id="search">$title</h3>
        $searchbox
        

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 93830de96776b439e0faef277e1d2ce8adbefed3..26ac08c8c5bb4d835e9306313394c954abd6f097 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -190,14 +190,16 @@ input[type=submit] {
     color: #fff;
 }
 
+
 /**
  * global
  */
 /* .tool .action */
 .action {
-    float: right;
+       margin: 5px 0;
 }
 
+
 /**
  *     login
  */
@@ -205,9 +207,10 @@ input[type=submit] {
     margin-right: 20px;
 }
 
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
 nav {
        height: 60px;
        display: block;
@@ -515,11 +518,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
        position: fixed;
        left: 28px;
        bottom: 6px;
+       z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
+       z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -532,9 +537,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     list-style: none;
     border: 3px solid #364e59;
     z-index: 100000;
-    -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-    -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-    box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+    -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
 }
 .menu-popup a {
     display: block;
@@ -582,24 +587,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /** sysmsg **/
 #sysmsg_info {
-       position:fixed;
-       bottom:0;
-       -moz-box-shadow:0 0 5px #888;
-       -webkit-box-shadow:0 0 5px #888;
-       box-shadow:0 0 5px #888;
+       position: fixed;
+       bottom: 0;
+       -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+       -webkit-box-shadow: 3px 3px 10px 0 #000;
+       box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-       background-color:#fcaf3e;
+       background-color: #fcaf3e;
        border:2px solid #f8911b;
-       border-bottom:0;
+       border-bottom: 0;
        padding-bottom: 50px;
        z-index: 1000;
 }
 #sysmsg {
        position: fixed;
        bottom: 0;
-       -moz-box-shadow: 0 0 5px #888;
-       -webkit-box-shadow: 0 0 5px #888;
-       box-shadow: 0 0 5px #888;
+       -moz-box-shadow: 3px 3px 10px 0 #000;
+       -webkit-box-shadow: 3px 3px 10px 0 #000;
+       box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
        background-color: #fcaf3e;
        border: 2px solid #f8911b;
@@ -683,7 +688,9 @@ aside #viewcontacts {
 #netsearch-box {
        margin: 30px 0px;
 }
-
+.ttright {
+       margin: 0px 0px 0px 0px;
+}
 
 /**
 * contacts block
@@ -766,6 +773,15 @@ aside #viewcontacts {
 #profile-jot-text_ifr {
        width:99.900002% !important;
 }
+[id$="jot-text_ifr"] {
+       width: 99.900002% !important;
+       color: #2e2f2e;
+       background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+       color: #2e2f2e;
+       background: #eec;
+}
 #profile-attach-wrapper,
 #profile-audio-wrapper,
 #profile-link-wrapper,
@@ -805,6 +821,9 @@ aside #viewcontacts {
        border-bottom: 0;
        padding: 5px;
 }
+#profile-jot-net {
+       margin: 5px 0;
+}
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
@@ -820,18 +839,19 @@ aside #viewcontacts {
     border: 0;
     text-decoration: none;
        float: right;
+       cursor: pointer;
 }
 #profile-jot-perms { 
        float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
-    -webkit-border-radius: 5px 0px 0px 5px;
-    -moz-border-radius: 5px 0px 0px 5px;
-    border-radius: 5px 0px 0px 5px;     
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;     
     overflow: hidden;
     border: 0px;
-    margin: 0 -4px 0 10px;
+    margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
        width: 1px;
@@ -849,23 +869,21 @@ aside #viewcontacts {
        height: 22px;
        background-color: #555753;
        color: #eeeeec;
-       -webkit-border-radius: 0 5px 5px 0;
-       -moz-border-radius: 0 5px 5px 0;
-       border-radius: 0 5px 5px 0;
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
        border: 0;
        margin: 0;
        float: right;
 }
-#jot-perms-icons {
-       background-color: #555753;
+#jot-perms-icon {
        height: 22px;
        width: 20px;
-       -webkit-border-radius: 0 5px 5px 0;
-       -moz-border-radius: 0 5px 5px 0;
-       border-radius: 0 5px 5px 0;
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
        overflow: hidden;
        border: 0;
-       margin: 0 0 0 94.4%;
 }
 #profile-jot-acl-wrapper {
        margin: 0 10px;
@@ -908,10 +926,11 @@ aside #viewcontacts {
        clear: both;
 }
 #jot-title-desc {
-       color: #cccccc;
+       color: #ccc;
 }
 #profile-jot-desc {
        color: #a00;
+       margin: 5px 0;
 }
 #jot-title-wrapper {
        margin-bottom: 5px;
@@ -1088,7 +1107,7 @@ section {
        clear: left;
        font-size: 0.8em;
        color: #878883;
-       margin: 20px 0 0 110px;
+       margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
        display: inline;
@@ -1325,10 +1344,11 @@ div[id$="wrapper"] br {
 .photo-album-image-wrapper,
 .photo-top-image-wrapper {
     float: left;
-    -moz-box-shadow: 0 0 5px #888;
-    -webkit-box-shadow: 0 0 5px #888;
-    box-shadow: 0 0 5px #888;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     background-color: #eee;
+       color: #111;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1497,20 +1517,25 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
+       font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
-    font-size: 0.8em;
+    font-size: 0.9em;
     padding-left: 10px;
 }
+.mail-list-sender-name, .mail-list-date {
+       font-style: italic;
+}
 .mail-list-subject {
-    font-size: 1.5em;
+    font-size: 1.2em;
 }
 .mail-list-delete-wrapper {
     float: right;
 }
 .mail-list-outside-wrapper-end {
     clear: both;
+       border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1681,7 +1706,6 @@ div[id$="wrapper"] br {
 }
 
 
-
 /**
  *     register, settings & profile forms
  */
@@ -1728,30 +1752,56 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin: 5px 2px 0 0;
+       display: none;
+}
+/*.profile-edit-side-div:hover {
+       display: block;
 }
 .profile-edit-side-link {
-       margin: 0 20px -18px 0;
-    float: right;
+       margin: 3px 0px 0px 70px;
+}*/
+#profiles-menu-trigger {
+       margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
+.icon-profile-edit {
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+       cursor: pointer;
+    display: block;
+    float: right;
+       width: 20px;
+    height: 20px;
+    margin: 0 0 -18px;
+       position: absolute;
+    text-decoration: none;
+       top: 18px;
+       right: 226px;
+}
 #profile-edit-links ul {
     margin: 20px 0;
     padding: 0;
     list-style: none;
 }
+.marital {
+       margin-top: 5px;
+}
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-/*     background: #2e2f2e;
-       color: #eec;*/
+       background: #2e2f2e;
+       color: #eec;
+}
+#id_ssl_policy {
+       width: 374px;
 }
 
+
 /**
  *     contacts selector
  */
@@ -1961,10 +2011,12 @@ div[id$="wrapper"] br {
 .group-selected, .nets-selected {
     padding: 3px;
        color: #111;
-    border: 1px solid #CCCCCC;
-    background: #F8F8F8;
+    background: #f8f8f8;
     font-weight: bold;
 }
+.group-selected:hover, .nets-selected:hover {
+       color: #111;
+}
 .groupsideedit {
     margin-right: 10px;
 }
@@ -2063,12 +2115,12 @@ div[id$="wrapper"] br {
     border-bottom: 1px solid #000;
 }
 #adminpage dt {
-    width: 200px;
+    width: 250px;
     float: left;
     font-weight: bold;
 }
 #adminpage dd {
-       margin-left: 200px;
+       margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
@@ -2294,6 +2346,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
+       border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2391,7 +2444,7 @@ div[id$="wrapper"] br {
        background-position: -70px -40px;
 }
 .unlock {
-       background-position: -90px -40px;
+       background-position: -88px -40px;
 }
 .video {
        background-position: -110px -40px;
@@ -2487,106 +2540,109 @@ footer {
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
+       background: #eec;
+       color: #2e2f2e;
 }
 #acl-wrapper {
-    width: 690px;
-    float: left;
+    width: 660px;
+       margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
+       margin: 6px;
 }
 #acl-showall {
-    float:left;
-    display:block;
-    width:auto;
-    height:18px;
-    background-color:#CCC;
-    background-image:url("../../../images/show_all_off.png");
-    background-position:7px 7px;
-    background-repeat:no-repeat;
-    padding:7px 10px 7px 30px;
-    -webkit-border-radius:5px;
-    -moz-border-radius:5px;
-    border-radius:5px;
-    color:#999;
+    float: left;
+    display: block;
+    width: auto;
+    height: 18px;
+    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    color: #999;
+       margin: 5px 0;
 }
 #acl-showall.selected {
-    color:#000;
-    background-color:#F90;
-    background-image:url(../../../images/show_all_on.png);
+    color: #000;
+    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
 }
 #acl-list {
-    height:210px;
-    border:1px solid #ccc;
-    clear:both;
-    margin-top:30px;
-    overflow:auto;
-}
-#acl-list-content {
+    height: 210px;
+    border: 1px solid #ccc;
+    clear: both;
+    margin-top: 30px;
+    overflow: auto;
 }
+/*#acl-list-content {
+}*/
 .acl-list-item {
-    display:block;
-    width:150px;
-    height:30px;
-    border:1px solid #ccc;
-    margin:5px;
-    float:left;
+       border: 1px solid #ccc;
+    display: block;
+    float: left;
+    height: 110px;
+    margin: 3px 0 5px 5px;
+    width: 120px;
 }
 .acl-list-item img {
-    width:22px;
-    height:22px;
-    float:left;
-    margin:4px;
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px;
 }
 .acl-list-item p {
     height: 12px;
     font-size: 10px;
-    margin: 0;
+    margin: 0 0 22px;
     padding: 2px 0 1px;
 }
 .acl-list-item a {
-    font-size:8px;
-    display:block;
-    width:40px;
-    height:10px;
-    float:left;
-    color:#999;
-    background-color:#CCC;
-    background-position:3px 3px;
-    background-repeat:no-repeat;
-    margin-right:5px;
-    -webkit-border-radius:2px;
-    -moz-border-radius:2px;
-    border-radius:2px;
-    padding-left:15px;
+    background: #ccc 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+       clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #999;
+    margin: 5px auto 0;
+       padding: 0 3px;
+       text-align: center;
+       vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration:none;
-    color:#000;
+    color: #000;
+       border: 0;
 }
 .acl-button-show {
-    background-image:url('../../../images/show_off.png');
+    background-image: url('../../../images/show_off.png');
+       margin: 0 auto;
 }
 .acl-button-hide {
-    background-image:url('../../../images/hide_off.png');
+    background-image: url('../../../images/hide_off.png');
+       margin: 0 auto;
 }
 .acl-button-show.selected {
-    color:#000;
-    background-color:#9ade00;
-    background-image:url(../../../images/show_on.png);
+    color: #000;
+    background-color: #9ade00;
+    background-image: url(../../../images/show_on.png);
 }
 .acl-button-hide.selected {
-    color:#000;
-    background-color:#ff4141;
-    background-image:url(../../../images/hide_on.png);
+    color: #000;
+    background-color: #ff4141;
+    background-image: url(../../../images/hide_on.png);
 }
 .acl-list-item.groupshow {
-    border-color:#9ade00;
+    border-color: #9ade00;
 }
 .acl-list-item.grouphide {
-    border-color:#ff4141;
+    border-color: #ff4141;
 }
 /** /acl **/
 
@@ -2645,7 +2701,7 @@ footer {
 
 
 @media handheld {
-    body {
-        font-size: 15pt;
-    }
+       body {
+               font-size: 15pt;
+       }
 }

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index cbfcb09e675f416f9d00253559a320f109d2945a..ac97948a3885314e53cc84f8d3dc580c8c90ad8a 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -64,7 +64,7 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
-       // notifications
+       // click outside notifications menu closes it
        $('html').click(function() {
                $('#nav-notifications-linkmenu').removeClass('selected');
                document.getElementById("nav-notifications-menu").style.display = "none";
@@ -74,16 +74,7 @@ $(document).ready(function() {
                event.stopPropagation();
        });
 
-       // usermenu
-       $('html').click(function() {
-               $('#nav-user-linkmenu').removeClass('selected');
-               document.getElementById("nav-user-menu").style.display = "none";
-       });
-
-       $('#nav-user-linkmenu').click(function(event) {
-               event.stopPropagation();
-       });
-
+       // main function in toolbar functioning
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -97,17 +88,35 @@ $(document).ready(function() {
             });
         }
     };
+       // our trigger for the toolbar button
     $('.floaterflip').click(function() {
         toggleToolbar();
         return false;
     });
-});
-</script>
-<script>
-$(document).ready(function() {
+
+       // (attempt) to change the text colour in a top post
        $('#profile-jot-text').focusin(function() {
-               $(this).css('color: #eec;');
+               $(this).css({color: '#eec'});
+       });
+
+       // make auto-complete work in more places
+       $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+
+/*     $('#profile-photo-wrapper').mouseover(function() {
+               $('.profile-edit-side-div').css({display: 'block'});
+       }).mouseout(function() {
+               $('.profile-edit-side-div').css({display: 'none'});
+               return false;
        });
+
+       $('img.photo').mouseover(function() {
+               $('.profile-edit-side-div').css({display: 'block'});
+       }).mouseout(function() {
+               $('.profile-edit-side-div').css({display: 'none'});
+               return false;
+       });*/
+
 });
 </script>
 EOT;
+

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index b013cfeef45966ed69a4af35550facc5d01b5936..c67a88635c54e47e76d455d7c702927a55e42b09 100644 (file)
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -26,11 +26,14 @@
                                <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                                <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
                        {{ endif }}
+                       
                        {{ if $item.vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
                                <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
                                <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               {{ if $item.vote.share }}
+                                       <a href="#" id="share-$item.id"
+                                       class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
                                <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
                        {{ endif }}

diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 86453fad21afc41e8dafbc99bf8008d24c88508f..f251d7352bb1301cfc1bf676727b41d4dda2fea7 100644 (file)
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -31,11 +31,15 @@
                                <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                                <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
                        {{ endif }}
+                       
                        {{ if $item.vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
                                <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
                                <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+
+                       {{ if $item.vote.share }}
+                               <a href="#"  id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
                                <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
                        {{ endif }}
@@ -63,6 +67,7 @@
                                                {{ endfor }}
                                        </div>                  
                        </div>
+                       
                </div>
                <div class="wall-item-author">
                        <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>