Set the right form names

merge-requests/62/head
Mike Koch 7 years ago
parent 7d6f3828fd
commit f07358cb4a

@ -3851,7 +3851,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-hover-color" <label for="admin-navbar-text-hover-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -3868,7 +3868,7 @@ $modsForHesk_settings = mfh_getSettings();
</div> </div>
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-brand-text-color" <label for="admin-navbar-brand-text-hover-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -3926,7 +3926,7 @@ $modsForHesk_settings = mfh_getSettings();
<h4><?php echo $hesklang['sidebar']; ?></h4> <h4><?php echo $hesklang['sidebar']; ?></h4>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-background-color" <label for="admin-sidebar-background-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -3937,7 +3937,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color" <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_background']; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -3946,7 +3946,7 @@ $modsForHesk_settings = mfh_getSettings();
<h4><?php echo $hesklang['sidebar_header']; ?></h4> <h4><?php echo $hesklang['sidebar_header']; ?></h4>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-brand-background-color" <label for="admin-sidebar-header-background-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="left" data-placement="left"
@ -3957,7 +3957,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color" <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -3965,7 +3965,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-text-color" <label for="admin-sidebar-text-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -3976,13 +3976,13 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color" <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_text']; ?>">
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-brand-text-color" <label for="admin-sidebar-brand-text-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -3993,7 +3993,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color" <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_header_text']; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -4001,7 +4001,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-hover-color" <label for="admin-sidebar-text-hover-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -4012,7 +4012,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color" <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_text_hover']; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -4020,7 +4020,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-navbar-background-hover-color" <label for="admin-sidebar-background-hover-color"
class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
@ -4031,7 +4031,7 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12">
<input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color" <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
class="form-control" class="form-control"
value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>"> value="<?php echo $modsForHesk_settings['admin_sidebar_background_hover']; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -4040,17 +4040,28 @@ $modsForHesk_settings = mfh_getSettings();
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="form-group"> <div class="form-group">
<label for="admin-sidebar-font-weight" <label for="admin-sidebar-font-weight"
class="col-sm-7 col-xs-12 control-label"><?php echo 'FONT WEIGHT'; ?> class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['font_weight']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
data-placement="top" data-placement="top"
title="<?php echo $hesklang['background_hover_color']; ?>" title="<?php echo $hesklang['font_weight']; ?>"
data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i> data-content="<?php echo $hesklang['font_weight_help']; ?>"></i>
</label> </label>
<div class="col-sm-5 col-xs-12"> <div class="col-sm-5 col-xs-12 form-inline">
<input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color" <div class="radio">
class="form-control" <label>
value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>"> <input type="radio" name="admin-sidebar-font-weight" value="normal"
<?php echo $modsForHesk_settings['admin_sidebar_font_weight'] == 'normal' ? 'checked' : ''; ?>>
<?php echo $hesklang['normal']; ?>
</label>
</div><br>
<div class="radio">
<label>
<input type="radio" name="admin-sidebar-font-weight" value="bold"
<?php echo $modsForHesk_settings['admin_sidebar_font_weight'] == 'bold' ? 'checked' : ''; ?>>
<?php echo $hesklang['bold']; ?>
</label>
</div>
</div> </div>
</div> </div>
</div> </div>

@ -1042,7 +1042,7 @@ function execute310Scripts() {
'text' => $light_theme ? '#444' : '#b8c7ce', 'text' => $light_theme ? '#444' : '#b8c7ce',
'text_hover' => $light_theme ? '#444' : '#b8c7ce', 'text_hover' => $light_theme ? '#444' : '#b8c7ce',
'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c', 'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c',
'font_weight' => $light_theme ? '600' : 'normal' 'font_weight' => $light_theme ? 'bold' : 'normal'
); );
$sidebar_header = array( $sidebar_header = array(
'background' => $light_theme ? '#f9fafc' : '#1a2226', 'background' => $light_theme ? '#f9fafc' : '#1a2226',

@ -2151,6 +2151,10 @@ $hesklang['navbar'] = 'Navigation Bar';
$hesklang['navbar_brand'] = 'Navigation Brand'; $hesklang['navbar_brand'] = 'Navigation Brand';
$hesklang['sidebar'] = 'Sidebar'; $hesklang['sidebar'] = 'Sidebar';
$hesklang['sidebar_header'] = 'Sidebar Header'; $hesklang['sidebar_header'] = 'Sidebar Header';
$hesklang['font_weight'] = 'Font Weight';
$hesklang['font_weight_help'] = 'The font weight for text';
$hesklang['normal'] = 'Normal';
$hesklang['bold'] = 'Bold';
// DO NOT CHANGE BELOW // DO NOT CHANGE BELOW

Loading…
Cancel
Save