tagging missing from wallwall and a couple of themes, star missing from dispy

diff --git a/include/conversation.php b/include/conversation.php
index 53369cf20f3ae1289fe75eeb47a6ed3e448bdc6c..2ef37694dc2dd1a668f4c7bef941538f8e140a87 100755 (executable)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,6 +6,11 @@
 function localize_item(&$item){
 
        $Text = $item['body'];
+
+
+       // find private image (w/data url) if present and convert image 
+       // link to a magic-auth redirect.
+
        $saved_image = '';
        $img_start = strpos($Text,'[img]data:');
        $img_end = strpos($Text,'[/img]');
@@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $toplevelprivate = false;
 
                                // Take care of author collapsing and comment collapsing
+                               // (author collapsing is currently disabled)
                                // 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.
                        
@@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
                                        $item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-                                       /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+                                       // DISABLED
+                                       /*
+                                       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'] 
@@ -424,7 +432,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                                if($blowhard_count >= 3)
                                                        $o .= '</div>';
                                                $blowhard_count = 0;
-                                       }*/
+                                       }
+                                       // END DISABLED
+                                       */
 
                                        $comments_seen = 0;
                                        $comments_collapsed = false;

diff --git a/mod/tagger.php b/mod/tagger.php
index 76ec3366c840d8a0ad2043c6114ae048febb4d77..3ff5d57aa2091af318bbe43fce5b0da8612f14ac 100755 (executable)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -134,6 +134,7 @@ EOT;
        $arr['target'] = $target;
        $arr['object-type'] = $objtype;
        $arr['object'] = $obj;
+       $arr['private'] = $item['private'];
        $arr['allow_cid'] = $item['allow_cid'];
        $arr['allow_gid'] = $item['allow_gid'];
        $arr['deny_cid'] = $item['deny_cid'];

diff --git a/view/theme/dispy/premium.png b/view/theme/dispy/premium.png
new file mode 100755 (executable)
index 0000000..1ad601c
Binary files /dev/null and b/view/theme/dispy/premium.png differ

diff --git a/view/theme/dispy/star.png b/view/theme/dispy/star.png
new file mode 100755 (executable)
index 0000000..a327ba1
Binary files /dev/null and b/view/theme/dispy/star.png differ

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 5bc1450db4f5df88decec9bb1d66a61a749e344b..62c7b48e0fc8de5b7cc14a3407103b0a058f7518 100755 (executable)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1099,6 +1099,21 @@ div[id$="wrapper"] br { clear: left; }
        border-bottom: 0px;
 }*/
 
+.starred { 
+       background-image: url("star.png"); 
+       repeat: no-repeat;
+}
+.unstarred { 
+       background-image: url("premium.png");
+       repeat: no-repeat;
+}
+
+.tagged {
+       background-image: url("tag.png");
+       repaet: no-repeat;
+}
+
+
 
 .border {
        border: 1px solid #babdb6;

diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
new file mode 100644 (file)
index 0000000..7095253
Binary files /dev/null and b/view/theme/dispy/tag.png differ

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 9c3703f5fd93f47525d3d30e68732807d72f735e..882843a0934192f9b0b63788118cb2ab1e3cfcfd 100755 (executable)
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -24,6 +24,7 @@
                <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>
+                               <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
                        {{ endif }}
                        {{ if $vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">

diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 95c68220ae14325e00b78a8819af7a7a0d3193b3..57c6600b7d0a11249ac6f81bddf30730dd08cc39 100755 (executable)
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -29,6 +29,7 @@
                <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>
+                               <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
                        {{ endif }}
                        {{ if $vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">

diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index ea9a218b42916c467ee0582c97482cb5155e2fcf..4675f1e00cec543148f75a08810ce4037eb41958 100755 (executable)
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -59,6 +59,7 @@
                         
                        {{ if $star }}
                        <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+                       <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
                        {{ endif }}
                        
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >

diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
index 727e3d1c24edd2c15281202400de480378bb6206..56c8a82e266c5e9dcc5f6f86a2325e05dca1ac52 100755 (executable)
--- a/view/theme/loozah/wall_item.tpl
+++ b/view/theme/loozah/wall_item.tpl
@@ -49,6 +49,8 @@
                         
                        {{ if $star }}
                        <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+                       <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+
                        {{ endif }}
                        
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >

diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
index 09de86c7be5d61b67089d87c3c288385248a9cda..0e4c1a6cf30d9106509bd956c06dbcfd2fe4cca3 100755 (executable)
--- a/view/theme/loozah/wallwall_item.tpl
+++ b/view/theme/loozah/wallwall_item.tpl
@@ -53,6 +53,7 @@
                         
                        {{ if $star }}
                        <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+                       <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
                        {{ endif }}
                        
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >

diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl
index 2301da1d164fcc0a974df1ccf1d1a5343bd6ee20..8e452f4f6e98365c7b898e74d60c9ee8f40e1832 100644 (file)
--- a/view/theme/vier/wallwall_item.tpl
+++ b/view/theme/vier/wallwall_item.tpl
@@ -62,6 +62,7 @@
                        {{ 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="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
                        {{ endif }}
                        
                        {{ if $vote }}

diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 11297647ae253cc7ca3e202e0066213033fb63d8..61a248135debd91806a6eb82e5b12c0549121725 100755 (executable)
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -55,6 +55,8 @@
                        {{ 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="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+
                        {{ endif }}
                        
                        {{ if $vote }}