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

diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
index 4b70ab98d16ec178935b51f3b11a6f4071bf46aa..8cf08df8b22e4ae3d6cc4da7cfefa8a0bde739c6 100644 (file)
--- 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 7b39ec53a4bcf87242bcfdd5c14b3b8a302922b0..dbf50a9ea03a6ba7b2d9e6f094446ae309bd03b4 100644 (file)
--- 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 a8f4bc908cdc199536cb458aaf412176eb5bde3f..38a097f75635caf136169b033a8739b90d8fdee2 100644 (file)
--- 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 60b1d30dccfe82bae741ba48b7ddfa0eeabe0cd2..0c513ec794357c73b149c87f609e3a61c87eab65 100644 (file)
--- 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 eb953968119c7a634c78c6a66edf83035c2fa910..caeb920e5ad0dc942f83257b4496eba181e951b7 100644 (file)
--- 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 06822d013ca8acf176bc586cccf6fc5c7b53d698..1be97a20309296f522ece0d1e3aba6b9347b494d 100644 (file)
--- 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">