From caffb217c1e7227137ac1575af369b34d10519fe Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 12 Mar 2012 23:31:54 +0100
Subject: [PATCH] fixes

---
 view/theme/diabook-blue/group_side.tpl        |  29 ++++++++++++++++++
 .../diabook-blue/icons/notifications.png      | Bin 795 -> 727 bytes
 view/theme/diabook-blue/style.css             |   7 ++++-
 view/theme/diabook-blue/theme.php             |   4 +--
 view/theme/diabook/group_side.tpl             |  29 ++++++++++++++++++
 view/theme/diabook/style.css                  |   7 ++++-
 6 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100755 view/theme/diabook-blue/group_side.tpl
 create mode 100755 view/theme/diabook/group_side.tpl

diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
new file mode 100755
index 0000000000..af183d04da
--- /dev/null
+++ b/view/theme/diabook-blue/group_side.tpl
@@ -0,0 +1,29 @@
+<div id="group-sidebar" class="widget">
+	<div class="title tool">
+		<h3 class="label">$title</h3>
+		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul>
+			{{ for $groups as $group }}
+			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
+				<a href="$group.href" class="label">
+					$group.text
+				</a>
+				{{ if $group.edit }}
+					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
+				{{ endif }}
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}
+			</li>
+			{{ endfor }}
+		</ul>
+	</div>
+</div>	
+
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index 33ae95c6a0c78c4e71a5b6da79c48040c1aae1cc..c23673dbd09fe07a2a17a34bb70d472043922501 100755
GIT binary patch
delta 677
zcmV;W0$Tl>2G<24iBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPwje+mFJ
zGV;hyHvj+vS4l)cR5;7E)WK_2M-<2LPhN7NRnbJABo{GgydY9R5V{l8uC#O^#jR9y
z<xT|gpK#Hx+Et?)-AKBril89kt_X^_X~z@=9b70Sm>`a?>E^u0<&nU%;J|R_&N;vD
zJ#)^v!)F>}{Y6zb<CsIQ<h1xHe~_wf<}i-Ml2Z>lE&C2EV4<p;sZW4T^>x8807tav
zun+g~zN(ul_SXZBS9Me2eQ5UKTwgO5PP?#(dpLo&IE$CKS#l~v&<fvTJATGiT*qO|
zm7M<Wr{WBHxLR_0gX6dq`)j3TDr}c<JTzB>ai$&dGyIG1@EY?0KaI=Se}sbpeSmj3
zg<tVo_)X(?bV^RU`w{PqWB-XgIE1^n9UuP*zr_5p<g^;LyK($Ip?w*wL061Lo2^E4
zQ+QZ%dWHQsg4vkgRCRM8Y!AbCQ)qkrEVSEgHJ&9LwpDer5zq0l<=4aWux*R?GQ=2w
zSFok3n=W4AF^*wx$?0vZfB%VjG>WwsNAU<bv|EBT0N+A`{UxUqMVP_qs%|D@?*l%R
zoKjUclTol5H%d-_Mar6B4Z!o5j2?z-xHFW3&QR(;hR?NlKM{=icDrrBA5okiN=^$^
z-PBkrIW5QfX#l<|IpxUl=2(A^D|msgOHL~tC^@a*Jif$*s&2X^d#7A-S`JvZ6>&E-
z%K`1;LTJwi%S7vF_i+(lU}@-2n{K6H8c$lbrKrjEV61tujIFbOvZ|Zqm?uZkwj&lz
zzSfv&MLe^X!?1Q@#A|mZF7kE3!(&wNYzsU)il8$hc;bHq^LfU9xd+>H+r|Yn00000
LNkvXXu0mjf8k0i6

delta 746
zcmV<G0u}w&1)ByTiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)~e+U&a
z1~tO86aWAMn@L1LR5;6()In$+RTKu`Z)P$JHL=Mf#atwzmcdX23xYc#(Nz_dB3-yC
zO52UwLcyKObkTyYbY*qZf-P}lZN(J3a3@8Dy3sMDg=TQk)JPIAlb6@cdF4@~rWX!#
z=AQHa-2a?=PX=YG3hYO>ZR$mjf3V6_?MH#dwyC@M)a+@P#60H9RE_nMCuipVK@j<U
zvavo6lan)ZijBXQ3VeV!aS>OGkxo{Obh3LlFZQNpPg`ADctCdh`uoaM6~#zr2-|oT
zZy;N{`{TD+nW|^7i0e3l6}*Q#__}TC_92NSUc=M)7#&=~EcWL(jxNr(e@%TChjAwM
z$95>&Sj5iYaA3{{$MLL8)$eii*YO9=1?e$-hGD!EWZz>A@8VN@8F^3PE95!$g}h%e
zjTv0SH^}f2J_-A<ZR%dcu7%9$z}~^WJV4z@91cl0+NNH{LA;Equvf}dy%4b*kvkmN
zF0wqN^y1q_U~ieKCvXc}e*^XF;#S1=#(z7=kz)gU%2bVG89(Dy9B7+*CHz0b4n-3V
z;1GU76WBf2$Z-V~4z^8QM{y@`tW4Et>}_JRZR)yA)o3&#;d0y5zeQ;(T*;%Wqj3k}
z0u~;Unuqn*R^(iW|0BV1E-O>@IDUwtztcALe3`0*zuKl=5C4|{e?HeXbrUswGW@sj
zId0>{JWZe2z)3uYQ)Q~g+oo>Xrd|({@qrVLL)+BrK{k$4fjya~Piz#cOACsT&N5cx
z34XV|w$kluD@Hoc<L$U!m$%ne76)Qm(e10abnoUDTZ3;j+iA*_sXAJwYCY`ezf7G6
z*t`#p%V~0EPL^eZKyP<qK=MR?v)Aj{3A>vCdbUi}X4u*P%OBdsP@am3-1q-;<+~sp
cdXxj)2MhZ7$iM)eMgRZ+07*qoM6N<$f+vb;p8x;=

diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 81c056bf3c..67ee117697 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -970,6 +970,10 @@ aside #side-peoplefind-url {
   widht: 55px;
   height: 55px;
 }
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1065,7 +1069,8 @@ body .pageheader{
    padding: 10px;
 	text-align: center;
 	font-size: 1.0em;
-	margin-top: 140%;
+	clear: both;
+	display: block;
 }	
 
 .tabs {
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 1617dd7f0a..38a282d3b5 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -1,8 +1,8 @@
 <?php
 
 /*
- * Name: Diabook
- * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Name: Diabook-blue
+ * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
  * Version: 
  * Author: 
  */
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
new file mode 100755
index 0000000000..af183d04da
--- /dev/null
+++ b/view/theme/diabook/group_side.tpl
@@ -0,0 +1,29 @@
+<div id="group-sidebar" class="widget">
+	<div class="title tool">
+		<h3 class="label">$title</h3>
+		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul>
+			{{ for $groups as $group }}
+			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
+				<a href="$group.href" class="label">
+					$group.text
+				</a>
+				{{ if $group.edit }}
+					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
+				{{ endif }}
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}
+			</li>
+			{{ endfor }}
+		</ul>
+	</div>
+</div>	
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index badedb02fa..9edd989b04 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -962,6 +962,10 @@ aside #side-peoplefind-url {
   widht: 55px;
   height: 55px;
 }
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1058,7 +1062,8 @@ body .pageheader{
    padding: 10px;
 	text-align: center;
 	font-size: 1.0em;
-	margin-top: 140%;
+	clear: both;
+	display: block;
 }	
 .tabs {