From 05223cc32592e4ed92385112fb08ad771a7e3234 Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Mon, 24 Sep 2012 10:15:31 +0200
Subject: [PATCH] 	modified:   view/theme/smoothly/search_item.tpl 
 modified:   view/theme/smoothly/theme.php 	modified:  
 view/theme/smoothly/wall_item.tpl 	modified:  
 view/theme/smoothly/wall_thread.tpl 	modified:  
 view/theme/smoothly/wallwall_item.tpl 	modified:  
 view/theme/smoothly/wallwall_thread.tpl

---
 view/theme/smoothly/search_item.tpl     |  3 ++-
 view/theme/smoothly/theme.php           | 13 ++++++++----
 view/theme/smoothly/wall_item.tpl       | 20 ++++++++++++++++--
 view/theme/smoothly/wall_thread.tpl     | 27 +++++++++++++++++++------
 view/theme/smoothly/wallwall_item.tpl   | 16 ++++++++++++++-
 view/theme/smoothly/wallwall_thread.tpl | 27 +++++++++++++++++++------
 6 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
index 4b70ab98d1..8cf08df8b2 100644
--- a/view/theme/smoothly/search_item.tpl
+++ b/view/theme/smoothly/search_item.tpl
@@ -1,3 +1,4 @@
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
@@ -34,7 +35,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>			
 		
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 7b39ec53a4..dbf50a9ea0 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,15 +3,19 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.9.20-3
+ * Version: Version 0.9.24-1
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
+$a = get_app();
 $a->theme_info = array();
 
 function smoothly_init(&$a) {
+	$cssFile = null;
+	$ssl_state = null;
+	$baseurl = $a->get_baseurl($ssl_state);
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
@@ -95,10 +99,10 @@ $('.savedsearchterm').hover(
 </script>
 EOT;
 
-    // custom css
-    if (!is_null($cssFile)) {
+    	/** custom css **/
+	if (!is_null($cssFile)) {
         $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-    }
+	}
 
 _js_in_foot();
 
@@ -109,6 +113,7 @@ if(! function_exists('_js_in_foot')) {
 		/** @purpose insert stuff in bottom of page
 		*/
 		$a = get_app();
+		$ssl_state = null;
 		$baseurl = $a->get_baseurl($ssl_state);
 		$bottom['$baseurl'] = $baseurl;
 		$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
diff --git a/view/theme/smoothly/wall_item.tpl b/view/theme/smoothly/wall_item.tpl
index a8f4bc908c..38a097f756 100644
--- a/view/theme/smoothly/wall_item.tpl
+++ b/view/theme/smoothly/wall_item.tpl
@@ -39,6 +39,20 @@
 					<span class='tag'>$tag</span>
 					{{ endfor }}
 				</div>
+
+				{{ if $item.has_cats }}
+				<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
+
+				{{ if $item.has_folders }}
+				<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
 			</div>
 		</div>
 		<div class="wall-item-social" id="wall-item-social-$item.id">
@@ -83,8 +97,10 @@
 		</div>
 		
 		<div class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
+			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
+			</a>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>	
 	</div>
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index 60b1d30dcc..0c513ec794 100644
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -46,7 +46,8 @@
 			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
 			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
 			</a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">&bull; $item.ago</div>
+			<div class="wall-item-ago">&bull;</div>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 		</div>	
 
 		<div>
@@ -56,11 +57,25 @@
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
+				<div class="body-tag">
+					{{ for $item.tags as $tag }}
+					<span class='tag'>$tag</span>
+					{{ endfor }}
+				</div>
+
+				{{ if $item.has_cats }}
+				<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
+
+				{{ if $item.has_folders }}
+				<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
 			</div>
 		</div>
 <!--
diff --git a/view/theme/smoothly/wallwall_item.tpl b/view/theme/smoothly/wallwall_item.tpl
index eb95396811..caeb920e5a 100644
--- a/view/theme/smoothly/wallwall_item.tpl
+++ b/view/theme/smoothly/wallwall_item.tpl
@@ -47,6 +47,20 @@
 						<span class='tag'>$tag</span>
 					{{ endfor }}
 				</div>
+
+				{{ if $item.has_cats }}
+				<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
+
+				{{ if $item.has_folders }}
+				<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
 			</div>
 		</div>
 
@@ -95,7 +109,7 @@
 			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
 			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
 			</a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 		</div>	
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/smoothly/wallwall_thread.tpl b/view/theme/smoothly/wallwall_thread.tpl
index 06822d013c..1be97a2030 100644
--- a/view/theme/smoothly/wallwall_thread.tpl
+++ b/view/theme/smoothly/wallwall_thread.tpl
@@ -45,7 +45,8 @@
 			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
 			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
 			</a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">&bull; $item.ago</div>
+			<div class="wall-item-ago">&bull;</div>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 		</div>	
 
 		<div>
@@ -54,11 +55,25 @@
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
+				<div class="body-tag">
+					{{ for $item.tags as $tag }}
+					<span class='tag'>$tag</span>
+					{{ endfor }}
+				</div>
+
+				{{ if $item.has_cats }}
+				<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
+
+				{{ if $item.has_folders }}
+				<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
+				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
+				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+				</div>
+				{{ endif }}
 			</div>
 		</div>
 		<div class="wall-item-social" id="wall-item-social-$item.id">