diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index 346934b70..33f68dd6a 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -39,6 +39,7 @@ {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} <div class="submit"><input type="submit" name="page_site" value="$submit" /></div> diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl new file mode 100644 index 000000000..c53f8b017 --- /dev/null +++ b/view/theme/diabook/wall_thread.tpl @@ -0,0 +1,125 @@ +{{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"> +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + 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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></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"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </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.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></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> + </div> +</div> + +{{ if $item.threaded }} +{{ if $item.comment }} +<div class="wall-item-comment-wrapper $item.indent" > + $item.comment +</div> +{{ endif }} +{{ endif }} + +{{ if $item.flatten }} +<div class="wall-item-comment-wrapper" > + $item.comment +</div> +{{ endif }} + + +{{ for $item.children as $item }} + {{ inc $item.template }}{{ endinc }} +{{ endfor }} + +</div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl new file mode 100644 index 000000000..c53f8b017 --- /dev/null +++ b/view/theme/diabook/wallwall_thread.tpl @@ -0,0 +1,125 @@ +{{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"> +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + 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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></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"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </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.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></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> + </div> +</div> + +{{ if $item.threaded }} +{{ if $item.comment }} +<div class="wall-item-comment-wrapper $item.indent" > + $item.comment +</div> +{{ endif }} +{{ endif }} + +{{ if $item.flatten }} +<div class="wall-item-comment-wrapper" > + $item.comment +</div> +{{ endif }} + + +{{ for $item.children as $item }} + {{ inc $item.template }}{{ endinc }} +{{ endfor }} + +</div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index 5f6b26a78..3d1701b29 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -94,4 +94,15 @@ $('#hide-comments-' + id).html('$showfewer'); } } + + function showHideCommentBox(id) { + if( $('#comment-edit-form-' + id).is(':visible')) { + $('#comment-edit-form-' + id).hide(); + } + else { + $('#comment-edit-form-' + id).show(); + } + } + + </script> diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl new file mode 100644 index 000000000..5f434d4cb --- /dev/null +++ b/view/theme/dispy/wall_thread.tpl @@ -0,0 +1,115 @@ +{{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"> +<a name="$item.id" ></a> +<div class="wall-item-outside-wrapper $item.indent$item.previewing" 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" 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" target="redir" 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 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> + <div class="wall-item-ago" id="wall-item-ago-$item.id"> + $item.ago + </div> + </div> + <div class="wall-item-tools" id="wall-item-tools-$item.id"> + <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> + <ul class="wall-item-subtools1"> + {{ if $item.star }} + <li> + <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> + </li> + {{ endif }} + {{ if $item.vote }} + <li 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="#" 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;" /> + </li> + {{ endif }} + </ul><br style="clear:left;" /> + <ul class="wall-item-subtools2"> + {{ if $item.filer }} + <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.filer"></a></li> + {{ endif }} + {{ if $item.plink }} + <li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li> + {{ endif }} + {{ if $item.edpost }} + <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li> + {{ endif }} + <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id"> + {{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }} + {{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }} + </li> + </ul> + <div class="wall-item-delete-end"></div> + </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> + <div class="wall-item-wrapper-end"></div> + <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> + <div class="wall-item-comment-separator"></div> + + {{ if $item.threaded }} + {{ if $item.comment }} + <div class="wall-item-comment-wrapper $item.indent" > + $item.comment + </div> + {{ endif }} + {{ endif }} + + {{ if $item.flatten }} + <div class="wall-item-comment-wrapper" > + $item.comment + </div> + {{ endif }} + +<div class="wall-item-outside-wrapper-end $item.indent" ></div> +</div> +{{ for $item.children as $item }} + {{ inc $item.template }}{{ endinc }} +{{ endfor }} + +</div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl new file mode 100644 index 000000000..cab97cafa --- /dev/null +++ b/view/theme/dispy/wallwall_thread.tpl @@ -0,0 +1,121 @@ +{{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"> +<a name="$item.id" ></a> +<div class="wall-item-outside-wrapper $item.indent$item.previewing 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 wwto" id="wall-item-ownerphoto-wrapper-$item.id" > + <a href="$item.owner_url" target="redir" 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 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" target="redir" 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 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> + <div class="wall-item-ago" id="wall-item-ago-$item.id"> + $item.ago + </div> + </div> + <div class="wall-item-tools" id="wall-item-tools-$item.id"> + <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> + <ul class="wall-item-subtools1"> + {{ if $item.star }} + <li> + <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> + </li> + {{ endif }} + {{ if $item.vote }} + <li 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="#" 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;" /> + </li> + {{ endif }} + </ul><br style="clear:left;" /> + <ul class="wall-item-subtools2"> + {{ if $item.filer }} + <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li> + {{ endif }} + {{ if $item.plink }} + <li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li> + {{ endif }} + {{ if $item.edpost }} + <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li> + {{ endif }} + + <li 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 }} + {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} + </li> + </ul> + <div class="wall-item-delete-end"></div> + </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> + <div class="wall-item-wrapper-end"></div> + <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> + <div class="wall-item-comment-separator"></div> + + {{ if $item.threaded }} + {{ if $item.comment }} + <div class="wall-item-comment-wrapper $item.indent" > + $item.comment + </div> + {{ endif }} + {{ endif }} + + {{ if $item.flatten }} + <div class="wall-item-comment-wrapper" > + $item.comment + </div> + {{ endif }} + +<div class="wall-item-outside-wrapper-end $item.indent" ></div> +</div> +{{ for $item.children as $item }} + {{ inc $item.template }}{{ endinc }} +{{ endfor }} + +</div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl new file mode 100644 index 000000000..6e017ac29 --- /dev/null +++ b/view/theme/frost-mobile/threaded_conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $item }} +{{ inc $item.template }}{{ endinc }} +{{ 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/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl index 165a188f1..d6fb677c5 100644 --- a/view/theme/frost-mobile/wall_thread.tpl +++ b/view/theme/frost-mobile/wall_thread.tpl @@ -4,7 +4,6 @@ </div> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> {{endif}} -{{if $item.comment_lastcollapsed}}</div>{{endif}} <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <a name="$item.id" ></a> <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >--> @@ -103,4 +102,5 @@ <!--</div>--> {{ endif }} </div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/frost-mobile/wallwall_thread.tpl b/view/theme/frost-mobile/wallwall_thread.tpl index 816c33d2d..3af6aaa11 100644 --- a/view/theme/frost-mobile/wallwall_thread.tpl +++ b/view/theme/frost-mobile/wallwall_thread.tpl @@ -4,7 +4,6 @@ </div> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> {{endif}} -{{if $item.comment_lastcollapsed}}</div>{{endif}} <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <a name="$item.id" ></a> <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >--> @@ -106,4 +105,5 @@ <!--</div>--> {{ endif }} </div> +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index 95c7cf763..9e81c7a6a 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -4,7 +4,6 @@ </div> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> {{endif}} -{{if $item.comment_lastcollapsed}}</div>{{endif}} <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <a name="$item.id" ></a> <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >--> @@ -46,6 +45,7 @@ <!-- </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"> @@ -73,6 +73,7 @@ {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" 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> @@ -100,4 +101,4 @@ <!--</div>--> {{ endif }} </div> - +{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl index 1117b6903..346e384e5 100644 --- a/view/theme/frost/wallwall_thread.tpl +++ b/view/theme/frost/wallwall_thread.tpl @@ -4,7 +4,6 @@ </div> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> {{endif}} -{{if $item.comment_lastcollapsed}}</div>{{endif}} <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <a name="$item.id" ></a> <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >--> @@ -105,4 +104,5 @@ <!--</div>--> {{ endif }} </div> +{{if $item.comment_lastcollapsed}}</div>{{endif}}