diff options
| author | Crack <piotrprz@gmail.com> | 2010-07-22 14:37:51 +0400 |
|---|---|---|
| committer | Crack <piotrprz@gmail.com> | 2010-07-22 14:37:51 +0400 |
| commit | 7399ce3e6137742af746cbc08389a3e29e186a13 (patch) | |
| tree | 22539170bbff5073d282161285cc13d94efa2240 /prefs_manage.php | |
| parent | 7ac7e24d8cc97cb3c0234b0058661770c0d0f44c (diff) | |
a few changes on preferences manage page
fix JS date generation on preferences export to localStorage
Diffstat (limited to 'prefs_manage.php')
| -rw-r--r-- | prefs_manage.php | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/prefs_manage.php b/prefs_manage.php index 9eeacbc6dc..da2fa09ede 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -223,18 +223,15 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__')); echo PMA_generate_common_hidden_inputs() . "\n"; ?> <input type="hidden" name="json" value="" /> - <div> - <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" /> - <label for="import_text_file"><?php echo __('Import from text file') ?></label> - <br /> - <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" /> - <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label> - </div> + <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" /> + <label for="import_text_file"><?php echo __('Import from file') ?></label> <div id="opts_import_text_file" class="prefsmanage_opts"> <label for="input_import_file"><?php echo __('Location of the text file'); ?></label> <input type="file" name="import_file" id="input_import_file" /> </div> - <div id="opts_import_local_storage" class="prefsmanage_opts" style="display:none"> + <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" /> + <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label> + <div id="opts_import_local_storage" class="prefsmanage_opts disabled"> <div class="localStorage-supported"> <?php echo __('Settings will be imported from your browser\'s local storage.') ?> <br /> @@ -249,6 +246,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__')); <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?> </span> </div> + <input type="checkbox" id="import_merge" name="import_merge" /> <label for="import_merge"><?php echo __('Merge with current configuration') ?></label> <br /><br /> @@ -274,11 +272,11 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__')); <input type="radio" id="export_local_storage" name="export_type" value="local_storage" disabled="disabled" /> <label for="export_local_storage"><?php echo __('Save to browser\'s storage') ?></label> </div> - <div id="opts_export_local_storage" class="prefsmanage_opts" style="display:none"> + <div id="opts_export_local_storage" class="prefsmanage_opts disabled"> <span class="localStorage-supported"> <?php echo __('Settings will be saved in your browser\'s local storage.') ?> <span class="localStorage-exists"> - <b><?php PMA_Message::notice(__('Existing settings will be overridden!'))->display() ?></b> + <br /><b><?php echo __('Existing settings will be overwritten!') ?></b> </span> </span> <span class="localStorage-unsupported"> |