From f980b79edcff78a849d65de15f36f2b0475665d7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 6 Apr 2012 11:19:12 +0200 Subject: new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... --- view/theme/diabook/communityhome.tpl | 0 view/theme/diabook/contact_template.tpl | 0 view/theme/diabook/directory_item.tpl | 0 view/theme/diabook/fpostit/fpostit.js | 0 view/theme/diabook/group_side.tpl | 0 view/theme/diabook/icons/attach.png | Bin view/theme/diabook/icons/audio.png | Bin view/theme/diabook/icons/camera.png | Bin view/theme/diabook/icons/close_box.png | Bin view/theme/diabook/icons/contacts2.png | Bin view/theme/diabook/icons/drop.png | Bin view/theme/diabook/icons/expand.png | Bin view/theme/diabook/icons/file_as.png | Bin view/theme/diabook/icons/link.png | Bin view/theme/diabook/icons/lock.png | Bin view/theme/diabook/icons/lupe.png | Bin view/theme/diabook/icons/messages.png | Bin view/theme/diabook/icons/next.png | Bin view/theme/diabook/icons/notifications.png | Bin view/theme/diabook/icons/notify.png | Bin view/theme/diabook/icons/pencil.png | Bin view/theme/diabook/icons/prev.png | Bin view/theme/diabook/icons/recycle.png | Bin view/theme/diabook/icons/remote.png | Bin view/theme/diabook/icons/scroll_top.png | Bin view/theme/diabook/icons/selected.png | Bin view/theme/diabook/icons/star.png | Bin view/theme/diabook/icons/starred.png | Bin view/theme/diabook/icons/tagged.png | Bin view/theme/diabook/icons/unlock.png | Bin view/theme/diabook/icons/unstarred.png | Bin view/theme/diabook/icons/video.png | Bin view/theme/diabook/icons/weblink.png | Bin view/theme/diabook/jot.tpl | 0 view/theme/diabook/mail_conv.tpl | 0 view/theme/diabook/nav.tpl | 4 ++-- view/theme/diabook/photo_view.tpl | 0 view/theme/diabook/profile_vcard.tpl | 2 +- view/theme/diabook/rs_common_tabs.tpl | 0 view/theme/diabook/search_item.tpl | 0 view/theme/diabook/style-profile.css | 2 ++ view/theme/diabook/style.css | 20 ++++++++++++++++++++ view/theme/diabook/theme.php | 15 +++++---------- 43 files changed, 30 insertions(+), 13 deletions(-) mode change 100644 => 100755 view/theme/diabook/communityhome.tpl mode change 100644 => 100755 view/theme/diabook/contact_template.tpl mode change 100644 => 100755 view/theme/diabook/directory_item.tpl mode change 100644 => 100755 view/theme/diabook/fpostit/fpostit.js mode change 100644 => 100755 view/theme/diabook/group_side.tpl mode change 100644 => 100755 view/theme/diabook/icons/attach.png mode change 100644 => 100755 view/theme/diabook/icons/audio.png mode change 100644 => 100755 view/theme/diabook/icons/camera.png mode change 100644 => 100755 view/theme/diabook/icons/close_box.png mode change 100644 => 100755 view/theme/diabook/icons/contacts2.png mode change 100644 => 100755 view/theme/diabook/icons/drop.png mode change 100644 => 100755 view/theme/diabook/icons/expand.png mode change 100644 => 100755 view/theme/diabook/icons/file_as.png mode change 100644 => 100755 view/theme/diabook/icons/link.png mode change 100644 => 100755 view/theme/diabook/icons/lock.png mode change 100644 => 100755 view/theme/diabook/icons/lupe.png mode change 100644 => 100755 view/theme/diabook/icons/messages.png mode change 100644 => 100755 view/theme/diabook/icons/next.png mode change 100644 => 100755 view/theme/diabook/icons/notifications.png mode change 100644 => 100755 view/theme/diabook/icons/notify.png mode change 100644 => 100755 view/theme/diabook/icons/pencil.png mode change 100644 => 100755 view/theme/diabook/icons/prev.png mode change 100644 => 100755 view/theme/diabook/icons/recycle.png mode change 100644 => 100755 view/theme/diabook/icons/remote.png mode change 100644 => 100755 view/theme/diabook/icons/scroll_top.png mode change 100644 => 100755 view/theme/diabook/icons/selected.png mode change 100644 => 100755 view/theme/diabook/icons/star.png mode change 100644 => 100755 view/theme/diabook/icons/starred.png mode change 100644 => 100755 view/theme/diabook/icons/tagged.png mode change 100644 => 100755 view/theme/diabook/icons/unlock.png mode change 100644 => 100755 view/theme/diabook/icons/unstarred.png mode change 100644 => 100755 view/theme/diabook/icons/video.png mode change 100644 => 100755 view/theme/diabook/icons/weblink.png mode change 100644 => 100755 view/theme/diabook/jot.tpl mode change 100644 => 100755 view/theme/diabook/mail_conv.tpl mode change 100644 => 100755 view/theme/diabook/photo_view.tpl mode change 100644 => 100755 view/theme/diabook/rs_common_tabs.tpl mode change 100644 => 100755 view/theme/diabook/search_item.tpl mode change 100644 => 100755 view/theme/diabook/theme.php (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl old mode 100644 new mode 100755 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 @@ $nav.contacts.1 @@ -36,7 +36,7 @@ diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl old mode 100644 new mode 100755 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 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 50a7c6974..0c83a0567 --- 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('', $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('', $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"); }); - }); - + '; - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' -- cgit v1.2.3