From a798ef1a5677b0669ce9262bcc868769e985df00 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 24 Sep 2012 21:43:03 -0700 Subject: [PATCH 1/2] one template to rule them all --- view/wall_thread.tpl | 51 ++++++++++++++++++++-------------------- view/wallwall_thread.tpl | 10 ++++---- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl index 86a937fef5..ef7236bafa 100644 --- a/view/wall_thread.tpl +++ b/view/wall_thread.tpl @@ -6,38 +6,40 @@ {{endif}}
-{{ if $item.threaded }} -
-{{ else }} -
-{{ endif }} +
-
-
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu -
-
    - $item.item_photo_menu -
-
+
+
    + $item.item_photo_menu +
+
+
{{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- -
+ $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
+
$item.ago
+
$item.title
@@ -80,14 +82,15 @@ {{ endif }} {{ if $item.filer }} - {{ endif }} + {{ endif }} +
{{ if $item.drop.dropping }}{{ endif }}
{{ if $item.drop.dropping }}{{ endif }}
-
+
$item.dislike
@@ -106,12 +109,10 @@ {{ inc $item.template }}{{ endinc }} {{ endfor }} -{{ if $item.comment }} {{ if $item.flatten }}
$item.comment
{{ endif }} -{{ endif }}
{{if $item.comment_lastcollapsed}}
{{endif}} diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl index 211f951328..ef7236bafa 100644 --- a/view/wallwall_thread.tpl +++ b/view/wallwall_thread.tpl @@ -6,15 +6,17 @@ {{endif}}
-
+
-
+
+ {{ if $item.owner_url }}
$item.wall
-
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
$item.ago
From 245d9f0aca069e84066a20b0a2a545c67f48ac11 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 25 Sep 2012 01:31:48 -0700 Subject: [PATCH 2/2] one template to rule them all --- include/conversation.php | 8 +- object/Item.php | 2 - view/theme/comix-plain/wall_item.tpl | 78 ---------- view/theme/comix-plain/wallwall_item.tpl | 85 ----------- view/theme/comix/wall_item.tpl | 78 ---------- view/theme/comix/wallwall_item.tpl | 85 ----------- view/theme/diabook/wall_item.tpl | 109 -------------- view/theme/diabook/wall_thread.tpl | 1 - view/theme/diabook/wallwall_item.tpl | 115 --------------- view/theme/diabook/wallwall_thread.tpl | 134 ----------------- view/theme/dispy/wall_item.tpl | 98 ------------- view/theme/dispy/wall_thread.tpl | 65 ++++---- view/theme/dispy/wallwall_item.tpl | 108 -------------- view/theme/dispy/wallwall_thread.tpl | 131 ----------------- view/theme/facepark/wall_item.tpl | 77 ---------- view/theme/facepark/wallwall_item.tpl | 82 ----------- view/theme/frost-mobile/wall_item.tpl | 82 ----------- view/theme/frost-mobile/wall_thread.tpl | 55 +++---- view/theme/frost-mobile/wallwall_item.tpl | 87 ----------- view/theme/frost-mobile/wallwall_thread.tpl | 109 -------------- view/theme/frost/wall_item.tpl | 79 ---------- view/theme/frost/wall_thread.tpl | 56 +++---- view/theme/frost/wallwall_item.tpl | 86 ----------- view/theme/frost/wallwall_thread.tpl | 108 -------------- view/theme/quattro/wall_item.tpl | 94 ------------ view/theme/quattro/wall_thread.tpl | 31 ++-- view/theme/quattro/wallwall_item.tpl | 96 ------------ view/theme/quattro/wallwall_thread.tpl | 155 -------------------- view/theme/smoothly/wall_item.tpl | 114 -------------- view/theme/smoothly/wall_thread.tpl | 71 +++++---- view/theme/smoothly/wallwall_item.tpl | 121 --------------- view/theme/smoothly/wallwall_thread.tpl | 145 ------------------ view/theme/testbubble/wall_item.tpl | 78 ---------- view/theme/testbubble/wall_thread.tpl | 41 +++--- view/theme/testbubble/wallwall_item.tpl | 81 ---------- view/theme/testbubble/wallwall_thread.tpl | 103 ------------- view/theme/vier/wall_item.tpl | 92 ------------ view/theme/vier/wall_thread.tpl | 25 +++- view/theme/vier/wallwall_item.tpl | 99 ------------- view/theme/vier/wallwall_thread.tpl | 151 ------------------- view/wall_item.tpl | 88 ----------- view/wall_thread.tpl | 2 +- view/wallwall_item.tpl | 95 ------------ view/wallwall_thread.tpl | 118 --------------- 44 files changed, 195 insertions(+), 3523 deletions(-) delete mode 100644 view/theme/comix-plain/wall_item.tpl delete mode 100644 view/theme/comix-plain/wallwall_item.tpl delete mode 100644 view/theme/comix/wall_item.tpl delete mode 100644 view/theme/comix/wallwall_item.tpl delete mode 100644 view/theme/diabook/wall_item.tpl delete mode 100644 view/theme/diabook/wallwall_item.tpl delete mode 100644 view/theme/diabook/wallwall_thread.tpl delete mode 100644 view/theme/dispy/wall_item.tpl delete mode 100644 view/theme/dispy/wallwall_item.tpl delete mode 100644 view/theme/dispy/wallwall_thread.tpl delete mode 100644 view/theme/facepark/wall_item.tpl delete mode 100644 view/theme/facepark/wallwall_item.tpl delete mode 100644 view/theme/frost-mobile/wall_item.tpl delete mode 100644 view/theme/frost-mobile/wallwall_item.tpl delete mode 100644 view/theme/frost-mobile/wallwall_thread.tpl delete mode 100644 view/theme/frost/wall_item.tpl delete mode 100644 view/theme/frost/wallwall_item.tpl delete mode 100644 view/theme/frost/wallwall_thread.tpl delete mode 100644 view/theme/quattro/wall_item.tpl delete mode 100644 view/theme/quattro/wallwall_item.tpl delete mode 100644 view/theme/quattro/wallwall_thread.tpl delete mode 100644 view/theme/smoothly/wall_item.tpl delete mode 100644 view/theme/smoothly/wallwall_item.tpl delete mode 100644 view/theme/smoothly/wallwall_thread.tpl delete mode 100644 view/theme/testbubble/wall_item.tpl delete mode 100644 view/theme/testbubble/wallwall_item.tpl delete mode 100644 view/theme/testbubble/wallwall_thread.tpl delete mode 100644 view/theme/vier/wall_item.tpl delete mode 100644 view/theme/vier/wallwall_item.tpl delete mode 100644 view/theme/vier/wallwall_thread.tpl delete mode 100644 view/wall_item.tpl delete mode 100644 view/wallwall_item.tpl delete mode 100644 view/wallwall_thread.tpl diff --git a/include/conversation.php b/include/conversation.php index 1bdde5e9ff..4026923d85 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -359,7 +359,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $result = array(); $wall_template = 'wall_thread.tpl'; - $wallwall_template = 'wallwall_thread.tpl'; +// $wallwall_template = 'wallwall_thread.tpl'; $items_seen = 0; $nb_items = count($items); @@ -504,7 +504,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $owner_url = zrl($a->page_contact['url']); $owner_photo = $a->page_contact['thumb']; $owner_name = $a->page_contact['name']; - $template = $wallwall_template; $commentww = 'ww'; } else if($item['owner-link']) { @@ -527,7 +526,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $owner_url = $item['owner-link']; $owner_photo = $item['owner-avatar']; $owner_name = $item['owner-name']; - $template = $wallwall_template; $commentww = 'ww'; // If it is our contact, use a friendly redirect link if((link_compare($item['owner-link'],$item['url'])) @@ -793,8 +791,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $items = $cb['items']; $cmnt_tpl = get_markup_template('comment_item.tpl'); - $tpl = 'wall_item.tpl'; - $wallwall = 'wallwall_item.tpl'; $hide_comments_tpl = get_markup_template('hide_comments.tpl'); $alike = array(); @@ -814,7 +810,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { // "New Item View" on network page or search page results // - just loop through the items and format them minimally for display - //$tpl = get_markup_template('search_item.tpl'); +// $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; foreach($items as $item) { diff --git a/object/Item.php b/object/Item.php index ed439e4d29..e039968bd7 100644 --- a/object/Item.php +++ b/object/Item.php @@ -598,7 +598,6 @@ class Item extends BaseObject { $this->owner_url = zrl($a->page_contact['url']); $this->owner_photo = $a->page_contact['thumb']; $this->owner_name = $a->page_contact['name']; - $this->set_template('wall2wall'); $this->wall_to_wall = true; } else if($this->get_data_value('owner-link')) { @@ -620,7 +619,6 @@ class Item extends BaseObject { $this->owner_photo = $this->get_data_value('owner-avatar'); $this->owner_name = $this->get_data_value('owner-name'); - $this->set_template('wall2wall'); $this->wall_to_wall = true; // If it is our contact, use a friendly redirect link if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl deleted file mode 100644 index 0ef70cf8b9..0000000000 --- a/view/theme/comix-plain/wall_item.tpl +++ /dev/null @@ -1,78 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl deleted file mode 100644 index 4c5b120873..0000000000 --- a/view/theme/comix-plain/wallwall_item.tpl +++ /dev/null @@ -1,85 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl deleted file mode 100644 index 0ef70cf8b9..0000000000 --- a/view/theme/comix/wall_item.tpl +++ /dev/null @@ -1,78 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl deleted file mode 100644 index 4c5b120873..0000000000 --- a/view/theme/comix/wallwall_item.tpl +++ /dev/null @@ -1,85 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl deleted file mode 100644 index 8acc91193d..0000000000 --- a/view/theme/diabook/wall_item.tpl +++ /dev/null @@ -1,109 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body - {{ 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 }} -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl index cea2705976..4846841761 100644 --- a/view/theme/diabook/wall_thread.tpl +++ b/view/theme/diabook/wall_thread.tpl @@ -36,7 +36,6 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body - {{ if $item.has_cats }}
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl deleted file mode 100644 index 0a183f0766..0000000000 --- a/view/theme/diabook/wallwall_item.tpl +++ /dev/null @@ -1,115 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body - {{ 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 }} -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl deleted file mode 100644 index 4846841761..0000000000 --- a/view/theme/diabook/wallwall_thread.tpl +++ /dev/null @@ -1,134 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl deleted file mode 100644 index 0b869e144f..0000000000 --- a/view/theme/dispy/wall_item.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-
-
-
- $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.location }}$item.location {{ endif }} -
-
- $item.name -
-
- $item.ago -
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
    - {{ if $item.star }} -
  • - - -
    • - {{ endif }} - {{ if $item.vote }} - - {{ endif }} -

-
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} -
    • - {{ endif }} - {{ if $item.edpost }} -
    • - {{ endif }} -
  • - {{ if $item.drop.dropping }}
    {{ endif }} - {{ if $item.drop.dropping }}
    {{ endif }} -
    • -
-
-
-
-
$item.title
-
-
- $item.body -
- {{ 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 }} - -
-
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl index 19b32bfaa1..3f06e539b6 100644 --- a/view/theme/dispy/wall_thread.tpl +++ b/view/theme/dispy/wall_thread.tpl @@ -6,21 +6,28 @@ {{endif}}
-
+
-
-
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu -
-
    - $item.item_photo_menu -
-
+
+
    + $item.item_photo_menu +
+
+
@@ -50,26 +57,27 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} {{ endif }}
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} + {{ if $item.filer }} +
    • + {{ endif }} + {{ if $item.plink }}
    • - {{ endif }} - {{ if $item.edpost }} + {{ endif }} + {{ if $item.edpost }}
    • - {{ endif }} -
  • - {{ if $item.drop.dropping }}
    {{ endif }} - {{ if $item.drop.dropping }}
    {{ endif }} -
    • + {{ endif }} + +
  • + {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }} +
@@ -80,9 +88,9 @@ $item.body
{{ for $item.tags as $tag }} - $tag + $tag {{ endfor }} -
+
{{ if $item.has_cats }}
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
@@ -93,10 +101,9 @@
{{ endif }} -
-
+
$item.dislike
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl deleted file mode 100644 index edfbdf27e0..0000000000 --- a/view/theme/dispy/wallwall_item.tpl +++ /dev/null @@ -1,108 +0,0 @@ - -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.location }}$item.location {{ endif }} -
-
- $item.name -
-
- $item.ago -
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
    - {{ if $item.star }} -
  • - - -
    • - {{ endif }} - {{ if $item.vote }} - - {{ endif }} -

-
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} -
    • - {{ endif }} - {{ if $item.edpost }} -
    • - {{ endif }} - -
  • - {{ if $item.drop.dropping }}{{ endif }} - {{ if $item.drop.dropping }}{{ endif }} -
    • -
-
-
-
-
$item.title
-
-
- $item.body -
- {{ 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 }} - -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl deleted file mode 100644 index b150e1fd02..0000000000 --- a/view/theme/dispy/wallwall_thread.tpl +++ /dev/null @@ -1,131 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/facepark/wall_item.tpl b/view/theme/facepark/wall_item.tpl deleted file mode 100644 index dda4bc4a90..0000000000 --- a/view/theme/facepark/wall_item.tpl +++ /dev/null @@ -1,77 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/facepark/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl deleted file mode 100644 index ba6131857f..0000000000 --- a/view/theme/facepark/wallwall_item.tpl +++ /dev/null @@ -1,82 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/frost-mobile/wall_item.tpl b/view/theme/frost-mobile/wall_item.tpl deleted file mode 100644 index f75059d9c7..0000000000 --- a/view/theme/frost-mobile/wall_item.tpl +++ /dev/null @@ -1,82 +0,0 @@ - - -
-
- -
- - $item.name - - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name -
$item.ago
- - -
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
- - $item.comment - - - - diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl index d6fb677c5f..3af6aaa111 100644 --- a/view/theme/frost-mobile/wall_thread.tpl +++ b/view/theme/frost-mobile/wall_thread.tpl @@ -6,46 +6,48 @@ {{endif}}
- +
-
- -
+
+
+ + $item.owner_name +
+
$item.wall
+ +
- $item.name - + $item.name +
+
    + $item.item_photo_menu +
+
--> +
{{ if $item.lock }}$item.lock {{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- + $item.name $item.to $item.owner_name $item.vwall
+
$item.ago
-
-
$item.title
$item.body - + {{ for $item.tags as $tag }} $tag {{ endfor }} - +
@@ -58,7 +60,7 @@
{{ endif }} {{ if $item.plink }} - + {{ endif }} {{ if $item.edpost }} @@ -70,14 +72,15 @@ {{ endif }} {{ if $item.filer }} - {{ endif }} - + {{ endif }} + + {{ if $item.drop.dropping }}{{ endif }} - + {{ if $item.drop.dropping }}{{ endif }}
-
+
$item.dislike
diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl deleted file mode 100644 index 9affbcebae..0000000000 --- a/view/theme/frost-mobile/wallwall_item.tpl +++ /dev/null @@ -1,87 +0,0 @@ - - -
-
-
- - $item.owner_name -
-
$item.wall
- -
- - $item.name - - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
-
- - $item.comment - - - - - diff --git a/view/theme/frost-mobile/wallwall_thread.tpl b/view/theme/frost-mobile/wallwall_thread.tpl deleted file mode 100644 index 3af6aaa111..0000000000 --- a/view/theme/frost-mobile/wallwall_thread.tpl +++ /dev/null @@ -1,109 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl deleted file mode 100644 index e2cb60dbe0..0000000000 --- a/view/theme/frost/wall_item.tpl +++ /dev/null @@ -1,79 +0,0 @@ - - -
-
-
- - $item.name - - menu - -
    - $item.item_photo_menu -
- -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name -
$item.ago
- - -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
- - $item.comment - - - - diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index 008ec89dbf..a60c926fa1 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -6,46 +6,51 @@ {{endif}}
- -
-
-
+ +
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu - -
    - $item.item_photo_menu -
- + +
    + $item.item_photo_menu +
+ +
{{ if $item.lock }}$item.lock {{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- + $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
+
$item.ago
$item.title
$item.body - + {{ for $item.tags as $tag }} $tag {{ endfor }} - +
-
{{ if $item.vote }} -
+
$item.dislike
@@ -102,3 +107,4 @@ {{ endif }}
{{if $item.comment_lastcollapsed}}
{{endif}} + diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl deleted file mode 100644 index 6d7a3ec323..0000000000 --- a/view/theme/frost/wallwall_item.tpl +++ /dev/null @@ -1,86 +0,0 @@ - - -
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu - -
    - $item.item_photo_menu -
- - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
-
- - $item.comment - - - - - diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl deleted file mode 100644 index f23cf00ab3..0000000000 --- a/view/theme/frost/wallwall_thread.tpl +++ /dev/null @@ -1,108 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl deleted file mode 100644 index 731c2d2bfc..0000000000 --- a/view/theme/quattro/wall_item.tpl +++ /dev/null @@ -1,94 +0,0 @@ - -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
$item.location
-
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.plink }}$item.plink.title{{ endif }} -
-
-
- $item.name - $item.ago -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} - {{ if $item.filer }} - $item.filer - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl index 757f175468..2500fbccee 100644 --- a/view/theme/quattro/wall_thread.tpl +++ b/view/theme/quattro/wall_thread.tpl @@ -30,18 +30,25 @@
-
- $item.name + $item.name menu +
+ {{ if $item.owner_url }} + + {{ endif }}
$item.location
@@ -57,14 +64,20 @@ $tag {{ endfor }}
-
+
-
+
{{ if $item.plink }}$item.plink.title{{ endif }}
- $item.name $item.ago + $item.name + $item.ago + {{ if $item.owner_url }}
$item.to $item.owner_name $item.vwall + {{ endif }}
@@ -72,6 +85,7 @@ $item.star.do $item.star.undo $item.star.tagger + {{ endif }} {{ if $item.filer }} $item.filer @@ -105,19 +119,18 @@
$item.dislike
- {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.thread_level!=1 }} + + {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
- $item.comment + $item.comment
{{ endif }}{{ endif }}{{ endif }} -
- {{ for $item.children as $child }} {{ if $item.type == tag }} {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }} diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl deleted file mode 100644 index e26b186360..0000000000 --- a/view/theme/quattro/wallwall_item.tpl +++ /dev/null @@ -1,96 +0,0 @@ -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
- - $item.owner_name - -
-
$item.location
-
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.plink }}$item.plink.title{{ endif }} -
-
-
- $item.name $item.ago -
$item.to $item.owner_name $item.vwall - -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - - {{ endif }} - {{ if $item.filer }} - $item.filer - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
-
- $item.comment -
diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl deleted file mode 100644 index 4589390089..0000000000 --- a/view/theme/quattro/wallwall_thread.tpl +++ /dev/null @@ -1,155 +0,0 @@ -{{if $mode == display}} -{{ else }} -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text - {{ if $item.thread_level==3 }} - - expand / - collapse thread{{ endif }} -
- {{endif}} -{{ endif }} - -{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
-{{ endif }}{{ endif }}{{ endif }} - - -{{ if $item.flatten }} -
$item.comment
-{{ endif }} diff --git a/view/theme/smoothly/wall_item.tpl b/view/theme/smoothly/wall_item.tpl deleted file mode 100644 index 38a097f756..0000000000 --- a/view/theme/smoothly/wall_item.tpl +++ /dev/null @@ -1,114 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.location }} - $item.location - {{ endif }} -
-
-
- {{ if $item.lock }} -
- $item.lock -
- {{ else }} -
- {{ endif }} -
-
-
$item.title
-
-
$item.body -
- {{ 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 }} -
-
- - -
- {{ if $item.edpost }} - - {{ endif }} - -
- {{ if $item.drop.dropping }} - - {{ endif }} -
- - {{ if $item.drop.dropping }} - {{ endif }} - -
-
- -
- - $item.name - -
$item.ago
- -
-
-
- -
$item.dislike
-
$item.comment
-
- -
- diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl index 0c513ec794..09799e881f 100644 --- a/view/theme/smoothly/wall_thread.tpl +++ b/view/theme/smoothly/wall_thread.tpl @@ -1,47 +1,48 @@ {{if $item.comment_firstcollapsed}}
- $item.num_comments - $item.hide_text + $item.num_comments + $item.hide_text