From 1a9bbac0bede3daf3bca9260397e1ad2214be1f7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 28 Mar 2012 20:45:39 +0200 Subject: bugfix in diabook --- view/theme/diabook/theme.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a3f0ca0d4..076223a48 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -243,17 +243,18 @@ if ($a->argv[0] === "network" && local_user()){ //right_aside at profile pages -if ($a->argv[0] === "profile"){ +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ if($ccCookie != "8") { // COMMUNITY diabook_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css"; + + } } - // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); -- cgit v1.2.3 From aa26517cdcb70fd110372cf35fdefdd3357059e6 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 28 Mar 2012 23:07:34 +0200 Subject: add a searchbox to "find friends" for global search --- view/theme/diabook/communityhome.tpl | 7 +++--- view/theme/diabook/icons/srch_bg.gif | Bin 0 -> 65 bytes view/theme/diabook/icons/srch_l.gif | Bin 0 -> 303 bytes view/theme/diabook/icons/srch_r.gif | Bin 0 -> 227 bytes view/theme/diabook/icons/srch_r_f2.gif | Bin 0 -> 278 bytes view/theme/diabook/style-network.css | 39 ++++++++++++++++++++++++++++----- view/theme/diabook/style-profile.css | 26 ++++++++++++++++++++++ view/theme/diabook/theme.php | 7 ++++++ 8 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 view/theme/diabook/icons/srch_bg.gif create mode 100644 view/theme/diabook/icons/srch_l.gif create mode 100644 view/theme/diabook/icons/srch_r.gif create mode 100644 view/theme/diabook/icons/srch_r_f2.gif (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index a14705ed7..3e840abc4 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -30,13 +30,14 @@ {{ endif }} -
+
{{ if $nv }}

Find Friends

$nv.directory.1
$nv.match.1
-$nv.suggest.1 -$nv.invite.1 +$nv.suggest.1
+$nv.invite.1 +$nv.search {{ endif }}
diff --git a/view/theme/diabook/icons/srch_bg.gif b/view/theme/diabook/icons/srch_bg.gif new file mode 100644 index 000000000..6a523ba8f Binary files /dev/null and b/view/theme/diabook/icons/srch_bg.gif differ diff --git a/view/theme/diabook/icons/srch_l.gif b/view/theme/diabook/icons/srch_l.gif new file mode 100644 index 000000000..6d95bf35d Binary files /dev/null and b/view/theme/diabook/icons/srch_l.gif differ diff --git a/view/theme/diabook/icons/srch_r.gif b/view/theme/diabook/icons/srch_r.gif new file mode 100644 index 000000000..89833a316 Binary files /dev/null and b/view/theme/diabook/icons/srch_r.gif differ diff --git a/view/theme/diabook/icons/srch_r_f2.gif b/view/theme/diabook/icons/srch_r_f2.gif new file mode 100644 index 000000000..6df457bed Binary files /dev/null and b/view/theme/diabook/icons/srch_r_f2.gif differ diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 3882e37bd..74ab3c233 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1095,6 +1095,32 @@ aside #side-peoplefind-url { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; } /* widget: search */ +span.sbox_l { + background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} + +span.sbox_r { + background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} + +span.sbox input { + background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} #add-search-popup { width: 200px; top: 18px; @@ -1725,12 +1751,13 @@ transition: all 0.2s ease-in-out; margin-left: 5px; } /*input[type="submit"] { - border: 0px; - background-color: @ButtonBackgroundColor; - color: @ButtonColor; - padding: 0px 10px; - .rounded(5px); - height: 18px; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; }*/ /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 249596f9f..9bd67da8d 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1090,6 +1090,32 @@ aside #side-peoplefind-url { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; } /* widget: search */ +span.sbox_l { + background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} + +span.sbox_r { + background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} + +span.sbox input { + background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} #add-search-popup { width: 200px; top: 18px; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 076223a48..5d6173918 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -147,6 +147,13 @@ function diabook_community_info(){ $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + $nv['search'] = '
+ + + + + '; + $aside['$nv'] = $nv; }; -- cgit v1.2.3 From 339c8a4b56f3f9d9b1557fbb393821602f62cc54 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 29 Mar 2012 11:02:59 +0200 Subject: css fixes in diabook-derivates --- view/theme/diabook/communityhome.tpl | 4 ++-- view/theme/diabook/nav.tpl | 12 +++++------- view/theme/diabook/style-network.css | 8 ++++++++ view/theme/diabook/style-profile.css | 8 ++++++++ view/theme/diabook/style.css | 4 ++++ view/theme/diabook/theme.php | 3 +-- 6 files changed, 28 insertions(+), 11 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 3e840abc4..72e27e4e5 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -7,10 +7,10 @@
{{ if $lastusers_title }}

Help or @NewHere ?

+NewHere
Friendica Support
Let's talk
-Local Friendica
-NewHere +Local Friendica {{ endif }}
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 9acf1032c..99d69ab38 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -66,14 +66,12 @@
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index d595fd7da..f4dee582b 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -527,7 +527,8 @@ header { box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); } header #site-location { - display: none; +position: absolute; +top: 30px; } header #banner { overflow: hidden; -- cgit v1.2.3 From 0b4165493558a7084dab057c1c2784c7b4872332 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 31 Mar 2012 11:09:57 +0200 Subject: bug-fixes in diabook-derivates --- view/theme/diabook/jot.tpl | 12 ++++++------ view/theme/diabook/style-network.css | 1 + view/theme/diabook/style-profile.css | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 387eb1f91..9aef99787 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -21,23 +21,23 @@
-
+
-
+
-