diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_users.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/locmanage.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 22 | ||||
| -rwxr-xr-x | view/tpl/mail_head.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/siteinfo.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/xrd_host.tpl | 2 |
8 files changed, 38 insertions, 28 deletions
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index f372911a0..8a4b772a8 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -5,8 +5,8 @@ function confirm_delete_multi(){ return confirm("{{$confirm_delete_multi}}"); } - function selectall(cls){ - $("."+cls).attr('checked','checked'); + function toggle_selectall(cls){ + $("."+cls).prop("checked", !$("."+cls).prop("checked")); return false; } </script> @@ -40,7 +40,7 @@ {{/foreach}} </tbody> </table> - <div class="selectall"><a href="#" onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> + <div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div> <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div> {{else}} <p>{{$no_pending}}</p> @@ -79,10 +79,10 @@ {{/foreach}} </tbody> </table> - <div class="selectall"><a href="#" onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> + <div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div> <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div> {{else}} NO USERS?!? {{/if}} </form> -</div>
\ No newline at end of file +</div> diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 40f91a8bb..944b3c3f4 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -17,7 +17,7 @@ function drophub(id) { {{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td> <td> -{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}} +{{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}} </td> <td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}{{/if}}</td> </tr> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 523a9160a..062710f1d 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,12 +1,16 @@ -<h3>{{$prvmsg_header}}</h3> <div class="generic-content-wrapper"> -{{foreach $mails as $mail}} - {{include file="mail_conv.tpl"}} -{{/foreach}} + <div class="section-title-wrapper"> + <h2>{{$prvmsg_header}}</h2> + </div> + <div class="section-content-wrapper"> + {{foreach $mails as $mail}} + {{include file="mail_conv.tpl"}} + {{/foreach}} -{{if $canreply}} -{{include file="prv_message.tpl"}} -{{else}} -{{$unknown_text}} -{{/if}} + {{if $canreply}} + {{include file="prv_message.tpl"}} + {{else}} + {{$unknown_text}} + {{/if}} + </div> </div> diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 1cd7145e7..7bc854fff 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,3 +1,10 @@ -<h3>{{$messages}}</h3> - -{{$tab_content}} +<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> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 1d499e12f..e3f8ef75c 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,8 +1,6 @@ -<div class="generic-content-wrapper" id="mail-list-wrapper"> - <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> - <span class="mail-list">{{$from_name}}</span> - <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> - <span class="mail-list" title="{{$date}}">{{$date}}</span> - <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> - <div class="clear"> </div> -</div> +<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> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index f5ff23700..225b4f6b0 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -15,7 +15,7 @@ <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> {{/if}} {{if $lock}} - <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('item',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> + <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </div> <div class="btn-group btn-group"> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 3b0c8841c..0b16f5602 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -10,6 +10,7 @@ {{if $polled}} <p>{{$polled}} {{$lastpoll}}</p> {{/if}} +<p>{{$load_average}} {{$loadavg_all}}</p> <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl index 57f383788..2a40dcf47 100755 --- a/view/tpl/xrd_host.tpl +++ b/view/tpl/xrd_host.tpl @@ -4,7 +4,7 @@ <hm:Host>{{$zhost}}</hm:Host> - <Link rel='lrdd' template='{{$zroot}}/xrd/?uri={uri}' /> + <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' /> <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" href="{{$zroot}}/oexchange/xrd" /> |