diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 63 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 60 | ||||
| -rw-r--r-- | view/tpl/magicsig.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/xrd_person.tpl | 5 |
6 files changed, 86 insertions, 75 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 013f3f296..88df7481a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,14 +15,11 @@ <div class="clear"></div> </div> {{/if}} - <div id="acl-wrapper"> <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <input type="text" id="acl-search" placeholder=""> - <div id="acl-list"> <div id="acl-list-content"></div> - </div> <span id="acl-fields"></span> </div> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index da762a094..70e1677af 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -5,7 +5,7 @@ $("nav").bind('nav-update', function(e,data){ var elm = $('#pending-update'); var register = $(data).find('register').text(); - if (register=="0") { reigster=""; elm.hide();} else { elm.show(); } + if (register=="0") { register=""; elm.hide();} else { elm.show(); } elm.html(register); }); }); @@ -13,16 +13,9 @@ <div class="widget"> <h3>{{$admtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> - <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> - <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> - <li><a href='{{$admin.security.0}}'>{{$admin.security.1}}</a></li> - <li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li> - <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> - <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li><a href='{{$admin.features.0}}'>{{$admin.features.1}}</a></li> - <li><a href='{{$admin.profs.0}}'>{{$admin.profs.1}}</a></li> - <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> + {{foreach $admin as $link}} + <li><a href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li> + {{/foreach}} </ul> </div> @@ -34,11 +27,11 @@ {{/if}} -{{if $admin.plugins_admin}} +{{if $plugins}} <div class="widget"> <h3>{{$plugadmtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - {{foreach $admin.plugins_admin as $l}} + {{foreach $plugins as $l}} <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> @@ -48,6 +41,6 @@ <div class="widget"> <h3>{{$logtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> + <li><a href='{{$logs.0}}'>{{$logs.1}}</a></li> </ul> </div> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 23f1e0dd4..17713aef4 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,53 @@ -<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> -{{if $channel.default_links}} -{{if $channel.default}} -<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> -{{else}} -<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default"><i class="icon-check-empty" title="{{$msg_make_default}}"></i></a></div> -{{/if}} -{{/if}} -<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> -<div class="channels-notifications-wrapper">{{if $channel.delegate}}{{else}}<a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a>{{/if}}</div> -<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> +<div class="section-subtitle-wrapper"> + <div class="pull-right"> + {{if $channel.default_links}} + {{if $channel.default}} + <div> + <i class="icon-check"></i> {{$msg_default}} + </div> + {{else}} + <a href="manage/{{$channel.channel_id}}/default" class="make-default-link"> + <i class="icon-check-empty"></i> {{$msg_make_default}} + </a> + {{/if}} + {{/if}} + {{if $channel.delegate}} + {{$delegated_desc}} + {{/if}} + </div> + <h3> + {{if $selected == $channel.channel_id}} + <i class="selected-channel icon-circle" title="{{$msg_selected}}"></i> + {{/if}} + {{if $channel.delegate}} + <i class="icon-circle-arrow-right" title="{{$delegated_desc}}"></i> + {{/if}} + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}</a>{{/if}} + </h3> + <div class="clear"></div> +</div> +<div class="section-content-wrapper"> + <div class="channel-photo-wrapper"> + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}} + <img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /> + {{if $selected != $channel.channel_id}}</a>{{/if}} + </div> + <div class="channel-notifications-wrapper"> + {{if !$channel.delegate}} + <div class="channel-notification"> + <i class="icon-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i> + {{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}} + </div> + <div class="channel-notification"> + <i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i> + {{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}} + </div> + <div class="channel-link"> + <i class="icon-map-marker"></i> + <a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a> + </div> + {{/if}} + </div> </div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 44daa0a3e..1a6012926 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,38 +1,24 @@ -<div class="generic-content-wrapper-styled"> -<h3>{{$header}}</h3> - -{{if $links}} -{{foreach $links as $l}} -<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> -{{/foreach}} -{{/if}} -<div class="channels-break"></div> - -{{if $channel_usage_message}} -<div id="channel-usage-message" class="usage-message"> -{{$channel_usage_message}} -</div> -{{/if}} -<div id="channels-desc" class="descriptive-text">{{$desc}}</div> - -<div id="all-channels"> -{{foreach $all_channels as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> - -{{if $delegates}} -<hr /> -<h3>{{$delegate_header}}</h3> -<div id="delegated-channels"> -{{foreach $delegates as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> -{{/if}} - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i> {{$create.2}}</a> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + {{if $channel_usage_message}} + <div id="channel-usage-message" class="section-content-warning-wrapper"> + {{$channel_usage_message}} + </div> + {{/if}} + <div id="channels-desc" class="section-content-info-wrapper"> + {{$desc}} + </div> + {{foreach $all_channels as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{if $delegates}} + {{foreach $delegates as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{/if}} + </div> </div> diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl deleted file mode 100644 index 78d8bbbd3..000000000 --- a/view/tpl/magicsig.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env"> -<me:data type="application/atom+xml"> -{{$data}} -</me:data> -<me:encoding>{{$encoding}}</me:encoding> -<me:alg>{{$algorithm}}</me:alg> -<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig> -</me:env> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 754eb3944..93fdcb1df 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -2,7 +2,10 @@ <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>{{$accturi}}</Subject> - + {{if $aliases}}{{foreach $aliases as $a}} + <Alias>{{$a}}</Alias> + {{/foreach}}{{/if}} + <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="{{$atom}}" /> |