From 77094f8d2bffa70c9e95518b9883f8752304102c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 19 Mar 2016 16:17:19 -0700 Subject: make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move. --- view/tpl/admin_aside.tpl | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'view/tpl') 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 @@

{{$admtxt}}

@@ -34,11 +27,11 @@ {{/if}} -{{if $admin.plugins_admin}} +{{if $plugins}}

{{$plugadmtxt}}

@@ -48,6 +41,6 @@

{{$logtxt}}

-- cgit v1.2.3 From 30cf56bdb505ffa50bb7416ec8623fb97418d358 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 Mar 2016 01:45:56 +0100 Subject: make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected --- view/tpl/acl_selector.tpl | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/tpl') 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 @@
{{/if}} -
-
-
-- cgit v1.2.3 From fea532af4da522001c71eb79df5fc49c83833da9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 20 Mar 2016 19:55:53 -0700 Subject: rework salmon - important, update addons also if you have enabled gnusoc addon --- view/tpl/magicsig.tpl | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 view/tpl/magicsig.tpl (limited to 'view/tpl') 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 @@ - - - -{{$data}} - -{{$encoding}} -{{$algorithm}} -{{$signature}} - -- cgit v1.2.3 From 97e1a6dfde7d8d8e23d463ab22f24011cbce0d8c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 22 Mar 2016 02:06:19 +0100 Subject: whip mod manage into shape --- view/tpl/channel.tpl | 59 ++++++++++++++++++++++++++++++++++++++++---------- view/tpl/channels.tpl | 60 ++++++++++++++++++++------------------------------- 2 files changed, 71 insertions(+), 48 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 23f1e0dd4..d306f0aa0 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,49 @@ -
-{{if $channel.default_links}} -{{if $channel.default}} -
{{$msg_default}}
-{{else}} -
-{{/if}} -{{/if}} -{{$channel.channel_name}} -
{{if $channel.delegate}}{{else}} {{$channel.mail}}  {{$channel.intros}}{{/if}}
-
{{$channel.channel_name}}
 +
+
+ {{if $channel.default_links}} + {{if $channel.default}} +
+  {{$msg_default}} +
+ {{else}} + +  {{$msg_make_default}} + + {{/if}} + {{/if}} + {{if $channel.delegate}} + {{$delegated_desc}} + {{/if}} +
+

+ {{if $selected == $channel.channel_id}} + + {{/if}} + {{if $channel.delegate}} + + {{/if}} + {{if $selected != $channel.channel_id}}{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}{{/if}} +

+
+
+
+
+ {{if $selected != $channel.channel_id}}{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}{{/if}} +
+
+ {{if !$channel.delegate}} +
+ + {{if $channel.mail != 0}}{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}{{/if}} +
+
+ + {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}} +
+ {{/if}} +
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 44daa0a3e..be9017bff 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,38 +1,24 @@ -
-

{{$header}}

- -{{if $links}} -{{foreach $links as $l}} -{{$l.2}} -{{/foreach}} -{{/if}} -
- -{{if $channel_usage_message}} -
-{{$channel_usage_message}} -
-{{/if}} -
{{$desc}}
- -
-{{foreach $all_channels as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -
- -
- -{{if $delegates}} -
-

{{$delegate_header}}

-
-{{foreach $delegates as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -
- -
-{{/if}} - +
+
+ {{$create.2}} +

{{$header}}

+
+
+ {{if $channel_usage_message}} +
+ {{$channel_usage_message}} +
+ {{/if}} +
+ {{$desc}} +
+ {{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}} +
-- cgit v1.2.3 From c6b89b99b9a98a5a25087190eeeee15365c7a853 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 22 Mar 2016 10:29:17 +0100 Subject: Add a link to /locs to channel manager --- view/tpl/channel.tpl | 4 ++++ view/tpl/channels.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index d306f0aa0..17713aef4 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -44,6 +44,10 @@ {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}}
+
+ + {{$locs}} +
{{/if}}
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index be9017bff..1a6012926 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@
- {{$create.2}} +  {{$create.2}}

{{$header}}

-- cgit v1.2.3 From 6f2ba0c6193a229b3f371de2cae7b314927d4cbb Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 22 Mar 2016 19:58:59 -0700 Subject: rewrite the webfinger discovery logic --- view/tpl/xrd_person.tpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'view/tpl') 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 @@ {{$accturi}} - + {{if $aliases}}{{foreach $aliases as $a}} + {{$a}} + {{/foreach}}{{/if}} + -- cgit v1.2.3