Merge pull request #457 from fermionic/testbubble-broken-with-threading

Add wall_thread and wallwall_thread

diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl
deleted file mode 100644 (file)
index fccd9a8..0000000
--- a/view/theme/testbubble/conversation.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-       {{ for $thread.items as $item }}
-               {{if $item.comment_firstcollapsed}}
-                       <div class="hide-comments-outer">
-                       <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-                       </div>
-                       <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-               {{endif}}
-               {{if $item.comment_lastcollapsed}}</div>{{endif}}
-               
-               {{ inc $item.template }}{{ endinc }}
-               
-               
-       {{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ 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/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl
new file mode 100644 (file)
index 0000000..b40e7b1
--- /dev/null
+++ b/view/theme/testbubble/wall_thread.tpl
@@ -0,0 +1,100 @@
+{{if $item.comment_firstcollapsed}}
+       <div class="hide-comments-outer">
+       <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+       </div>
+       <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+<div class="wall-item-outside-wrapper $item.indent" id="wall-item-outside-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
+                                onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+                                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+                               </a>
+                               <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                               <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                                       <ul>
+                                               $item.item_photo_menu
+                                       </ul>
+                               </div>
+                       </div>
+                       <div class="wall-item-photo-end"></div>
+                       <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
+               </div>
+               <div class="wall-item-lock-wrapper">
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+               </div>
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <div class="wall-item-title-end"></div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+                                       <div class="body-tag">
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ 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 }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </div>
+                       {{ endif }}
+                       {{ if $item.plink }}
+                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <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 }}
+                       
+                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       </div>
+                               {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       <div class="wall-item-delete-end"></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>
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+                               
+               </div>  
+       </div>
+       <div class="wall-item-wrapper-end"></div>
+       <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+       {{ if $item.threaded }}
+       {{ if $item.comment }}
+       <div class="wall-item-comment-wrapper $item.indent" >
+               $item.comment
+       </div>
+       {{ endif }}
+       {{ endif }}
+</div>
+
+<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+
+{{ for $item.children as $item }}
+       {{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+       $item.comment
+</div>
+{{ endif }}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}

diff --git a/view/theme/testbubble/wallwall_thread.tpl b/view/theme/testbubble/wallwall_thread.tpl
new file mode 100644 (file)
index 0000000..de43c66
--- /dev/null
+++ b/view/theme/testbubble/wallwall_thread.tpl
@@ -0,0 +1,103 @@
+{{if $item.comment_firstcollapsed}}
+       <div class="hide-comments-outer">
+       <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+       </div>
+       <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+<div class="wall-item-outside-wrapper $item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                       </div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+                       <div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                               onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul>
+                        $item.item_photo_menu
+                    </ul>
+                </div>
+
+                       </div>
+                       <div class="wall-item-photo-end"></div>
+                       <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+               </div>
+               <div class="wall-item-lock-wrapper">
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+               </div>
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <div class="wall-item-title-end"></div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+                                       <div class="body-tag">
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ 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 }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </div>
+                       {{ endif }}
+                       {{ if $item.plink }}
+                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <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 }}
+                       
+                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       </div>
+                               {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       <div class="wall-item-delete-end"></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>
+                       <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+               </div>  
+       </div>  
+       <div class="wall-item-wrapper-end"></div>
+       <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+       {{ if $item.threaded }}
+       {{ if $item.comment }}
+       <div class="wall-item-comment-wrapper $item.indent" >
+               $item.comment
+       </div>
+       {{ endif }}
+       {{ endif }}
+</div>
+
+<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+
+{{ for $item.children as $item }}
+       {{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+       $item.comment
+</div>
+{{ endif }}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}