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