From 7bb92899218a2a0de261d3caeed1d723a508cc13 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Aug 2013 21:06:11 -0700
Subject: Preparatory work for photo conversations (third time). Also take away
 unused "post new activity" preferences until they actually do something.

---
 view/tpl/settings.tpl              | 6 +++---
 view/tpl/threaded_conversation.tpl | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 194b90e80..0471546a6 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -100,9 +100,9 @@
 <div id="settings-notifications">
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
-
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{*the next two aren't yet implemented *}}
+{{*include file="field_checkbox.tpl" field=$post_newfriend*}}
+{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
 {{include file="field_checkbox.tpl" field=$post_profilechange}}
 
 
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 4bfcde896..2d71f01ab 100755
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,3 +1,6 @@
+{{if $photo_item}}
+{{$photo_item}}
+{{/if}}
 {{foreach $threads as $thread_item}}
 {{include file="{{$thread_item.template}}" item=$thread_item}}
 {{/foreach}}
-- 
cgit v1.2.3