From ae9e1fa688c90e128637b5c44cf4705287f6cfa1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Oct 2014 18:35:56 -0700 Subject: missing event permissions --- view/tpl/event_form.tpl | 3 ++- view/tpl/event_head.tpl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2a580e3b8..d91e44458 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -66,7 +66,8 @@
{{$sh_text}}
-{{$acl}} + + {{$acl}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 8388187d1..6f1d2f22c 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -115,10 +115,10 @@ $('#event-share-checkbox').change(function() { if ($('#event-share-checkbox').is(':checked')) { - $('#acl-wrapper').show(); + $('#event-permissions-button').show(); } else { - $('#acl-wrapper').hide(); + $('#event-permissions-button').hide(); } }).trigger('change'); -- cgit v1.2.3 From 6867a8a7f6060c82cba3a34cd944a3737e8e263e Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 16 Oct 2014 17:21:37 +0200 Subject: Login menu --- view/tpl/nav.tpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 6c461f062..ac6cb1a9c 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -48,14 +48,15 @@
- {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 6719f2e75..fe683b91a 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
- {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
-- cgit v1.2.3 From bae3029c639bf6f9469dd93bfedc3dce0d8510d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 16:12:05 -0700 Subject: merge madness --- view/tpl/event_form.tpl | 92 ++----------------------------------------------- view/tpl/nav.tpl | 2 +- view/tpl/photo_view.tpl | 16 +++++++-- 3 files changed, 17 insertions(+), 93 deletions(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d91e44458..ade404125 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -3,8 +3,7 @@

{{$title}}

-{{if ! $bootstrap}} -{{$format_desc}} {{/if}}{{$desc}} +{{$desc}}

@@ -17,11 +16,7 @@
{{$s_text}}
-{{if $bootstrap}} - -{{else}} -{{$s_dsel}} {{$s_tsel}} -{{/if}} +{{$s_dsel}}

@@ -31,11 +26,7 @@
{{$f_text}}
-{{if $bootstrap}} - -{{else}} -{{$f_dsel}} {{$f_tsel}} -{{/if}} +{{$f_dsel}}
@@ -73,81 +64,4 @@
- - - - - - -
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@
- + - + {{if $edit.albums}} {{foreach $edit.albums as $al}} @@ -47,18 +47,18 @@ {{/if}}
- +
- +
{{$edit.rotatecw}}
{{$edit.rotateccw}}
-
- +
+
@@ -69,8 +69,8 @@

- - + +
-- cgit v1.2.3 From ec8bab7784b531299150ddb2c18ede40d5c5df6c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 28 Oct 2014 11:56:00 +0100 Subject: change the way tagrm works to allow tag removal on the fly --- view/tpl/photo_view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 54e15de74..c79cd7d56 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -85,7 +85,7 @@
{{$tag_hdr}} {{foreach $tags as $t}} - {{$t.0}}{{if $edit}}  {{/if}} + {{$t.0}}{{if $edit}}  {{/if}} {{/foreach}}
{{/if}} -- cgit v1.2.3