From 86aefe0e012939fb08193fa59ba74deed062a1af Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Feb 2015 15:27:45 -0800 Subject: new session functions --- view/tpl/admin_site.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index a30892f71..1bcdba473 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -24,7 +24,7 @@ $.post(url, data, function(data) { if(timer) clearTimeout(timer); NavUpdate(); - $.fancybox.close(); + $.colorbox.close(); }) return false; -- cgit v1.2.3 From dce0bb0ef806d88a855c362f359b7b1a350deff2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Feb 2015 16:41:38 -0800 Subject: finish converting "delete" to trash icons for consistency. The 'x' was left in a couple of places like the group list widget and saved search term widget and ignoring friend suggestions where it was more appropriate to leave it. --- view/tpl/admin_channels.tpl | 2 +- view/tpl/admin_users.tpl | 2 +- view/tpl/app.tpl | 2 +- view/tpl/item_filer.tpl | 2 +- view/tpl/locmanage.tpl | 2 +- view/tpl/mail_conv.tpl | 2 +- view/tpl/mail_list.tpl | 2 +- view/tpl/menulist.tpl | 2 +- view/tpl/mitemlist.tpl | 2 +- view/tpl/photo_drop.tpl | 2 +- view/tpl/settings_oauth.tpl | 2 +- view/tpl/show_thing.tpl | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 817eb939a..f4612c094 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -35,7 +35,7 @@ - + {{/foreach}} diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 5bf64b4df..7e0b828d9 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -76,7 +76,7 @@ - + {{/foreach}} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 9f0b1746b..cebc17d45 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -11,7 +11,7 @@ {{if $install}}{{/if}} {{if $edit}}{{/if}} -{{if $delete}}{{/if}} +{{if $delete}}{{/if}} {{/if}} {{/if}} diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl index 0e68a172a..07163d59a 100644 --- a/view/tpl/item_filer.tpl +++ b/view/tpl/item_filer.tpl @@ -1,7 +1,7 @@ {{if $categories}}
{{foreach $categories as $cat}} - {{$cat.term}}  + {{$cat.term}}  {{/foreach}}
{{/if}} diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index d1bb00543..40f91a8bb 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -19,7 +19,7 @@ function drophub(id) { {{if $hub.primary}}{{else}}{{/if}} -{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}{{/if}}{{/if}} +{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}{{/if}}{{/if}} {{/foreach}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index f794ffc78..a75939617 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,7 +8,7 @@
{{$mail.date}}
{{$mail.subject}}
{{$mail.body}}
-
+
{{if $mail.can_recall}}
{{/if}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 6b06f6127..8643f27b9 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ {{$from_name}} {{$subject}} {{$date}} - +
 
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index bb862fef0..35ad91937 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -9,7 +9,7 @@ {{if $menus }} {{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 2c1ded6cc..dc5b0e9f9 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -10,7 +10,7 @@ {{if $mlist }} {{/if}} diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index cb7ae17ba..31b654374 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,4 @@
- +
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index f7b4a0b1a..20e8f458f 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -24,7 +24,7 @@ {{/if}} {{if $app.my}} - + {{/if}} {{/foreach}} diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index c48912918..9aacc8958 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -7,7 +7,7 @@ {{if $canedit}}
- +
{{/if}} -- cgit v1.2.3 From 5d57df2694b6515b43c4a641bf47b8c5f112d4f7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Feb 2015 17:18:09 -0800 Subject: per Randal overheard on a foreign network - tab in post/comment edit window goes to submit instead of the next button. --- view/tpl/comment_item.tpl | 2 +- view/tpl/jot.tpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index ab67bc196..cdcf35131 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -60,7 +60,7 @@
{{if $preview}} - {{/if}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index f32dba095..4fe48d4e5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -21,7 +21,7 @@
{{/if}} {{if $catsenabled}} {{/if}}
- +
@@ -99,7 +99,7 @@ {{/if}} - +
-- cgit v1.2.3 From a00c072f02efb741629b4b3e5b0eac1b3d6a95d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Feb 2015 20:00:47 -0800 Subject: high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start --- view/tpl/admin_aside.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 013b72d50..58d645dbf 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -16,6 +16,7 @@
  • {{$admin.site.1}}
  • {{$admin.users.1}}
  • {{$admin.channels.1}}
    • +
  • {{$admin.queue.1}}
  • {{$admin.plugins.1}}
  • {{$admin.themes.1}}
  • {{$admin.dbsync.1}}
    • -- cgit v1.2.3 From 6e64f9af54c6af4fd93afb4d7d7a1594bfb55913 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Mar 2015 15:22:23 +0100 Subject: first pile of work on settings --- view/tpl/field_checkbox.tpl | 8 +++++--- view/tpl/field_colorinput.tpl | 8 ++++---- view/tpl/field_custom.tpl | 6 +++--- view/tpl/field_input.tpl | 10 +++++----- view/tpl/field_intcheckbox.tpl | 8 +++++--- view/tpl/field_password.tpl | 8 ++++---- view/tpl/field_select.tpl | 8 ++++---- view/tpl/field_select_disabled.tpl | 8 ++++---- view/tpl/field_select_grouped.tpl | 6 +++--- view/tpl/field_select_raw.tpl | 8 ++++---- view/tpl/field_textarea.tpl | 8 ++++---- view/tpl/field_themeselect.tpl | 6 +++--- view/tpl/group_selection.tpl | 4 ++-- view/tpl/settings.tpl | 10 ++++++++-- view/tpl/settings_nick_set.tpl | 2 +- 15 files changed, 59 insertions(+), 49 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 7a2781be0..b6edd8288 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,6 @@ -
    - -
    {{$field.3}} +
    + +
    + {{$field.3}}
    +
    diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a1e912186..9b6f33462 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,6 +1,6 @@ -
    - - {{if $field.4}} {{$field.4}} {{/if}} - {{$field.3}} +
    + + {{if $field.4}} {{$field.4}} {{/if}} + {{$field.3}}
    diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index 754f5b2f4..907b4c50e 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@ -
    - +
    + {{$field.2}} - {{$field.3}} + {{$field.3}}
    diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index be6e3f047..e4756c218 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@ -
    - - {{if $field.4}} {{$field.4}} {{/if}} - {{$field.3}} -
    +
    + + {{if $field.4}} {{$field.4}} {{/if}} + {{$field.3}} +
    diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 847783518..565f97760 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,6 @@ -
    - -
    {{$field.4}} +
    + +
    + {{$field.4}}
    +
    diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 38ecf3d07..c9f4c5f6d 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ -
    - - - {{$field.3}} +
    + + + {{$field.3}}
    diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 95d1855d6..762447290 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ -
    - - {{foreach $field.4 as $opt=>$val}}{{/foreach}} - {{$field.3}} + {{$field.3}}
    diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index e241be895..ee5e1508f 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,7 +1,7 @@ -
    - - {{foreach $field.4 as $opt=>$val}}{{/foreach}} - {{$field.3}} + {{$field.3}}
    diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl index c7fb4f322..e6d1479de 100644 --- a/view/tpl/field_select_grouped.tpl +++ b/view/tpl/field_select_grouped.tpl @@ -1,6 +1,6 @@ -
    +
    - {{foreach $field.4 as $group=>$opts}} {{foreach $opts as $opt=>$val}} @@ -8,5 +8,5 @@ {{/foreach}} - {{$field.3}} + {{$field.3}}
    diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 74d575bd0..2780df58c 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,7 +1,7 @@ -
    - - {{$field.4}} - {{$field.3}} + {{$field.3}}
    diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index dad89a145..01fdc23f5 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ -
    - - - {{$field.3}} +
    + + + {{$field.3}}
    diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index 120727478..200cf726b 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,7 +1,7 @@ -
    - - {{foreach $field.4 as $opt=>$val}}{{/foreach}} {{$field.3}} diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl index 2223125ea..270d2aa79 100755 --- a/view/tpl/group_selection.tpl +++ b/view/tpl/group_selection.tpl @@ -1,6 +1,6 @@ -
    +
    - {{foreach $groups as $group}} {{/foreach}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 894f0fe83..b41bf87b9 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,5 +1,8 @@ -
    -

    {{$ptitle}}

    +
    +
    +

    {{$ptitle}}

    +
    +
    {{$nickname_block}} @@ -78,10 +81,12 @@
    {{$activity_options}}
    +
    {{*not yet implemented *}} {{*include file="field_checkbox.tpl" field=$post_joingroup*}} {{include file="field_checkbox.tpl" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_profilechange}} +
    {{$lbl_not}}
    @@ -150,3 +155,4 @@
    +
    diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index ae11c00c8..5d9f17e9e 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,4 @@
    -
    {{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}}
    +
    -- cgit v1.2.3 From b4a2f764abbc551f84fd5f6a4265e1d71c343569 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Mar 2015 16:21:32 +0100 Subject: fix login --- view/tpl/login.tpl | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index f6f48e138..7bde90c23 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,33 +1,29 @@ -
    - -
    - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} -
    +
    +
    + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} +
    - - -
    + +
    - {{include file="field_checkbox.tpl" field=$remember}} + {{include file="field_checkbox.tpl" field=$remember}} -
    +
    -
    - +
    + +
    - + {{foreach $hiddens as $k=>$v}} {{/foreach}} - - - -- cgit v1.2.3 From ea6e86fecc901c0e64b74a1e6fc87499df93af1d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Mar 2015 21:45:49 +0100 Subject: more settings work --- view/tpl/settings.tpl | 314 +++++++++++++++++++++-------------------- view/tpl/settings_nick_set.tpl | 4 +- 2 files changed, 162 insertions(+), 156 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b41bf87b9..20f2618a0 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,158 +1,164 @@
    -
    -

    {{$ptitle}}

    -
    -
    - -{{$nickname_block}} - -
    - - -

    {{$h_basic}}

    - -{{include file="field_input.tpl" field=$username}} -{{include file="field_select_grouped.tpl" field=$timezone}} -{{include file="field_input.tpl" field=$defloc}} -{{include file="field_checkbox.tpl" field=$allowloc}} - -{{include file="field_checkbox.tpl" field=$adult}} - -
    - -
    - - -

    {{$h_prv}}

    - -{{include file="field_select_grouped.tpl" field=$role}} - -
    -{{include file="field_checkbox.tpl" field=$hide_presence}} - - - -
    - -{{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} -{{/foreach}} -
    - +
    + +

    {{$ptitle}}

    +
    -
    - -
    - - {{$aclselect}} -
    -
    -
    -
    - -{{$group_select}} - -{{$profile_in_dir}} - -
    - -
    - - - -{{$suggestme}} - -{{include file="field_checkbox.tpl" field=$blocktags}} - - -{{include file="field_input.tpl" field=$expire}} - -
    - - -
    - -
    - - - -

    {{$h_not}}

    -
    - -
    {{$activity_options}}
    -
    -{{*not yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_joingroup*}} -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_profilechange}} -
    - - -
    {{$lbl_not}}
    - -
    -{{include file="field_intcheckbox.tpl" field=$notify1}} -{{include file="field_intcheckbox.tpl" field=$notify2}} -{{include file="field_intcheckbox.tpl" field=$notify3}} -{{include file="field_intcheckbox.tpl" field=$notify4}} -{{include file="field_intcheckbox.tpl" field=$notify5}} -{{include file="field_intcheckbox.tpl" field=$notify6}} -{{include file="field_intcheckbox.tpl" field=$notify7}} -{{include file="field_intcheckbox.tpl" field=$notify8}} -
    - -
    {{$lbl_vnot}}
    - -
    -{{include file="field_intcheckbox.tpl" field=$vnotify1}} -{{include file="field_intcheckbox.tpl" field=$vnotify2}} -{{include file="field_intcheckbox.tpl" field=$vnotify3}} -{{include file="field_intcheckbox.tpl" field=$vnotify4}} -{{include file="field_intcheckbox.tpl" field=$vnotify5}} -{{include file="field_intcheckbox.tpl" field=$vnotify6}} -{{include file="field_intcheckbox.tpl" field=$vnotify10}} -{{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*}} -
    - -{{include file="field_input.tpl" field=$evdays}} - - - -
    - -
    - -
    - - -{{if $menus}} -

    {{$lbl_misc}}

    - - - -
    {{$menu_desc}}
    -
    - -
    -
    - -
    -
    -{{/if}} - - -
    + {{$nickname_block}} + + + + + + +
    +
    + +
    +
    + {{include file="field_input.tpl" field=$username}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_checkbox.tpl" field=$adult}} +
    + +
    +
    +
    +
    +
    + +
    +
    + {{include file="field_select_grouped.tpl" field=$role}} + +
    + {{include file="field_checkbox.tpl" field=$hide_presence}} + + +
    + + {{foreach $permiss_arr as $permit}} + {{include file="field_select.tpl" field=$permit}} + {{/foreach}} +
    + +
    +
    + +
    + + {{$aclselect}} +
    +
    +
    + {{$group_select}} + {{$profile_in_dir}} +
    +
    + {{$suggestme}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$expire}} +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    {{$activity_options}}
    +
    + {{*not yet implemented *}} + {{*include file="field_checkbox.tpl" field=$post_joingroup*}} + {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} +
    +
    {{$lbl_not}}
    +
    + {{include file="field_intcheckbox.tpl" field=$notify1}} + {{include file="field_intcheckbox.tpl" field=$notify2}} + {{include file="field_intcheckbox.tpl" field=$notify3}} + {{include file="field_intcheckbox.tpl" field=$notify4}} + {{include file="field_intcheckbox.tpl" field=$notify5}} + {{include file="field_intcheckbox.tpl" field=$notify6}} + {{include file="field_intcheckbox.tpl" field=$notify7}} + {{include file="field_intcheckbox.tpl" field=$notify8}} +
    +
    {{$lbl_vnot}}
    +
    + {{include file="field_intcheckbox.tpl" field=$vnotify1}} + {{include file="field_intcheckbox.tpl" field=$vnotify2}} + {{include file="field_intcheckbox.tpl" field=$vnotify3}} + {{include file="field_intcheckbox.tpl" field=$vnotify4}} + {{include file="field_intcheckbox.tpl" field=$vnotify5}} + {{include file="field_intcheckbox.tpl" field=$vnotify6}} + {{include file="field_intcheckbox.tpl" field=$vnotify10}} + {{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*}} +
    + {{include file="field_input.tpl" field=$evdays}} +
    +
    + +
    +
    +
    +
    + {{if $menus}} +
    + +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + {{/if}} +
    diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index 5d9f17e9e..2460952fe 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,4 @@ -
    - +
    +
    {{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}}
    -- cgit v1.2.3 From e8e6231a4e079bff7a9d0bdd9e4c1dfa5808402b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Mar 2015 21:51:44 +0100 Subject: settings: missing /form and whitespace --- view/tpl/settings.tpl | 262 +++++++++++++++++++++++++------------------------- 1 file changed, 129 insertions(+), 133 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 20f2618a0..3d13dc5de 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -4,161 +4,157 @@

    {{$ptitle}}

    - {{$nickname_block}} - - - - -
    -
    - -
    -
    - {{include file="field_input.tpl" field=$username}} - {{include file="field_select_grouped.tpl" field=$timezone}} - {{include file="field_input.tpl" field=$defloc}} - {{include file="field_checkbox.tpl" field=$allowloc}} - {{include file="field_checkbox.tpl" field=$adult}} -
    - +
    +
    + +
    +
    + {{include file="field_input.tpl" field=$username}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_checkbox.tpl" field=$adult}} +
    + +
    -
    -
    - -
    -
    - {{include file="field_select_grouped.tpl" field=$role}} +
    + +
    +
    + {{include file="field_select_grouped.tpl" field=$role}} -
    - {{include file="field_checkbox.tpl" field=$hide_presence}} - +
    + {{include file="field_checkbox.tpl" field=$hide_presence}} + -
    +
    - {{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} - {{/foreach}} -
    - + {{foreach $permiss_arr as $permit}} + {{include file="field_select.tpl" field=$permit}} + {{/foreach}} +
    + +
    -
    -
    - - {{$aclselect}} -
    +
    + + {{$aclselect}} +
    +
    +
    + {{$group_select}} + {{$profile_in_dir}} +
    +
    + {{$suggestme}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$expire}} +
    +
    +
    -
    - {{$group_select}} - {{$profile_in_dir}} -
    -
    - {{$suggestme}} - {{include file="field_checkbox.tpl" field=$blocktags}} - {{include file="field_input.tpl" field=$expire}} -
    -
    -
    -
    -
    - -
    -
    -
    -
    {{$activity_options}}
    -
    - {{*not yet implemented *}} - {{*include file="field_checkbox.tpl" field=$post_joingroup*}} - {{include file="field_checkbox.tpl" field=$post_newfriend}} - {{include file="field_checkbox.tpl" field=$post_profilechange}} -
    -
    {{$lbl_not}}
    -
    - {{include file="field_intcheckbox.tpl" field=$notify1}} - {{include file="field_intcheckbox.tpl" field=$notify2}} - {{include file="field_intcheckbox.tpl" field=$notify3}} - {{include file="field_intcheckbox.tpl" field=$notify4}} - {{include file="field_intcheckbox.tpl" field=$notify5}} - {{include file="field_intcheckbox.tpl" field=$notify6}} - {{include file="field_intcheckbox.tpl" field=$notify7}} - {{include file="field_intcheckbox.tpl" field=$notify8}} -
    -
    {{$lbl_vnot}}
    -
    - {{include file="field_intcheckbox.tpl" field=$vnotify1}} - {{include file="field_intcheckbox.tpl" field=$vnotify2}} - {{include file="field_intcheckbox.tpl" field=$vnotify3}} - {{include file="field_intcheckbox.tpl" field=$vnotify4}} - {{include file="field_intcheckbox.tpl" field=$vnotify5}} - {{include file="field_intcheckbox.tpl" field=$vnotify6}} - {{include file="field_intcheckbox.tpl" field=$vnotify10}} - {{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}} +
    + +
    +
    +
    +
    {{$activity_options}}
    +
    + {{*not yet implemented *}} + {{*include file="field_checkbox.tpl" field=$post_joingroup*}} + {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} +
    +
    {{$lbl_not}}
    +
    + {{include file="field_intcheckbox.tpl" field=$notify1}} + {{include file="field_intcheckbox.tpl" field=$notify2}} + {{include file="field_intcheckbox.tpl" field=$notify3}} + {{include file="field_intcheckbox.tpl" field=$notify4}} + {{include file="field_intcheckbox.tpl" field=$notify5}} + {{include file="field_intcheckbox.tpl" field=$notify6}} + {{include file="field_intcheckbox.tpl" field=$notify7}} + {{include file="field_intcheckbox.tpl" field=$notify8}} +
    +
    {{$lbl_vnot}}
    +
    + {{include file="field_intcheckbox.tpl" field=$vnotify1}} + {{include file="field_intcheckbox.tpl" field=$vnotify2}} + {{include file="field_intcheckbox.tpl" field=$vnotify3}} + {{include file="field_intcheckbox.tpl" field=$vnotify4}} + {{include file="field_intcheckbox.tpl" field=$vnotify5}} + {{include file="field_intcheckbox.tpl" field=$vnotify6}} + {{include file="field_intcheckbox.tpl" field=$vnotify10}} + {{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*}} + {{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +
    + {{include file="field_input.tpl" field=$evdays}} +
    +
    +
    - {{include file="field_input.tpl" field=$evdays}} -
    -
    -
    -
    - {{if $menus}} -
    - -
    -
    -
    - - -
    -
    - + {{if $menus}} +
    + +
    +
    +
    + + +
    +
    + +
    + {{/if}}
    - {{/if}} -
    +
    -- cgit v1.2.3 From ba7bdd79b720dcb58dfd88a38f43444eb4da06f4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Mar 2015 15:55:27 -0800 Subject: queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. --- view/tpl/admin_queue.tpl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 view/tpl/admin_queue.tpl (limited to 'view/tpl') diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl new file mode 100644 index 000000000..2abe87db9 --- /dev/null +++ b/view/tpl/admin_queue.tpl @@ -0,0 +1,14 @@ +

    {{$banner}}

    + +{{if $hasentries}} + + + +{{foreach $entries as $e}} + + +{{/foreach}} + +
    {{$numentries}}  {{$desturl}}  
    {{$e.total}}{{$e.outq_posturl}}
    + +{{/if}} \ No newline at end of file -- cgit v1.2.3 From 6b467974a33a054d96b69c8c3b85b2807ffd5f29 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 2 Mar 2015 20:51:32 +0100 Subject: some more work on settings --- view/tpl/settings.tpl | 62 +++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 29 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3d13dc5de..02937e4b2 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -24,7 +24,7 @@ {{include file="field_checkbox.tpl" field=$allowloc}} {{include file="field_checkbox.tpl" field=$adult}}
    - +
    @@ -40,28 +40,34 @@
    {{include file="field_select_grouped.tpl" field=$role}} -
    - {{include file="field_checkbox.tpl" field=$hide_presence}} - - -
    - - {{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} - {{/foreach}} -
    - -
    +
    +
    - -
    - - {{$aclselect}} -
    + +
    + + {{$aclselect}}
    -
    {{$group_select}} + {{include file="field_checkbox.tpl" field=$hide_presence}} {{$profile_in_dir}}
    @@ -70,7 +76,7 @@ {{include file="field_input.tpl" field=$expire}}
    - +
    @@ -86,14 +92,14 @@
    -
    {{$activity_options}}
    +

    {{$activity_options}}

    {{*not yet implemented *}} {{*include file="field_checkbox.tpl" field=$post_joingroup*}} {{include file="field_checkbox.tpl" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_profilechange}}
    -
    {{$lbl_not}}
    +

    {{$lbl_not}}

    {{include file="field_intcheckbox.tpl" field=$notify1}} {{include file="field_intcheckbox.tpl" field=$notify2}} @@ -104,7 +110,7 @@ {{include file="field_intcheckbox.tpl" field=$notify7}} {{include file="field_intcheckbox.tpl" field=$notify8}}
    -
    {{$lbl_vnot}}
    +

    {{$lbl_vnot}}

    {{include file="field_intcheckbox.tpl" field=$vnotify1}} {{include file="field_intcheckbox.tpl" field=$vnotify2}} @@ -118,13 +124,11 @@ {{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*}} + {{include file="field_input.tpl" field=$evdays}}
    - {{include file="field_input.tpl" field=$evdays}}
    - +
    @@ -143,9 +147,9 @@
    -- cgit v1.2.3 From 74c1b6168938872303b3ff61e9bea1c9c86a29c5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 3 Mar 2015 09:18:04 +0100 Subject: make remove channel button work again --- view/tpl/settings.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 02937e4b2..6ad23b007 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@
    - +  {{$removeme}}

    {{$ptitle}}

    -- cgit v1.2.3 From 6e0b5b742c5b11dc0e8f181926c401bb892aab3b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 3 Mar 2015 11:32:54 +0100 Subject: login adjustment --- view/tpl/login.tpl | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 7bde90c23..9472bd961 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,29 +1,19 @@
    -
    - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} +
    + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} + {{include file="field_checkbox.tpl" field=$remember}} +
    - -
    - - {{include file="field_checkbox.tpl" field=$remember}} - -
    - -
    - -
    - {{foreach $hiddens as $k=>$v}} {{/foreach}} - -- cgit v1.2.3 From 44b714d0eb13263d5900bd8d51bf3995388f4bd0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Mar 2015 14:38:34 -0800 Subject: group/collection edit page cleanup --- view/tpl/group_drop.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl index 850e7101f..34ee3e3fd 100755 --- a/view/tpl/group_drop.tpl +++ b/view/tpl/group_drop.tpl @@ -2,6 +2,6 @@ + class="group-delete-icon btn btn-default" title="{{$delete}}" >
    -- cgit v1.2.3 From df90677f900a1a6ed496628545a8e109700e168b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Mar 2015 17:43:13 -0800 Subject: add the tag hijacking preference to Diaspora settings --- view/tpl/settings_addons.tpl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index a18f57658..a41f4802b 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -11,7 +11,14 @@
    -
    +
    + + +
    +
    + + +
    {{/if}} {{$settings_addons}} -- cgit v1.2.3 From 6d30abe4bf4a92961f103f1ae899a2ef49a6d607 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 09:54:33 +0100 Subject: Accordionize feature settings --- view/tpl/settings_features.tpl | 49 +++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 20 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 3ede4c76d..75eb34fb9 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,21 +1,30 @@ -
    -

    {{$title}}

    - - -
    - - -{{foreach $features as $f}} -

    {{$f.0}}

    - -{{foreach $f.1 as $fcat}} - {{include file="field_checkbox.tpl" field=$fcat}} -{{/foreach}} -{{/foreach}} - -
    - -
    - -
    +
    +
    +

    {{$title}}

    +
    +
    + +
    + {{foreach $features as $g => $f}} +
    + +
    +
    + {{foreach $f.1 as $fcat}} + {{include file="field_checkbox.tpl" field=$fcat}} + {{/foreach}} +
    + +
    +
    +
    +
    + {{/foreach}} +
    -- cgit v1.2.3 From 4b08ccd873a02dcbcd8603f4b8681de47776e31f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 10:11:48 +0100 Subject: clean up account settings --- view/tpl/settings_account.tpl | 44 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 36bb494d8..5f1f9c9b1 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,28 +1,20 @@ -
    -

    {{$title}}

    - - - - - -{{include file="field_input.tpl" field=$email}} - - -

    {{$h_pass}}

    - -{{include file="field_password.tpl" field=$password1}} -{{include file="field_password.tpl" field=$password2}} - - -
    - +
    +
    +  {{$removeme}} +

    {{$title}}

    +
    +
    + + +
    + {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$password1}} + {{include file="field_password.tpl" field=$password2}} +
    + +
    + {{$account_settings}} +
    +
    -{{$account_settings}} - - -
    -- cgit v1.2.3 From eceafd5777c2b2c15d5db93e0a11bbeb328142e2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 10:26:25 +0100 Subject: fix wording --- view/tpl/settings.tpl | 2 +- view/tpl/settings_account.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 6ad23b007..eb497bbb5 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@
    -  {{$removeme}} +  {{$removeme}}

    {{$ptitle}}

    diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 5f1f9c9b1..9f550fe4a 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,6 +1,6 @@
    -  {{$removeme}} +  {{$removeme}}

    {{$title}}

    -- cgit v1.2.3 From 431a462d60af173592cf6a046dc2280a07484402 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 11:01:16 +0100 Subject: cleanup removeme --- view/tpl/removeme.tpl | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index c42eaf0e1..5b329dd6d 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -1,22 +1,20 @@ -

    {{$title}}

    - -
    - -
    {{$desc}}
    - -
    - - -
    - - -
    -
    - -{{include file="field_checkbox.tpl" field=$global}} - - - -
    +
    +
    +

    {{$title}}

    +
    +
    + {{$desc.0}}{{$desc.1}}{{$desc.2}} +
    +
    +
    + +
    + + +
    + {{include file="field_checkbox.tpl" field=$global}} + +
    +
    -- cgit v1.2.3 From e5e96dfbffd48b3d6b527e539e300a5091e7a19c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 11:11:36 +0100 Subject: cleanup removeaccount --- view/tpl/removeaccount.tpl | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index b7378806b..aefcd51a8 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -1,22 +1,20 @@ -

    {{$title}}

    - -
    - -
    {{$desc}}
    - -
    - - -
    - - -
    -
    - -{{include file="field_checkbox.tpl" field=$global}} - - - -
    +
    +
    +

    {{$title}}

    +
    +
    + {{$desc.0}}{{$desc.1}}{{$desc.2}} +
    +
    +
    + +
    + + +
    + {{include file="field_checkbox.tpl" field=$global}} + +
    +
    -- cgit v1.2.3 From ddaf5c067dcee0b8712e62bd710927d63fdf4d46 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Mar 2015 14:00:36 -0800 Subject: cleanup mail buttons --- view/tpl/mail_conv.tpl | 4 ++-- view/tpl/mail_list.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index a75939617..ec8f8c1e3 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,9 +8,9 @@
    {{$mail.date}}
    {{$mail.subject}}
    {{$mail.body}}
    -
    +
    {{if $mail.can_recall}} -
    +
    {{/if}}
    diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 8643f27b9..1d499e12f 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ {{$from_name}} {{$subject}} {{$date}} - +
     
    -- cgit v1.2.3 From 2ea162136e8ab68ca0ad854a4225471ffd35a5a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Mar 2015 20:00:54 -0800 Subject: the link icon on comments now calls the link parsing tool (just like the main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever). --- view/tpl/comment_item.tpl | 2 +- view/tpl/jot.tpl | 2 +- view/tpl/js_strings.tpl | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index cdcf35131..c9a3c451c 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -43,7 +43,7 @@ - - - +
    +
    +
    +
    + {{if $theme_config}} + {{$theme_config}} + {{/if}} +
    + +
    +
    + {{include file="field_input.tpl" field=$ajaxint}} + {{include file="field_input.tpl" field=$itemspage}} + {{include file="field_input.tpl" field=$channel_divmore_height}} + {{include file="field_input.tpl" field=$network_divmore_height}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$title_tosource}} + {{include file="field_checkbox.tpl" field=$channel_list_mode}} + {{include file="field_checkbox.tpl" field=$network_list_mode}} + {{include file="field_checkbox.tpl" field=$user_scalable}} + {{if $expert}} +
    + {{$layout_editor}} +
    + {{/if}} +
    + +
    +
    +
    +
    +
    +
    -- cgit v1.2.3 From 688ef34d98dbfafb5418f15eabd8bc41e9a5b581 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 5 Mar 2015 18:16:43 +0100 Subject: only show theme settings if we have any themes --- view/tpl/settings_display.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 1dbf4381a..d27ea15e0 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,6 +6,7 @@
    + {{if $theme || $mobile_theme}}
    + {{/if}} {{if $theme_config}} {{$theme_config}} {{/if}} -- cgit v1.2.3 From ce229d73f86f90ed102145694780abb54de51345 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 5 Mar 2015 19:08:32 +0100 Subject: whitespace and minor restructuring --- view/tpl/settings_display.tpl | 59 ++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 23 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index d27ea15e0..6532b4ec1 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -17,12 +17,12 @@
    - {{if $theme}} - {{include file="field_themeselect.tpl" field=$theme}} - {{/if}} - {{if $mobile_theme}} - {{include file="field_themeselect.tpl" field=$mobile_theme}} - {{/if}} + {{if $theme}} + {{include file="field_themeselect.tpl" field=$theme}} + {{/if}} + {{if $mobile_theme}} + {{include file="field_themeselect.tpl" field=$mobile_theme}} + {{/if}}
    @@ -30,9 +30,22 @@
    {{/if}} - {{if $theme_config}} - {{$theme_config}} - {{/if}} +
    + +
    +
    + {{if $theme_config}} + {{$theme_config}} + {{/if}} +
    +
    +
    -
    +
    - {{include file="field_input.tpl" field=$ajaxint}} - {{include file="field_input.tpl" field=$itemspage}} - {{include file="field_input.tpl" field=$channel_divmore_height}} - {{include file="field_input.tpl" field=$network_divmore_height}} - {{include file="field_checkbox.tpl" field=$nosmile}} - {{include file="field_checkbox.tpl" field=$title_tosource}} - {{include file="field_checkbox.tpl" field=$channel_list_mode}} - {{include file="field_checkbox.tpl" field=$network_list_mode}} - {{include file="field_checkbox.tpl" field=$user_scalable}} - {{if $expert}} -
    + {{include file="field_input.tpl" field=$ajaxint}} + {{include file="field_input.tpl" field=$itemspage}} + {{include file="field_input.tpl" field=$channel_divmore_height}} + {{include file="field_input.tpl" field=$network_divmore_height}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$title_tosource}} + {{include file="field_checkbox.tpl" field=$channel_list_mode}} + {{include file="field_checkbox.tpl" field=$network_list_mode}} + {{include file="field_checkbox.tpl" field=$user_scalable}} + {{if $expert}} +
    {{$layout_editor}} -
    - {{/if}} +
    + {{/if}}
    -- cgit v1.2.3 From ec5c989352c91e050d306d234f638bb3fc7f6f6d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Mar 2015 15:53:25 -0800 Subject: make destructive queue management functions an expert option --- view/tpl/admin_queue.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl index 2abe87db9..6c2df7e31 100644 --- a/view/tpl/admin_queue.tpl +++ b/view/tpl/admin_queue.tpl @@ -6,7 +6,7 @@ {{foreach $entries as $e}} -{{$e.total}}{{$e.outq_posturl}} +{{$e.total}}{{$e.outq_posturl}}{{if $expert}}{{/if}} {{/foreach}} -- cgit v1.2.3 From 22391a24378cae317cdf62dc4be4b31b68e8191f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Mar 2015 18:24:49 -0800 Subject: straighten out some directory stuff, which required some Comanche structural changes --- view/tpl/dir_sort_links.tpl | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index d9ecd22c6..62cf7ff1b 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,5 +1,8 @@ -- cgit v1.2.3 From f6da235a7d0eae48f7b691a139825708b99dcd75 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Mar 2015 23:31:01 -0800 Subject: major cleanup of directory options --- view/tpl/dir_sort_links.tpl | 10 +++++----- view/tpl/field_checkbox.tpl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 62cf7ff1b..5cefe2f28 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,15 +1,15 @@ diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index b6edd8288..514626d5f 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,6 +1,6 @@
    -
    +
    {{$field.3}}
    -- cgit v1.2.3 From 480dac1af2dd5ed5ba3105577559568237fe5d80 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Mar 2015 23:35:56 -0800 Subject: add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. --- 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 cae920c5d..2964d9c4b 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ {{/if}}
    {{$profile.name}}{{if $profile.online}} {{/if}}
    - + {{if $reddress}}
    {{$profile.reddress}}
    {{/if}} {{if $pdesc}}
    {{$profile.pdesc}}
    {{/if}}
    {{$profile.name}}
    -- cgit v1.2.3 From 23ea974615cc8ffb3756769fe872affcee3d5c3a Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sat, 7 Mar 2015 18:19:52 +0100 Subject: Add alert to admin page about old PHP version. Add an alert message to admin summary page when a PHP version < 5.4 was detected as this has reached EOL and will not be supported with the new SabreDAV library. Some styleguide optimisation. Add NULL_DATE example to doc/sql_conventions.bb. Display a "0" when no plugins active in summary page. Added some more numbers to summary admin page, expired accounts, channels. Hope I interpreted them right. I have no idea how to get blocked accounts. --- view/tpl/admin_summary.tpl | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 7f752a773..259640849 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,36 +1,32 @@

    {{$title}} - {{$page}}

    - +{{if $adminalertmsg}} + +{{/if}}
    {{$queues.label}}
    {{$queues.queue}}
    +
    +
    {{$accounts.0}}
    +
    {{foreach from=$accounts.1 item=acc name=account}}{{$acc.val}}{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}
    +
    {{$pending.0}}
    {{$pending.1}}
    -
    -
    {{$users.0}}
    -
    {{$users.1}}
    +
    {{$channels.0}}
    +
    {{foreach from=$channels.1 item=ch name=chan}}{{$ch.val}}{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}
    -
    {{$plugins.0}}
    {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} -  
    {{$version.0}}
    {{$version.1}} - {{$build}}
    - -
    +
    \ No newline at end of file -- cgit v1.2.3 From c6d45858bb73c0f3765fcc7257ed1347d6de1577 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 8 Mar 2015 19:02:48 +0100 Subject: Fixing (un)blocking accounts in /admin/users. When I look at the instructions in sql_conventions about setting bit flags I don't understand how this could have worked before. Changed the behavior for (un)blocking so that it should work now. --- view/tpl/admin_users.tpl | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 7e0b828d9..52ccbf253 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,15 +10,15 @@ return false; } -
    +

    {{$title}} - {{$page}}

    - +
    - - + +

    {{$h_pending}}

    {{if $pending}} - +
    {{foreach $th_pending as $th}}{{/foreach}} @@ -31,27 +31,25 @@ - + {{/foreach}}
    {{$th}}
    {{$u.account_created}} - - + +
    -
    {{$select_all}}
    -
    +
    {{$select_all}}
    +
    {{else}}

    {{$no_pending}}

    {{/if}} - - - - + +

    {{$h_users}}

    {{if $users}} - +
    {{foreach $th_users as $th}}{{/foreach}} @@ -62,30 +60,30 @@ {{foreach $users as $u}} - - + - - - - - - + + + + + + {{/foreach}}
    {{$th}}
    {{$u.channels}}{{$u.account_created}}{{$u.account_service_class}}{{$u.channels}}{{$u.account_created}}{{$u.account_service_class}} - - + +
    -
    {{$select_all}}
    -
    +
    {{$select_all}}
    +
    {{else}} NO USERS?!? {{/if}}
    -
    +
    \ No newline at end of file -- cgit v1.2.3 From 26a414fe4b3ab4b1d995233f0402532ad41eaeb7 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Mar 2015 16:25:55 -0700 Subject: make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon --- view/tpl/saved_searches.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 73987f192..1f7861078 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@
    +
    + + + + + +
    {{if $visitor}}