diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 26 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_head.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/message_side.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/uexport.tpl | 7 |
8 files changed, 46 insertions, 41 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index e2ce3c552..26434b20a 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -78,6 +78,7 @@ {{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$delivery_interval}} + {{include file="field_input.tpl" field=$delivery_batch_count}} {{include file="field_input.tpl" field=$poll_interval}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$abandon_days}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index ec8f8c1e3..2e64de7bc 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,18 +1,18 @@ -<div class="mail-conv-outside-wrapper"> +<div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper"> <div class="mail-conv-sender" > - <a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a> - <div class="mail-conv-sender-name" >{{$mail.from_name}}</div> + <a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a> </div> - <div class="mail-conv-detail" > + <div class="mail-conv-detail"> {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} - <div class="mail-conv-date">{{$mail.date}}</div> - <div class="mail-conv-subject">{{$mail.subject}}</div> + <div class="mail-conv-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> + <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> <div class="mail-conv-body">{{$mail.body}}</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> - {{if $mail.can_recall}} - <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> - {{/if}} - <div class="mail-conv-outside-wrapper-end"></div> -</div> + <div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" > + {{if $mail.can_recall}} + <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a> + {{/if}} + <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a> + </div> + </div> + <div class="clear"></div> </div> -<hr class="mail-conv-break" /> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 062710f1d..789c25ade 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,6 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + <a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> <h2>{{$prvmsg_header}}</h2> + <div class="clear"></div> </div> <div class="section-content-wrapper"> {{foreach $mails as $mail}} diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 7bc854fff..d52fa40e0 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,10 +1,8 @@ -<div class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <h2>{{$header}}</h2> - </div> - <div class="section-content-wrapper"> - {{foreach $messages as $message}} - {{include file="mail_list.tpl"}} - {{/foreach}} - </div> +<div class="widget"> + <h3>{{$header}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{foreach $messages as $message}} + {{include file="mail_list.tpl"}} + {{/foreach}} + </ul> </div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index e3f8ef75c..fc9b5afa8 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,6 +1,7 @@ -<a href="{{$message.from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$message.from_photo}}" alt="{{$message.from_name}}" /></a> -<span class="mail-list">{{$message.from_name}}</span> -<span class="mail-list {{if $message.seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$message.id}}" class="mail-link">{{$message.subject}}</a></span> -<span class="mail-list" title="{{$message.date}}">{{$message.date}}</span> -<span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$message.id}}" onclick="return confirmDelete();" title="{{$message.delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> -<div class="clear"></div> +<li> + <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}"> + <span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> + <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> + <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> + </a> +</li> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 3e32eae14..b3bb94d71 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,14 +1,10 @@ <div class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li> - <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li> + <li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.label}}</a></li> + <li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li> + <li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li> + <li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li> + <li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li> </ul> - {{if $tabs}} - <ul class="nav nav-pills nav-stacked"> - {{foreach $tabs as $t}} - <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li> - {{/foreach}} - </ul> - {{/if}} </div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index c6f393aa4..a83896f32 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -8,7 +8,7 @@ <div id="prvmail-to-label">{{$to}}</div> {{if $showinputs}} -<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" /> +<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" tabindex="10" /> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}"> {{else}} {{$select}} @@ -18,10 +18,10 @@ <input type="hidden" name="media_str" id="jot-media" value="" /> <div id="prvmail-subject-label">{{$subject}}</div> -<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> +<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> <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 class="prvmail-text form-control" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea> <div id="prvmail-submit-wrapper" > @@ -51,6 +51,6 @@ <div id="prvmail-rotator"></div> </div> </div> -<div id="prvmail-end"></div> +<div id="prvmail-end" class="clear"></div> </form> </div> diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index b9a1b9572..7eafd97a6 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -8,5 +8,12 @@ <p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> <p>{{$full}}</p> + + <p>{{$extra}}</p> + <p>{{$extra2}}</p> + <p>{{$extra3}}</p> + + <p>{{$extra4}}</p> + </div> </div> |