From f2e2632810ad3ac465edcf4cf80e1dc89e995c82 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 29 Mar 2012 00:04:00 -0400 Subject: [PATCH 01/12] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master: From 339c8a4b56f3f9d9b1557fbb393821602f62cc54 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 29 Mar 2012 11:02:59 +0200 Subject: [PATCH 02/12] css fixes in diabook-derivates --- view/theme/diabook-blue/communityhome.tpl | 7 ++-- view/theme/diabook-blue/icons/srch_bg.gif | Bin 0 -> 65 bytes view/theme/diabook-blue/icons/srch_l.gif | Bin 0 -> 303 bytes view/theme/diabook-blue/icons/srch_r.gif | Bin 0 -> 227 bytes view/theme/diabook-blue/icons/srch_r_f2.gif | Bin 0 -> 278 bytes view/theme/diabook-blue/nav.tpl | 18 +++++------ view/theme/diabook-blue/style-network.css | 34 ++++++++++++++++++++ view/theme/diabook-blue/style-profile.css | 34 ++++++++++++++++++++ view/theme/diabook-blue/style.css | 8 +++++ view/theme/diabook-blue/theme.php | 19 +++++++++++ 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 +- 16 files changed, 136 insertions(+), 23 deletions(-) create mode 100644 view/theme/diabook-blue/icons/srch_bg.gif create mode 100644 view/theme/diabook-blue/icons/srch_l.gif create mode 100644 view/theme/diabook-blue/icons/srch_r.gif create mode 100644 view/theme/diabook-blue/icons/srch_r_f2.gif diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index fa8197dd4..00a59eec0 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -7,10 +7,10 @@
{{ if $lastusers_title }}

Help or @NewHere ?

+NewHere
Friendica Support
Let's talk
Local Friendica -NewHere {{ endif }}
@@ -30,13 +30,14 @@ {{ endif }} -
+
{{ if $nv }}

Find Friends

$nv.directory.1
$nv.match.1
-$nv.suggest.1 +$nv.suggest.1
$nv.invite.1 +$nv.search {{ endif }}
diff --git a/view/theme/diabook-blue/icons/srch_bg.gif b/view/theme/diabook-blue/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-blue/icons/srch_l.gif b/view/theme/diabook-blue/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-blue/icons/srch_r.gif b/view/theme/diabook-blue/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-blue/icons/srch_r_f2.gif b/view/theme/diabook-blue/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-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 651b9647d..d73dd047a 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -65,15 +65,11 @@ - + {{ if $nav.directory }} + + {{ endif }} {{ if $nav.apps }} @@ -98,7 +98,7 @@ {{ endif }} - {{ if $nav.home }} + {{ if $nav.settings }}
-
    -
  • +
    {{ if $item.lock }}
    $item.lock
    {{ else }}
    {{ endif }} -
    • +
+ +