diff options
| author | friendica <info@friendica.com> | 2012-09-10 22:00:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-10 22:00:56 -0700 |
| commit | c8957b36ea11a41604330c8f87c0fc0611ef18e6 (patch) | |
| tree | 4a1b2ae68d463a69c388fa6ee0a7453cc8e74498 /view/tpl | |
| parent | 61cca7637af3c4484d90ed9e1208a10845758276 (diff) | |
| download | volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.gz volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.bz2 volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.zip | |
permissions responder + upstream merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/comment_item.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/wall_thread.tpl | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 98173aa30..3de24ca8d 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -1,10 +1,9 @@ + {{ if $threaded }} + <div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;"> + {{ else }} <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - {{ if $threaded }} - <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span> - <form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - {{ else }} + {{ endif }} <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - {{ endif }} <input type="hidden" name="type" value="$type" /> <input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="parent" value="$parent" /> diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl index 35f613b39..ade8264fa 100644 --- a/view/tpl/wall_thread.tpl +++ b/view/tpl/wall_thread.tpl @@ -6,7 +6,11 @@ {{endif}} <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <a name="$item.id" ></a> +{{ if $item.threaded }} +<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" > +{{ else }} <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > +{{ endif }} <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" @@ -93,11 +97,13 @@ {{ inc $item.template }}{{ endinc }} {{ endfor }} +{{ if $item.comment }} {{ if $item.flatten }} <div class="wall-item-comment-wrapper" > $item.comment </div> {{ endif }} +{{ endif }} </div> {{if $item.comment_lastcollapsed}}</div>{{endif}} |