diff options
author | friendica <info@friendica.com> | 2012-04-21 19:29:08 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-04-21 19:29:08 -0700 |
commit | d340b80094cbaf33f3989422240be929741b0ff8 (patch) | |
tree | 880edf811fbdd2c58ddc4748d95e9244c202fd9e /view/theme/diabook | |
parent | 371f3e450e1cdc5bcd92d7adb0107d83e87ae2d6 (diff) | |
parent | fe6567cb88eb129887253be8f2b62002d92ad769 (diff) | |
download | volse-hubzilla-d340b80094cbaf33f3989422240be929741b0ff8.tar.gz volse-hubzilla-d340b80094cbaf33f3989422240be929741b0ff8.tar.bz2 volse-hubzilla-d340b80094cbaf33f3989422240be929741b0ff8.zip |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'view/theme/diabook')
46 files changed, 76 insertions, 66 deletions
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index ee4dfba45..6843f958c 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -11,14 +11,16 @@ <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> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a> - <a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a> - <a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a> - <a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a> - <a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a> - <a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a> - <a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea> + <div class="comment-edit-bb-$id" style="display:none;"> + <a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('img',$id);">img</a> + <a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('url',$id);">url</a> + <a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('video',$id);">video</a> + <a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('u',$id);">u</a> + <a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('i',$id);">i</a> + <a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('b',$id);">b</a> + <a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('quote',$id);">quote</a> + </div> {{ 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/communityhome.tpl b/view/theme/diabook/communityhome.tpl index ff04d9da0..66f93c32d 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -82,4 +82,4 @@ $nv.search {{ endfor }} </ul> {{ endif }} -</div> +</div>
\ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css index b65902acb..28f47552e 100644 --- a/view/theme/diabook/diabook-aerith/style-network-wide.css +++ b/view/theme/diabook/diabook-aerith/style-network-wide.css @@ -1475,7 +1475,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } @@ -1483,7 +1483,7 @@ transition: all 0.2s ease-in-out; display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css index b2b1a7c19..c78ed53d9 100644 --- a/view/theme/diabook/diabook-aerith/style-network.css +++ b/view/theme/diabook/diabook-aerith/style-network.css @@ -1467,7 +1467,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } @@ -1475,7 +1475,7 @@ transition: all 0.2s ease-in-out; display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css index 17fd8bd40..19ebd9569 100644 --- a/view/theme/diabook/diabook-aerith/style-profile-wide.css +++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css @@ -1449,13 +1449,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css index ff8f20f88..4dc84e95c 100644 --- a/view/theme/diabook/diabook-aerith/style-profile.css +++ b/view/theme/diabook/diabook-aerith/style-profile.css @@ -1440,13 +1440,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index 8f04087b1..759e2a15a 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -1702,13 +1702,13 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index db8f125ee..18873ebc5 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -1693,13 +1693,13 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em ; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css index 024ceefb4..9cf8bb3a7 100644 --- a/view/theme/diabook/diabook-blue/style-network-wide.css +++ b/view/theme/diabook/diabook-blue/style-network-wide.css @@ -1437,7 +1437,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css index 40118f8e7..df646f456 100644 --- a/view/theme/diabook/diabook-blue/style-network.css +++ b/view/theme/diabook/diabook-blue/style-network.css @@ -1429,7 +1429,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css index c762de10e..04d2a73ef 100644 --- a/view/theme/diabook/diabook-blue/style-profile-wide.css +++ b/view/theme/diabook/diabook-blue/style-profile-wide.css @@ -1416,7 +1416,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css index 15ff1ad48..958b32f9c 100644 --- a/view/theme/diabook/diabook-blue/style-profile.css +++ b/view/theme/diabook/diabook-blue/style-profile.css @@ -1407,7 +1407,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index fdf91bb2f..92664ff86 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -1659,7 +1659,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 3b467c735..7cecfd34d 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -1651,7 +1651,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css index acfbcfa55..87efd8aa7 100644 --- a/view/theme/diabook/diabook-dark/style-network-wide.css +++ b/view/theme/diabook/diabook-dark/style-network-wide.css @@ -1452,7 +1452,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; /* background-color: #fff; */ width: 500px; } diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 17142f4e8..4111bdb5b 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -1430,7 +1430,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css index c762de10e..04d2a73ef 100644 --- a/view/theme/diabook/diabook-dark/style-profile-wide.css +++ b/view/theme/diabook/diabook-dark/style-profile-wide.css @@ -1416,7 +1416,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index 79bcb3fbc..d4c99ac51 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -1407,7 +1407,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 3f9d8b175..0a7cabcb0 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/style-wide.css @@ -1659,7 +1659,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index d36bbbf0b..631628a07 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -1651,7 +1651,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css index ea4071a1f..5cdcb9132 100644 --- a/view/theme/diabook/diabook-green/style-network-wide.css +++ b/view/theme/diabook/diabook-green/style-network-wide.css @@ -1451,7 +1451,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css index 29a4765ff..41ddc7442 100644 --- a/view/theme/diabook/diabook-green/style-network.css +++ b/view/theme/diabook/diabook-green/style-network.css @@ -1444,7 +1444,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css index 77cecb296..f1bf0d5ff 100644 --- a/view/theme/diabook/diabook-green/style-profile-wide.css +++ b/view/theme/diabook/diabook-green/style-profile-wide.css @@ -1425,7 +1425,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css index 7d7a1849f..ef196bede 100644 --- a/view/theme/diabook/diabook-green/style-profile.css +++ b/view/theme/diabook/diabook-green/style-profile.css @@ -1416,7 +1416,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index c5dd3e06a..e7243f4cb 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -1679,7 +1679,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index 87bbf5f3d..273f4b5a8 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -1677,7 +1677,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css index 321fb2940..c66432e84 100644 --- a/view/theme/diabook/diabook-pink/style-network-wide.css +++ b/view/theme/diabook/diabook-pink/style-network-wide.css @@ -1451,7 +1451,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css index ea6105799..7e8263e1a 100644 --- a/view/theme/diabook/diabook-pink/style-network.css +++ b/view/theme/diabook/diabook-pink/style-network.css @@ -1444,7 +1444,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css index 15b97cf43..c7cfd111e 100644 --- a/view/theme/diabook/diabook-pink/style-profile-wide.css +++ b/view/theme/diabook/diabook-pink/style-profile-wide.css @@ -1425,7 +1425,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css index 7d043dbb3..8d32cf028 100644 --- a/view/theme/diabook/diabook-pink/style-profile.css +++ b/view/theme/diabook/diabook-pink/style-profile.css @@ -1416,7 +1416,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 97f922d57..8442a8880 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -1679,7 +1679,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index fee5cca48..15b25d5cb 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -1677,7 +1677,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css index 56f3e59cc..b761465bc 100644 --- a/view/theme/diabook/diabook-red/style-network-wide.css +++ b/view/theme/diabook/diabook-red/style-network-wide.css @@ -1471,7 +1471,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css index 0be85ec8d..61fa69473 100644 --- a/view/theme/diabook/diabook-red/style-network.css +++ b/view/theme/diabook/diabook-red/style-network.css @@ -1463,7 +1463,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css index c699919be..1e4688b23 100644 --- a/view/theme/diabook/diabook-red/style-profile-wide.css +++ b/view/theme/diabook/diabook-red/style-profile-wide.css @@ -1429,7 +1429,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css index af3046448..45f27a311 100644 --- a/view/theme/diabook/diabook-red/style-profile.css +++ b/view/theme/diabook/diabook-red/style-profile.css @@ -1420,7 +1420,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index 9d262f09b..7a037694b 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -1687,7 +1687,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index 918169040..b45f5f593 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -1679,7 +1679,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 3bb3d25a8..29a89527c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ </nav> -<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div> +<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:$('html, body').animate({scrollTop:0}, 'slow'); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div> <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div> <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div> diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index af819b061..a31007f0a 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -1413,13 +1413,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 739a97b35..00c4d303a 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1404,13 +1404,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 21af162e8..30b5e6422 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -1388,13 +1388,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index a830e810e..9cd8386e3 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1380,13 +1380,13 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index ecc4c0709..19abf267d 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -1622,13 +1622,13 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 8ee8d24f6..edc87df98 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1620,13 +1620,13 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 17px 80px; + margin: 1px 5px 5px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { - height: 2.0em; + height: 1.6em; width: 100%; font-size: 10px; color: #999999; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a74e8c026..e8518a1c6 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -147,7 +147,6 @@ function diabook_community_info(){ } } - //right_aside FIND FRIENDS if(local_user()) { @@ -330,6 +329,7 @@ $a->page['htmlhead'] .= ' </script>'; + $a->page['htmlhead'] .= ' <script type="text/javascript"> @@ -480,7 +480,7 @@ function close_lastlikes(){ $a->page['htmlhead'] .= ' <script> -function insertFormatting(comment,BBcode,id) { +function insertFormatting(BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { @@ -508,4 +508,12 @@ function insertFormatting(comment,BBcode,id) { } return true; } + +function cmtBbOpen(id) { + $(".comment-edit-bb-" + id).show(); +} +function cmtBbClose(id) { + $(".comment-edit-bb-" + id).hide(); +} + </script> ';
\ No newline at end of file |