From 15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 1 Apr 2012 13:12:15 +0200
Subject: [PATCH] various bugfixes and css-fixes

---
 view/theme/diabook-aerith/jot.tpl   |   2 +-
 view/theme/diabook-aerith/nav.tpl   |  22 ++++++++++++----------
 view/theme/diabook-aerith/theme.php |   5 ++++-
 view/theme/diabook-blue/nav.tpl     |  22 ++++++++++++----------
 view/theme/diabook-blue/theme.php   |   5 ++++-
 view/theme/diabook-red/nav.tpl      |  22 ++++++++++++----------
 view/theme/diabook-red/theme.php    |   5 ++++-
 view/theme/diabook/nav.tpl          |  22 ++++++++++++----------
 view/theme/diabook/photo-menu.jpg   | Bin 0 -> 459 bytes
 view/theme/diabook/style.css        |   2 +-
 view/theme/diabook/theme.php        |   8 +++++++-
 11 files changed, 69 insertions(+), 46 deletions(-)
 create mode 100755 view/theme/diabook/photo-menu.jpg

diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index 5ef723d727..59066a19c5 100755
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
@@ -34,7 +34,7 @@
 	<div id="profile-video-wrapper" style="display: $visitor;" >
 		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
 	</div> 
-	<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
 		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index c344361031..f84b902d5b 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -11,16 +11,16 @@
 			{{ if $nav.network }}
 			<li id="nav-network-link" class="nav-menu-icon">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span></a>
-				<span id="net-update" class="nav-notify"></span>
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
 			</li>
 		    {{ endif }}
 	
 			{{ if $nav.contacts }}
 			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
 				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<span class="icon contacts">$nav.contacts.1</span>
+				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
 					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
@@ -31,8 +31,8 @@
 			{{ if $nav.messages }}
 			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
 			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@@ -43,8 +43,10 @@
 			{{ endif }}
 		
       {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+			   <span class="icon notify">$nav.notifications.1</span>
+				<span id="notify-update" class="nav-notify"></span></a>
 				<ul id="nav-notifications-menu" class="menu-popup">
 					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -100,8 +102,8 @@
 		
       {{ if $nav.settings }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+				<span id="home-update" class="nav-notify"></span></a>
 			</li>
 		{{ endif }}		
 		
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 132d69b475..2b135878a6 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -267,8 +267,11 @@ if ($a->argv[0] === "settings"){
 			'label'	=> t('Display settings'),
 			'url' 	=> $a->get_baseurl(true).'/settings/display',
 			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		),			
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
 		),	
-		
 		array(
 			'label'	=> t('Connector settings'),
 			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index d73dd047ab..3b78b59952 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -11,16 +11,16 @@
 			{{ if $nav.network }}
 			<li id="nav-network-link" class="nav-menu-icon">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span></a>
-				<span id="net-update" class="nav-notify"></span>
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
 			</li>
 		    {{ endif }}
 	
 			{{ if $nav.contacts }}
 			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
 				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<span class="icon contacts">$nav.contacts.1</span>
+				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
 					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
@@ -31,8 +31,8 @@
 			{{ if $nav.messages }}
 			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
 			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@@ -43,8 +43,10 @@
 			{{ endif }}
 		
       {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+			<span class="icon notify">$nav.notifications.1</span>
+				<span id="notify-update" class="nav-notify"></span></a>
 				<ul id="nav-notifications-menu" class="menu-popup">
 					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -100,8 +102,8 @@
 		
       {{ if $nav.settings }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+				<span id="home-update" class="nav-notify"></span></a>
 			</li>
 		{{ endif }}		
 		
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 4d9e31bfa2..fb6b44a16b 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -268,7 +268,10 @@ if ($a->argv[0] === "settings"){
 			'url' 	=> $a->get_baseurl(true).'/settings/display',
 			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
 		),	
-		
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
+		),	
 		array(
 			'label'	=> t('Connector settings'),
 			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index cd0653c6ee..fdf748cb20 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -11,16 +11,16 @@
 			{{ if $nav.network }}
 			<li id="nav-network-link" class="nav-menu-icon">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span></a>
-				<span id="net-update" class="nav-notify"></span>
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
 			</li>
 		    {{ endif }}
 	
 			{{ if $nav.contacts }}
 			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
 				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<span class="icon contacts">$nav.contacts.1</span>
+				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
 					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
@@ -31,8 +31,8 @@
 			{{ if $nav.messages }}
 			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
 			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@@ -43,8 +43,10 @@
 			{{ endif }}
 		
       {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+			<span class="icon notify">$nav.notifications.1</span>
+				<span id="notify-update" class="nav-notify"></span></a>
 				<ul id="nav-notifications-menu" class="menu-popup">
 					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -100,8 +102,8 @@
 		
       {{ if $nav.settings }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+				<span id="home-update" class="nav-notify"></span></a>
 			</li>
 		{{ endif }}		
 		
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index ba5a69d252..95af850a21 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -269,7 +269,10 @@ if ($a->argv[0] === "settings"){
 			'url' 	=> $a->get_baseurl(true).'/settings/display',
 			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
 		),	
-		
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
+		),	
 		array(
 			'label'	=> t('Connector settings'),
 			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 99d69ab38f..78eb341972 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -11,16 +11,16 @@
 			{{ if $nav.network }}
 			<li id="nav-network-link" class="nav-menu-icon">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span></a>
-				<span id="net-update" class="nav-notify"></span>
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
 			</li>
 		    {{ endif }}
 	
 			{{ if $nav.contacts }}
 			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
 				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<span class="icon contacts">$nav.contacts.1</span>
+				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
 					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
@@ -32,8 +32,8 @@
 			{{ if $nav.messages }}
 			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
 			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@@ -44,8 +44,10 @@
 			{{ endif }}
 		
       {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+			<span class="icon notify">$nav.notifications.1</span>
+				<span id="notify-update" class="nav-notify"></span></a>
 				<ul id="nav-notifications-menu" class="menu-popup">
 					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -101,8 +103,8 @@
 		
       {{ if $nav.settings }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+				<span id="home-update" class="nav-notify"></span></a>
 			</li>
 		{{ endif }}		
 		
diff --git a/view/theme/diabook/photo-menu.jpg b/view/theme/diabook/photo-menu.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..fde5eb53524ddb12ec5642f33d0d34e14e256193
GIT binary patch
literal 459
zcmex=<NpH&0WUXCHwH#VMut5=$ngIkgRpZ^YGO%hib8p2Nrr;Er*FXj+YHVO%uGxm
z1OzNV#LB_S%EH3R#m>&g!NbMF!_CFb&C4ewz{@Ad$IUGuCLky*A}T7%!!Ir&CL$pu
zA}RthgpnDjhlQ1sm6cP3mz!6FWbpq0gCGZk0D}NCqY?v?AS1IN<NqTJqCodEpaM3a
zuz~;sBMTEV12bHTk%^gAkcEwbT}aU|5vW20LmxX(R7Mb}j~UrSpn#CDp=0C4|F;-;
zfHF*i%z_N|4AWotsvB=CUc4~j(Z&?jPZHm5b4Tln+bq7c(odu*LpZ#iz3;@OO}}1S
zxk(l2i`m7?_U9Sgx>>UQrQGDKoE6M2QoDc3G+f#K-Lz&!r^Qc^B##H0%WszGMCU1W
znAE#pe4KOt&Ml**OEy0VoUS}?d3@zno#;NjlP3257arA~E4nCar)(9G=iXTV|0V#|
C@@!oI

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index c3f5f55982..956667faa3 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1161,6 +1161,7 @@ body .pageheader{
   margin-bottom: 0px;
   width: 775px;
 }
+
 .wall-item-decor {
   position: absolute;
   left: 790px;
@@ -1173,7 +1174,6 @@ body .pageheader{
   width: 780px;
 }
 
-
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 6973951a0e..88944322ed 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,6 +7,9 @@
  * Author: 
  */
 
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
 
 //change css on network and profilepages
 $cssFile = null;
@@ -276,7 +279,10 @@ if ($a->argv[0] === "settings"){
 			'url' 	=> $a->get_baseurl(true).'/settings/display',
 			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
 		),	
-		
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
+		),	
 		array(
 			'label'	=> t('Connector settings'),
 			'url' 	=> $a->get_baseurl(true).'/settings/connectors',