From 6a679d26ce1c2947e49c74f3b6a98a7ad770b325 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 27 Dec 2014 13:36:05 +0100 Subject: Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) --- view/tpl/channel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 55b122d9b..984421eec 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -7,7 +7,7 @@ {{/if}} {{/if}} {{$channel.channel_name}} -
{{if $channel.mail != 0}} {{$channel.mail}}{{else}}  {{/if}} {{if $channel.intros != 0}} {{$channel.intros}}{{else}}  {{/if}}
+
{{$channel.mail}}  {{$channel.intros}}
{{$channel.channel_name}}
 -- cgit v1.2.3 From 40a327b68fe1bb37bbc2fc6bc1c6d761ee564898 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 27 Dec 2014 14:06:09 +0100 Subject: Allow quick access to mail and connections from Channel Manager --- view/tpl/channel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 984421eec..c151ba8b2 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -7,7 +7,7 @@ {{/if}} {{/if}} {{$channel.channel_name}} -
{{$channel.mail}}  {{$channel.intros}}
+
{{$channel.mail}}  {{$channel.intros}}
{{$channel.channel_name}}
 -- cgit v1.2.3 From 801ab709adfa808072f70fe1bf4b712ddc33df42 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 18:16:27 +0100 Subject: more work on files --- view/tpl/attach_edit.tpl | 61 ++++++++++++++++++++++++-------------------- view/tpl/cloud_directory.tpl | 20 ++++++++------- 2 files changed, 45 insertions(+), 36 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index bf39e6158..033ee40a7 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,34 +1,41 @@
-
- - -
+
+ {{if !$isadir}} + + + + {{/if}} + +
+
+ + +
+ {{$aclselect}} -{{$aclselect}} + + + + - - - - - -{{if $isadir}} -
- - -
-{{else}} -
{{$cpdesc}}
-
-{{/if}} - -
{{$cpldesc}}
-
-
+ {{if $isadir}} +
+ +
+ {{/if}} +
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 99bba9474..01b9078fe 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,12 +1,12 @@ -
+
- - - - - - + + + + + + {{if $parentpath}} @@ -19,7 +19,7 @@ {{/if}} {{foreach $entries as $item}} - + {{if $item.is_owner}} @@ -35,7 +35,9 @@ - + + + {{/foreach}}
{{$name}}{{*{{$type}}*}}{{$name}}{{*{{$type}}*}}
{{$item.displayName}}
-- cgit v1.2.3 From 1ab23061df0c92abd6a9ed5ece1507cf19efff58 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 20:34:12 +0100 Subject: files css fixes --- view/tpl/cloud_directory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 01b9078fe..06f7a2308 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -26,7 +26,7 @@ {{$item.attachIcon}} - + {{else}} -- cgit v1.2.3 From fa23439b9cb93869985be14bc150c5a6a702ccce Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 20:46:16 +0100 Subject: more files css fixes --- view/tpl/cloud_directory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 06f7a2308..77d861224 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -
+
-- cgit v1.2.3 From a70e42edac9580eab7013f1fcdc5eae252a10dd1 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 29 Dec 2014 14:47:41 +0000 Subject: Remove link to hubloc status in admin panel. This is a potentially useful tool, but plain doesn't work at the moment. --- view/tpl/admin_aside.tpl | 1 - 1 file changed, 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 2ab3edcc2..013b72d50 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -18,7 +18,6 @@
  • {{$admin.channels.1}}
  • {{$admin.plugins.1}}
  • {{$admin.themes.1}}
    • -
  • {{$admin.hubloc.1}}
  • {{$admin.dbsync.1}}
    • -- cgit v1.2.3 From e69e59d260c311ceae4cbde3239c33d8caea4553 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 29 Dec 2014 22:07:40 +0100 Subject: Don't show current channel separately in channel manager, highlight it instead --- view/tpl/channel.tpl | 4 +--- view/tpl/channels.tpl | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index c151ba8b2..af80e7b4d 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,4 +1,4 @@ -
    +
    {{if $channel.default_links}} {{if $channel.default}}
    {{$msg_default}}
    @@ -10,5 +10,3 @@
    {{$channel.mail}}  {{$channel.intros}}
    {{$channel.channel_name}}
    - -
    diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 0dec68a53..26d0e14d2 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -13,14 +13,6 @@ {{$channel_usage_message}}
    {{/if}} -{{if $selected}} -
    -
    {{$msg_selected}}
    -{{include file="channel.tpl" channel=$selected}} -
    -
    -{{/if}} -
    {{$desc}}
    -- cgit v1.2.3 From f2bfdf0c76d2cce95f136b5240a6d7aa18bea8dc Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 29 Dec 2014 22:45:07 +0100 Subject: some work on cloud actionspanel and minor cleanup --- view/tpl/cloud_actionspanel.tpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d88bc94c4..0e621e9db 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -2,16 +2,17 @@
    - - + + +
    -
    - - + + +
    -- cgit v1.2.3 From 6cbbe854d5fd10d0d072dd19a9d3bc82df427d98 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 30 Dec 2014 12:12:55 +0100 Subject: css fixes --- view/tpl/cloud_actionspanel.tpl | 3 ++- view/tpl/photos_upload.tpl | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 0e621e9db..da708a98c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -8,9 +8,10 @@
    +
    - + diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 10fc82648..0b3a0ae81 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -18,7 +18,7 @@ {{$aclselect}} {{if $default}} -
    +
    @@ -29,13 +29,12 @@
    {{/if}} -
    - -
    +
    +
    {{if $uploader}}
    -- cgit v1.2.3 From 12e6d98659a41655da4463a0f105716e8f59a6f7 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 30 Dec 2014 14:11:27 +0100 Subject: Remove some old, unused templates --- view/tpl/atom_feed_dfrn.tpl | 29 -------------------- view/tpl/crepair.tpl | 45 -------------------------------- view/tpl/diaspora_profile.tpl | 16 ------------ view/tpl/edpage_head.tpl | 1 - view/tpl/hide_comments.tpl | 4 --- view/tpl/intros.tpl | 17 ------------ view/tpl/intros_header.tpl | 1 - view/tpl/list_things.tpl | 13 --------- view/tpl/netfriend.tpl | 14 ---------- view/tpl/nogroup-template.tpl | 12 --------- view/tpl/notifications_comments_item.tpl | 3 --- view/tpl/notifications_dislikes_item.tpl | 3 --- view/tpl/notifications_friends_item.tpl | 3 --- view/tpl/notifications_likes_item.tpl | 3 --- view/tpl/notifications_posts_item.tpl | 3 --- view/tpl/saved_searches_aside.tpl | 14 ---------- view/tpl/suggestions.tpl | 20 -------------- 17 files changed, 201 deletions(-) delete mode 100755 view/tpl/atom_feed_dfrn.tpl delete mode 100755 view/tpl/crepair.tpl delete mode 100644 view/tpl/diaspora_profile.tpl delete mode 100755 view/tpl/edpage_head.tpl delete mode 100755 view/tpl/hide_comments.tpl delete mode 100755 view/tpl/intros.tpl delete mode 100755 view/tpl/intros_header.tpl delete mode 100644 view/tpl/list_things.tpl delete mode 100755 view/tpl/netfriend.tpl delete mode 100755 view/tpl/nogroup-template.tpl delete mode 100755 view/tpl/notifications_comments_item.tpl delete mode 100755 view/tpl/notifications_dislikes_item.tpl delete mode 100755 view/tpl/notifications_friends_item.tpl delete mode 100755 view/tpl/notifications_likes_item.tpl delete mode 100755 view/tpl/notifications_posts_item.tpl delete mode 100755 view/tpl/saved_searches_aside.tpl delete mode 100755 view/tpl/suggestions.tpl (limited to 'view/tpl') diff --git a/view/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl deleted file mode 100755 index 307001fbe..000000000 --- a/view/tpl/atom_feed_dfrn.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - {{$feed_id}} - {{$feed_title}} - Friendica - - {{$hub}} - {{$salmon}} - {{$community}} - - {{$feed_updated}} - - - {{$name}} - {{$profile_page}} - - - {{$birthday}} - diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl deleted file mode 100755 index 1a5a019db..000000000 --- a/view/tpl/crepair.tpl +++ /dev/null @@ -1,45 +0,0 @@ -
    - -

    {{$contact_name}}

    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - - - - diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl deleted file mode 100644 index cf53f51c0..000000000 --- a/view/tpl/diaspora_profile.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - {{$handle}} - {{$first}} - {{$last}} - {{$large}} - {{$medium}} - {{$small}} - {{$dob}} - {{$gender}} - {{$about}} - {{$location}} - {{$searchable}} - {{$tags}} - - diff --git a/view/tpl/edpage_head.tpl b/view/tpl/edpage_head.tpl deleted file mode 100755 index 890b746bf..000000000 --- a/view/tpl/edpage_head.tpl +++ /dev/null @@ -1 +0,0 @@ -

    {{$title}}

    diff --git a/view/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl deleted file mode 100755 index f4ed9c552..000000000 --- a/view/tpl/hide_comments.tpl +++ /dev/null @@ -1,4 +0,0 @@ -
    -{{$num_comments}} {{$hide_text}} -
    -
    diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl deleted file mode 100755 index a4aed3bb8..000000000 --- a/view/tpl/intros.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
    - -
    {{$fullname}}
    -{{$fullname}} -
    -
    - - - -{{include file="field_checkbox.tpl" field=$hidden}} -{{* {{include file="field_checkbox.tpl" field=$activity}} *}} - - - - -
    -
    diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl deleted file mode 100755 index 15096c7f8..000000000 --- a/view/tpl/intros_header.tpl +++ /dev/null @@ -1 +0,0 @@ -

    {{$title}}

    diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl deleted file mode 100644 index fb8935d82..000000000 --- a/view/tpl/list_things.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{{if $things}} -{{foreach $things as $key => $items}} -{{$items.profile}} {{$key}} -
      -{{foreach $items as $item}} -
    • {{if $item.img}}{{$item.term}}{{/if}} -{{$item.term}} -
      • -{{/foreach}} -
    -
    -{{/foreach}} -{{/if}} diff --git a/view/tpl/netfriend.tpl b/view/tpl/netfriend.tpl deleted file mode 100755 index ec6b3b6cc..000000000 --- a/view/tpl/netfriend.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
    {{$approve_as}}
    - -
    - - -
    -
    -
    -
    - - -
    -
    -
    diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl deleted file mode 100755 index 15094b2d6..000000000 --- a/view/tpl/nogroup-template.tpl +++ /dev/null @@ -1,12 +0,0 @@ -

    {{$header}}

    - -{{foreach $contacts as $contact}} - {{include file="contact_template.tpl"}} -{{/foreach}} -
    - -{{$paginate}} - - - - diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_comments_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    - {{$item_text}} {{$item_when}} -
    diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_dislikes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    - {{$item_text}} {{$item_when}} -
    diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_friends_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    - {{$item_text}} {{$item_when}} -
    diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_likes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    - {{$item_text}} {{$item_when}} -
    diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_posts_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -
    - {{$item_text}} {{$item_when}} -
    diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl deleted file mode 100755 index e0983f0dd..000000000 --- a/view/tpl/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
    - - {{$searchbox}} - - -
    -
    diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl deleted file mode 100755 index 2d9cba325..000000000 --- a/view/tpl/suggestions.tpl +++ /dev/null @@ -1,20 +0,0 @@ -
    - -

    {{$str_notifytype}} {{$notify_type}}

    -
    {{$madeby}}
    -
    {{$fullname}}
    -{{$fullname}} -
    {{$note}}
    -
    -
    - - - -
    - -
    -{{include file="field_checkbox.tpl" field=$hidden}} - - -
    -
    -- cgit v1.2.3 From e6a3ea2c95579a33a5c009aa223a899c8f2aeeb8 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 30 Dec 2014 15:27:33 +0100 Subject: Make showing wall posts, intros and private messages under Notices optional --- view/tpl/settings.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7fa52677b..47d85d8e4 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -113,6 +113,8 @@ {{include file="field_intcheckbox.tpl" field=$vnotify7}} {{include file="field_intcheckbox.tpl" field=$vnotify8}} {{include file="field_intcheckbox.tpl" field=$vnotify9}} +{{include file="field_intcheckbox.tpl" field=$vnotify11}} +{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} {{*include file="field_intcheckbox.tpl" field=$vnotify11*}}
    -- cgit v1.2.3 From 4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 30 Dec 2014 21:04:48 +0100 Subject: design fixes for photos, files and random fixes --- view/tpl/attach_edit.tpl | 43 ++++++++++++++++++++++--------------------- view/tpl/photos_upload.tpl | 35 +++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 33 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 033ee40a7..82f2a7628 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,6 +1,10 @@
    + + + + -
    +
    {{if !$isadir}} @@ -10,28 +14,25 @@
    -
    - - +
    + {{if $isadir}} +
    + +
    + {{/if}} +
    + + +
    - {{$aclselect}} - - - - - - {{if $isadir}} -
    - -
    - {{/if}} + {{$aclselect}}
    - + diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 7e4f00a2d..5c7f58ad1 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,4 @@
    - - {{$field.3}} + + {{$field.3}}
    diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a68781698..a1e912186 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,5 +1,5 @@
    - + {{if $field.4}} {{$field.4}} {{/if}} {{$field.3}}
    diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 1f9218954..337c60673 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,5 +1,5 @@
    - + {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index a6b49f6da..754f5b2f4 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@
    - + {{$field.2}} {{$field.3}}
    diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index a584f95e7..be6e3f047 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,5 +1,5 @@
    - + {{if $field.4}} {{$field.4}} {{/if}} {{$field.3}}
    diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 41ee46822..1d0bd9175 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,4 @@
    - - {{$field.4}} + + {{$field.4}}
    diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 23058f8a6..38ecf3d07 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@
    - + {{$field.3}}
    diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index 147b6b834..a92324cad 100755 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,5 +1,5 @@
    - + {{$field.3}}
    diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl index c8639cf10..378e02a62 100755 --- a/view/tpl/field_richtext.tpl +++ b/view/tpl/field_richtext.tpl @@ -1,5 +1,5 @@
    - + {{$field.3}}
    diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 9aca26e7b..95d1855d6 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,5 +1,5 @@
    - + diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index f0090cf98..e241be895 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,5 +1,5 @@
    - + diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 861be3201..74d575bd0 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,5 +1,5 @@
    - + diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index b454045c0..dad89a145 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@
    - + {{$field.3}}
    diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index a0e454bf5..120727478 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,6 +1,6 @@
    - + diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index e36e775c7..f5a909833 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,5 +1,5 @@
    - +
    -- cgit v1.2.3 From ef94747e5eb4d8b2e3566835280c31b848fc28e6 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 14:36:17 +0100 Subject: Add field template for grouped selects --- view/tpl/field_select_grouped.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 view/tpl/field_select_grouped.tpl (limited to 'view/tpl') diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl new file mode 100644 index 000000000..c7fb4f322 --- /dev/null +++ b/view/tpl/field_select_grouped.tpl @@ -0,0 +1,12 @@ +
    + + + {{$field.3}} +
    -- cgit v1.2.3 From 686b6ee1182c09969e2817b53825a78975c75bf5 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 14:44:50 +0100 Subject: Use grouped select field for timezone selection --- view/tpl/install_settings.tpl | 2 +- view/tpl/settings.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index f4fd82fdb..62dcbb8b3 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -20,7 +20,7 @@ {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} -{{$timezone}} +{{include file="field_select_grouped.tpl" field=$timezone}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 47d85d8e4..83da4f87e 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -9,7 +9,7 @@

    {{$h_basic}}

    {{include file="field_input.tpl" field=$username}} -{{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select_grouped.tpl" field=$timezone}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} -- cgit v1.2.3 From 85e76773a04995884e798a89cc285f48377bcb62 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 15:54:16 +0100 Subject: Use grouped select field for role selection --- view/tpl/new_channel.tpl | 5 +---- view/tpl/select_timezone.tpl | 11 +++++++++++ view/tpl/settings.tpl | 5 +---- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 view/tpl/select_timezone.tpl (limited to 'view/tpl') diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 241846eb4..ff2011181 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -5,10 +5,7 @@
    {{$desc}}
    {{$help_role}}
    - - - {{$role_select}} -
    {{$questionmark}}
    + {{include file="field_select_grouped.tpl" field=$role}}
    diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl new file mode 100644 index 000000000..2820a54f4 --- /dev/null +++ b/view/tpl/select_timezone.tpl @@ -0,0 +1,11 @@ +{{* TODO: Make id configurabel *}} + + diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 83da4f87e..53f08e24f 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -22,10 +22,7 @@

    {{$h_prv}}

    -
    - -{{$role_select}} -
    +{{include file="field_select_grouped.tpl" field=$role}}
    {{include file="field_checkbox.tpl" field=$hide_presence}} -- cgit v1.2.3 From 1c2dc97a4a6e740d97ee29c8b7c4d0e37832ff4c Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 18:19:17 +0100 Subject: Double click on day in calendar creats new event starting that day --- view/tpl/event_head.tpl | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index bcb1e07f6..03ea833f9 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -24,6 +24,11 @@ eventClick: function(calEvent, jsEvent, view) { showEvent(calEvent.id); }, + loading: function(isLoading, view) { + if(!isLoading) { + $('td.fc-day').dblclick(function() { window.location.href='https://caterva.eu/events/new?start='+$(this).data('date'); }); + } + }, eventRender: function(event, element, view) { //console.log(view.name); -- cgit v1.2.3 From 42773a11220a5bba7bdf3395e3f00913dce9f5a0 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Fri, 2 Jan 2015 18:14:23 +0100 Subject: Reworked switch to also display text --- view/tpl/field_checkbox.tpl | 2 +- view/tpl/field_intcheckbox.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 5c7f58ad1..7a2781be0 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,4 @@
    - {{$field.3}} +
    {{$field.3}}
    diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 1d0bd9175..847783518 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,4 @@
    - {{$field.4}} +
    {{$field.4}}
    -- cgit v1.2.3 From 31648d65c8c5c3a54fc36b83871dcc09a9ac982f Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 2 Jan 2015 19:20:52 -0800 Subject: some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. --- view/tpl/abook_edit.tpl | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index c2c11e4b1..bb20312fa 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -7,11 +7,27 @@
    {{$tabs}}
    +
    +{{foreach $buttons as $b }} + +{{/foreach}} {{/if}} -
    + + + + + + + {{if $last_update}} {{$lastupdtext}} {{$last_update}} @@ -27,7 +43,6 @@ {{/if}} - {{if $self}}
    @@ -40,10 +55,6 @@ - - {{if $is_pending}} @@ -63,15 +74,6 @@

    {{$permlbl}}

    {{$permnote}}
    - -
    - - - - - -
    - -- cgit v1.2.3 From 0779e3ae53161843110610eba27380bfab0b2dd0 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 3 Jan 2015 13:42:05 +0100 Subject: provide some info for buttons --- view/tpl/attach_edit.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 82f2a7628..0147d35ba 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -6,11 +6,11 @@
    {{if !$isadir}} - + {{/if}} -
    -- cgit v1.2.3 From 028dff44cccc27db4140ad41fc4893d6cd6ad0f0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 4 Jan 2015 00:47:44 -0800 Subject: remove hard-coded url to caterva.eu from events code. --- view/tpl/event_head.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 03ea833f9..830347555 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -26,7 +26,7 @@ }, loading: function(isLoading, view) { if(!isLoading) { - $('td.fc-day').dblclick(function() { window.location.href='https://caterva.eu/events/new?start='+$(this).data('date'); }); + $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); } }, -- cgit v1.2.3 From 386f361855663b445d1497bbbabcf87891ce94d9 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 4 Jan 2015 12:54:23 +0100 Subject: Autocmplete suggestions for non-local users, also suggest from visited channel's connections --- view/tpl/head.tpl | 2 ++ view/tpl/jot-header.tpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 9c9e7b970..8a32bd7f6 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -26,6 +26,8 @@ var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; var justifiedGalleryActive = false; + {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} + {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index bdbb7d09c..c23395b03 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -10,7 +10,7 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, -- cgit v1.2.3 From c14dc699ae749b5242f1ce14847a1db4c0eebc30 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 5 Jan 2015 00:28:42 +0100 Subject: Fix initEditor on non-wall pages --- view/tpl/jot-header.tpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index c23395b03..8d26fc653 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -10,7 +10,10 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections + if(typeof channelId === 'undefined') + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + else + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, -- cgit v1.2.3 From 128b0008eef797050cf5146fb1dd69505c4439d4 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 5 Jan 2015 18:30:12 +0100 Subject: Replace jslider with jRange --- view/tpl/contact_slider.tpl | 2 +- view/tpl/main_slider.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 93d0cc625..09a79edd8 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@
    diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index fbc290df1..c8f3d2e06 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -2,8 +2,8 @@ diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8d26fc653..678d16a71 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -11,9 +11,9 @@ function initEditor(cb){ $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); if(typeof channelId === 'undefined') - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + $("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); else - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections + $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 85fa51b0a..e1d1c6d23 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -41,7 +41,7 @@ if(plaintext != 'none') { }); } else - $("#prvmail-text").contact_autocomplete(baseurl+"/acl"); + $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); -- cgit v1.2.3
    {{$them}}{{$me}}