Browse Source

Changed name from NuHesk to NuMods per Klemen's request.

merge-requests/2/head
Mike Koch 8 years ago
parent
commit
481531e20f
  1. 24
      README.md
  2. 6
      admin/admin_settings.php
  3. 24
      css/hesk_newStyle.php
  4. 2
      inc/headerAdmin.inc.php
  5. 8
      install/updateNuMods.php
  6. 0
      js/nuMods-javascript.js
  7. 7
      language/en/text.php
  8. 19
      nuHesk_settings.inc.php
  9. 19
      nuMods_settings.inc.php

24
README.md

@ -1,11 +1,11 @@
[![Analytics](https://ga-beacon.appspot.com/UA-49251479-1/hesk/README)](https://github.com/mkoch227/Hesk)
<h2>NuHesk v1.2.0</h2>
<h2>NuMods v1.2.0</h2>
This branch contains all files modified from the base version of HESK to become NuHesk, a set of modifications for HESK v2.x
This branch contains all files modified from the base version of HESK to become NuMods, a set of modifications for HESK v2.x
<h2>Features</h2>
<p>Currently, the two major features of NuHesk are:</p>
<p>Currently, the two major features of NuMods are:</p>
<ul>
<li>A new, responsive user interface</li>
<li>Ability to create custom ticket statuses</li>
@ -17,7 +17,7 @@ You can download this tweak via two ways:
<ol>
<li><strong>Stable Releases:</strong> Releases that have a release tag associated with a commit are considered releases. You can click on "releases" on the top of the repo, and then click "zip" or "tar.gz" to download the repo at that stage.</li>
<li><strong>Bleeding-edge Releases:</strong> You can also download the latest, bleeding-edge version of NuHesk by simply clicking "download as zip" to the right of the repository. This will download an exact copy of this branch in its current state, which may be contain bugs/other issues. This is not recommended for a production use.</li>
<li><strong>Bleeding-edge Releases:</strong> You can also download the latest, bleeding-edge version of NuMods by simply clicking "download as zip" to the right of the repository. This will download an exact copy of this branch in its current state, which may be contain bugs/other issues. This is not recommended for a production use.</li>
</ol>
<h2>Installation</h2>
@ -25,16 +25,16 @@ You can download this tweak via two ways:
<ol>
<li>Download HESK from <a href="http://www.hesk.com/download.php" target="_blank">http://www.hesk.com/download.php</a>.</li>
<li>Extract the contents of HESK to a directory of your choice.</li>
<li>Download NuHesk from one of the two methods described above.</li>
<li>Download NuMods from one of the two methods described above.</li>
<li>Copy and paste the contents of the zip/tar.gz bundle and overwrite any files in the original HESK 2.x folder.</li>
<li>Upload the resulting folder to your webserver.</li>
<li>Go to the /install directory in your web browser and click on "Install/Update NuHesk Installation"</li>
<li>Go to the /install directory in your web browser and click on "Install/Update NuMods Installation"</li>
</ol>
<p>Please consult the official HESK Documentation on how to install HESK, as it is the same for both HESK and NuHesk.</p>
<p>Please consult the official HESK Documentation on how to install HESK, as it is the same for both HESK and NuMods.</p>
<h2>Languages</h2>
<p>As of current, only English is a supported language, as there have been several language items that have been edited/created. If you want to translate NuHesk to your own language, it is recommended to download the original HESK language file for your language, and then add/edit the lines listed under <code>//Added or modified in HESK UI</code> and <code>//Added or modified in NuHesk X.X.X</code> (where X.X.X is a version number) for your language.</p>
<p>If you create a translation for NuHesk, please submit it via a pull request or via the PHP Junkyards forum, where it will be committed to this branch.</p>
<p>As of current, only English is a supported language, as there have been several language items that have been edited/created. If you want to translate NuMods to your own language, it is recommended to download the original HESK language file for your language, and then add/edit the lines listed under <code>//Added or modified in HESK UI</code> and <code>//Added or modified in NuMods X.X.X</code> (where X.X.X is a version number) for your language.</p>
<p>If you create a translation for NuMods, please submit it via a pull request or via the PHP Junkyards forum, where it will be committed to this branch.</p>
<h2>Browser Compability</h2>
<p>This list may be incomplete. Please leave a note on the PHP Junkyard forums for additional browser compatibility information.
@ -45,10 +45,10 @@ You can download this tweak via two ways:
<li><strong>Internet Explorer 8:</strong> Partial Compatibility</li>
<li><strong>Internet Explorer 9:</strong> Compatible</li>
</ul>
<p>There are no intentions of making NuHesk compatible with Internet Explorer 6 or 7, or any browser that is 2 or more major revisions older than its latest version.</p>
<p>There are no intentions of making NuMods compatible with Internet Explorer 6 or 7, or any browser that is 2 or more major revisions older than its latest version.</p>
<h2>Versioning</h2>
<p>NuHesk will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format:</p>
<p>NuMods will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format:</p>
<code>&lt;major&gt;.&lt;minor&gt;.&lt;patch&gt;</code>
@ -63,6 +63,6 @@ You can download this tweak via two ways:
<p>For more information on SemVer, please visit http://semver.org.</p>
<h2>Credits</h2>
<p>Mike Koch - Creator of NuHesk</p>
<p>Mike Koch - Creator of NuMods</p>
<p>Klemen Stirn - Creator of HESK</p>
<p>lupolo from PHPJunkyard Scripts - diligent bug reporting on the PHPJunkyard Scripts Forum</p>

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 . 'nuHesk_settings.inc.php');
require(HESK_PATH . 'nuMods_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['nuHeskVersion']; ?>:
<?php echo $hesklang['nuModsVersion']; ?>:
</td>
<td style="padding-left: 10px">
<?php echo $nuHesk_settings['version']; ?>
<?php echo $nuMods_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('../nuHesk_settings.inc.php');
require_once('../nuMods_settings.inc.php');
$navbarBackgroundColor = $nuHesk_settings['navbarBackgroundColor'];
$navbarBrandColor = $nuHesk_settings['navbarBrandColor'];
$navbarBrandHoverColor = $nuHesk_settings['navbarBrandHoverColor'];
$navbarBackgroundColor = $nuMods_settings['navbarBackgroundColor'];
$navbarBrandColor = $nuMods_settings['navbarBrandColor'];
$navbarBrandHoverColor = $nuMods_settings['navbarBrandHoverColor'];
$navbarItemTextColor = $nuHesk_settings['navbarItemTextColor'];
$navbarItemTextHoverColor = $nuHesk_settings['navbarItemTextHoverColor'];
$navbarItemTextSelectedColor = $nuHesk_settings['navbarItemTextSelectedColor'];
$navbarItemSelectedBackgroundColor = $nuHesk_settings['navbarItemSelectedBackgroundColor'];
$navbarItemTextColor = $nuMods_settings['navbarItemTextColor'];
$navbarItemTextHoverColor = $nuMods_settings['navbarItemTextHoverColor'];
$navbarItemTextSelectedColor = $nuMods_settings['navbarItemTextSelectedColor'];
$navbarItemSelectedBackgroundColor = $nuMods_settings['navbarItemSelectedBackgroundColor'];
$dropdownItemTextColor = $nuHesk_settings['dropdownItemTextColor'];
$dropdownItemTextHoverColor = $nuHesk_settings['dropdownItemTextHoverColor'];
$dropdownItemTextHoverBackgroundColor = $nuHesk_settings['dropdownItemTextHoverBackgroundColor'];
$dropdownItemTextColor = $nuMods_settings['dropdownItemTextColor'];
$dropdownItemTextHoverColor = $nuMods_settings['dropdownItemTextHoverColor'];
$dropdownItemTextHoverBackgroundColor = $nuMods_settings['dropdownItemTextHoverBackgroundColor'];
$questionMarkColor = $nuHesk_settings['questionMarkColor'];
$questionMarkColor = $nuMods_settings['questionMarkColor'];
?>
.row {

2
inc/headerAdmin.inc.php

@ -47,7 +47,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/nuHesk-javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/nuMods-javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
<?php

8
install/updateNuHesk.php → install/updateNuMods.php

@ -48,7 +48,7 @@ if ($_GET['update'] == 1)
VALUES (2, 'replied', 'wait_cust_reply', '#0000FF', 0, 0, 0, 0, 0, 0, 1, 0);");
hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` (ID, ShortNameContentKey, TicketViewContentKey, TextColor, IsNewTicketStatus, IsClosed, IsClosedByClient, IsCustomerReplyStatus,
IsStaffClosedOption, IsStaffReopenedStatus, IsDefaultStaffReplyStatus, LockedTicketStatus)
VALUES (3, 'closed', 'closed', '#008000', 0, 1, 1, 0, 1, 0, 0, 1);");
VALUES (3, 'resolved', 'resolved', '#008000', 0, 1, 1, 0, 1, 0, 0, 1);");
hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` (ID, ShortNameContentKey, TicketViewContentKey, TextColor, IsNewTicketStatus, IsClosed, IsClosedByClient, IsCustomerReplyStatus,
IsStaffClosedOption, IsStaffReopenedStatus, IsDefaultStaffReplyStatus, LockedTicketStatus)
VALUES (4, 'in_progress', 'in_progress', '#000000', 0, 0, 0, 0, 0, 0, 0, 0);");
@ -61,11 +61,11 @@ if ($_GET['update'] == 1)
?>
<html>
<head>
<title>NuHesk 1.2.0 Install / Upgrade</title>
<title>NuMods 1.2.0 Install / Upgrade</title>
</head>
<body>
<div style="display: <?php echo $showInstructions; ?>">
<h1>Install / Upgrade NuHesk to 1.2.0</h1>
<h1>Install / Upgrade NuMods to 1.2.0</h1>
<h4><i>If you have not yet installed/updated HESK, please do so first before continuing; otherwise installation will <b>fail</b>!</i></h4>
<br/>
<p>Please verify the database information below. Addtionally, ensure that the database user has CREATE permissions.</p>
@ -78,7 +78,7 @@ if ($_GET['update'] == 1)
</div>
<div style="display: <?php echo $showFinished; ?>">
<h1>Installation / Upgrade Finished</h1>
<p>The installation / upgrade of NuHesk has finished. You can now delete the <b>install</b> directory and access the <a href="<?php echo HESK_PATH . 'admin'; ?>">admin area</a></p>
<p>The installation / upgrade of NuMods has finished. You can now delete the <b>install</b> directory and access the <a href="<?php echo HESK_PATH . 'admin'; ?>">admin area</a></p>
</div>
</body>
</html>

0
js/nuHesk-javascript.js → js/nuMods-javascript.js

7
language/en/text.php

@ -21,7 +21,7 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
// This is the email break line that will be used in email piping
$hesklang['EMAIL_HR']='------ Reply above this line ------';
// ADDED OR MODIFIED IN NuHESK 1.2
// ADDED OR MODIFIED IN NuMods 1.2
$hesklang['statuses'] = 'Statuses';
$hesklang['basicProperties'] = 'Basic Properties';
$hesklang['shortNameKey'] = 'Short Name Key';
@ -39,7 +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';
$hesklang['nuModsVersion'] = 'NuMods Version';
$hesklang['shortNameRequired'] = 'Short Name Key is required.';
$hesklang['longNameRequired'] = 'Long Name Key is required.';
$hesklang['textColorRequired'] = 'Text Color is required.';
@ -50,7 +50,8 @@ $hesklang['whyCantIDeleteThisStatusReason'] = 'This status cannot be deleted bec
$hesklang['isNewTicketMsg'] = 'When a new ticket is created, set its status to';
$hesklang['isRepliedByClientMsg'] = 'When a client replies to a ticket, set its status to';
$hesklang['close_this_ticket']='Close ticket';
$hesklang['closed']='closed'; // Ticket has been RESOLVED
$hesklang['closed']='closed';
$hesklang['resolved']='Resolved'; // Ticket has been RESOLVED
$hesklang['quick_help_ticket']='Here is the information on your ticket. You can add a reply to this ticket, close it, or re-open the ticket if applicable.';

19
nuHesk_settings.inc.php

@ -1,19 +0,0 @@
<?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';
?>

19
nuMods_settings.inc.php

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