diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 13:47:20 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 13:47:20 -0400 |
| commit | 78280bdfed363f2316f1fa4e854e9604ebd58470 (patch) | |
| tree | 349bd483ccf265bef6216c041a4e4c3b587b357b /view/theme/slack-NS | |
| parent | 1a1efc7e4614a50a6221e17f0bb4ca48b6d38642 (diff) | |
| parent | c9e5609cbfd89db35b536a22eb2ce6cbf7992783 (diff) | |
| download | volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.tar.gz volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.tar.bz2 volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #307, explaining decentralised private photos is impossible.
this turns out to be harder than I thought
cleanup - make bb-buttons vanish when comment closed
Esperanto at 100% again
* master:
Diffstat (limited to 'view/theme/slack-NS')
| -rwxr-xr-x | view/theme/slack-NS/comment_item.tpl | 61 | ||||
| -rw-r--r-- | view/theme/slack-NS/theme.php | 3 |
2 files changed, 2 insertions, 62 deletions
diff --git a/view/theme/slack-NS/comment_item.tpl b/view/theme/slack-NS/comment_item.tpl deleted file mode 100755 index 84b9597e8..000000000 --- a/view/theme/slack-NS/comment_item.tpl +++ /dev/null @@ -1,61 +0,0 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <ul class="comment-edit-bb-$id"> - <li><a class="editicon boldbb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','b', $id);"></a></li> - <li><a class="editicon italicbb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','i', $id);"></a></li> - <li><a class="editicon underlinebb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','u', $id);"></a></li> - <li><a class="editicon quotebb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','quote', $id);"></a></li> - <li><a class="editicon codebb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','code', $id);"></a></li> - <li><a class="editicon imagebb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','img', $id);"></a></li> - <li><a class="editicon urlbb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','url', $id);"></a></li> - <li><a class="editicon videobb shadow" - style="cursor: pointer;" - onclick="insertFormatting('$comment','video', $id);"></a></li> - </ul> - <div class="comment-edit-bb-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea> - {{ if $qcomment }} - <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > - <option value=""></option> - {{ for $qcomment as $qc }} - <option value="$qc">$qc</option> - {{ endfor }} - </select> - {{ endif }} - - <div class="comment-edit-text-end"></div> - <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" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php index 68d579211..14d058c7d 100644 --- a/view/theme/slack-NS/theme.php +++ b/view/theme/slack-NS/theme.php @@ -14,7 +14,8 @@ function insertFormatting(comment,BBcode,id) { $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); - } + $("#comment-edit-text-" + id).val(tmpStr); + } textarea = document.getElementById("comment-edit-text-" +id); if (document.selection) { |