From 05223cc32592e4ed92385112fb08ad771a7e3234 Mon Sep 17 00:00:00 2001 From: pixelroot 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 4b70ab98d..8cf08df8b 100644 --- a/view/theme/smoothly/search_item.tpl +++ b/view/theme/smoothly/search_item.tpl @@ -1,3 +1,4 @@ +
@@ -34,7 +35,7 @@
$item.name -
$item.ago
+
$item.ago
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 7b39ec53a..dbf50a9ea 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 * Maintainer: Alex * Screenshot: Screenshot */ +$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 EOT; - // custom css - if (!is_null($cssFile)) { + /** custom css **/ + if (!is_null($cssFile)) { $a->page['htmlhead'] .= sprintf('', $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 a8f4bc908..38a097f75 100644 --- a/view/theme/smoothly/wall_item.tpl +++ b/view/theme/smoothly/wall_item.tpl @@ -39,6 +39,20 @@ $tag {{ endfor }}
+ + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
@@ -83,8 +97,10 @@
- $item.name -
$item.ago
+ + $item.name + +
$item.ago
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl index 60b1d30dc..0c513ec79 100644 --- a/view/theme/smoothly/wall_thread.tpl +++ b/view/theme/smoothly/wall_thread.tpl @@ -46,7 +46,8 @@ $item.name -
• $item.ago
+
+
$item.ago
@@ -56,11 +57,25 @@
$item.title
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+ + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}