aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/diabook-aerith/comment_item.tpl39
-rw-r--r--view/theme/diabook-aerith/icons/bb-image.pngbin0 -> 697 bytes
-rw-r--r--view/theme/diabook-aerith/icons/bb-video.pngbin0 -> 917 bytes
-rw-r--r--view/theme/diabook-aerith/icons/bold.pngbin0 -> 699 bytes
-rw-r--r--view/theme/diabook-aerith/icons/contacts.pngbin568 -> 803 bytes
-rw-r--r--view/theme/diabook-aerith/icons/contacts3.pngbin0 -> 568 bytes
-rw-r--r--view/theme/diabook-aerith/icons/italic.pngbin0 -> 577 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/messages.pngbin579 -> 901 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/messages3.pngbin0 -> 579 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/notifications.pngbin754 -> 1033 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/notifications3.pngbin0 -> 754 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/notify.pngbin795 -> 1100 bytes
-rwxr-xr-xview/theme/diabook-aerith/icons/notify3.pngbin0 -> 795 bytes
-rw-r--r--view/theme/diabook-aerith/icons/underline.pngbin0 -> 604 bytes
-rw-r--r--view/theme/diabook-aerith/oembed_video.tpl4
-rw-r--r--view/theme/diabook-aerith/style-network.css5
-rw-r--r--view/theme/diabook-aerith/style-profile.css5
-rw-r--r--view/theme/diabook-aerith/style.css29
-rwxr-xr-xview/theme/diabook-aerith/theme.php74
-rw-r--r--view/theme/diabook-blue/comment_item.tpl39
-rw-r--r--view/theme/diabook-blue/icons/bb-image.pngbin0 -> 697 bytes
-rw-r--r--view/theme/diabook-blue/icons/bb-video.pngbin0 -> 917 bytes
-rw-r--r--view/theme/diabook-blue/icons/bold.pngbin0 -> 699 bytes
-rw-r--r--view/theme/diabook-blue/icons/italic.pngbin0 -> 577 bytes
-rw-r--r--view/theme/diabook-blue/icons/underline.pngbin0 -> 604 bytes
-rw-r--r--view/theme/diabook-blue/oembed_video.tpl4
-rw-r--r--view/theme/diabook-blue/style-network.css5
-rw-r--r--view/theme/diabook-blue/style-profile.css5
-rw-r--r--view/theme/diabook-blue/style.css29
-rwxr-xr-xview/theme/diabook-blue/theme.php75
-rw-r--r--view/theme/diabook-red/comment_item.tpl39
-rw-r--r--view/theme/diabook-red/icons/bb-image.pngbin0 -> 697 bytes
-rw-r--r--view/theme/diabook-red/icons/bb-video.pngbin0 -> 917 bytes
-rw-r--r--view/theme/diabook-red/icons/bold.pngbin0 -> 699 bytes
-rw-r--r--view/theme/diabook-red/icons/italic.pngbin0 -> 577 bytes
-rw-r--r--view/theme/diabook-red/icons/underline.pngbin0 -> 604 bytes
-rw-r--r--view/theme/diabook-red/oembed_video.tpl4
-rw-r--r--view/theme/diabook-red/style-network.css5
-rw-r--r--view/theme/diabook-red/style-profile.css5
-rw-r--r--view/theme/diabook-red/style.css29
-rwxr-xr-xview/theme/diabook-red/theme.php75
-rw-r--r--view/theme/diabook/comment_item.tpl39
-rw-r--r--view/theme/diabook/icons/bb-image.pngbin0 -> 697 bytes
-rw-r--r--view/theme/diabook/icons/bb-video.pngbin0 -> 917 bytes
-rw-r--r--view/theme/diabook/icons/bold.pngbin0 -> 699 bytes
-rw-r--r--view/theme/diabook/icons/contacts.pngbin559 -> 773 bytes
-rw-r--r--view/theme/diabook/icons/contacts3.pngbin0 -> 559 bytes
-rw-r--r--view/theme/diabook/icons/italic.pngbin0 -> 577 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/diabook/icons/messages.pngbin488 -> 777 bytes
-rw-r--r--view/theme/diabook/icons/messages3.pngbin0 -> 488 bytes
-rwxr-xr-xview/theme/diabook/icons/notifications.pngbin714 -> 926 bytes
-rwxr-xr-xview/theme/diabook/icons/notifications3.pngbin0 -> 714 bytes
-rwxr-xr-xview/theme/diabook/icons/notify.pngbin534 -> 1001 bytes
-rwxr-xr-xview/theme/diabook/icons/notify3.pngbin0 -> 534 bytes
-rw-r--r--view/theme/diabook/icons/underline.pngbin0 -> 604 bytes
-rw-r--r--view/theme/diabook/oembed_video.tpl2
-rw-r--r--view/theme/diabook/style-network.css6
-rw-r--r--view/theme/diabook/style-profile.css6
-rw-r--r--view/theme/diabook/style-settings.css2
-rw-r--r--view/theme/diabook/style.css29
-rwxr-xr-xview/theme/diabook/theme.php59
61 files changed, 552 insertions, 61 deletions
diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook-aerith/comment_item.tpl
@@ -0,0 +1,39 @@
+ <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>
+ <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 italic" onclick="insertFormatting('i',$id);">i</a>
+ <a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ {{ 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/diabook-aerith/icons/bb-image.png b/view/theme/diabook-aerith/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/bb-image.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/bb-video.png b/view/theme/diabook-aerith/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/bb-video.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/bold.png b/view/theme/diabook-aerith/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/bold.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png
index cd0e289a7..79f6d497c 100644
--- a/view/theme/diabook-aerith/icons/contacts.png
+++ b/view/theme/diabook-aerith/icons/contacts.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/contacts3.png b/view/theme/diabook-aerith/icons/contacts3.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/contacts3.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/italic.png b/view/theme/diabook-aerith/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/italic.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d..c83ba186a 100755
--- a/view/theme/diabook-aerith/icons/messages.png
+++ b/view/theme/diabook-aerith/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png
new file mode 100755
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/messages3.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818..2bcd74927 100755
--- a/view/theme/diabook-aerith/icons/notifications.png
+++ b/view/theme/diabook-aerith/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png
new file mode 100755
index 000000000..2b4fbb818
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notifications3.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53..159cd2c59 100755
--- a/view/theme/diabook-aerith/icons/notify.png
+++ b/view/theme/diabook-aerith/icons/notify.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png
new file mode 100755
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notify3.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/underline.png b/view/theme/diabook-aerith/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/underline.png
Binary files differ
diff --git a/view/theme/diabook-aerith/oembed_video.tpl b/view/theme/diabook-aerith/oembed_video.tpl
new file mode 100644
index 000000000..d6d29f724
--- /dev/null
+++ b/view/theme/diabook-aerith/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+ <img width='$tw' height='$th' src='$turl' >
+ <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 3b461e6db..385b58ac4 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #3465A4;
@@ -1447,7 +1448,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;
}
@@ -2173,7 +2174,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 73f46e9ee..078b6d01f 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #3465A4;
@@ -1439,7 +1440,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;
@@ -2162,7 +2163,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index f82652154..2089090f1 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/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-aerith/icons/bold.png");
+ float: right;
+ margin-top: 2px;}
+.icon.underline{
+ background-image: url("../../../view/theme/diabook-aerith/icons/underline.png");
+ float: right;
+ margin-top: 2px;}
+.icon.italic{
+ background-image: url("../../../view/theme/diabook-aerith/icons/italic.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-image{
+ background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-video{
+ background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png");
+ float: right;
+ margin-top: 2px;}
+
.icon.contacts {
background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
.icon.notifications {
@@ -1276,7 +1296,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
- max-width: 575px;
+ max-width: 775px;
}
.qcomment{
max-width: 122px;
@@ -1331,6 +1351,7 @@ body .pageheader{
padding: 5px;
margin-bottom: 0px;
width: 775px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #3465A4;
@@ -1592,7 +1613,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;
@@ -2324,7 +2345,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index a1ea51e82..1b26e47f8 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : 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.016)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.014)";
+$diabook_version = "Diabook-aerith (Version: 1.016)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
</script>';
+$a->page['htmlhead'] .= '
+ <script>
+
+$(document).ready(function() {
+ $("iframe").each(function(){
+ var ifr_source = $(this).attr("src");
+ var wmode = "wmode=transparent";
+ if(ifr_source.indexOf("?") != -1) {
+ var getQString = ifr_source.split("?");
+ var oldString = getQString[1];
+ var newString = getQString[0];
+ $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+ }
+ else $(this).attr("src",ifr_source+"?"+wmode);
+ });
+
+
+});
+
+function yt_iframe() {
+
+ $("iframe").load(function() {
+ var ifr_src = $(this).contents().find("body iframe").attr("src");
+ $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+ });
+
+ };
+
+ </script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
@@ -374,7 +403,12 @@ $a->page['htmlhead'] .= '
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
+</script>';
+
+ if($ccCookie != "8") {
+$a->page['htmlhead'] .= '
+<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@@ -458,9 +492,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
-
-
+</script>';}
+$a->page['htmlhead'] .= '
+<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@@ -471,5 +506,32 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
- };
-</script>';} \ No newline at end of file
+ }
+</script>';}
+
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == "Kommentar") {
+ tmpStr = "";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#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();
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+</script> '; \ No newline at end of file
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -0,0 +1,39 @@
+ <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>
+ <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 italic" onclick="insertFormatting('i',$id);">i</a>
+ <a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ {{ 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/diabook-blue/icons/bb-image.png b/view/theme/diabook-blue/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook-blue/icons/bb-image.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/bb-video.png b/view/theme/diabook-blue/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/bb-video.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/bold.png b/view/theme/diabook-blue/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/bold.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/italic.png b/view/theme/diabook-blue/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook-blue/icons/italic.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/underline.png b/view/theme/diabook-blue/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook-blue/icons/underline.png
Binary files differ
diff --git a/view/theme/diabook-blue/oembed_video.tpl b/view/theme/diabook-blue/oembed_video.tpl
new file mode 100644
index 000000000..d6d29f724
--- /dev/null
+++ b/view/theme/diabook-blue/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+ <img width='$tw' height='$th' src='$turl' >
+ <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index bd1cb249c..b37d82968 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #1872A2;
@@ -1409,7 +1410,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;
}
@@ -2134,7 +2135,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index da826d74c..ae7fa8d14 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #1872A2;
@@ -1406,7 +1407,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;
@@ -2129,7 +2130,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index ebf684708..2f2369c46 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/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-blue/icons/bold.png");
+ float: right;
+ margin-top: 2px;}
+.icon.underline{
+ background-image: url("../../../view/theme/diabook-blue/icons/underline.png");
+ float: right;
+ margin-top: 2px;}
+.icon.italic{
+ background-image: url("../../../view/theme/diabook-blue/icons/italic.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-image{
+ background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-video{
+ background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png");
+ float: right;
+ margin-top: 2px;}
+
.icon.contacts {
background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
.icon.notifications {
@@ -1236,7 +1256,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
- max-width: 575px;
+ max-width: 775px;
}
.qcomment{
max-width: 122px;
@@ -1287,6 +1307,7 @@ body .pageheader{
padding: 5px;
margin-bottom: 0px;
width: 775px;
+ padding-top: 10px;
}
.tread-wrapper a{
color: #1872A2;
@@ -1550,7 +1571,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;
@@ -2281,7 +2302,7 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
+
font-weight: bold;
}
.aprofile dt{
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index a8b4fcd6c..f63f15fd9 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: 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.016)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.014)";
+$diabook_version = "Diabook-blue (Version: 1.016)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
</script>';
+$a->page['htmlhead'] .= '
+ <script>
+
+$(document).ready(function() {
+ $("iframe").each(function(){
+ var ifr_source = $(this).attr("src");
+ var wmode = "wmode=transparent";
+ if(ifr_source.indexOf("?") != -1) {
+ var getQString = ifr_source.split("?");
+ var oldString = getQString[1];
+ var newString = getQString[0];
+ $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+ }
+ else $(this).attr("src",ifr_source+"?"+wmode);
+ });
+
+
+});
+
+function yt_iframe() {
+
+ $("iframe").load(function() {
+ var ifr_src = $(this).contents().find("body iframe").attr("src");
+ $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+ });
+
+ };
+
+ </script>';
+
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
-$(function() {
+ $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
+</script>';
+
+ if($ccCookie != "8") {
+$a->page['htmlhead'] .= '
+<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@@ -458,9 +493,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
-
-
+</script>';}
+$a->page['htmlhead'] .= '
+<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@@ -471,5 +507,32 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
- };
+ }
</script>';}
+
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == "Kommentar") {
+ tmpStr = "";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#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();
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+</script> ';
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 @@
+ <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>
+ <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 italic" onclick="insertFormatting('i',$id);">i</a>
+ <a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ {{ 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/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook-red/icons/bb-image.png
Binary files 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
--- /dev/null
+++ b/view/theme/diabook-red/icons/bb-video.png
Binary files 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
--- /dev/null
+++ b/view/theme/diabook-red/icons/bold.png
Binary files 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
--- /dev/null
+++ b/view/theme/diabook-red/icons/italic.png
Binary files 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
--- /dev/null
+++ b/view/theme/diabook-red/icons/underline.png
Binary files differ
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 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+ <img width='$tw' height='$th' src='$turl' >
+ <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index efbec090a..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;
}
@@ -2171,7 +2172,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..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;
@@ -2143,7 +2144,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..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 {
@@ -1266,7 +1286,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
- max-width: 575px;
+ max-width: 775px;
}
.qcomment{
max-width: 122px;
@@ -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;
@@ -2310,7 +2331,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..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.014)
+ * Version: (Version: 1.016)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.014)";
+$diabook_version = "Diabook-red (Version: 1.016)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
</script>';
+$a->page['htmlhead'] .= '
+ <script>
+
+$(document).ready(function() {
+ $("iframe").each(function(){
+ var ifr_source = $(this).attr("src");
+ var wmode = "wmode=transparent";
+ if(ifr_source.indexOf("?") != -1) {
+ var getQString = ifr_source.split("?");
+ var oldString = getQString[1];
+ var newString = getQString[0];
+ $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+ }
+ else $(this).attr("src",ifr_source+"?"+wmode);
+ });
+
+
+});
+
+function yt_iframe() {
+
+ $("iframe").load(function() {
+ var ifr_src = $(this).contents().find("body iframe").attr("src");
+ $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+ });
+
+ };
+
+ </script>';
+
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
-$(function() {
+ $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
+</script>';
+
+ if($ccCookie != "8") {
+$a->page['htmlhead'] .= '
+<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@@ -459,9 +494,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
-
-
+</script>';}
+$a->page['htmlhead'] .= '
+<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@@ -472,5 +508,32 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
- };
+ }
</script>';}
+
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == "Kommentar") {
+ tmpStr = "";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#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();
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+</script> '; \ No newline at end of file
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
new file mode 100644
index 000000000..4668b9ce3
--- /dev/null
+++ b/view/theme/diabook/comment_item.tpl
@@ -0,0 +1,39 @@
+ <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>
+ <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 italic" onclick="insertFormatting('i',$id);">i</a>
+ <a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ {{ 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/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/icons/bb-image.png
Binary files differ
diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/icons/bb-video.png
Binary files differ
diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/icons/bold.png
Binary files differ
diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index 8a3e69ec1..1fb6d695b 100644
--- a/view/theme/diabook/icons/contacts.png
+++ b/view/theme/diabook/icons/contacts.png
Binary files differ
diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png
new file mode 100644
index 000000000..8a3e69ec1
--- /dev/null
+++ b/view/theme/diabook/icons/contacts3.png
Binary files differ
diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/icons/italic.png
Binary files differ
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index 38e11ef88..ab7b0f491 100755..100644
--- a/view/theme/diabook/icons/messages.png
+++ b/view/theme/diabook/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
new file mode 100644
index 000000000..4f3ce3693
--- /dev/null
+++ b/view/theme/diabook/icons/messages3.png
Binary files differ
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..347f1519e 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
new file mode 100755
index 000000000..2c9c791c0
--- /dev/null
+++ b/view/theme/diabook/icons/notifications3.png
Binary files differ
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..355abb1eb 100755
--- a/view/theme/diabook/icons/notify.png
+++ b/view/theme/diabook/icons/notify.png
Binary files differ
diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
new file mode 100755
index 000000000..9b852d05b
--- /dev/null
+++ b/view/theme/diabook/icons/notify3.png
Binary files differ
diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/icons/underline.png
Binary files differ
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
index 026007271..d6d29f724 100644
--- a/view/theme/diabook/oembed_video.tpl
+++ b/view/theme/diabook/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index af6e4027a..ed7c76cbe 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.wall-item-decor {
position: absolute;
@@ -1385,7 +1386,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;
@@ -2103,7 +2104,6 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
font-weight: bold;
}
.aprofile dt{
@@ -2549,4 +2549,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-}
+} \ No newline at end of file
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 6b05903d3..51eb61253 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out;
padding: 5px;
margin-bottom: 0px;
width: 575px;
+ padding-top: 10px;
}
.wall-item-decor {
position: absolute;
@@ -1379,7 +1380,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;
@@ -2100,7 +2101,6 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
font-weight: bold;
}
.aprofile dt{
@@ -2546,4 +2546,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-}
+} \ No newline at end of file
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
index 60e2f336b..fdb4f24c7 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-settings.css
@@ -2526,4 +2526,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-}
+} \ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index e99aa5644..229076484 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -83,6 +83,27 @@
#adminpage .selectall { text-align: right; }
/* icons */
+.icon.bold{
+ background-image: url("../../../view/theme/diabook/icons/bold.png");
+ float: right;
+ margin-top: 2px;}
+.icon.underline{
+ background-image: url("../../../view/theme/diabook/icons/underline.png");
+ float: right;
+ margin-top: 2px;}
+.icon.italic{
+ background-image: url("../../../view/theme/diabook/icons/italic.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-image{
+ background-image: url("../../../view/theme/diabook/icons/bb-image.png");
+ float: right;
+ margin-top: 2px;}
+.icon.bb-video{
+ background-image: url("../../../view/theme/diabook/icons/bb-video.png");
+ float: right;
+ margin-top: 2px;}
+
.icon.contacts {
background-image: url("../../../view/theme/diabook/icons/contacts.png");}
.icon.notifications {
@@ -1219,7 +1240,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
- max-width: 575px;
+ max-width: 775px;
}
.qcomment{
max-width: 122px;
@@ -1269,6 +1290,7 @@ body .pageheader{
padding: 5px;
margin-bottom: 0px;
width: 775px;
+ padding-top: 10px;
}
.wall-item-decor {
@@ -1516,7 +1538,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;
@@ -2246,7 +2268,6 @@ blockquote {
color: #777;
}
.oembed {
- font-size: large;
font-weight: bold;
}
.aprofile dt{
@@ -2687,4 +2708,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-}
+} \ No newline at end of file
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index fbe42a304..bf31c08eb 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: 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.016)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.014)";
+$diabook_version = "Diabook (Version: 1.016)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
</script>';
+
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
- $(".embed_yt iframe").each(function(){
+ $("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
@@ -391,7 +392,18 @@ $(document).ready(function() {
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
+
+
});
+
+function yt_iframe() {
+
+ $("iframe").load(function() {
+ var ifr_src = $(this).contents().find("body iframe").attr("src");
+ $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+ });
+
+ };
</script>';
@@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
+</script>';
+
+ if($ccCookie != "8") {
+$a->page['htmlhead'] .= '
+<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@@ -487,9 +504,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
-
-
+</script>';}
+$a->page['htmlhead'] .= '
+<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@@ -500,5 +518,32 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
- };
-</script>';} \ No newline at end of file
+ }
+</script>';}
+
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == "Kommentar") {
+ tmpStr = "";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#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();
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+</script> '; \ No newline at end of file