diff options
| author | friendica <info@friendica.com> | 2012-08-21 20:03:25 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-08-21 20:03:25 -0700 |
| commit | 30e86284af3cdf64cf4f5f6a0e1ced04cfb73258 (patch) | |
| tree | 938d2031d1492d9cbfa6b77382e5aaebba50c8d5 | |
| parent | 9b9f35f8e57464ead49be0a8e2aa64b0d8a6573c (diff) | |
| download | volse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.tar.gz volse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.tar.bz2 volse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.zip | |
upstream
| -rw-r--r-- | include/conversation.php | 10 | ||||
| -rw-r--r-- | view/theme/duepuntozero/css/style.css | 3 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/tpl/comment_item.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/comment_item.tpl | 4 |
4 files changed, 20 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2edb551a5..3bbaf0cba 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -496,6 +496,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr } } + if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) { + $comments_threaded = true; + } + else { + $comments_threaded = false; + } + if($page_writeable) { $buttons = array( 'like' => array( t("I like this \x28toggle\x29"), t("like")), @@ -512,7 +519,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $qcomment = (($qc) ? explode("\n",$qc) : null); } $comment = replace_macros($cmnt_tpl,array( - '$return_path' => '', + '$return_path' => '', + '$threaded' => $comments_threaded, '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''), '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'), '$id' => $item['item_id'], diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css index 18f620110..bbb4cb54f 100644 --- a/view/theme/duepuntozero/css/style.css +++ b/view/theme/duepuntozero/css/style.css @@ -934,6 +934,9 @@ input#dfrn-url { #network-bmark-link { margin-top: 10px; } +.tread-wrapper .wall-item-comment-wrapper { + margin-left: 50px; +} .wall-item-content-wrapper { margin-top: 10px; diff --git a/view/theme/duepuntozero/tpl/comment_item.tpl b/view/theme/duepuntozero/tpl/comment_item.tpl index 63c05f335..f64ae753b 100755 --- a/view/theme/duepuntozero/tpl/comment_item.tpl +++ b/view/theme/duepuntozero/tpl/comment_item.tpl @@ -1,6 +1,10 @@ <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 }} + <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/comment_item.tpl b/view/tpl/comment_item.tpl index b2be6f94e..98173aa30 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -1,6 +1,10 @@ <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 }} + <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" /> |