From 1fcbc7aa5a0b560b99201320a64e4e7671665613 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Thu, 8 Mar 2012 14:49:07 +0100
Subject: [PATCH] add links to /profiles, add some icons to diabook/icons,
 fixes in css

---
 view/theme/diabook/icons/bluebug.png | Bin 0 -> 1032 bytes
 view/theme/diabook/icons/lupe.png    | Bin 0 -> 697 bytes
 view/theme/diabook/nav.tpl           |   8 +++-
 view/theme/diabook/profile_vcard.tpl |  64 +++++++++++++++++++++++++++
 view/theme/diabook/style.css         |  35 ++++++++++++---
 5 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 view/theme/diabook/icons/bluebug.png
 create mode 100755 view/theme/diabook/icons/lupe.png
 create mode 100644 view/theme/diabook/profile_vcard.tpl

diff --git a/view/theme/diabook/icons/bluebug.png b/view/theme/diabook/icons/bluebug.png
new file mode 100644
index 0000000000000000000000000000000000000000..3979e7d8e78731f4646d6a8208cc48c6b7bdfa1d
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY(
z6*~k{ZGI;J00W3gL_t(I%bk=xY#db-h0lF&X5P;3de`3dt{2(Cv0_Y2*0ziwfGr?G
zq(MSLAVir02|5r`q;$|yQBffwQ3P7t(BYs+Kx8Na#1X7*#r&AW@p`>KGqbZZ?~lUR
z!X3)(ZgD<c-Fwf05I%(P@t~E-9BLT=5YYpJthE3DuC;<v5<>WAv{vm>xiTrWdBSML
zADf%k(~rzdltxF(ouI3=l(lSbXmO}e^y0YR@;p&Z(<B0b<56-$#W`5xM`5rzzp!{w
z2=R*JIO9YlEC4B08pr*;IF45CY;9f5=7vr)&X>bp=W_sXjzCcqHbzG)Z^|&({(ZAC
z>3HIWOg1-`&F2jO^n-v!LAMo$;cWmT*+Q`%hr#zpdOk5eg+gHjz21RFKP+aa7b?}I
zi)W4SPlZ8{@3z}K2>VbXCkr$6-KiH}-Y(ZB<lawfyq_j(M<8eC@9pEosmVuwS$^k(
zcPH!f%R1Q4G&gRksCiESfIm{v!>4Bjina6G>+5vqcH=7kS_cuqT8salYxcs&D+~1}
zm)@(EhR+F?ajgc9H3Lor5P2p|xoWn0`hKgk*}A{|$+fp%S_RN3Rw{=(vetr#p68D9
z2K?-~7%Ue?2>^oY7r|T(qbyG;<u>CXKUz8)2lp=hJ3yn`Y#xF#e)e$yJ-0eu>uKZ$
zi9#9<tWG7k5X3wO09hgcu7Kg5prMfp0O`5zVk+fL1^_A<JPqJGTbsOhkQ%+$PtY;2
zJ?5ZefVR{)7^G<R`nDCu)HbAL_2Heu+{}+k%BKLpVUEMCQX2sNXoX3{nFMz@h%+J(
zAdQ6tY??y%dIZLRGKVD|S1&F7+Pl0_W{%4pGKOj3YXCU7dw1U{l@szrmWYS|d-Stb
zX;{t3S_XszWuvIIb@{Udz^XOI<<?pQ06sA7PS<%_n>wSSK_v}CCJm4>j?@AY49fRO
zy22*i&Q`p(x}t7;wWom&tTp`DBEuuE_O5+-OF#EoU^~$mMNx_Q!eQAgk;4eql1ima
z2C@<F?tBrv|N6I?Lg9RpBsWiZ4NMe$!7e0m{EhkOho$mE<+lpMxw_|ZVL?z*r(rw%
zZU4{RPtBF(>%Q=wjg501vfn)cV%&L#Gv*WH>uD120RVmY^Qn9_KMN2Gno$E+=C%RA
z^F-BJTi3?KMyneqa)lThBgWkSn?uByON@;j_5T0~%doWJv<t2P0000<MNUMnLSTYv
Ctl0Db

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8b2283478826e60abdacb85cae80037911fa63a
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY(
z6(2hl<FdQ}00KElL_t(I%hi-WXp=!0#(&S3)PJ<rx;ROx5WRdfwvJK|bd804T?BFK
zpbiQS4hkwFqIDNs3qqZ8p_@?X*3DuEn+t_HxL5=&rHxdRz7BpuT9fFg&vYEe@80Kq
zpF8;1rM(+Tl0?9eq^o8&W@ddrUD6yd0|f7V^RIvt6BB)A_Q=d8CG`RgplN0qNm*bW
zn3nXkTrPiX2h8lLY|6~8>!+507r=BBMel$CGaHnY2kOqb#Sp^xy}+ntJp@cj+L1J6
zX2mFqo@6qaSLJf~AutX+2Mz%@B^A0>7{~D)GdnM7NzyIv{aUqJwdLhy0|+5(#Bsa=
zi~z&HKt7*;9YWY{TcMeaNooMz%s#cdz0qi_0xu<f0di)R?Pj^p%$mUaP7|D+o!ybN
z3Ty$AehbMiU>(Rv%6ad1+5wBjqJR@-*4x^yPL}7=Xe6al>3F-tJv}`q&FoS-m<2QY
z)^RBLe0~kM3=9JM;y7N(<#Ow_TFr{Zq6&q=Dc}Z>NU8((DwRsD8}Ku5EX~<jU_?^n
zoa@hKvloEdW|l}gkUCm-&b<jCd~FL1Ay^#8Z_TU@oCby^odYgP8V7Qcwo=$ZNu!eb
zoO27U(b?75YPGuQoLiJM4-5cVN!!2%PzD~D*@mRiw2x;b9dXXhhY%WVKZlm5*q;J1
zGk|UH{brIRM}hmmHDG@lwP%$|<!)DCH<e1I!;&8VdiTJL_x=i<vh*i~5VoCj^QnUm
fz+?!a$$z0A2T<$Bbnymv00000NkvXXu0mjfGuSL9

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index dc339131d..c7c00e20c 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -119,7 +119,8 @@
 						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
 					{{ endfor }}
 					
-					{{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
 					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
 					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
 				</ul>
@@ -141,6 +142,11 @@
 </nav>
 
 
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
+
+
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
new file mode 100644
index 000000000..3a545f9ba
--- /dev/null
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -0,0 +1,64 @@
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				<li><a href="profiles" >$profile.edit.3</a></li>
+								
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt><br> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index fe1d3d882..1722588ba 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -214,6 +214,17 @@
   padding: 1px;
 }
 
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
 .icon.text {
   text-indent: 0px;
 }
@@ -615,13 +626,21 @@ nav #logo-text {
 }
 nav .nav-menu-search {
   position: relative;
-  
+
   margin: 3px 17px;
   margin-right: 0px;
   height: 17px;
-  width: 205px;
+  width: 180px;
+  
 }
 
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+	}
+
+
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
@@ -871,14 +890,14 @@ aside .vcard dl {
 aside .vcard dt {
   float: left;
   margin-left: 0px;
-  width: 35%;
+  /*width: 35%;*/
   text-align: right;
   color: #999999;
 }
 aside .vcard dd {
   float: left;
-  margin-left: 4px;
-  width: 60%;
+  margin-left: 5px;
+  /*width: 60%;*/
 }
 aside #profile-extra-links ul {
   padding: 0px;
@@ -1016,6 +1035,12 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+}	
+
 .tabs {
     
     background-position: 0 -20px;