Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hesk-ui' into web-services

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Mike Koch 2014-06-10 21:47:10 -04:00
commit 555b532bb2
8 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -276,3 +276,4 @@ rate.php
readme.html
reply_ticket.php
robots.txt
.idea/

1
README.md
View File

@ -4,6 +4,7 @@
This branch contains additional files on top of HESK UI that create the HESK Web Services, a REST API to retrieve / submit changes to support tickets.
<h2>Download</h2>
There are currently no releases available, however you will eventually be able to download this tweak via two ways:

3
admin/admin_ticket.php
View File

@ -537,6 +537,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<td colspan="10" style="border-width: 0px"><?php echo $hesklang['created_on'].': '.hesk_date($ticket['dt']); ?>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $hesklang['last_update'].': '.hesk_date($ticket['lastchange']); ?></td>
<td colspan="10" style="border-width: 0px; text-align: right">
<?php
$random=rand(10000,99999);
if ($ticket['status'] != 3)
{
echo '<a
@ -630,8 +631,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</td>';
echo '<td colspan="'.$hesk_settings['ticketColumnWidth'].'"><p class="ticketPropertyTitle">'.$hesklang['status'].'</p>';
$random=rand(10000,99999);
$status_options = array(
0 => '<option value="0">'.$hesklang['open'].'</option>',

3
admin/new_ticket.php
View File

@ -130,8 +130,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-9">
<input type="text" class="form-control" name="email" size="40" maxlength="255" value="<?php if (isset($_SESSION['as_email'])) {echo stripslashes(hesk_input($_SESSION['as_email']));} ?>" <?php if($hesk_settings['detect_typos']) { echo ' onblur="Javascript:hesk_suggestEmail(1)"'; } ?> placeholder="<?php echo $hesklang['email']; ?>"/>
</div>
<div id="email_suggestions"></div>
</div>
<div id="email_suggestions"></div>
<hr/>
<!-- Department and Priority -->
<?php if (in_array('category',$_SESSION['iserror'])) {echo '<div class="form-group has-error">';} elseif (in_array('category',$_SESSION['isnotice'])) {echo '<div class="form-group has-warning">';} else {echo '<div class="form-group">';} ?>

5
css/hesk_newStyle.php
View File

@ -18,6 +18,11 @@
$questionMarkColor = $hesk_ui_settings['questionMarkColor'];
?>
.row {
margin-left: 0px;
margin-right: 0px;
}
.navbar {
margin-bottom: 0;
}

4
inc/ticket_list.inc.php
View File

@ -120,7 +120,7 @@ if ($total > 0)
<div align="center" style="float: left">
'.sprintf($hesklang['tickets_on_pages'],$total,$pages).' '.$hesklang['jump_page'].' <select name="myHpage" id="myHpage">
</div>
<div align="right" style="float: right">
<div align="right" style="text-align: right">
<a href="new_ticket.php">'.$hesklang['nti'].'</a>
</div>
</div>';
@ -183,7 +183,7 @@ if ($total > 0)
<div align="center" style="float: left">
'.sprintf($hesklang['tickets_on_pages'],$total,$pages).'
</div>
<div align="right" style="float: right">
<div align="right" style="text-align: right">
<a href="new_ticket.php">'.$hesklang['nti'].'</a>
</div>
</div>';

2
index.php
View File

@ -731,7 +731,7 @@ function print_start()
<div class="form-group">
<br/>
<label for="ticketID"><?php echo $hesklang['ticket_trackID']; ?>:</label>
<input type="text" class="form-control" name="track" id="ticketID" maxlength="20" size="35" value="<?php echo $trackingID; ?>" placeholder="<?php echo $hesklang['ticket_trackID']; ?>">
<input type="text" class="form-control" name="track" id="ticketID" maxlength="20" size="35" value="" placeholder="<?php echo $hesklang['ticket_trackID']; ?>">
</div>
<?php
$tmp = '';

2
install/install_functions.inc.php
View File

@ -779,7 +779,7 @@ function hesk_iHeader()
<link rel="stylesheet" href="../css/bootstrap.css">
<link rel="stylesheet" href="../css/bootstrap-theme.css">
<link href="../css/hesk_style_v25.css" type="text/css" rel="stylesheet" />
<link href="../css/hesk_newStyle.css" type="text/css" rel="stylesheet" />
<link href="../css/hesk_newStyle.php" type="text/css" rel="stylesheet" />
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="../js/jquery-1.10.2.min.js"></script>
<script language="Javascript" type="text/javascript" src="../hesk_javascript_v25.js"></script>