From cb1ecf2c5ad649eb372db9eb3bd1da756f207fb6 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 00:15:27 +0100
Subject: diabook: Moving the location between the icons

---
 view/theme/diabook/style.css         | 3 +++
 view/theme/diabook/wall_item.tpl     | 3 +--
 view/theme/diabook/wallwall_item.tpl | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index bccfea149..2d4670dca 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1113,6 +1113,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1168,6 +1169,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;
@@ -1178,6 +1180,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/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a014949..8c892fd2a 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -82,7 +81,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 603a908c5..3b103745b 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -88,7 +87,8 @@
 					<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">
@@ -100,4 +100,4 @@
 
 <div class="wall-item-comment-wrapper" >
 	$item.comment
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 74b3e9f273b019729d213f3ccaeba1bb11d61d24 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 15:50:35 +0100
Subject: Enabled Caching for items. Changed color of tags in diabook.

---
 view/theme/diabook/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 2d4670dca..0504ce96a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1277,14 +1277,14 @@ section {
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
-- 
cgit v1.2.3


From b879a1ddf1575a3bd355edcee634be4a8d179c25 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 17:45:12 +0100
Subject: Pages: Show every community page - even from foreign servers (with
 caching)

---
 view/theme/diabook/style.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 0504ce96a..ce3307645 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -484,6 +484,9 @@ code {
 #sidebar-group-list .tool:hover {
 	background: #EEE;
 }
+#sidebar-pages-list .tool:hover {
+	background: #EEE;
+}
 .tool .label {
   float: left;
 }
-- 
cgit v1.2.3


From 7235d5466a4f54cd80d1b661b142ec99230afbf2 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 20:24:55 +0100
Subject: Removed changes

---
 view/theme/diabook/wall_item.tpl     | 14 +++++---------
 view/theme/diabook/wallwall_item.tpl | 16 ++++++----------
 2 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 6cbab0a71..321bbbe9e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,7 +13,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -21,7 +22,8 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -46,10 +48,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
-=======
 
->>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
 			<div class="wall-item-actions-social">
 			
 			
@@ -85,11 +84,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
-			<div class="wall-item-location">$item.location&nbsp;</div>			
-=======
 			<div class="wall-item-location">$item.location&nbsp;</div>
->>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
@@ -102,3 +97,4 @@
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
+
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 4f0a2e25f..05ed4cc82 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,7 +18,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -26,8 +27,10 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
+id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 				 $item.vwall <span class="wall-item-ago">- &nbsp;
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -52,10 +55,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-=======
 
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
 			<div class="wall-item-actions-social">
 			
 			
@@ -92,10 +92,6 @@
 				{{ endif }}
 			</div>
 			<div class="wall-item-location">$item.location&nbsp;</div>
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-
-=======
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
-- 
cgit v1.2.3


From 42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Wed, 14 Mar 2012 12:50:11 +0100
Subject: add links to home, profile, photos, events, notes to aside in
 network-stream

---
 view/theme/diabook/profile_side.tpl | 19 ++++++++++++++++++
 view/theme/diabook/style.css        | 40 ++++++++++++++++++++++++++++++++++---
 view/theme/diabook/theme.php        | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 view/theme/diabook/profile_side.tpl

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
new file mode 100644
index 000000000..595684bf5
--- /dev/null
+++ b/view/theme/diabook/profile_side.tpl
@@ -0,0 +1,19 @@
+<div id="profile_side">
+	<div id="ps-usernameicon">
+		<a href="$ps.usermenu.status.0" title="$userinfo.name">
+			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
+		</a>
+		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+	<li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
+	<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+	<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+	<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+</ul>
+
+</div>
+
+				
\ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 9edd989b0..df692cbc6 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -863,7 +863,42 @@ ul.menu-popup .empty {
         padding: 7px 7px 0px 0px;
 }
 
-
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  color: #2D2D2D;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+	list-style: none;	
+  padding-left: 16px;
+  min-height: 16px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+	}
+.menu-profile-list:hover{
+	background: #EEE;
+	}
+.menu-profile-list-item:hover{	
+	text-decoration: none;	
+   }
 
 /* aside */
 aside {
@@ -2346,5 +2381,4 @@ float: left;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
-
+}
\ No newline at end of file
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 5d3c2906d..9b3ed30b0 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -11,6 +11,43 @@ $a->theme_info = array(
   'extends' => 'diabook',
 );
 
+//profile_side
+
+
+
+$nav['usermenu']=array();
+$userinfo = null;
+
+if(local_user()) {
+	
+
+
+$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		
+$userinfo = array(
+			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+			'name' => $a->user['username'],
+		);	
+	
+$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
+$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+
+
+if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
+$tpl = get_markup_template('profile_side.tpl');
+
+$a->page['aside'] .= replace_macros($tpl, array(
+		'$userinfo' => $userinfo,
+		'$ps' => $ps,
+	));
+}
+}
+
+//js script
+
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
-- 
cgit v1.2.3


From f03c57007a2a9ec73902acfb2d951528e68e3117 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Wed, 14 Mar 2012 12:56:59 +0100
Subject: fix in nav

---
 view/theme/diabook/nav.tpl | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 8b32ebe6c..5776b6cf7 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -152,10 +152,6 @@
 </ul>
 
 
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
 
 {#
 
-- 
cgit v1.2.3


From 6dbee45d92450131bad7a8381a0339a880dacfd9 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Thu, 15 Mar 2012 08:29:39 +0100
Subject: add links to wall, photos, events, etc to aside on networkpage, fixes
 in css

---
 view/theme/diabook/icons/toogle_off.png | Bin 391 -> 834 bytes
 view/theme/diabook/icons/toogle_on.png  | Bin 429 -> 715 bytes
 view/theme/diabook/profile_side.tpl     |   3 ++-
 view/theme/diabook/style.css            |  38 +++++++++++++++++++++++++++-----
 view/theme/diabook/theme.php            |   9 ++++----
 5 files changed, 38 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 view/theme/diabook/icons/toogle_off.png
 mode change 100755 => 100644 view/theme/diabook/icons/toogle_on.png

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png
old mode 100755
new mode 100644
index 99490bcd9..0fcce4d5a
Binary files a/view/theme/diabook/icons/toogle_off.png and b/view/theme/diabook/icons/toogle_off.png differ
diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png
old mode 100755
new mode 100644
index 81e8f9120..79ce07f0e
Binary files a/view/theme/diabook/icons/toogle_on.png and b/view/theme/diabook/icons/toogle_on.png differ
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 595684bf5..01da55ce1 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -8,10 +8,11 @@
 	
 <ul id="profile-side-menu" class="menu-profile-side">
 	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
 	<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
 	<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
 	<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
 </ul>
 
 </div>
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index df692cbc6..437f323fa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -462,7 +462,7 @@ code {
 }
 #panel {
   position: absolute;
-  width: 10em;
+  width: 12em;
   background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
@@ -769,8 +769,6 @@ ul.menu-popup {
   margin: 0px;
   padding: 0px;
   list-style: none;
-  border: 1px solid #364e59;
-  border-top-color: transparent;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
@@ -1904,7 +1902,6 @@ ul.tabs li .active {
 /* photo */
 .lframe {
   float: left;
-  margin: 0px 10px 10px 0px;
 }
 /* profile match wrapper */
 .profile-match-wrapper {
@@ -2352,7 +2349,36 @@ float: left;
   color: #999999;
 }
 
-.photo-top-image-wrapper {
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #EEE;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+}
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+/*.photo-top-image-wrapper {
         position: relative;
         float: left;
         margin-top: 15px;
@@ -2368,7 +2394,7 @@ float: left;
         padding: 0px 3px;
         padding-top: 0.5em;
         background-color: rgb(255, 255, 255);
-}
+}*/
 #photo-top-end {
         clear: both;
 }
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 9b3ed30b0..9093ac2ca 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/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: 
  */
@@ -34,7 +34,7 @@ $ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profil
 $ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
 $ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
 $ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-
+$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
 
 if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
 $tpl = get_markup_template('profile_side.tpl');
@@ -46,8 +46,7 @@ $a->page['aside'] .= replace_macros($tpl, array(
 }
 }
 
-//js script
-
+//js scripts
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
-- 
cgit v1.2.3


From 02395c8af5fd8112688920ae04e0971d1a4ee4f8 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 16 Mar 2012 03:49:43 +0100
Subject: added icons to profile_side, fixes in css

---
 view/theme/diabook/style.css         |  7 ++-----
 view/theme/diabook/wall_item.tpl     |  7 ++-----
 view/theme/diabook/wallwall_item.tpl | 11 ++++-------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'view/theme/diabook')

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index b7568631f..437f323fa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -485,9 +485,6 @@ code {
 #sidebar-group-list .tool:hover {
 	background: #EEE;
 }
-#sidebar-pages-list .tool:hover {
-	background: #EEE;
-}
 .tool .label {
   float: left;
 }
@@ -1337,14 +1334,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #999;
+  color: #3465A4;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #999;
+  color: #3465A4;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 321bbbe9e..ebe40fd4e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,8 +13,7 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -22,8 +21,7 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -97,4 +95,3 @@ class="wall-item-name$item.sparkle">$item.name</span></a>
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
-
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 05ed4cc82..e02e5a8be 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,8 +18,7 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -27,10 +26,8 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
-id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 				 $item.vwall <span class="wall-item-ago">- &nbsp;
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -103,4 +100,4 @@ id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 
 <div class="wall-item-comment-wrapper" >
 	$item.comment
-</div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3