Browse Source

Renamed settings and language file keys

merge-requests/2/head
Mike Koch 8 years ago
parent
commit
f5d3c2bdce
  1. 6
      admin/admin_settings.php
  2. 24
      css/hesk_newStyle.php
  3. 19
      hesk_ui_settings.inc.php
  4. 2
      inc/headerAdmin.inc.php
  5. 0
      js/nuHesk-javascript.js
  6. 2
      language/en/text.php
  7. 19
      nuHesk_settings.inc.php

6
admin/admin_settings.php

@ -42,7 +42,7 @@ if (is_dir(HESK_PATH . 'install')) {die('Please delete the <b>install</b> folder
// Get all the required files and functions
require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'hesk_ui_settings.inc.php');
require(HESK_PATH . 'nuHesk_settings.inc.php');
// Save the default language for the settings page before choosing user's preferred one
$hesk_settings['language_default'] = $hesk_settings['language'];
@ -146,10 +146,10 @@ if ( defined('HESK_DEMO') )
</td></tr>
<tr>
<td style="text-align: right">
<?php echo $hesklang['heskUiVersion']; ?>:
<?php echo $hesklang['nuHeskVersion']; ?>:
</td>
<td style="padding-left: 10px">
<?php echo $hesk_ui_settings['version']; ?>
<?php echo $nuHesk_settings['version']; ?>
</td>
</tr>
<tr><td style="text-align: right">

24
css/hesk_newStyle.php

@ -1,21 +1,21 @@
<?php
header("Content-type: text/css; charset: UTF-8");
require_once('../hesk_ui_settings.inc.php');
require_once('../nuHesk_settings.inc.php');
$navbarBackgroundColor = $hesk_ui_settings['navbarBackgroundColor'];
$navbarBrandColor = $hesk_ui_settings['navbarBrandColor'];
$navbarBrandHoverColor = $hesk_ui_settings['navbarBrandHoverColor'];
$navbarBackgroundColor = $nuHesk_settings['navbarBackgroundColor'];
$navbarBrandColor = $nuHesk_settings['navbarBrandColor'];
$navbarBrandHoverColor = $nuHesk_settings['navbarBrandHoverColor'];
$navbarItemTextColor = $hesk_ui_settings['navbarItemTextColor'];
$navbarItemTextHoverColor = $hesk_ui_settings['navbarItemTextHoverColor'];
$navbarItemTextSelectedColor = $hesk_ui_settings['navbarItemTextSelectedColor'];
$navbarItemSelectedBackgroundColor = $hesk_ui_settings['navbarItemSelectedBackgroundColor'];
$navbarItemTextColor = $nuHesk_settings['navbarItemTextColor'];
$navbarItemTextHoverColor = $nuHesk_settings['navbarItemTextHoverColor'];
$navbarItemTextSelectedColor = $nuHesk_settings['navbarItemTextSelectedColor'];
$navbarItemSelectedBackgroundColor = $nuHesk_settings['navbarItemSelectedBackgroundColor'];
$dropdownItemTextColor = $hesk_ui_settings['dropdownItemTextColor'];
$dropdownItemTextHoverColor = $hesk_ui_settings['dropdownItemTextHoverColor'];
$dropdownItemTextHoverBackgroundColor = $hesk_ui_settings['dropdownItemTextHoverBackgroundColor'];
$dropdownItemTextColor = $nuHesk_settings['dropdownItemTextColor'];
$dropdownItemTextHoverColor = $nuHesk_settings['dropdownItemTextHoverColor'];
$dropdownItemTextHoverBackgroundColor = $nuHesk_settings['dropdownItemTextHoverBackgroundColor'];
$questionMarkColor = $hesk_ui_settings['questionMarkColor'];
$questionMarkColor = $nuHesk_settings['questionMarkColor'];
?>
.row {

19
hesk_ui_settings.inc.php

@ -1,19 +0,0 @@
<?php
//-- NuHesk Theme Color Settings
$hesk_ui_settings['navbarBackgroundColor'] = '#414a5c';
$hesk_ui_settings['navbarBrandColor'] = '#d4dee7';
$hesk_ui_settings['navbarBrandHoverColor'] = '#ffffff';
$hesk_ui_settings['navbarItemTextColor'] = '#d4dee7';
$hesk_ui_settings['navbarItemTextHoverColor'] = '#ffffff';
$hesk_ui_settings['navbarItemTextSelectedColor'] = '#ffffff';
$hesk_ui_settings['navbarItemSelectedBackgroundColor'] = '#2d3646';
$hesk_ui_settings['dropdownItemTextColor'] = '#333333';
$hesk_ui_settings['dropdownItemTextHoverColor'] = '#262626';
$hesk_ui_settings['dropdownItemTextHoverBackgroundColor'] = '#f5f5f5';
$hesk_ui_settings['questionMarkColor'] = '#000000';
/* DO NOT EDIT ANYTHING BELOW THIS LINE */
$hesk_ui_settings['version']='1.2.0';
?>

2
inc/headerAdmin.inc.php

@ -48,7 +48,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript_v25.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/hesk-ui-javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/nuHesk-javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
<?php

0
js/hesk-ui-javascript.js → js/nuHesk-javascript.js

2
language/en/text.php

@ -39,6 +39,7 @@ $hesklang['isStaffClosedOptionMsg'] = 'When a staff member clicks the "Close tic
$hesklang['isStaffReopenedStatusMsg'] = 'When a staff member clicks the "Open ticket" link, change the status to:';
$hesklang['isDefaultStaffReplyStatusMsg'] = 'When a staff member replies to a ticket, change the status to:';
$hesklang['lockedTicketStatusMsg'] = 'When a ticket is locked, change the status to:';
$hesklang['nuHeskVersion']='NuHesk Version';
// ADDED OR MODIFIED IN HESK UI
@ -57,7 +58,6 @@ $hesklang['categoryChange']=' - - Change Category - - ';
$hesklang['navigation']='Navigation';
$hesklang['nti']='<span class="glyphicon glyphicon-plus-sign"></span> New ticket';
$hesklang['savedResponses']='Saved Responses';
$hesklang['heskUiVersion']='Hesk UI Version';
$hesklang['add_ticket_general_information']='General Information';
$hesklang['add_ticket_your_message']='Your Message';

19
nuHesk_settings.inc.php

@ -0,0 +1,19 @@
<?php
//-- NuHesk Theme Color Settings
$nuHesk_settings['navbarBackgroundColor'] = '#414a5c';
$nuHesk_settings['navbarBrandColor'] = '#d4dee7';
$nuHesk_settings['navbarBrandHoverColor'] = '#ffffff';
$nuHesk_settings['navbarItemTextColor'] = '#d4dee7';
$nuHesk_settings['navbarItemTextHoverColor'] = '#ffffff';
$nuHesk_settings['navbarItemTextSelectedColor'] = '#ffffff';
$nuHesk_settings['navbarItemSelectedBackgroundColor'] = '#2d3646';
$nuHesk_settings['dropdownItemTextColor'] = '#333333';
$nuHesk_settings['dropdownItemTextHoverColor'] = '#262626';
$nuHesk_settings['dropdownItemTextHoverBackgroundColor'] = '#f5f5f5';
$nuHesk_settings['questionMarkColor'] = '#000000';
/* DO NOT EDIT ANYTHING BELOW THIS LINE */
$nuHesk_settings['version']='1.2.0';
?>
Loading…
Cancel
Save