aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/diabook')
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/communityhome.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/contact_template.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/directory_item.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/fpostit/fpostit.js0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/group_side.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/attach.pngbin1069 -> 1069 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/audio.pngbin762 -> 762 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/camera.pngbin685 -> 685 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/close_box.pngbin206 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/contacts2.pngbin549 -> 549 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/drop.pngbin292 -> 292 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/expand.pngbin263 -> 263 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/file_as.pngbin352 -> 352 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/link.pngbin365 -> 365 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/lock.pngbin366 -> 366 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/lupe.pngbin697 -> 697 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/messages.pngbin488 -> 488 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/next.pngbin300 -> 300 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/notifications.pngbin714 -> 714 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/notify.pngbin534 -> 534 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/pencil.pngbin286 -> 286 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/prev.pngbin336 -> 336 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/recycle.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/remote.pngbin427 -> 427 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/scroll_top.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/selected.pngbin211 -> 211 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/star.pngbin388 -> 388 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/starred.pngbin501 -> 501 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/tagged.pngbin353 -> 353 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/unlock.pngbin362 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/unstarred.pngbin468 -> 468 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/video.pngbin472 -> 472 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/weblink.pngbin505 -> 505 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/jot.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/mail_conv.tpl0
-rw-r--r--view/theme/diabook/nav.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/photo_view.tpl0
-rw-r--r--view/theme/diabook/profile_vcard.tpl2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/rs_common_tabs.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/search_item.tpl0
-rw-r--r--view/theme/diabook/style-profile.css2
-rw-r--r--view/theme/diabook/style.css20
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/theme.php15
43 files changed, 30 insertions, 13 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5c2164b50..5c2164b50 100644..100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook/fpostit/fpostit.js
+++ b/view/theme/diabook/fpostit/fpostit.js
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook/icons/attach.png
+++ b/view/theme/diabook/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook/icons/audio.png
+++ b/view/theme/diabook/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook/icons/camera.png
+++ b/view/theme/diabook/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook/icons/close_box.png
+++ b/view/theme/diabook/icons/close_box.png
Binary files differ
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
index 7817279f4..7817279f4 100644..100755
--- a/view/theme/diabook/icons/contacts2.png
+++ b/view/theme/diabook/icons/contacts2.png
Binary files differ
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook/icons/drop.png
+++ b/view/theme/diabook/icons/drop.png
Binary files differ
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
index a46e88ea5..a46e88ea5 100644..100755
--- a/view/theme/diabook/icons/expand.png
+++ b/view/theme/diabook/icons/expand.png
Binary files differ
diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook/icons/file_as.png
+++ b/view/theme/diabook/icons/file_as.png
Binary files differ
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook/icons/link.png
+++ b/view/theme/diabook/icons/link.png
Binary files differ
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook/icons/lock.png
+++ b/view/theme/diabook/icons/lock.png
Binary files differ
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook/icons/lupe.png
+++ b/view/theme/diabook/icons/lupe.png
Binary files differ
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index 38e11ef88..38e11ef88 100644..100755
--- a/view/theme/diabook/icons/messages.png
+++ b/view/theme/diabook/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook/icons/next.png
+++ b/view/theme/diabook/icons/next.png
Binary files differ
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..270997740 100644..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/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..9b852d05b 100644..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/pencil.png b/view/theme/diabook/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook/icons/pencil.png
+++ b/view/theme/diabook/icons/pencil.png
Binary files differ
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook/icons/prev.png
+++ b/view/theme/diabook/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook/icons/recycle.png
+++ b/view/theme/diabook/icons/recycle.png
Binary files differ
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook/icons/remote.png
+++ b/view/theme/diabook/icons/remote.png
Binary files differ
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook/icons/scroll_top.png
+++ b/view/theme/diabook/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook/icons/selected.png
+++ b/view/theme/diabook/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
Binary files differ
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook/icons/starred.png
+++ b/view/theme/diabook/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook/icons/tagged.png
+++ b/view/theme/diabook/icons/tagged.png
Binary files differ
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook/icons/unlock.png
+++ b/view/theme/diabook/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook/icons/unstarred.png
+++ b/view/theme/diabook/icons/unstarred.png
Binary files differ
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook/icons/video.png
+++ b/view/theme/diabook/icons/video.png
Binary files differ
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook/icons/weblink.png
+++ b/view/theme/diabook/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index bd43994b5..bd43994b5 100644..100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook/mail_conv.tpl
+++ b/view/theme/diabook/mail_conv.tpl
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 78eb34197..522fb22b4 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -36,7 +36,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index e28ec2909..b982a2069 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -22,7 +22,7 @@
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ b/view/theme/diabook/rs_common_tabs.tpl
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 5ac152252..5edfc73a3 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2023,6 +2023,8 @@ ul.tabs li .active {
/* photo */
.photo {
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 5f60c0bff..90291d7b6 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -449,6 +449,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -2046,6 +2064,8 @@ height: 350px;
/* photo */
.photo {
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 50a7c6974..0c83a0567 100644..100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
/*
* 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.012)
+ * Version: (Version: 1.013)
* Author:
*/
@@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+
//js scripts
$a->page['htmlhead'] .= '
@@ -350,15 +351,9 @@ $a->page['htmlhead'] .= '
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
-
- $(document).ready(function (){
- $("iframe").each(function(){
- var url = $(this).attr("src");
- $(this).attr("src",url+"?wmode=transparent"); });
- });
-
+
</script>';
-
+
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '