aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css2
-rwxr-xr-xview/tpl/msg-header.tpl7
-rwxr-xr-xview/tpl/prv_message.tpl18
3 files changed, 19 insertions, 8 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1a556df06..a7e8f0717 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1711,11 +1711,13 @@ tr.mceLast {
#prvmail-upload-wrapper,
#prvmail-attach-wrapper,
#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
#prvmail-rotator-wrapper {
float: left;
margin-top: 10px;
margin-right: 10px;
width: 24px;
+ cursor: pointer;
}
#prvmail-end {
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 5e2597605..79f9e23c1 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -85,6 +85,13 @@ else
}
}
+ function prvmailGetExpiry() {
+ reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
+ if(reply && reply.length) {
+ $('#inp-prvmail-expires').val(reply);
+ }
+ }
+
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 35f50da00..621f56be7 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -14,20 +14,17 @@
{{$select}}
{{/if}}
+<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+
<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>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" >
- <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="14" />
+ <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" >
<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
</div>
@@ -36,10 +33,15 @@
<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
</div>
-
<div id="prvmail-link-wrapper" >
<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
</div>
+
+ <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
+ <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+ </div>
+
+
<div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div>