From ee01e67fa709197bdf3b0e2f990cdf1bf312856b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 09:41:27 +0200 Subject: use default style for default webpage --- view/tpl/page_display.tpl | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 5328648b9..a4870d623 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,9 +1,14 @@
- -
- {{if $title}}

{{$title}}

{{/if}} -
{{$author}}
-
{{$date}}
-
{{$body}}
-
+
+
+ {{if $title}} +

{{$title}}

+ {{/if}} +
+
+
{{$author}}
+
{{$date}}
+
{{$body}}
+
+
-- cgit v1.2.3 From 807471d2a5f1b53c616376bcb5f0cdcb361f20ce Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 09:56:30 +0200 Subject: move if clause outside of the div --- view/tpl/page_display.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index a4870d623..a320920c7 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,10 +1,10 @@
+ {{if $title}}
- {{if $title}}

{{$title}}

- {{/if}}
+ {{/if}}
{{$author}}
{{$date}}
-- cgit v1.2.3 From adfb4072e80695a253a9a92da2b1ebbdbc7f18bf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 12:13:15 +0200 Subject: various css fixes --- view/tpl/conv_item.tpl | 3 +-- view/tpl/conv_list.tpl | 3 +-- view/tpl/photo_item.tpl | 2 +- view/tpl/search_item.tpl | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 27632d770..30a007bd6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -165,8 +165,7 @@
-
-
+
{{if $item.toplevel}} {{foreach $item.children as $child}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cb2fb8959..5487d5937 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -179,8 +179,7 @@
-
-
+
{{if $item.comment_lastcollapsed}} diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 16f9a76c2..2ea7aa9f3 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -21,7 +21,7 @@ {{$comment}} -
+
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index dee33f1b3..256443b84 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -57,7 +57,7 @@ {{$item.conv.title}} {{/if}} -
+
-- cgit v1.2.3 From f67d9d59afea32a90ea546163da25e36cc4ad9fb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 22:29:27 +0200 Subject: rename function get_directory_settings => get_directory_setting and move sort options to directory title bar --- view/tpl/dir_sort_links.tpl | 7 ------- view/tpl/directory_header.tpl | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 5cefe2f28..9346a7455 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -5,11 +5,4 @@ {{include file="field_checkbox.tpl" field=$globaldir}} {{include file="field_checkbox.tpl" field=$pubforums}} -{{$sort}}:
- diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 26739efc3..25a9b8279 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,6 +1,18 @@
+
+ + +

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

+
{{foreach $entries as $entry}} {{include file="direntry.tpl"}} -- cgit v1.2.3 From f6cf992aee86e69d1ea5790c22d4af40c266d79e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 22:48:01 +0200 Subject: fix sorting of channel suggestions --- view/tpl/directory_header.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 25a9b8279..79598fc9a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -5,10 +5,10 @@

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

-- cgit v1.2.3 From efa55437d4d14dd81d10a98e5d3201d27bcbfafb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 13:59:16 +0200 Subject: increase width of the aside area and make default profile image size 300x300 --- view/tpl/cropbody.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index da5b1e859..4794c0b83 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -25,8 +25,8 @@ 'croppa', { previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, + minWidth: 300, + minHeight: 300, maxWidth: 640, maxHeight: 640, ratioDim: { x: 100, y:100 }, -- cgit v1.2.3 From 115c18353ec73c924be7ceadf8ba2a1fd24f05e3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 14:44:24 +0200 Subject: move profile image up and refine the aside width --- view/tpl/profile_vcard.tpl | 3 +-- view/tpl/xchan_vcard.tpl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..9eac48c6d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
- +
{{$profile.name}}
{{if $profile.edit}}
@@ -18,7 +18,6 @@
{{$profile.name}}{{if $profile.online}} {{/if}}
{{if $reddress}}
{{$profile.reddress}}
{{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} -
{{$profile.name}}
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ca0fe76be..2acbb24e4 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@
-
{{$name}}
{{$name}}
+
{{$name}}
-- cgit v1.2.3 From 1554b5a2eea889284ed2e13111d72029dfc96963 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 12:46:20 +0200 Subject: add generic content wrapper to post/webpage editor and make editpost render correctly --- view/tpl/edpost_head.tpl | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,12 +1,14 @@ -
- {{if $delete}} -
-  {{$delete}} +
+
+ {{if $delete}} +
+  {{$delete}} +
+ {{/if}} +

{{$title}}

+
+
+
+ {{$editor}}
- {{/if}} -

{{$title}}

-
-
-
- {{$editor}}
-- cgit v1.2.3 From fee607db56f9e87320ce2644ba61ca49266ea7ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:16:45 +0200 Subject: more webpages - generic-content-wrapper fixes --- view/tpl/menuedit.tpl | 4 +++ view/tpl/mitemedit.tpl | 71 +++++++++++++++++++++++++++----------------------- view/tpl/mitemlist.tpl | 61 +++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 64 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..0e5df2c47 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,4 +1,5 @@ {{if $header}} +
{{if $menu_id}}
@@ -27,3 +28,6 @@
+{{if $header}} +
+{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..8715d6391 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -
-

{{$header}}

-
+
+
+

{{$header}}

+
{{/if}} -
-
- - {{if $mitem_id}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - - {{foreach $menu_names as $menu_name}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} -
-
- - {{if $submit_more}} - - {{/if}} - +
+ + + {{if $mitem_id}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + + {{foreach $menu_names as $menu_name}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} +
+
+ + {{if $submit_more}} + + {{/if}} + +
+ {{$aclselect}}
- {{$aclselect}} -
- +
+ +
+{{if $header}}
+{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -
-
- +
+
+
+ +
+

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

+
-

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

-
-
-{{$create}} + {{$create}} -{{if $mlist }} -
- - - - - - - - - {{foreach $mlist as $m }} - - - - - - - - {{/foreach}} -
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+ {{if $mlist }} +
+ + + + + + + + + {{foreach $mlist as $m }} + + + + + + + + {{/foreach}} +
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+
+ {{/if}}
-{{/if}} - - - -- cgit v1.2.3 From d8f03450e7564f8a790ce514fa98330aa8535229 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 00:40:12 +0200 Subject: make menu creation for sys channel work --- view/tpl/menuedit.tpl | 4 ++-- view/tpl/mitemedit.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 0e5df2c47..5c8734ef7 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,9 +1,9 @@ {{if $header}}
- {{if $menu_id}} + {{if $menu_edit_link}}
-  {{$editcontents}} +  {{$editcontents}}
{{/if}}

{{$header}}

diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 8715d6391..569552e28 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@
{{/if}}
-
+ {{if $mitem_id}} -- cgit v1.2.3 From f81874ca49a4a414b359a488b82fd4c274b24472 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 01:04:57 +0200 Subject: fix sys channel menu in a morre standard way --- view/tpl/mitemedit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 569552e28..f9dc4e2cc 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@
{{/if}}
- + {{if $mitem_id}} -- cgit v1.2.3 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 From 0c77a127f2e10bcea23e49d5eef61ce444046b31 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Jul 2015 14:03:34 +0200 Subject: show inherited state in Connection Default Permissions --- view/tpl/abook_edit.tpl | 7 +++++-- view/tpl/field_acheckbox.tpl | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 71693a553..93f52be8d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -176,7 +176,8 @@
- {{$permnote}} + {{if $notself}}{{$permnote}}{{/if}} + {{if $self}}{{$permnote_self}}{{/if}}
@@ -194,7 +195,9 @@ {{if $self}}
-
{{$autolbl}}
+
+ {{$autolbl}} +
{{include file="field_checkbox.tpl" field=$autoperms}}
{{/if}} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index d2aad3875..f96fd5fd6 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@ {{if $notself}} @@ -9,9 +9,9 @@ {{/if}} -- cgit v1.2.3 From 39a09eb525df95a38c14bf3e6f9b8c74bda68314 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Jul 2015 22:04:52 +0200 Subject: fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos --- view/tpl/photo_view.tpl | 77 ++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 45 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 63d5ad778..f5ff23700 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,7 +2,6 @@
- {{if $tools}} {{/if}} @@ -11,7 +10,6 @@
{{/if}} -
{{if $edit}} @@ -29,11 +27,8 @@ {{/if}}
-

{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}

-
-
{{$map}} @@ -88,12 +83,9 @@
-
-
- {{if $tags}}
{{$tag_hdr}} @@ -102,31 +94,29 @@ {{/foreach}}
{{/if}} -
- - {{if $responses.count }} -
-
- {{foreach $responses as $verb=>$response}} - {{if $response.count}} -
- - {{if $response.list_part}} - - {{else}} - - {{/if}} - {{if $response.list_part}} + {{if $responses.count }} +
+
+ {{foreach $responses as $verb=>$response}} + {{if $response.count}} +
+ + {{if $response.list_part}} + + {{else}} + + {{/if}} + {{if $response.list_part}} {{/if}} + {{/foreach}}
- {{/if}} - {{/foreach}} -
- {{/if}} -
- {{if $likebuttons}} -
- - +
+ {{/if}} + {{if $likebuttons}} +
+ + +
+
+ {{/if}} +
-
- {{/if}} -
- {{$comments}} - {{if $commentbox}}
{{$commentbox}}
{{/if}} -
- {{$paginate}} -- cgit v1.2.3 From 464625cd9107a82785bca40eb771a5c1149d8f2d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Jul 2015 15:03:55 +0200 Subject: show icons instead of disabled checkboxes --- view/tpl/field_acheckbox.tpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index f96fd5fd6..e99128bbb 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,16 @@ {{if $notself}}
{{/if}}
-
+
{{$field.6}} 		- + - {{if $field.5}}{{$inherited}}{{/if}} + {{if $field.5}}{{$inherited}}{{if $self}}{{if $field.7}} {{else}} {{/if}}{{/if}}{{/if}}
- + {{if $field.2}}{{else}}{{/if}} - + {{if $self || !$field.5}} + + {{/if}} + {{if $notself && $field.5}} + {{if $field.3}}{{else}}{{/if}} + {{/if}} {{if $field.5}}{{$inherited}}{{if $self}}{{if $field.7}} {{else}} {{/if}}{{/if}}{{/if}} -- cgit v1.2.3 From 4d45bc9da185c4c8f558b07f8020dce8171fb957 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Jul 2015 21:01:11 +0200 Subject: Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. --- view/tpl/profile_vcard.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 9eac48c6d..bea0d894f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
-- cgit v1.2.3 From f6142d18c43a77473dd4e2e3ea6c25154487ff2b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 26 Jul 2015 20:54:09 +0200 Subject: Provide connection status if status is "a-normal" --- view/tpl/abook_edit.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 93f52be8d..0a7cf2d4d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -22,6 +22,15 @@
{{if $notself}} + {{foreach $buttons as $b}} + {{if $b.info}} +
+
+ {{$b.info}} +
+
+ {{/if}} + {{/foreach}}
{{$addr_text}} '{{$addr}}' -- cgit v1.2.3 From 85f546e691351efbab36da34be6e625c7198066a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 26 Jul 2015 22:44:49 -0700 Subject: crude but more or less functional event import from thunderbird ics files --- view/tpl/events-js.tpl | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 9812291bf..7ecf2e753 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -3,6 +3,19 @@

{{$title}}

+ + + + -- cgit v1.2.3 From 52ccbd6b64d46aa7f2dfbf73599889efeaf66a08 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 27 Jul 2015 20:58:25 -0700 Subject: align buttons on event calendar --- view/tpl/events-js.tpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 7ecf2e753..c91419783 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -2,8 +2,9 @@

{{$title}}

- - +
+   +
- - - - +
+
-- cgit v1.2.3