diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index 346934b70..33f68dd6a 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -39,6 +39,7 @@ {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl new file mode 100644 index 000000000..c53f8b017 --- /dev/null +++ b/view/theme/diabook/wall_thread.tpl @@ -0,0 +1,125 @@ +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl new file mode 100644 index 000000000..c53f8b017 --- /dev/null +++ b/view/theme/diabook/wallwall_thread.tpl @@ -0,0 +1,125 @@ +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index 5f6b26a78..3d1701b29 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -94,4 +94,15 @@ $('#hide-comments-' + id).html('$showfewer'); } } + + function showHideCommentBox(id) { + if( $('#comment-edit-form-' + id).is(':visible')) { + $('#comment-edit-form-' + id).hide(); + } + else { + $('#comment-edit-form-' + id).show(); + } + } + + diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl new file mode 100644 index 000000000..5f434d4cb --- /dev/null +++ b/view/theme/dispy/wall_thread.tpl @@ -0,0 +1,115 @@ +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl new file mode 100644 index 000000000..cab97cafa --- /dev/null +++ b/view/theme/dispy/wallwall_thread.tpl @@ -0,0 +1,121 @@ +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}} diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl new file mode 100644 index 000000000..6e017ac29 --- /dev/null +++ b/view/theme/frost-mobile/threaded_conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $item }} +{{ inc $item.template }}{{ endinc }} +{{ endfor }} + +
+ + diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl index 165a188f1..d6fb677c5 100644 --- a/view/theme/frost-mobile/wall_thread.tpl +++ b/view/theme/frost-mobile/wall_thread.tpl @@ -4,7 +4,6 @@ {{endif}}
@@ -103,4 +102,5 @@ {{ endif }}
+{{if $item.comment_lastcollapsed}}{{endif}} diff --git a/view/theme/frost-mobile/wallwall_thread.tpl b/view/theme/frost-mobile/wallwall_thread.tpl index 816c33d2d..3af6aaa11 100644 --- a/view/theme/frost-mobile/wallwall_thread.tpl +++ b/view/theme/frost-mobile/wallwall_thread.tpl @@ -4,7 +4,6 @@ {{endif}}
@@ -106,4 +105,5 @@ {{ endif }}
+{{if $item.comment_lastcollapsed}}{{endif}} diff --git a/view/theme/frost/conversation.tpl b/view/theme/frost/conversation.tpl deleted file mode 100644 index fccd9a8bb..000000000 --- a/view/theme/frost/conversation.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{{ if $dropping }} - -
-{{ endif }} diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index 95c7cf763..9e81c7a6a 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -4,7 +4,6 @@ {{endif}}
@@ -46,6 +45,7 @@
+
{{ if $item.vote }}
@@ -73,6 +73,7 @@ {{ if $item.drop.dropping }}{{ endif }} {{ if $item.drop.dropping }}{{ endif }} +
@@ -100,4 +101,4 @@ {{ endif }} - +{{if $item.comment_lastcollapsed}}{{endif}} diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl index 1117b6903..346e384e5 100644 --- a/view/theme/frost/wallwall_thread.tpl +++ b/view/theme/frost/wallwall_thread.tpl @@ -4,7 +4,6 @@ {{endif}}
@@ -105,4 +104,5 @@ {{ endif }}
+{{if $item.comment_lastcollapsed}}{{endif}}