From 1a9bbac0bede3daf3bca9260397e1ad2214be1f7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 28 Mar 2012 20:45:39 +0200 Subject: [PATCH 1/2] bugfix in diabook --- view/theme/diabook-blue/communityhome.tpl | 14 +++++++------- view/theme/diabook-blue/style-network.css | 14 +++++++++++++- view/theme/diabook-blue/style-profile.css | 12 ++++++++++++ view/theme/diabook-blue/theme.php | 6 +++--- view/theme/diabook/theme.php | 5 +++-- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 1e3da21993..fa8197dd45 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -6,7 +6,7 @@
{{ if $lastusers_title }} -

Help or @NewHere ?

+

Help or @NewHere ?

Friendica Support
Let's talk
Local Friendica @@ -16,7 +16,7 @@
{{ if $lastusers_title }} -

Connectable Services

+

Connectable Services

Facebook StatusNet @@ -32,7 +32,7 @@
{{ if $nv }} -

Find Friends

+

Find Friends

$nv.directory.1
$nv.match.1
$nv.suggest.1 @@ -42,14 +42,14 @@
{{ if $lastusers_title }} -

PostIt to Friendica

+

PostIt to Friendica

Post to Friendica from anywhere by bookmarking the Link.
{{ endif }}
{{ if $lastusers_title }} -

$lastusers_title

+

$lastusers_title

{{ for $lastusers_items as $i }} $i @@ -70,7 +70,7 @@
{{ if $photos_title }} -

$photos_title

+

$photos_title

{{ for $photos_items as $i }} $i @@ -81,7 +81,7 @@
{{ if $like_title }} -

$like_title

+

$like_title

    {{ for $like_items as $i }}
  • $i
    • diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index ebf4da695a..fc4e4c60ce 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1197,6 +1197,18 @@ right_aside .icon {width: 10px; height: 10px;} background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); float: right; cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; } /* wall item */ @@ -1279,7 +1291,7 @@ right_aside .icon {width: 10px; height: 10px;} } .wall-item-container .wall-item-content img { - max-width: 400px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index db172dcdaa..b3a578680a 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1196,6 +1196,18 @@ right_aside .icon {width: 10px; height: 10px;} background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); float: right; cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; } /* wall item */ .tread-wrapper { diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3e35144de6..de3042dbf6 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -150,7 +150,7 @@ function diabook_blue_community_info(){ if(local_user()) { $page = '
    -

    '.t("Community Pages").'

    +

    '.t("Community Pages").'

      '; $pagelist = array(); @@ -212,7 +212,7 @@ if ($a->argv[0] === "network" && local_user()){ $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", ""); + $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); $tpl = get_markup_template('profile_side.tpl'); @@ -237,7 +237,7 @@ 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_blue_community_info(); diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a3f0ca0d4b..076223a48c 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); From aa26517cdcb70fd110372cf35fdefdd3357059e6 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 28 Mar 2012 23:07:34 +0200 Subject: [PATCH 2/2] 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 diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index a14705ed76..3e840abc48 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 0000000000000000000000000000000000000000..6a523ba8fcf1400053a9725a5e6d6c5c6976ee21 GIT binary patch literal 65 zcmZ?wbhEHbWMmL#Sj50kUS9tH|Nk2|Zk#!D=HthYKsEyyDE?$&6=7gy&;jv4Y8jZ> NIGiv33s7OO1^`K570Uns literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/srch_l.gif b/view/theme/diabook/icons/srch_l.gif new file mode 100644 index 0000000000000000000000000000000000000000..6d95bf35d9a2681b02edff0614d715f1e77e6944 GIT binary patch literal 303 zcmZ?wbhEHb6lM@+IKse?mX`MY`}b?tt}S1_yt=yj=+UE3pFZvE>?|!U-MV$_`}gnv z|NlR8=FEHd?wvVvrnR+o&z?PN*RBPM0L2-I0E$0ZSVe$V>44ON>||hF^FXP~_mGXp zs&$Je%J{H|mgG)m4(4ck^xxsAlVIlurV|r`I3+nm7>{xncyLVTRljn8p<-{(>lF-! zEMlAom@hThFm$Fm6~xIf2&`aoiglAJjZ0Hviz`)PZsyKsP0lJ}Qx*(iWn?X9PA_Hc z;*E`uV@cv>Dp6wO70l;nW?@*Q%a;_$wv~-{-3BG525;pREG!e1xZL+G=iRG(wCi~L U{*$)nk9%=#UwY%_Qbh)90GP#U5&!@I literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/srch_r.gif b/view/theme/diabook/icons/srch_r.gif new file mode 100644 index 0000000000000000000000000000000000000000..89833a3167084bd8232b4b32ad120faedcb15936 GIT binary patch literal 227 zcmZ?wbhEHb6lM@+IKseCT3Y)5|NndU?wvVvX6@Rwt*x!^-@o6pXV2ori?3a~Hgo38 zr%#`L|Nec;mMuW`(W6I!iWx`&ia%LcMHmDabU>Owb~3OgC@A!$ER=Ctu*(1SKK6wg zy&I(})=7JR(rCGo<-uc6#nQC)1doJJi}U86E*#5`9DUfRYsA*8H&Iccqm%9PPqo<9 mVln2*6AP@_xpyyk_fGeyJ5zlyPh*pINoQ9HQ@gVwgEau9fKuQ9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6df457bede2a81e236390edf1a1865d79f004945 GIT binary patch literal 278 zcmZ?wbhEHb6lM@+IKseCT3Y(!$B%2*t{pvkbkCkWYuB!Q_Uu_}YwNvx_ZBZ+{Qmv> zGiT1soH_IV|NmRIY=JNsNCApJSy)9F1Q>Kcnm~3kuufJ`=zDTdz+>?$=hypO4jS}r z)T&sg-DY6WdL_$(N20p5scA*f4-V!=r3X3!GujvvcgsqwXlmK8@@Wx!Fms8<4Ksli z$HFdfaL61k%DTT+naeq?CPs^`LAxqHzm_*EC$B)WxRu$ND>W^^yR5`Ha%P+_x0#Dy kRG@d=T%R?)L2G>&ZC7q6wc+5{!nAwOUZx#ev=kYv0cTrf>Hq)$ literal 0 HcmV?d00001 diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 3882e37bd2..74ab3c233a 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 249596f9fd..9bd67da8dc 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 076223a48c..5d61739185 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; };