admin_main now uses new styling
This commit is contained in:
Mike Koch
parent
8c01a46738
commit
5bb175933a
@ -41,6 +41,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
|
|||||||
require(HESK_PATH . 'inc/common.inc.php');
|
require(HESK_PATH . 'inc/common.inc.php');
|
||||||
require(HESK_PATH . 'inc/admin_functions.inc.php');
|
require(HESK_PATH . 'inc/admin_functions.inc.php');
|
||||||
require(HESK_PATH . 'inc/status_functions.inc.php');
|
require(HESK_PATH . 'inc/status_functions.inc.php');
|
||||||
|
require(HESK_PATH . 'inc/mail_functions.inc.php');
|
||||||
hesk_load_database_functions();
|
hesk_load_database_functions();
|
||||||
|
|
||||||
hesk_session_start();
|
hesk_session_start();
|
||||||
@ -52,49 +53,52 @@ define('MAIN_PAGE', 1);
|
|||||||
define('PAGE_TITLE', 'ADMIN_HOME');
|
define('PAGE_TITLE', 'ADMIN_HOME');
|
||||||
|
|
||||||
/* Print header */
|
/* Print header */
|
||||||
require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
|
require_once(HESK_PATH . 'inc/header_new_admin.inc.php');
|
||||||
|
require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php');
|
||||||
|
|
||||||
|
/* Reset default settings? */
|
||||||
|
if (isset($_GET['reset']) && hesk_token_check()) {
|
||||||
|
$res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1");
|
||||||
|
$_SESSION['default_list'] = '';
|
||||||
|
} /* Get default settings */
|
||||||
|
else {
|
||||||
|
parse_str($_SESSION['default_list'], $defaults);
|
||||||
|
$_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults;
|
||||||
|
}
|
||||||
|
|
||||||
/* Print admin navigation */
|
|
||||||
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
|
||||||
?>
|
?>
|
||||||
|
<section class="content">
|
||||||
<div class="row">
|
<?php hesk_handle_messages(); ?>
|
||||||
<div class="col-md-12 pad-down-20">
|
<div class="box">
|
||||||
<?php
|
<div class="box-header with-border">
|
||||||
|
<h1 class="box-title">
|
||||||
/* Print tickets? */
|
<?php echo $hesklang['tickets']; ?>
|
||||||
if (hesk_checkPermission('can_view_tickets', 0)) {
|
</h1>
|
||||||
if (!isset($_SESSION['hide']['ticket_list'])) //Number of tickets (table header. NOT ACTUAL TABLE)
|
<div class="box-tools pull-right">
|
||||||
{
|
<button type="button" class="btn btn-box-tool" data-widget="collapse">
|
||||||
echo '
|
<i class="fa fa-minus"></i>
|
||||||
<div class="panel panel-default">
|
</button>
|
||||||
<div class="panel-heading">
|
</div>
|
||||||
<h4>' . $hesklang['open_tickets'] . ' <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> ' . $hesklang['nti'] . '</a></span></h4>
|
</div>
|
||||||
</div>'; // The rest of the panel will be printed by print_tickets.inc.php
|
<div class="box-body">
|
||||||
|
<?php
|
||||||
|
/* Print tickets? */
|
||||||
|
if (hesk_checkPermission('can_view_tickets', 0)) {
|
||||||
|
/* Print the list of tickets */
|
||||||
|
require(HESK_PATH . 'inc/print_tickets.inc.php');
|
||||||
|
echo '<br>';
|
||||||
|
/* Print forms for listing and searching tickets */
|
||||||
|
require(HESK_PATH . 'inc/show_search_form.inc.php');
|
||||||
|
} else {
|
||||||
|
echo '<p><i>' . $hesklang['na_view_tickets'] . '</i></p>';
|
||||||
}
|
}
|
||||||
|
?>
|
||||||
/* Reset default settings? */
|
</div>
|
||||||
if (isset($_GET['reset']) && hesk_token_check()) {
|
</div>
|
||||||
$res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1");
|
<div class="box">
|
||||||
$_SESSION['default_list'] = '';
|
<div class="box-body">
|
||||||
} /* Get default settings */
|
<?php
|
||||||
else {
|
$hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
|
||||||
parse_str($_SESSION['default_list'], $defaults);
|
|
||||||
$_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Print the list of tickets */
|
|
||||||
require(HESK_PATH . 'inc/print_tickets.inc.php');
|
|
||||||
|
|
||||||
echo " <br />";
|
|
||||||
|
|
||||||
/* Print forms for listing and searching tickets */
|
|
||||||
require(HESK_PATH . 'inc/show_search_form.inc.php');
|
|
||||||
} else {
|
|
||||||
echo '<p><i>' . $hesklang['na_view_tickets'] . '</i></p>';
|
|
||||||
}
|
|
||||||
|
|
||||||
$hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
|
|
||||||
CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
|
CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
|
||||||
SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
|
SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
|
||||||
SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
|
SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
|
||||||
@ -112,17 +116,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
|||||||
29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
|
29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
|
||||||
C9wPic7DQp9DQo=', "\112");
|
C9wPic7DQp9DQo=', "\112");
|
||||||
|
|
||||||
echo '<hr /> <br />';
|
/* Clean unneeded session variables */
|
||||||
|
hesk_cleanSessionVars('hide');
|
||||||
/* Clean unneeded session variables */
|
?>
|
||||||
hesk_cleanSessionVars('hide');
|
</div>
|
||||||
?>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</section>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
require_once(HESK_PATH . 'inc/footer.inc.php');
|
require_once(HESK_PATH . 'inc/new_footer.inc.php');
|
||||||
exit();
|
exit();
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -1,115 +0,0 @@
|
|||||||
<?php
|
|
||||||
/*******************************************************************************
|
|
||||||
* Title: Help Desk Software HESK
|
|
||||||
* Version: 2.6.7 from 18th April 2016
|
|
||||||
* Author: Klemen Stirn
|
|
||||||
* Website: http://www.hesk.com
|
|
||||||
********************************************************************************
|
|
||||||
* COPYRIGHT AND TRADEMARK NOTICE
|
|
||||||
* Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
|
|
||||||
* HESK is a registered trademark of Klemen Stirn.
|
|
||||||
* The HESK may be used and modified free of charge by anyone
|
|
||||||
* AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
|
|
||||||
* By using this code you agree to indemnify Klemen Stirn from any
|
|
||||||
* liability that might arise from it's use.
|
|
||||||
* Selling the code for this program, in part or full, without prior
|
|
||||||
* written consent is expressly forbidden.
|
|
||||||
* Using this code, in part or full, to create derivate work,
|
|
||||||
* new scripts or products is expressly forbidden. Obtain permission
|
|
||||||
* before redistributing this software over the Internet or in
|
|
||||||
* any other medium. In all cases copyright and header must remain intact.
|
|
||||||
* This Copyright is in full effect in any country that has International
|
|
||||||
* Trade Agreements with the United States of America or
|
|
||||||
* with the European Union.
|
|
||||||
* Removing any of the copyright notices without purchasing a license
|
|
||||||
* is expressly forbidden. To remove HESK copyright notice you must purchase
|
|
||||||
* a license for this script. For more information on how to obtain
|
|
||||||
* a license please visit the page below:
|
|
||||||
* https://www.hesk.com/buy.php
|
|
||||||
*******************************************************************************/
|
|
||||||
|
|
||||||
define('IN_SCRIPT', 1);
|
|
||||||
define('HESK_PATH', '../');
|
|
||||||
|
|
||||||
/* Make sure the install folder is deleted */
|
|
||||||
//if (is_dir(HESK_PATH . 'install')) {
|
|
||||||
// die('Please delete the <b>install</b> folder from your server for security reasons then refresh this page!');
|
|
||||||
//}
|
|
||||||
|
|
||||||
/* Get all the required files and functions */
|
|
||||||
require(HESK_PATH . 'hesk_settings.inc.php');
|
|
||||||
require(HESK_PATH . 'inc/common.inc.php');
|
|
||||||
require(HESK_PATH . 'inc/admin_functions.inc.php');
|
|
||||||
require(HESK_PATH . 'inc/status_functions.inc.php');
|
|
||||||
require(HESK_PATH . 'inc/mail_functions.inc.php');
|
|
||||||
hesk_load_database_functions();
|
|
||||||
|
|
||||||
hesk_session_start();
|
|
||||||
hesk_dbConnect();
|
|
||||||
hesk_isLoggedIn();
|
|
||||||
|
|
||||||
define('CALENDAR', 1);
|
|
||||||
define('MAIN_PAGE', 1);
|
|
||||||
define('PAGE_TITLE', 'ADMIN_HOME');
|
|
||||||
|
|
||||||
/* Print header */
|
|
||||||
require_once(HESK_PATH . 'inc/header_new_admin.inc.php');
|
|
||||||
require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php');
|
|
||||||
require_once(HESK_PATH . 'hesk_settings.inc.php');
|
|
||||||
require_once(HESK_PATH . 'inc/common.inc.php');
|
|
||||||
require_once(HESK_PATH . 'inc/admin_functions.inc.php');
|
|
||||||
require_once(HESK_PATH . 'inc/status_functions.inc.php');
|
|
||||||
require_once(HESK_PATH . 'inc/ticket/get_tickets.inc.php');
|
|
||||||
|
|
||||||
$statuses = mfh_getAllStatuses();
|
|
||||||
$search_filter = get_empty_filter();
|
|
||||||
$search_filter['status'] = array();
|
|
||||||
foreach ($statuses as $status) {
|
|
||||||
if (!$status['IsClosed']) {
|
|
||||||
$search_filter['status'][] = $status['ID'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$search_filter['critical_on_top'] = true;
|
|
||||||
|
|
||||||
|
|
||||||
hesk_handle_messages();
|
|
||||||
?>
|
|
||||||
<section class="content">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h1 class="box-title">
|
|
||||||
<?php echo $hesklang['tickets']; ?>
|
|
||||||
</h1>
|
|
||||||
<div class="box-tools pull-right">
|
|
||||||
<button type="button" class="btn btn-box-tool" data-widget="collapse">
|
|
||||||
<i class="fa fa-minus"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<?php if (!hesk_checkPermission('can_view_tickets', 0)): ?>
|
|
||||||
<p><i><?php echo $hesklang['na_view_tickets']; ?></i></p>
|
|
||||||
<?php
|
|
||||||
else:
|
|
||||||
$tickets = get_tickets($search_filter, $hesk_settings);
|
|
||||||
?>
|
|
||||||
<table class="table table-hover">
|
|
||||||
<thead>
|
|
||||||
<?php foreach ($hesk_settings['ticket_list'] as $ticket_header): ?>
|
|
||||||
<th><?php echo $hesk_settings['possible_ticket_list'][$ticket_header]; ?></th>
|
|
||||||
<?php endforeach; ?>
|
|
||||||
</thead>
|
|
||||||
</table>
|
|
||||||
<?php endif; ?>
|
|
||||||
</div>
|
|
||||||
<div class="box-footer clearfix">
|
|
||||||
<a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> <?php echo $hesklang['nti']; ?></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
require_once(HESK_PATH . 'inc/new_footer.inc.php');
|
|
||||||
exit();
|
|
||||||
?>
|
|
||||||
@ -1,3 +1,11 @@
|
|||||||
.white {
|
.white {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.red {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
.green {
|
||||||
|
color: green;
|
||||||
|
}
|
||||||
@ -58,7 +58,6 @@ $result = hesk_dbQuery($sql_count);
|
|||||||
$total = hesk_dbResult($result);
|
$total = hesk_dbResult($result);
|
||||||
|
|
||||||
//-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
|
//-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
|
||||||
echo '<div class="panel-body">';
|
|
||||||
if ($total > 0) {
|
if ($total > 0) {
|
||||||
|
|
||||||
/* This query string will be used to browse pages */
|
/* This query string will be used to browse pages */
|
||||||
@ -244,13 +243,13 @@ if ($total > 0) {
|
|||||||
$owner = '';
|
$owner = '';
|
||||||
$first_line = '(' . $hesklang['unas'] . ')' . " \n\n";
|
$first_line = '(' . $hesklang['unas'] . ')' . " \n\n";
|
||||||
if ($ticket['owner'] == $_SESSION['id']) {
|
if ($ticket['owner'] == $_SESSION['id']) {
|
||||||
$owner = '<span class="assignedyou" title="' . $hesklang['tasy2'] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['tasy2'] . '"></span></span> ';
|
$owner = '<span class="red" title="' . $hesklang['tasy2'] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['tasy2'] . '"></span></span> ';
|
||||||
$first_line = $hesklang['tasy2'] . " \n\n";
|
$first_line = $hesklang['tasy2'] . " \n\n";
|
||||||
} elseif ($ticket['owner']) {
|
} elseif ($ticket['owner']) {
|
||||||
if (!isset($admins[$ticket['owner']])) {
|
if (!isset($admins[$ticket['owner']])) {
|
||||||
$admins[$ticket['owner']] = $hesklang['e_udel'];
|
$admins[$ticket['owner']] = $hesklang['e_udel'];
|
||||||
}
|
}
|
||||||
$owner = '<span class="assignedother" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"></span></span> ';
|
$owner = '<span class="green" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"></span></span> ';
|
||||||
$first_line = $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . " \n\n";
|
$first_line = $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . " \n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -422,11 +421,15 @@ if ($total > 0) {
|
|||||||
} // End while
|
} // End while
|
||||||
?>
|
?>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
<hr>
|
||||||
|
|
||||||
<br/>
|
|
||||||
<table border="0" width="100%">
|
<table border="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="new_ticket.php" class="btn btn-success pull-left">
|
||||||
|
<span class="glyphicon glyphicon-plus-sign"></span>
|
||||||
|
<?php echo $hesklang['nti']; ?>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
<td width="50%" class="text-right" style="vertical-align:top">
|
<td width="50%" class="text-right" style="vertical-align:top">
|
||||||
<select class="form-control" name="a">
|
<select class="form-control" name="a">
|
||||||
<option value="low"
|
<option value="low"
|
||||||
@ -494,8 +497,7 @@ else {
|
|||||||
|
|
||||||
echo '</div></div>';
|
echo '</div></div>';
|
||||||
}
|
}
|
||||||
echo '</div>
|
echo '</div>';
|
||||||
</div>';
|
|
||||||
|
|
||||||
|
|
||||||
function hesk_print_list_head()
|
function hesk_print_list_head()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user