From 6162de142c2765c770f43bf269f0444310551705 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 6 Nov 2013 18:28:36 -0800
Subject: allow private mail sender to set an expiration on their messages.
 Once expired the message is destroyed at both ends (subject to the
 granularity of the polling interval) and is gone. Officially it takes some
 form of language independent string like 2013/11/22, but English speakers can
 use anything that strtotime() understands, like "+30 minutes" or "next
 Tuesday".

---
 view/theme/redbasic/css/style.css | 2 +-
 view/tpl/prv_message.tpl          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 32d33ad70..c5d41d7ba 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1693,7 +1693,7 @@ tr.mceLast {
 }
 
 
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+#prvmail-to-label, #prvmail-subject-label, #prvmail-expires-label, #prvmail-message-label {
 	margin-bottom: 10px;
 	margin-top: 20px;
 }
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index d65bc3570..494eec48c 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -17,12 +17,15 @@
 <div id="prvmail-subject-label">{{$subject}}</div>
 <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
+<div id="prvmail-expires-label">{{$expires}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-expires" name="expires" value="" tabindex="12" />
+
 <div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="13">{{$text}}</textarea>
 
 
 <div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="14" />
 	<div id="prvmail-upload-wrapper" >
 		<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
 	</div> 
-- 
cgit v1.2.3