From 7f712973831212694de824a2e63961b98ef53959 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 12:46:40 +0200 Subject: cleanup connedit --- view/tpl/abook_edit.tpl | 349 ++++++++++++++++++++++++++----------------- view/tpl/contact_slider.tpl | 20 ++- view/tpl/field_acheckbox.tpl | 14 +- view/tpl/rating_slider.tpl | 19 ++- 4 files changed, 252 insertions(+), 150 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d118cbb9c..202c6881e 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,140 +1,211 @@ -
-

{{$header}}

- -

{{$addr}}

- -{{if $notself}} -
-{{$tabs}} -
-
-{{foreach $buttons as $b }} - -{{/foreach}} -{{/if}} - - -
-
- - - - - - - - -{{if $last_update}} -{{$lastupdtext}} {{$last_update}} -{{/if}} - - -{{if $is_pending}} -
-{{include file="field_checkbox.tpl" field=$unapproved}} -
-{{/if}} - - -{{if $notself}} -{{if $slide}} -

{{$lbl_slider}}

- -{{$slide}} - -{{/if}} - -{{if $connfilter}} - {{include file="field_textarea.tpl" field=$incl}} - {{include file="field_textarea.tpl" field=$excl}} -{{else}} - - -{{/if}} - -{{if $rating}} -

{{$lbl_rating}}

- -{{$rating}} - - -{{/if}} - - - -{{/if}} - - -{{if $self}} -
-
{{$autolbl}}
-{{include file="field_checkbox.tpl" field=$autoperms}} -
-{{/if}} - - - - - - -{{if $rating}} -{{if $notself}} - {{include file="field_textarea.tpl" field=$rating_text}} -{{/if}} -{{/if}} - -{{if $notself}} -{{if $multiprofs }} -
-

{{$lbl_vis1}}

-
{{$lbl_vis2}}
- -{{$profile_select}} -
-{{/if}} -{{/if}} - -

{{$permlbl}}

- -{{if $notself}} - - - -{{if $notself}} -
-{{/if}} - - - -{{if $self && $noperms}} - -{{/if}} - - -
+
+
+ {{if $notself}} +
+ + +
+ {{/if}} +

{{$header}}

+
+
+ {{if $notself}} +
+
+ {{$addr_text}} '{{$addr}}' +
+ {{if $last_update}} +
+ {{$lastupdtext}} {{$last_update}} +
+ {{/if}} +
+ {{/if}} + +
+ + + +
+ {{if $notself}} + + {{if $is_pending}} +
+ +
+
+ {{include file="field_checkbox.tpl" field=$unapproved}} +
+ +
+
+
+
+ + + {{/if}} + + {{if $affinity }} +
+ +
+
+ {{if $slide}} +
{{$lbl_slider}}
+ {{$slide}} + + {{/if}} + + {{if $multiprofs }} +
+ {{$lbl_vis2}} + {{$profile_select}} +
+ {{/if}} +
+ +
+
+
+
+ {{/if}} + + {{if $connfilter}} +
+ +
+
+ {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} +
+ +
+
+
+
+ {{else}} + + + {{/if}} + + {{if $rating}} +
+ +
+
+
+ {{$rating_info}} +
+
{{$lbl_rating_label}}
+ {{$rating}} + {{include file="field_textarea.tpl" field=$rating_text}} + +
+ +
+
+
+
+ {{/if}} + + {{/if}} + +
+ {{if $notself}} + + {{/if}} +
+
+
+ {{$permnote}} +
+ + + + + {{if $notself}} + + {{/if}} + + + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} +
{{$them}}{{$me}}
+ + {{if $self}} +
+
{{$autolbl}}
+ {{include file="field_checkbox.tpl" field=$autoperms}} +
+ {{/if}} + +
+ +
+
+
+
+
+
+
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 5c15e1c2c..550abc147 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,20 @@ -
+
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 816af2a65..a4f271f1a 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,17 +1,17 @@ - + - +
+ {{$field.6}} + {{if $notself}} + {{/if}} - + {{if $field.5}}{{$inherited}} {{/if}} - - {{$field.6}} - - \ No newline at end of file + diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl index 4702fc65b..4c36504e6 100644 --- a/view/tpl/rating_slider.tpl +++ b/view/tpl/rating_slider.tpl @@ -1,4 +1,19 @@ -
+
-- cgit v1.2.3 From f267bd55d68f6d3c63c33b1d307728e4ed12ddd5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 14:20:23 +0200 Subject: revert this until further investigation --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index a4f271f1a..2b5195322 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -9,7 +9,7 @@ {{/if}} - + {{if $field.5}}{{$inherited}} {{/if}} -- cgit v1.2.3 From cc1764989f70b28654b47fd58fd59b12b270b470 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 17:37:33 +0200 Subject: fix mod_connedit.js after cleanup --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 2b5195322..5b03a7848 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -12,6 +12,6 @@ - {{if $field.5}}{{$inherited}} {{/if}} + {{if $field.5}}{{$inherited}}{{/if}} -- cgit v1.2.3 From 4fe64179c8c99dbcbabd1580ddf760288d049547 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 19:29:49 +0200 Subject: disable the inherited checkboxes for notself --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 5b03a7848..d2aad3875 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -9,7 +9,7 @@ {{/if}} - + {{if $field.5}}{{$inherited}}{{/if}} -- cgit v1.2.3 From 104cbcab722477340961d45a93a441bb9fbc7e7a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 21:32:18 +0200 Subject: make strings translateable --- view/tpl/abook_edit.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 202c6881e..71693a553 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -46,7 +46,7 @@ @@ -64,15 +64,15 @@
- +
- {{$name}} ({{$addr}}) would like to connect with you. Please approve this connection to allow communication. + {{$name}} {{$pending_modal_body}}
- - + +
@@ -116,7 +116,7 @@ -- cgit v1.2.3