fix layout issues, deletable items and wall-wall

diff --git a/mod/profile.php b/mod/profile.php
index 0d9c94eedcbdfa6ca6f51bbd3c775796ff82a694..4adcd29f6bdaaa6c476bda385cb773e3620d4bed 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -249,6 +249,9 @@ function profile_content(&$a, $update = 0) {
 
        $tpl = file_get_contents('view/wall_item.tpl');
 
 
        $tpl = file_get_contents('view/wall_item.tpl');
 

+       $droptpl = file_get_contents('view/wall_item_drop.tpl');
+       $fakedrop = file_get_contents('view/wall_fake_drop.tpl');
+

        if($update)
                $return_url = $_SESSION['return_url'];
        else
        if($update)
                $return_url = $_SESSION['return_url'];
        else


@@ -333,9 +336,12 @@ function profile_content(&$a, $update = 0) {
                        $profile_link = $profile_url;
 
                        $drop = '';
                        $profile_link = $profile_url;
 
                        $drop = '';

+                       $dropping = false;

 
                        if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
 
                        if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))

-                               $drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+                               $dropping = true;
+
+                       $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id']));

 
 
                        $like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 
 
                        $like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');

diff --git a/view/wall_fake_drop.tpl b/view/wall_fake_drop.tpl
new file mode 100644 (file)
index 0000000..db34441
--- /dev/null
+++ b/view/wall_fake_drop.tpl
@@ -0,0 +1,2 @@
+<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/wallwall_item.tpl b/view/wallwall_item.tpl
index f3a803543c9e278f0b3a9774d686426daec1e954..0ff2ff6f75202472a50ef3912f1355ac5b297b49 100644 (file)
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,25 +1,27 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >

-       <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-               <a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-               <img src="$owner_photo" class="wall-item-photo" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a>
-       </div>
-       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
-       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-               <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-               <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-       </div>
-       <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-               <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
-               <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-               <div class="wall-item-location" id="wall-item-location-$id">$location</div>
-               $vote
-       </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-body" id="wall-item-body-$id" >$body</div>
-       </div>
-       $drop
+       <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+               <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
+                       <a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
+                       <img src="$owner_photo" class="wall-item-photo" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a>
+               </div>
+               <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
+               <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+                       <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+                       <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+               </div>

        
        

+               <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+                       <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
+                       <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+                       <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+                       $vote
+               </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-body" id="wall-item-body-$id" >$body</div>
+               </div>
+               $drop
+       </div>  

        <div class="wall-item-wrapper-end"></div>
        <div class="wall-item-like" id="wall-item-like-$id">$like</div>
        <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
        <div class="wall-item-wrapper-end"></div>
        <div class="wall-item-like" id="wall-item-like-$id">$like</div>
        <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>