aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css7
-rwxr-xr-xview/tpl/jot-header.tpl7
-rwxr-xr-xview/tpl/jot.tpl6
-rwxr-xr-xview/tpl/prv_message.tpl2
4 files changed, 21 insertions, 1 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c5d41d7ba..1a556df06 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -319,7 +319,8 @@ footer {
#profile-video,
#profile-audio,
#profile-link,
-#profile-title,
+#profile-title,
+#profile-expires,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
@@ -1137,6 +1138,10 @@ footer {
float: left;
margin-left: 15px;
}
+#profile-expire-wrapper {
+ float: left;
+ margin-left: 15px;
+}
#jot-preview-link {
float: left;
margin-left: 45px;
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 527db4e4f..05928bc32 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -191,6 +191,13 @@ function enableOnUser(){
}
}
+ function jotGetExpiry() {
+ reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+ if(reply && reply.length) {
+ $('#jot-expire').val(reply);
+ }
+ }
+
function jotShare(id) {
if ($('#jot-popup').length != 0) $('#jot-popup').show();
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 12978038c..f7dd12758 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -5,6 +5,7 @@
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+ <input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="webpage" value="{{$webpage}}" />
@@ -50,6 +51,11 @@
<div id="profile-nolocation-wrapper" style="display: none;" >
<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
</div>
+ <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
+ <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
+ </div>
+
+
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<div id="profile-rotator"></div>
</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 494eec48c..35f50da00 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -17,8 +17,10 @@
<div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+{{if $feature_expire}}
<div id="prvmail-expires-label">{{$expires}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-expires" name="expires" value="" tabindex="12" />
+{{/if}}
<div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="13">{{$text}}</textarea>