From c26787ab948d719fd59c8dc856ddfd67d101198b Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 2 Mar 2012 15:57:32 +0100
Subject: adjust2

---
 view/theme/diabook               |  1 -
 view/theme/diabook/wall_item.tpl | 92 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 delete mode 160000 view/theme/diabook
 create mode 100644 view/theme/diabook/wall_item.tpl

(limited to 'view/theme/diabook/wall_item.tpl')

diff --git a/view/theme/diabook b/view/theme/diabook
deleted file mode 160000
index e29c43c4e..000000000
--- a/view/theme/diabook
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e29c43c4e78e42f448cbd84dc51a3a346bdab01f
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
new file mode 100644
index 000000000..1f1a878b4
--- /dev/null
+++ b/view/theme/diabook/wall_item.tpl
@@ -0,0 +1,92 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<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>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</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> 
+			<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 }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $item.tag }}
+				<span class='tag'>$item.tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-location">$item.location&nbsp;</div>
+			<div class="wall-item-actions-social">
+		
+		{{ if $item.star }}
+				<a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+			{{ endif }}
+				
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}				
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
-- 
cgit v1.2.3


From d3f83c93753791708b873df46b00d749f27ae7df Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 3 Mar 2012 00:41:02 +0100
Subject: fixed broken tags and notifications in theme

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

(limited to 'view/theme/diabook/wall_item.tpl')

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 1f1a878b4..c1205b01b 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -38,8 +38,8 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
-- 
cgit v1.2.3


From 8f72d95b0e3e7a0da1702cf95cc40d0df1aef96d Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 3 Mar 2012 01:52:53 +0100
Subject: fix in wall_item.tpl new icon link.png

---
 view/theme/diabook/wall_item.tpl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'view/theme/diabook/wall_item.tpl')

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index c1205b01b..728e863e6 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -36,6 +36,7 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-tags">
 			{{ for $item.tags as $tag }}
@@ -45,17 +46,11 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
-		
-		{{ if $item.star }}
-				<a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
 				
 			{{ if $item.vote }}
 				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
@@ -64,7 +59,14 @@
 						
 			{{ if $item.vote.share }}
 				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}				
+			{{ endif }}		
+			
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+			{{ endif }}			
+					
 			</div>
 			
 			<div class="wall-item-actions-tools">
-- 
cgit v1.2.3


From d138d07c05900df4b67df99437ef628f4af6564d Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 3 Mar 2012 04:27:06 +0100
Subject: fixes in wall_item.tpl and style.css in theme diabook

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

(limited to 'view/theme/diabook/wall_item.tpl')

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 728e863e6..10d395316 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -5,6 +5,9 @@
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
+
+
+
 <div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
-- 
cgit v1.2.3