From 02f8e95b1a4b44f140b2e871097673185158d8a5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 12:28:28 -0500 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: deleted readme.txt from folder diabook github finally working adjust3 adjust2 adjust * master: From 81de5f780284f27964c8ec5147768450aa203f72 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 13:59:28 -0500 Subject: [PATCH 2/2] apply changes to templates to testbubble Signed-off-by: Simon L'nu --- view/theme/duepuntozero/wallwall_item.tpl | 4 +- view/theme/testbubble/comment_item.tpl | 5 +- view/theme/testbubble/conversation.tpl | 14 +++- view/theme/testbubble/search_item.tpl | 55 ++++++++------ view/theme/testbubble/wall_item.tpl | 92 +++++++++++------------ view/theme/testbubble/wallwall_item.tpl | 88 +++++++++++----------- 6 files changed, 135 insertions(+), 123 deletions(-) diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 211906c93..5cb2dbc3b 100755 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -28,8 +28,8 @@
$item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
+
$item.ago
+
$item.title
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index 4754a1eb7..6d9230dbf 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -11,6 +11,7 @@ $mytitle
+ {{ if $qcomment }} {{ for $qcomment as $qc }} $qc @@ -18,14 +19,12 @@ {{ endfor }} {{ endif }} - -
- +
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl index 33cedfb1e..43bb1dd47 100755 --- a/view/theme/testbubble/conversation.tpl +++ b/view/theme/testbubble/conversation.tpl @@ -1,6 +1,18 @@ {{ for $threads as $thread }}
- $thread.html + {{ for $thread.items as $item }} + {{if $item.comment_firstcollapsed}} +
+ $thread.num_comments $thread.hide_text +
+ {{endif}} + + {{ inc $item.template }}{{ endinc }} + + + {{ endfor }}
{{ endfor }} diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl index 27a08e4eb..a0a4ef393 100755 --- a/view/theme/testbubble/search_item.tpl +++ b/view/theme/testbubble/search_item.tpl @@ -1,48 +1,53 @@ -
-
-
-
- - $name - menu -
+
+
+
+
+ + $item.name + menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
- {{ if $drop.dropping }}{{ endif }} +
+
+ {{ if $item.drop.dropping }}{{ endif }}
- {{ if $drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }}
-
-
$title
+
+
$item.title
-
$body
+
$item.body
- $name -
$ago
+ $item.name +
$item.ago
-
- {{ if $conv }}$conv.title{{ endif }} +
+ + +
+ {{ if $item.conv }} + $item.conv.title + {{ endif }}
-
+
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 2b0e6740a..190e06a8a 100755 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -1,82 +1,78 @@ - -
-
-
-
- - $name +
+
+
+
+ + $item.name - menu -
+ menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
$title
+
+
$item.title
-
$body -
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
- -
- {{ if $vote }} - -
+
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index cd4def7fc..eb7c3ddba 100755 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -1,81 +1,81 @@ -
-
-
-
- - $owner_name +
+
+
+
+ + $item.owner_name
-
$wall
-
- - $name - menu -
+
$item.wall
+
+ + $item.name + menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
$title
+
+
$item.title
-
$body +
$item.body
- {{ for $tags as $tag }} + {{ for $item.tags as $tag }} $tag {{ endfor }}
-
- {{ if $vote }} - -
+