diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-26 13:28:24 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-26 13:28:24 -0700 |
| commit | 15d1a6c9374a20379d98bfac729ecf10609a7759 (patch) | |
| tree | 4cafe3c9d8f655880eaee3846d29ac157b6a9f1c /view/tpl | |
| parent | 9ab335626cdaad433c8f5b6d7fd4d980c1b37742 (diff) | |
| parent | 451db7dd98bcfb1525ee3dd0acfcd311b5615912 (diff) | |
| download | volse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.tar.gz volse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.tar.bz2 volse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 24 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index ec8f8c1e3..0a5e5a2c5 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,18 +1,18 @@ <div 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/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="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" 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/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> |