Browse Source

#91 Save custom field multilanguage selection.

Also fixed popovers so they're aren't crammed in on the MFH settings section
merge-requests/2/head
Mike Koch 7 years ago
parent
commit
e2c6e2c179
  1. 8
      admin/admin_settings.php
  2. 6
      admin/admin_settings_save.php
  3. 3
      js/modsForHesk-javascript.js
  4. 3
      language/en/text.php

8
admin/admin_settings.php

@ -1792,7 +1792,7 @@ if ( defined('HESK_DEMO') )
<div class="form-group">
<label for="rtl" class="col-sm-4 col-xs-12 control-label">
<?php echo $hesklang['displayRtl']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" data-placement="bottom"
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo $hesklang['displayRtl']; ?>"
data-content="<?php echo $hesklang['displayRtlHelp']; ?>"></i>
</label>
@ -1807,7 +1807,7 @@ if ( defined('HESK_DEMO') )
<div class="form-group">
<label for="show-icons" class="col-sm-4 col-xs-12 control-label">
<?php echo $hesklang['showIcons']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" data-placement="bottom"
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo $hesklang['showIcons']; ?>"
data-content="<?php echo $hesklang['showIconsHelp']; ?>"></i>
</label>
@ -1821,7 +1821,7 @@ if ( defined('HESK_DEMO') )
</div>
<div class="form-group">
<label for="maintenance-mode" class="col-sm-4 col-xs-12 control-label"><?php echo $hesklang['maintenanceMode']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" data-placement="bottom"
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo $hesklang['maintenanceMode']; ?>"
data-content="<?php echo $hesklang['maintenanceModeHelp']; ?>"></i>
</label>
@ -1839,7 +1839,7 @@ if ( defined('HESK_DEMO') )
<div class="form-group">
<label for="custom-field-setting" class="col-sm-4 col-xs-12 control-label">
<?php echo $hesklang['custom_field_setting']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" data-placement="bottom"
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo $hesklang['custom_field_setting']; ?>"
data-content="<?php echo $hesklang['custom_field_setting_help']; ?>"></i>
</label>

6
admin/admin_settings_save.php

@ -538,6 +538,7 @@ $set['hesk_version'] = $hesk_settings['hesk_version'];
$set['rtl'] = empty($_POST['rtl']) ? 0 : 1;
$set['show-icons'] = empty($_POST['show-icons']) ? 0 : 1;
$set['maintenance-mode'] = empty($_POST['maintenance-mode']) ? 0 : 1;
$set['custom-field-setting'] = empty($_POST['custom-field-setting']) ? 0 : 1;
$set['navbarBackgroundColor'] = hesk_input(hesk_POST('navbarBackgroundColor'));
$set['navbarBrandColor'] = hesk_input(hesk_POST('navbarBrandColor'));
$set['navbarBrandHoverColor'] = hesk_input(hesk_POST('navbarBrandHoverColor'));
@ -571,7 +572,10 @@ $modsForHesk_settings[\'rtl\'] = '.$set['rtl'].';
$modsForHesk_settings[\'show_icons\'] = '.$set['show-icons'].';
//-- Set this to 1 to enable maintenance mode
$modsForHesk_settings[\'maintenance_mode\'] = '.$set['maintenance-mode'].';';
$modsForHesk_settings[\'maintenance_mode\'] = '.$set['maintenance-mode'].';
//-- Set this to 1 to enable custom field names as keys
$modsForHesk_settings[\'custom_field_setting\'] = '.$set['custom-field-setting'].';';
// Write the file
if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )

3
js/modsForHesk-javascript.js

@ -6,7 +6,8 @@ var loadJquery = function()
//-- Active popovers
$('[data-toggle="popover"]').popover({
trigger: 'hover'
trigger: 'hover',
container: 'body'
});
//-- Activate jQuery's date picker

3
language/en/text.php

@ -28,7 +28,8 @@ $hesklang['multiple_select_custom_field'] = 'Multiple Select box';
$hesklang['multiple_select_custom_field_text'] = 'Options for this multi-select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
$hesklang['date_format'] = 'Date must be in YYYY-MM-DD format.';
$hesklang['custom_field_setting'] = 'Multilanguage support';
$hesklang['custom_field_setting_help'] = 'Enabling this setting will use the name of the custom field as the language file\'s key, rather than the direct name itself. This will allow for translatable custom field.';
$hesklang['custom_field_setting_help'] = 'Enabling this setting will use the name of the custom field as the language
file\'s key, rather than the direct name itself. This allows the custom field to be translated into different languages.';
$hesklang['enable_custom_field_language'] = 'Enable multilanguage support';
// ADDED OR MODIFIED IN Mods For HESK 1.6.0

Loading…
Cancel
Save