From 0f3255467e8a64af86ca67c6af70edf1d3279640 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 10 Mar 2012 13:22:41 +0100
Subject: [PATCH] fixed login-fields, fixed. notofication.png, changed
 locations

---
 .../diabook-blue/icons/notifications.png      | Bin 795 -> 727 bytes
 view/theme/diabook-blue/style.css             |  29 +++++++++++++++++-
 view/theme/diabook-blue/wall_item.tpl         |   4 +--
 view/theme/diabook-blue/wallwall_item.tpl     |   4 +--
 view/theme/diabook/icons/notifications.png    | Bin 758 -> 714 bytes
 view/theme/diabook/style.css                  |  15 ++++++++-
 view/theme/diabook/theme.php                  |   3 +-
 view/theme/diabook/wall_item.tpl              |   4 +--
 view/theme/diabook/wallwall_item.tpl          |   4 +--
 9 files changed, 52 insertions(+), 11 deletions(-)

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 7f5fe1fecf..51b173f2a9 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -652,6 +652,17 @@ nav .nav-menu-icon {
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
 }
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 7px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
 nav .nav-menu-icon.selected {
   background-color: #fff;
 }
@@ -1037,13 +1048,22 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
 #contact-edit-end {
-  margin-top: 140%;
 	}
 .pager {
    padding: 10px;
 	text-align: center;
 	font-size: 1.0em;
+	margin-top: 140%;
 }	
 
 .tabs {
@@ -1075,6 +1095,10 @@ section {
   margin-bottom: 0px;
   width: 775px;
 }
+.tread-wrapper a{
+  color: #1872A2;
+}
+
 .wall-item-decor {
   position: absolute;
   left: 790px;
@@ -1118,6 +1142,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1173,6 +1198,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1183,6 +1209,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;done
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index b1a0149490..ebe40fd4ea 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -46,7 +46,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
+
 			<div class="wall-item-actions-social">
 			
 			
@@ -82,7 +82,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index 603a908c5a..e02e5a8bec 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -52,7 +52,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
+
 			<div class="wall-item-actions-social">
 			
 			
@@ -88,7 +88,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f7648dde8433ab9c76c621915da1efb7b6..2709977406afc940f8e7a3376db1c6828aa2b151 100755
GIT binary patch
delta 665
zcmV;K0%ra81<C~>iBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPwie*+2t
zHZ4u|AwU2C0!m3lK~y-)wbW0j&UqBa@z?#M6y@Hcd+)-NP_memvZKL<2_;!xn#kEr
z7PFWvEfqyJ(^<Gy*G6VBG%4z4W+!F3H3_3EkU}>h;c;!wbNzaH)I&M-?fHGb=bZQN
z^PKbj9lnzdbRIHu2&>VKhzDN-f62_%7{Y^yXv1K`zY>>lDKkgE0y^5sE5>KVrS=q#
z;w*l{2Yl=(=m8umVZ%6qUvLJ$Mnt=#xK+>@9LHN6!S2jl)C0N*yDR2x<;)bL)hxwf
zv@snK&#@OL>%3Q4M$2~+dn;$U7>Aps_#Yoj#Zycb{1DD#DK;1MAH2fPe>jIfDsBvy
zF&GhRI*M1}5$<9ge#CWLt(Tv{@3l@x#C-X#V{7HyEyk*5DF*7A&6m1S+=__D*nn+S
zyB4-*=Em~fs@SEK+wN4MdEMsg_k9Jd$jl{pSU03&Z9FXBirT;LVl05)U|D7^$7B49
zpRhh6Uexnkt)11Z_1KBqe|S>4%ZjxC{tIidAtLTq6UK2UGe_#|9o|L6{mdMxhE3o~
zMBJ;Atu599cnTxfU;7KV)>VSRuF`#|m<zSvUyP|Hcn1GrGBfu@#2p;Ov51(<%!!%>
zLzy`d5py_(gAs8jGxuS#7&F~NXa}y~CiX<cvxe^n{9W5E5i#5FZ!O24*o0jXaaDci
z9lKF8VliHJeQ9Hje>aBNhVNzd<YF;;4wiv0oFB-{*R>AxliO6RE_p8-Zzvw`70{hK
z+~?RGujYLb+-?1WTMcllpM=3a!NcDm=KI(uq@dF1M8N9200000NkvXXu0mjfAj&_K

delta 710
zcmV;%0y+K41@;9YiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)}e*zp1
z7#StW&>#Q+0(MD6K~y-)mDDk4o@EdR@Zb9;4r;JTNlA+2qlQ8$4h6wYNOY>=P^6Pk
zlok#gM5vUu;8;k73W|ergViNnBrdH*u#g5fDd^y$HPDncI2a_D3{Ahr<-YPYCRiUh
z-g}<A|DXHc^WM`yW)5Hy-H2H9e?L}cPGSIy5z%cs)8}CVbC}D_kzVq|)XcvKD!)fI
z(!*h5VroWH)qRBb@F`B?J|09ww=;d-()^i+WJ~jBdWu>M;zPWPPw;+|na^Pn^EiqX
zyn{RVHX=5*NPGgX;aPl!-S`^Qm~3$ZUCc(rpE!aGbw099+eRvO0Y?fme_I?Un#}wi
z5AZtvz{MgxjxRBUmx}BM{EfHq1-_}gF<eI5VqeMo6$dbdYxoXL_2%=kk0WBUV%JLM
zfx_OwzP3Q!N*pRlHzMLL4&h~V%3jIL7b<q6a)%1rMbnm)&H8RsU{7W~jazl&z1797
zitVZWMn6Z3b?nN_QQXDPe|QxKBVwiezse5RB^<<I{DkGg?!tPDtJsf25plDcJC5U-
zIb3J=a4#ZmX6A5R#9my9h~KI;`*F3cTOF={5H8{SEmGUE-nw5omui2sI4(As`4oPv
zroR;tbD6mps}ZqQ{x1c5J|dQ@htHJ%2EM`)UK~6(yR!blo4Zfqe+o`z=0Zd)_f<36
zSKTO<BVr9})w@%85+~2iuB^8;rwcX1m$ABKGRFEOk8O#q7Unb-dNbdf(Pq0>CNqy^
z=33dY9bTP>*tQ3*pVP$DjHYS&s~GRAaJ+Z8xw&aO?BMO|XCKk9bzdX{ef~~)ZeKrZ
s@G&0cP9I_CzmnU>93ULr!QXcM1M4~U6?a^Jvj6}907*qoM6N<$f+Y1%i~s-t

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6e3909ab4f..ad7119c2aa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1036,13 +1036,23 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
 #contact-edit-end {
-  margin-top: 140%;
+   
 	}
 .pager {
    padding: 10px;
 	text-align: center;
 	font-size: 1.0em;
+	margin-top: 140%;
 }	
 .tabs {
     
@@ -1116,6 +1126,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1171,6 +1182,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1181,6 +1193,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0a20c9fbca..5a1828ad75 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
+
 //contacts
 $('html').click(function() {
  $('#nav-contacts-linkmenu').removeClass('selected');
@@ -62,5 +63,5 @@ $('html').click(function() {
  $('#nav-site-linkmenu').click(function(event){
      event.stopPropagation();
  });
-</script>
+</script> 
 EOT;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a0149490..ebe40fd4ea 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
+
 			<div class="wall-item-actions-social">
 			
 			
@@ -82,7 +82,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5a..e02e5a8bec 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
+
 			<div class="wall-item-actions-social">
 			
 			
@@ -88,7 +88,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">