diff options
| author | friendica <info@friendica.com> | 2012-04-11 16:45:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-11 16:45:19 -0700 |
| commit | d52dad3826ebed717dc7a9d24ac670cdd33e16f8 (patch) | |
| tree | 636d32e0288c30819621ef1e5820f9052429dc23 | |
| parent | 8a8702c9cd5dde44356da11f5417db6af0597d4e (diff) | |
| parent | a1d5026abf129fc520327881a293d17c1ab21eff (diff) | |
| download | volse-hubzilla-d52dad3826ebed717dc7a9d24ac670cdd33e16f8.tar.gz volse-hubzilla-d52dad3826ebed717dc7a9d24ac670cdd33e16f8.tar.bz2 volse-hubzilla-d52dad3826ebed717dc7a9d24ac670cdd33e16f8.zip | |
Merge https://github.com/friendica/friendica into pull
| -rw-r--r-- | view/theme/diabook-aerith/comment_item.tpl | 4 | ||||
| -rw-r--r-- | view/theme/diabook-blue/comment_item.tpl | 4 | ||||
| -rw-r--r-- | view/theme/diabook-red/comment_item.tpl | 6 | ||||
| -rw-r--r-- | view/theme/diabook/comment_item.tpl | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 6e455b726..225a5dd5c 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -15,10 +15,10 @@ <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl index 6e455b726..225a5dd5c 100644 --- a/view/theme/diabook-blue/comment_item.tpl +++ b/view/theme/diabook-blue/comment_item.tpl @@ -15,10 +15,10 @@ <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 64e4fb802..225a5dd5c 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -13,12 +13,12 @@ <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index 535134256..c5231be40 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> + <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> |