Template: Add keyboard shortcut Settings, restore message display.

This commit is contained in:
Nate 2020-03-18 11:54:31 -06:00
parent 5382b00610
commit 889e370a10
3 changed files with 190 additions and 116 deletions

View File

@ -230,6 +230,8 @@
$view->assign('login_logo_source', $login_logo_source);
$view->assign('login_logo_width', $login_logo_width);
$view->assign('login_logo_height', $login_logo_height);
//messages
$view->assign('messages', message::html(true, ' '));
//render the view
$output = $view->render('template.php');

View File

@ -2037,5 +2037,61 @@
$apps[$x]['default_settings'][$y]['default_setting_value'] = "fas fa-times";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "814ed631-a315-4bde-a822-4038432ae2a6";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_check_all_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [ctrl]+[a], list,edit: to check all";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "48d7d44b-9e2b-4e6c-a4e5-c75e7e76d4db";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_add_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [insert], list: to add";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "422747c2-07bb-48f5-8358-6df70054fd1f";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_copy_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [ctrl]+[c], list,edit: to copy";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2c0621d4-da12-40c1-8878-fc45a2f76d08";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_toggle_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [space], list: to toggle checked";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4500e534-77fb-4318-bf13-0c108ece62b1";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_delete_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [delete], list: to delete checked, edit: to delete";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c7d5ac85-556a-4b9a-8e12-743456dbc17f";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_submit_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [enter] - default behavior to submit form, when present";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f5f1ecec-5c31-4b32-a126-4857ee671224";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_save_enabled";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [ctrl]+[s], edit: to save";
?>

View File

@ -167,7 +167,7 @@
$(document).ready(function() {
{/literal}
// echo message::html(true, ' ');
{$messages}
//message bar hide on hover
{literal}
@ -219,6 +219,7 @@
//keyboard shortcut scripts
//key: [enter] - retain default behavior to submit form, when present - note: safari does not honor the first submit element when hiding it using 'display: none;' in the setAttribute method
{if $settings.theme.keyboard_shortcut_submit_enabled}
{literal}
var action_bar_actions, first_form, first_submit;
action_bar_actions = document.querySelector('div#action_bar.action_bar > div.actions');
@ -240,10 +241,13 @@
}
}
{/literal}
{/if}
//common (used by delete and toggle)
{if $settings.theme.keyboard_shortcut_delete_enabled || $settings.theme.keyboard_shortcut_toggle_enabled}
var list_checkboxes;
list_checkboxes = document.querySelectorAll('table.list tr.list-row td.checkbox input[type=checkbox]');
{/if}
//keyup event listener
{literal}
@ -286,6 +290,7 @@
{/literal}
//key: [insert], list: to add
{if $settings.theme.keyboard_shortcut_add_enabled}
{literal}
if (e.which == 45 && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {
e.preventDefault();
@ -297,8 +302,10 @@
if (list_add_button !== null) { list_add_button.click(); }
}
{/literal}
{/if}
//key: [delete], list: to delete checked, edit: to delete
{if $settings.theme.keyboard_shortcut_delete_enabled}
{literal}
if (e.which == 46 && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {
e.preventDefault();
@ -320,6 +327,7 @@
}
}
{/literal}
{/if}
//keyup end
{literal}
@ -332,6 +340,7 @@
{/literal}
//key: [space], list: to toggle checked - note: for default [space] checkbox behavior (ie. toggle focused checkbox) include in the if statement: && !(e.target.tagName == 'INPUT' && e.target.type == 'checkbox')
{if $settings.theme.keyboard_shortcut_toggle_enabled}
{literal}
if (e.which == 32 && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA' && list_checkboxes.length !== 0) {
e.preventDefault();
@ -343,8 +352,10 @@
if (list_toggle_button !== null) { list_toggle_button.click(); }
}
{/literal}
{/if}
//key: [ctrl]+[a], list,edit: to check all
{if $settings.theme.keyboard_shortcut_check_all_enabled}
{literal}
if ((((e.which == 97 || e.which == 65) && (e.ctrlKey || e.metaKey) && !e.shiftKey) || e.which == 19) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {
var list_checkbox_all;
@ -365,8 +376,10 @@
}
}
{/literal}
{/if}
//key: [ctrl]+[s], edit: to save
{if $settings.theme.keyboard_shortcut_check_save_enabled}
{literal}
if (((e.which == 115 || e.which == 83) && (e.ctrlKey || e.metaKey) && !e.shiftKey) || (e.which == 19)) {
e.preventDefault();
@ -378,8 +391,10 @@
if (edit_save_button !== null) { edit_save_button.click(); }
}
{/literal}
{/if}
//key: [ctrl]+[c], list,edit: to copy
{if $settings.theme.keyboard_shortcut_check_copy_enabled}
{if $browser_name_short == 'Safari'} //emulate with detecting [c] only, as [command] and [control] keys are ignored when captured
{literal}
if ((e.which == 99 || e.which == 67) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {
@ -402,6 +417,7 @@
}
}
{/literal}
{/if}
//keydown end
{literal}