From 7d018f651d5f5b21a650d81ab5ea16a224585da6 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 9 Apr 2012 00:02:48 +0200 Subject: fixed z-index of youtube-vids fixed bug to hide right_side --- view/theme/diabook-red/oembed_video.tpl | 4 +++ view/theme/diabook-red/style-network.css | 2 +- view/theme/diabook-red/style-profile.css | 2 +- view/theme/diabook-red/style.css | 4 +-- view/theme/diabook-red/theme.php | 50 +++++++++++++++++++++++++++----- 5 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 view/theme/diabook-red/oembed_video.tpl (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/oembed_video.tpl b/view/theme/diabook-red/oembed_video.tpl new file mode 100644 index 000000000..d6d29f724 --- /dev/null +++ b/view/theme/diabook-red/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index efbec090a..8d5e3fec9 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2171,7 +2171,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index ef6fd8601..570057b47 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2143,7 +2143,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index ef06ef5ca..883f11374 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1266,7 +1266,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -2310,7 +2310,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index fae26ae70..85206baec 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.014) + * Version: (Version: 1.015) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.014)"; +$diabook_version = "Diabook-red (Version: 1.015)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -367,15 +367,50 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + '; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' '; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} + } +';} \ No newline at end of file -- cgit v1.2.3 From 0d4fab4ee3cba6db669d6b7e608bfbbba8e8d3dc Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 10 Apr 2012 00:55:39 +0200 Subject: bbcode toolbar attached to the comment text field minor css-fixes --- view/theme/diabook-red/comment_item.tpl | 39 +++++++++++++++++++++++++++++ view/theme/diabook-red/icons/bb-image.png | Bin 0 -> 697 bytes view/theme/diabook-red/icons/bb-video.png | Bin 0 -> 917 bytes view/theme/diabook-red/icons/bold.png | Bin 0 -> 699 bytes view/theme/diabook-red/icons/italic.png | Bin 0 -> 577 bytes view/theme/diabook-red/icons/underline.png | Bin 0 -> 604 bytes view/theme/diabook-red/style-network.css | 3 ++- view/theme/diabook-red/style-profile.css | 3 ++- view/theme/diabook-red/style.css | 25 ++++++++++++++++-- view/theme/diabook-red/theme.php | 33 +++++++++++++++++++++--- 10 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 view/theme/diabook-red/comment_item.tpl create mode 100644 view/theme/diabook-red/icons/bb-image.png create mode 100644 view/theme/diabook-red/icons/bb-video.png create mode 100644 view/theme/diabook-red/icons/bold.png create mode 100644 view/theme/diabook-red/icons/italic.png create mode 100644 view/theme/diabook-red/icons/underline.png (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl new file mode 100644 index 000000000..4668b9ce3 --- /dev/null +++ b/view/theme/diabook-red/comment_item.tpl @@ -0,0 +1,39 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + video + img + i + u + b + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png new file mode 100644 index 000000000..9a1b32113 Binary files /dev/null and b/view/theme/diabook-red/icons/bb-image.png differ diff --git a/view/theme/diabook-red/icons/bb-video.png b/view/theme/diabook-red/icons/bb-video.png new file mode 100644 index 000000000..bd323531e Binary files /dev/null and b/view/theme/diabook-red/icons/bb-video.png differ diff --git a/view/theme/diabook-red/icons/bold.png b/view/theme/diabook-red/icons/bold.png new file mode 100644 index 000000000..8fab2a10f Binary files /dev/null and b/view/theme/diabook-red/icons/bold.png differ diff --git a/view/theme/diabook-red/icons/italic.png b/view/theme/diabook-red/icons/italic.png new file mode 100644 index 000000000..bf4b2b81d Binary files /dev/null and b/view/theme/diabook-red/icons/italic.png differ diff --git a/view/theme/diabook-red/icons/underline.png b/view/theme/diabook-red/icons/underline.png new file mode 100644 index 000000000..b1b4d3574 Binary files /dev/null and b/view/theme/diabook-red/icons/underline.png differ diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 8d5e3fec9..8be39e374 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1444,7 +1445,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 570057b47..242c08c68 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 883f11374..0cf034a56 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -82,7 +82,27 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bold{ + background-image: url("../../../view/theme/diabook-red/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-red/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-red/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-red/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-red/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-red/icons/contacts.png");} .icon.notifications { @@ -1317,6 +1337,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1579,7 +1600,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 85206baec..aec3ab95d 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.015) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.015)"; +$diabook_version = "Diabook-red (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -509,4 +509,31 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -';} \ No newline at end of file +';} + +$a->page['htmlhead'] .= ' + + '; \ No newline at end of file -- cgit v1.2.3 From b3f18945ba3c9596295deccd00789813d7702410 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 10 Apr 2012 14:38:59 +0200 Subject: diabook-themes: added url and quote to bbcode toolbar under comment box --- view/theme/diabook-red/comment_item.tpl | 4 +++- view/theme/diabook-red/icons/bb-url.png | Bin 0 -> 939 bytes view/theme/diabook-red/icons/quote.png | Bin 0 -> 631 bytes view/theme/diabook-red/style.css | 8 ++++++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 view/theme/diabook-red/icons/bb-url.png create mode 100644 view/theme/diabook-red/icons/quote.png (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 4668b9ce3..64e4fb802 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -13,7 +13,9 @@
video - img + img + url + quote i u b diff --git a/view/theme/diabook-red/icons/bb-url.png b/view/theme/diabook-red/icons/bb-url.png new file mode 100644 index 000000000..071fc1865 Binary files /dev/null and b/view/theme/diabook-red/icons/bb-url.png differ diff --git a/view/theme/diabook-red/icons/quote.png b/view/theme/diabook-red/icons/quote.png new file mode 100644 index 000000000..a464f2859 Binary files /dev/null and b/view/theme/diabook-red/icons/quote.png differ diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 0cf034a56..0acc12dd3 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -82,6 +82,14 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-red/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-red/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ background-image: url("../../../view/theme/diabook-red/icons/bold.png"); float: right; -- cgit v1.2.3 From 6db33fc5138e55f5ae95fe7b24b3e93f8e20408c Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 10 Apr 2012 15:13:34 +0200 Subject: diabook-themes: smal fix in bbcode-js --- view/theme/diabook-red/theme.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index aec3ab95d..d1b932f1c 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -523,15 +523,21 @@ function insertFormatting(BBcode,id) { $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } - + textarea = document.getElementById("comment-edit-text-" +id); if (document.selection) { textarea.focus(); selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; -- cgit v1.2.3 From a1d5026abf129fc520327881a293d17c1ab21eff Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 11 Apr 2012 18:49:07 +0200 Subject: diabook-themes: small fix --- view/theme/diabook-red/comment_item.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view/theme/diabook-red') 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 @@
video - img + img url - quote - i u + i b + quote {{ if $qcomment }}