From 9b7c6e96f79ef1b2dc9d71d18db816ffd99f644c Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 23 Sep 2018 20:41:01 +0200 Subject: only show nav settings icon when hovering over nav --- view/theme/redbasic/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a9ea29ba1..c54f571a2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1274,6 +1274,14 @@ img.mail-conv-sender-photo { white-space: nowrap; } +#nav-app-settings-link { + opacity: 0; +} + +nav:hover #nav-app-settings-link { + opacity: 1; +} + .page-title { margin: 7px 0px; } -- cgit v1.2.3 From e735220691366fb29276dbc3f47ad0347c40aaf5 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 23 Sep 2018 20:54:36 +0200 Subject: only explain how to select a channel if there are channels to select --- view/tpl/channels.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index f484b49e5..695b3b30f 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -9,9 +9,11 @@ {{$channel_usage_message}} {{/if}} + {{if $desc}}
{{$desc}}
+ {{/if}} {{foreach $all_channels as $chn}} {{include file="channel.tpl" channel=$chn}} {{/foreach}} -- cgit v1.2.3 From 4a7c678213fca1ba3f98c96579368062297d425b Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 24 Sep 2018 09:46:19 +0200 Subject: fade in nav settings button --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c54f571a2..97f4c67db 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1280,6 +1280,9 @@ img.mail-conv-sender-photo { nav:hover #nav-app-settings-link { opacity: 1; + transition: opacity .3s ease-in-out; + -moz-transition: opacity .3s ease-in-out; + -webkit-transition: opacity .3s ease-in-out; } .page-title { -- cgit v1.2.3 From c3aa15cc165730b6e67de580065ace255454dfb5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 24 Sep 2018 11:46:18 +0200 Subject: appification of notes --- view/tpl/notes.tpl | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'view') diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index c6d5d8a73..67da5ff37 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,5 +1,13 @@ +{{if $app}} +
+
+

{{$banner}}

+
+
+{{else}}

{{$banner}}

+{{/if}} +{{if $app}} +
+{{/if}}
-- cgit v1.2.3 From c748230b35b16cdf1558671b26a49af41b253876 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 24 Sep 2018 11:51:20 +0200 Subject: revert nav settings opacity --- view/theme/redbasic/css/style.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 97f4c67db..a9ea29ba1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1274,17 +1274,6 @@ img.mail-conv-sender-photo { white-space: nowrap; } -#nav-app-settings-link { - opacity: 0; -} - -nav:hover #nav-app-settings-link { - opacity: 1; - transition: opacity .3s ease-in-out; - -moz-transition: opacity .3s ease-in-out; - -webkit-transition: opacity .3s ease-in-out; -} - .page-title { margin: 7px 0px; } -- cgit v1.2.3 From 39866b74637a58df5b1ffb8f2b6f164849d65315 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 25 Sep 2018 11:37:22 +0200 Subject: move start_menu switch to settings/display for now --- view/tpl/settings_display.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 7600038ea..1500ea0d3 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -68,6 +68,7 @@ {{include file="field_checkbox.tpl" field=$user_scalable}} {{include file="field_checkbox.tpl" field=$preload_images}} {{include file="field_checkbox.tpl" field=$manual_update}} + {{include file="field_checkbox.tpl" field=$start_menu}} {{if $expert}}
{{$layout_editor}} -- cgit v1.2.3 From 9bb0f1d18ece05ac1d37800c61d0b071f560dac3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 25 Sep 2018 12:02:00 +0200 Subject: move advanced_theming switch to settings/display for now --- view/theme/redbasic/php/config.php | 2 +- view/tpl/settings_display.tpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index f98182739..ae926d07b 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -85,7 +85,7 @@ class RedbasicConfig { function form($arr) { - if(feature_enabled(local_channel(),'advanced_theming')) + if(get_pconfig(local_channel(), 'system', 'advanced_theming')) $expert = 1; diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 1500ea0d3..ee0e137b5 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -69,6 +69,7 @@ {{include file="field_checkbox.tpl" field=$preload_images}} {{include file="field_checkbox.tpl" field=$manual_update}} {{include file="field_checkbox.tpl" field=$start_menu}} + {{include file="field_checkbox.tpl" field=$advanced_theming}} {{if $expert}}
{{$layout_editor}} -- cgit v1.2.3 From 9bc76b425948e7a6118e7749a3eb7c08c447bab3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 15:02:20 +0200 Subject: appification of the pdl editor and move advanced_theming to theme settings where it belongs --- view/theme/redbasic/php/config.php | 6 ++++-- view/theme/redbasic/tpl/theme_settings.tpl | 1 + view/tpl/settings_display.tpl | 6 ------ 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ae926d07b..d9d46c8f4 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -54,6 +54,7 @@ class RedbasicConfig { $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); + $arr['advanced_theming'] = get_pconfig(local_channel(), 'redbasic', 'advanced_theming'); return $this->form($arr); } @@ -80,15 +81,15 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); + set_pconfig(local_channel(), 'redbasic', 'advanced_theming', $_POST['redbasic_advanced_theming']); } } function form($arr) { - if(get_pconfig(local_channel(), 'system', 'advanced_theming')) + if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming')) $expert = 1; - $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -112,6 +113,7 @@ class RedbasicConfig { '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), + '$advanced_theming' => ['redbasic_advanced_theming', t('Show more custom theme settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] )); return $o; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 7c552b49e..cc403f0a7 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,6 +1,7 @@ {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$font_size}} +{{include file="field_checkbox.tpl" field=$advanced_theming}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_icon_colour}} diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index ee0e137b5..f96e7f84c 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -69,12 +69,6 @@ {{include file="field_checkbox.tpl" field=$preload_images}} {{include file="field_checkbox.tpl" field=$manual_update}} {{include file="field_checkbox.tpl" field=$start_menu}} - {{include file="field_checkbox.tpl" field=$advanced_theming}} - {{if $expert}} -
- {{$layout_editor}} -
- {{/if}}
-- cgit v1.2.3 From 91502b4104788b4f2d57da800ffc4c38585de94d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 15:13:19 +0200 Subject: change wording --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index d9d46c8f4..0a779529d 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -113,7 +113,7 @@ class RedbasicConfig { '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), - '$advanced_theming' => ['redbasic_advanced_theming', t('Show more custom theme settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] + '$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] )); return $o; -- cgit v1.2.3 From aab97adb23c65dfc54f4f160742f8066fcd98032 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 16:22:34 +0200 Subject: oauth and oauth2 apps manager --- view/tpl/oauth.tpl | 36 ++++++++++++++++++++++++++++++++++++ view/tpl/oauth2.tpl | 36 ++++++++++++++++++++++++++++++++++++ view/tpl/oauth2_edit.tpl | 21 +++++++++++++++++++++ view/tpl/oauth_edit.tpl | 21 +++++++++++++++++++++ view/tpl/settings_oauth.tpl | 36 ------------------------------------ view/tpl/settings_oauth2.tpl | 36 ------------------------------------ view/tpl/settings_oauth2_edit.tpl | 21 --------------------- view/tpl/settings_oauth_edit.tpl | 21 --------------------- 8 files changed, 114 insertions(+), 114 deletions(-) create mode 100755 view/tpl/oauth.tpl create mode 100755 view/tpl/oauth2.tpl create mode 100755 view/tpl/oauth2_edit.tpl create mode 100755 view/tpl/oauth_edit.tpl delete mode 100755 view/tpl/settings_oauth.tpl delete mode 100755 view/tpl/settings_oauth2.tpl delete mode 100755 view/tpl/settings_oauth2_edit.tpl delete mode 100755 view/tpl/settings_oauth_edit.tpl (limited to 'view') diff --git a/view/tpl/oauth.tpl b/view/tpl/oauth.tpl new file mode 100755 index 000000000..881e22e99 --- /dev/null +++ b/view/tpl/oauth.tpl @@ -0,0 +1,36 @@ +
+
+

{{$title}}

+
+ +
+
+ + + + + {{foreach $apps as $app}} +
+ + {{if $app.clname}}

{{$app.clname}}

{{else}}

{{$noname}}

{{/if}} + {{if $app.my}} + {{if $app.oauth_token}} +
+ {{/if}} + {{/if}} + {{if $app.my}} + + + {{/if}} +
+ {{/foreach}} + +
+
+
diff --git a/view/tpl/oauth2.tpl b/view/tpl/oauth2.tpl new file mode 100755 index 000000000..a5b48ffce --- /dev/null +++ b/view/tpl/oauth2.tpl @@ -0,0 +1,36 @@ +
+
+

{{$title}}

+
+ +
+ + + + {{foreach $apps as $app}} +
+ + +
+ {{if $app.client_id}}

{{$app.client_id}}

{{else}}

{{$noname}}

{{/if}} + {{if $app.my}} + {{if $app.oauth_token}} +
+ {{/if}} + {{/if}} + {{if $app.my}} + + + {{/if}} +
+
+ {{/foreach}} + +
+
diff --git a/view/tpl/oauth2_edit.tpl b/view/tpl/oauth2_edit.tpl new file mode 100755 index 000000000..399c64977 --- /dev/null +++ b/view/tpl/oauth2_edit.tpl @@ -0,0 +1,21 @@ +
+
+

{{$title}}

+
+
+
+ +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$secret}} +{{include file="field_input.tpl" field=$redirect}} +{{include file="field_input.tpl" field=$grant}} +{{include file="field_input.tpl" field=$scope}} + +
+ + +
+ +
+
+
diff --git a/view/tpl/oauth_edit.tpl b/view/tpl/oauth_edit.tpl new file mode 100755 index 000000000..e44b44723 --- /dev/null +++ b/view/tpl/oauth_edit.tpl @@ -0,0 +1,21 @@ +
+
+

{{$title}}

+
+
+
+ +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$key}} +{{include file="field_input.tpl" field=$secret}} +{{include file="field_input.tpl" field=$redirect}} +{{include file="field_input.tpl" field=$icon}} + +
+ + +
+ +
+
+
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl deleted file mode 100755 index 811cfcec5..000000000 --- a/view/tpl/settings_oauth.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
-
-

{{$title}}

-
- -
-
- - - - - {{foreach $apps as $app}} -
- - {{if $app.clname}}

{{$app.clname}}

{{else}}

{{$noname}}

{{/if}} - {{if $app.my}} - {{if $app.oauth_token}} -
- {{/if}} - {{/if}} - {{if $app.my}} - - - {{/if}} -
- {{/foreach}} - -
-
-
diff --git a/view/tpl/settings_oauth2.tpl b/view/tpl/settings_oauth2.tpl deleted file mode 100755 index f3bf59a12..000000000 --- a/view/tpl/settings_oauth2.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
-
-

{{$title}}

-
- -
- - - - {{foreach $apps as $app}} -
- - -
- {{if $app.client_id}}

{{$app.client_id}}

{{else}}

{{$noname}}

{{/if}} - {{if $app.my}} - {{if $app.oauth_token}} -
- {{/if}} - {{/if}} - {{if $app.my}} - - - {{/if}} -
-
- {{/foreach}} - -
-
diff --git a/view/tpl/settings_oauth2_edit.tpl b/view/tpl/settings_oauth2_edit.tpl deleted file mode 100755 index 399c64977..000000000 --- a/view/tpl/settings_oauth2_edit.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-
-

{{$title}}

-
-
-
- -{{include file="field_input.tpl" field=$name}} -{{include file="field_input.tpl" field=$secret}} -{{include file="field_input.tpl" field=$redirect}} -{{include file="field_input.tpl" field=$grant}} -{{include file="field_input.tpl" field=$scope}} - -
- - -
- -
-
-
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl deleted file mode 100755 index e44b44723..000000000 --- a/view/tpl/settings_oauth_edit.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-
-

{{$title}}

-
-
-
- -{{include file="field_input.tpl" field=$name}} -{{include file="field_input.tpl" field=$key}} -{{include file="field_input.tpl" field=$secret}} -{{include file="field_input.tpl" field=$redirect}} -{{include file="field_input.tpl" field=$icon}} - -
- - -
- -
-
-
-- cgit v1.2.3 From a7948d7bfee1c0c8c9f1a731aabdc636c280bff0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 22:02:50 +0200 Subject: permcats app --- view/tpl/abook_edit.tpl | 2 +- view/tpl/defperms.tpl | 2 +- view/tpl/permcats.tpl | 64 ++++++++++++++++++++++++++++++++++++++++++ view/tpl/settings_permcats.tpl | 64 ------------------------------------------ 4 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 view/tpl/permcats.tpl delete mode 100644 view/tpl/settings_permcats.tpl (limited to 'view') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d72258fa0..6ff7bffcd 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -485,7 +485,7 @@
{{if $permcat_enable}} -  {{$permcat_new}} +  {{$permcat_new}} {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl index 5273ee91b..29f642cff 100755 --- a/view/tpl/defperms.tpl +++ b/view/tpl/defperms.tpl @@ -17,7 +17,7 @@

{{$permnote_self}}

{{if $permcat_enable}} -  {{$permcat_new}} +  {{$permcat_new}} {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/permcats.tpl b/view/tpl/permcats.tpl new file mode 100644 index 000000000..2cad2db5b --- /dev/null +++ b/view/tpl/permcats.tpl @@ -0,0 +1,64 @@ +
+
+

{{$title}}

+
+
+
+
+ {{$desc}} +
+ +
+ + {{include file="field_input.tpl" field=$name}} + +
+ +
+
+ +
+ +
+
+
+ {{$permnote}} +
+ + + + + + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} +
{{$me}}
+ +
+ +
+
+
+ {{if $permcats}} +
+ + {{foreach $permcats as $k => $v}} + + + + + {{/foreach}} +
{{$v}}
+
+ {{/if}} + +
+ + +
diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/settings_permcats.tpl deleted file mode 100644 index bbbd41669..000000000 --- a/view/tpl/settings_permcats.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
-
-

{{$title}}

-
-
-
-
- {{$desc}} -
- -
- - {{include file="field_input.tpl" field=$name}} - -
- -
-
- -
- -
-
-
- {{$permnote}} -
- - - - - - {{foreach $perms as $prm}} - {{include file="field_acheckbox.tpl" field=$prm}} - {{/foreach}} -
{{$me}}
- -
- -
-
-
- {{if $permcats}} -
- - {{foreach $permcats as $k => $v}} - - - - - {{/foreach}} -
{{$v}}
-
- {{/if}} - -
- - -
-- cgit v1.2.3 From e3c04b1fd0f441e0042e218f47696b1bfad26c73 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 22:24:36 +0200 Subject: guest access app --- view/tpl/settings_tokens.tpl | 72 -------------------------------------------- view/tpl/tokens.tpl | 72 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 view/tpl/settings_tokens.tpl create mode 100644 view/tpl/tokens.tpl (limited to 'view') diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl deleted file mode 100644 index 48190c00c..000000000 --- a/view/tpl/settings_tokens.tpl +++ /dev/null @@ -1,72 +0,0 @@ -
-
-

{{$title}}

-
-
-
-
- {{$desc}} -
- -
- - {{if $atoken}}{{/if}} - {{include file="field_input.tpl" field=$name}} - {{include file="field_input.tpl" field=$token}} - {{include file="field_input.tpl" field=$expires}} -
- -
-
- -
- -
-
-
- {{$permnote}} -
- - - - - - {{foreach $perms as $prm}} - {{include file="field_acheckbox.tpl" field=$prm}} - {{/foreach}} -
{{$me}}
- -
- -
-
-
-
- - -
{{$desc2}}
-
    -
  • {{$url1}}?f=&zat=
    • -
  • {{$url2}}?f=&zat=
    • -
- - {{if $tokens}} -
- - {{foreach $tokens as $t}} - - - - - {{/foreach}} -
{{$t.atoken_name}}
- -
- {{/if}} -
diff --git a/view/tpl/tokens.tpl b/view/tpl/tokens.tpl new file mode 100644 index 000000000..ccb1f8c61 --- /dev/null +++ b/view/tpl/tokens.tpl @@ -0,0 +1,72 @@ +
+
+

{{$title}}

+
+
+
+
+ {{$desc}} +
+ +
+ + {{if $atoken}}{{/if}} + {{include file="field_input.tpl" field=$name}} + {{include file="field_input.tpl" field=$token}} + {{include file="field_input.tpl" field=$expires}} +
+ +
+
+ +
+ +
+
+
+ {{$permnote}} +
+ + + + + + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} +
{{$me}}
+ +
+ +
+
+
+
+ + +
{{$desc2}}
+
    +
  • {{$url1}}?f=&zat=
    • +
  • {{$url2}}?f=&zat=
    • +
+ + {{if $tokens}} +
+ + {{foreach $tokens as $t}} + + + + + {{/foreach}} +
{{$t.atoken_name}}
+ +
+ {{/if}} +
-- cgit v1.2.3 From bdf6289b323c26329087eb21911576239e0b6216 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 22:32:06 +0200 Subject: tokens: add css file and fix argc and argv values --- view/css/mod_settings.css | 17 ----------------- view/css/mod_tokens.css | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 view/css/mod_tokens.css (limited to 'view') diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 4236b3dff..d8786eed2 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -9,20 +9,3 @@ .channel-menu { margin-top: 24px; } - -.zat-example { - color: red; -} - -#atoken-index { - width: 100%; -} - -#atoken-index td:nth-child(1){ - padding: 7px 3px 7px 10px; - white-space: nowrap; -} - -.atoken-index-tool { - padding: 7px 10px; -} diff --git a/view/css/mod_tokens.css b/view/css/mod_tokens.css new file mode 100644 index 000000000..ac3bd90d7 --- /dev/null +++ b/view/css/mod_tokens.css @@ -0,0 +1,16 @@ +.zat-example { + color: red; +} + +#atoken-index { + width: 100%; +} + +#atoken-index td:nth-child(1){ + padding: 7px 3px 7px 10px; + white-space: nowrap; +} + +.atoken-index-tool { + padding: 7px 10px; +} -- cgit v1.2.3 From 6b23c3e1796b818ce893ed919f2e2bdd000c83fb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 27 Sep 2018 14:56:47 +0200 Subject: implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels --- view/js/main.js | 29 +++++++++++++++++++++++++++++ view/tpl/conv_frame.tpl | 15 +++++++++++++-- view/tpl/conv_item.tpl | 6 +++++- view/tpl/jot.tpl | 8 ++++---- view/tpl/settings_features.tpl | 21 --------------------- view/tpl/settings_module.tpl | 21 +++++++++++---------- view/tpl/settings_module_ajax.tpl | 11 +++++++++++ 7 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 view/tpl/settings_module_ajax.tpl (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 17f94dd16..48277f5cc 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -41,6 +41,8 @@ $.ajaxSetup({cache: false}); $(document).ready(function() { $(document).on('click focus', '.comment-edit-form', handle_comment_form); + $(document).on('click', '.conversation-settings-link', getConversationSettings); + $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], @@ -122,6 +124,33 @@ $(document).ready(function() { }); +function getConversationSettings() { + $.get('settings/conversation/?f=&aj=1',function(data) { + $('#conversation_settings_body').html(data); + }); + + + +} + +function postConversationSettings() { + $.post( + 'settings/conversation', + $('#settings_module_ajax_form').serialize() + "&auto_update=" + next_page + ); + + if(next_page === 1) { + page_load = true; + } + + $('#conversation_settings').modal('hide'); + + if(timer) clearTimeout(timer); + timer = setTimeout(updateInit,100); + + return false; +} + function datasrc2src(selector) { $(selector).each(function(i, el) { $(el).attr("src", $(el).data("src")); diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 8aa865076..c6b3b0d9b 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -4,5 +4,16 @@ - - + diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 05c3d7ae0..5720a2a5f 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -183,6 +183,10 @@
{{$item.dreport}} {{/if}} + {{if $item.settings}} +
+ {{$item.settings}} + {{/if}}
@@ -210,7 +214,7 @@
-

{{$response.count}} {{$response.button}}

+

{{$response.count}} {{$response.button}}

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 2137baf9b..cb80c6c7e 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -212,7 +212,7 @@
- +
@@ -239,7 +239,7 @@
- +
@@ -266,7 +266,7 @@
- +
@@ -293,7 +293,7 @@
- +
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 998199c8e..12c4f44f3 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,31 +1,10 @@ - -

{{$title}}

- {{if ! $techlock}} -
- {{include file="field_select.tpl" field=$techlevel}} -
- {{else}} - - {{/if}} - {{if $hiddens}} - {{foreach $hiddens as $k => $v}} - - {{/foreach}} - {{/if}}
{{foreach $features as $g => $f}}
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl index cabefc3e5..a701ec364 100755 --- a/view/tpl/settings_module.tpl +++ b/view/tpl/settings_module.tpl @@ -4,15 +4,16 @@
- - {{if $rpath}} - - {{/if}} - {{foreach $features as $feature}} - {{include file="field_checkbox.tpl" field=$feature}} - {{/foreach}} -
- -
+ + {{if $rpath}} + + {{/if}} + {{foreach $features as $feature}} + {{include file="field_checkbox.tpl" field=$feature}} + {{/foreach}} +
+ +
+
diff --git a/view/tpl/settings_module_ajax.tpl b/view/tpl/settings_module_ajax.tpl new file mode 100644 index 000000000..bd7b6f3df --- /dev/null +++ b/view/tpl/settings_module_ajax.tpl @@ -0,0 +1,11 @@ +
+ + + {{foreach $features as $feature}} + {{include file="field_checkbox.tpl" field=$feature}} + {{/foreach}} +
+ +
+
+ -- cgit v1.2.3 From c15de3b68b2fecdaec70e5978f9b592ddfc57013 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Sep 2018 22:45:43 +0200 Subject: more checks --- view/tpl/settings_addon.tpl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/tpl/settings_addon.tpl b/view/tpl/settings_addon.tpl index b5665f579..93bf3d083 100644 --- a/view/tpl/settings_addon.tpl +++ b/view/tpl/settings_addon.tpl @@ -3,11 +3,20 @@

{{$title}}

+ {{if $action_url}}
- - {{$content}} -
- -
+ {{/if}} + {{if $form_security_token}} + + {{/if}} + {{$content}} + {{if $submit}} +
+ +
+ {{/if}} + {{if $action_url}} +
+ {{/if}}
-- cgit v1.2.3 From fe8b72362286ce55044e38524179e6694acda014 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Thu, 27 Sep 2018 22:42:42 -0400 Subject: Hide form when at or over service_class['limit_identities'] --- view/tpl/new_channel.tpl | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'view') diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 51880e1f6..8d72df55b 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -13,23 +13,25 @@
{{/if}} {{/if}} -
- {{if $default_role}} - - {{else}} - {{include file="field_select_grouped.tpl" field=$role}} - {{/if}} - - {{include file="field_input.tpl" field=$name}} - - {{include file="field_input.tpl" field=$nickname}} - - - -
- - -
-
+ {{if $canadd}} +
+ {{if $default_role}} + + {{else}} + {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} + + {{include file="field_input.tpl" field=$nickname}} + + + +
+ + +
+
+ {{/if}}
-- cgit v1.2.3 From 5f992ffe154ed9e2b225c9a1b3d7c47d39e41d34 Mon Sep 17 00:00:00 2001 From: "M. Dent" Date: Sat, 29 Sep 2018 00:17:55 +0200 Subject: Remove servicelevel logic --- view/tpl/admin_account_edit.tpl | 1 - view/tpl/admin_site.tpl | 3 --- view/tpl/settings_account.tpl | 6 ------ 3 files changed, 10 deletions(-) (limited to 'view') diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl index 3329c0025..1cbb9af0b 100644 --- a/view/tpl/admin_account_edit.tpl +++ b/view/tpl/admin_account_edit.tpl @@ -8,7 +8,6 @@ {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} -{{include file="field_select.tpl" field=$account_level}} {{include file="field_select.tpl" field=$account_language}} {{include file="field_input.tpl" field=$service_class}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c3f8177c2..c644bc973 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,9 +42,6 @@ {{include file="field_input.tpl" field=$sitename}} - {{include file="field_select.tpl" field=$techlevel}} - {{include file="field_checkbox.tpl" field=$techlock}} - {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$siteinfo}} {{include file="field_textarea.tpl" field=$admininfo}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index dd1d0d0c9..3eacf3f7a 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -12,12 +12,6 @@ {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} - {{if ! $techlock}} - {{include file="field_select.tpl" field=$techlevel}} - {{else}} - - {{/if}} -
-- cgit v1.2.3 From 7dadf387e58ade457698dc2ffc58bbda7be46652 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 1 Oct 2018 11:01:56 +0200 Subject: indicate locked features --- view/theme/redbasic/css/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a9ea29ba1..4f0658477 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1677,11 +1677,9 @@ dl.bb-dl > dd > li { .form-group.checkbox > div > input:disabled + label .onoffswitch-switch { - background-color: red; - border-radius: 3px; + background-color: red; opacity: 0.3; filter:alpha(opacity=30); - } -- cgit v1.2.3 From 5e7c9b9d4a0dccf615da1ebf8bac93c10b3d2ac8 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 3 Oct 2018 15:21:20 +0200 Subject: jot: show settings icon only to local profile owner --- view/tpl/jot.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index cb80c6c7e..4eae33d13 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -43,7 +43,9 @@ {{/if}}
+ {{if $is_owner}} + {{/if}} {{if $reset}}
- {{if $profselect}} - - {{$profselect}} - {{/if}} - {{if $menus}} -
- - -
- {{/if}} - {{if $misc_addon}} - {{$misc_addon}} - {{/if}} +
+ {{if $profselect}} + + {{$profselect}} + {{/if}} + {{if $menus}} +
+ + +
+ {{/if}} + {{if $misc_addon}} + {{$misc_addon}} + {{/if}} -
- +
+ +
-- cgit v1.2.3 From d0605e8d5f7c666fffc01352de4d9ed4738f41ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Oct 2018 11:50:38 +0200 Subject: uexport app --- view/pdl/mod_uexport.pdl | 1 - 1 file changed, 1 deletion(-) (limited to 'view') diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl index 37c85c765..ed1f77c5a 100644 --- a/view/pdl/mod_uexport.pdl +++ b/view/pdl/mod_uexport.pdl @@ -1,5 +1,4 @@ [region=aside] -[widget=settings_menu][/widget] [/region] [region=right_aside] [widget=notifications][/widget] -- cgit v1.2.3 From 1dbd83a582391872105da126547bdf678e5ea73d Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 4 Oct 2018 14:35:32 +0200 Subject: Update settings.tpl --- view/tpl/settings.tpl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 6976231ab..7980bc696 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -190,11 +190,10 @@ {{if $misc_addon}} {{$misc_addon}} {{/if}} - -
- -
-
+
+
+ +
-- cgit v1.2.3 From 6e03104e3ee785954b4f755240d1595f702522b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Oct 2018 20:48:22 +0200 Subject: move *_list_mode to features --- view/tpl/settings_display.tpl | 2 -- 1 file changed, 2 deletions(-) (limited to 'view') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index f96e7f84c..8267ab27c 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -63,8 +63,6 @@ {{include file="field_checkbox.tpl" field=$nosmile}} {{include file="field_checkbox.tpl" field=$channel_menu}} {{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}} {{include file="field_checkbox.tpl" field=$preload_images}} {{include file="field_checkbox.tpl" field=$manual_update}} -- cgit v1.2.3 From d4af745fc8000be9fcc198d3d0205a6b134e374c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Oct 2018 21:38:39 +0200 Subject: move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided --- view/tpl/settings_display.tpl | 2 -- view/tpl/settings_module.tpl | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 8267ab27c..c93efb4aa 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -58,8 +58,6 @@
{{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=$channel_menu}} {{include file="field_checkbox.tpl" field=$title_tosource}} diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl index a701ec364..03d16d1d7 100755 --- a/view/tpl/settings_module.tpl +++ b/view/tpl/settings_module.tpl @@ -11,6 +11,9 @@ {{foreach $features as $feature}} {{include file="field_checkbox.tpl" field=$feature}} {{/foreach}} + {{if $extra_settings_html}} + {{$extra_settings_html}} + {{/if}}
-- cgit v1.2.3 From 1eaf6df842184743ee20ec69931be1ff7136f34e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Oct 2018 22:21:20 +0200 Subject: fix issues with bs accordions --- view/tpl/generic_addon_settings.tpl | 2 +- view/tpl/permcats.tpl | 4 ++-- view/tpl/tokens.tpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl index 875c97feb..ae603056b 100644 --- a/view/tpl/generic_addon_settings.tpl +++ b/view/tpl/generic_addon_settings.tpl @@ -1,4 +1,4 @@ -
+ -
+
-
+