templates: add class to comment preview div, fix search_item.tpl

diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 49751c42b38135b5614af06a88ac398eaa0fe720..a28fc411a549a33cf61938166356de95a9b39a16 100644 (file)
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -17,7 +17,7 @@
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
                                        <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
                                        <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-                                       <div id="comment-edit-preview-$id" style="display:none;"></div>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
                                </div>
 
                                <div class="comment-edit-end"></div>

diff --git a/view/search_item.tpl b/view/search_item.tpl
index 616eaf110eb2126efad8c11a6137e1bcf7d1a23c..c4f3ccac7ba3197c9e0ba82d45dba3466ae7666e 100644 (file)
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,18 +1,20 @@
+
 <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"
+                       <div class="contact-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" alt="$name" />
+                                       <img src="$thumb" class="contact-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>
+                               <a href="#" rel="#wall-item-photo-menu-$id" class="contact-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>
@@ -27,6 +29,15 @@
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
+               </div>
+               <div class="wall-item-tags">
+                       {{ for $tags as $tag }}
+                               <span class='tag'>$tag</span>
+                       {{ endfor }}
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="">
                        {{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
                </div>
                <div class="wall-item-actions">
@@ -38,6 +49,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 }}
@@ -48,16 +60,12 @@
                        {{ 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" />
+                                       <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
                                        <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
                                {{ endif }}
                                {{ if $edpost }}
@@ -67,5 +75,9 @@
                        
                </div>
        </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links"></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>
 </div>
-

diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 96f3cee747b859f32fc0c9d70853090e18e736ba..83e6dd361bf0c95c59856efd2483e0d2c006d474 100644 (file)
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,10 +1,10 @@
-{{ 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">

diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 96d5147027afb340ad54052a7684f5628ef8e8d3..11297647ae253cc7ca3e202e0066213033fb63d8 100644 (file)
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,18 +1,12 @@
-{{ 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="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
-                               <a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
-                                       <img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
-                               </a>
-                       </div>
                        <div class="contact-photo-wrapper mframe 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)">
@@ -25,6 +19,11 @@
                                </ul>
                                
                        </div>  
+                       <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
+                               <a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
+                                       <img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
+                               </a>
+                       </div>                  
                        <div class="wall-item-location">$location</div> 
                </div>
                <div class="wall-item-content">