Browse Source

Basic starting point for service message updates

tags/v2.3.0
Mike Koch 4 years ago
parent
commit
082aa5ff33

+ 11
- 7
admin/service_messages.php View File

@@ -148,7 +148,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="panel-body">
<?php

// Get banned ips from database
// Get service messages from database
$res = hesk_dbQuery('SELECT * FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'service_messages` ORDER BY `order` ASC');
$num = hesk_dbNumRows($res);

@@ -265,12 +265,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
</tbody>
</table>
<div align="center">
<table border="0" cellspacing="1" cellpadding="3" class="white" width="100%">


</table>
</div>
<?php
}

@@ -332,6 +326,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div>
</div>
</div>
<div class="form-group">
<label for="icon" class="col-md-2 control-label"><?php echo $hesklang['sm_icon']; ?></label>
<?php
//
?>
<div class="col-md-10">
<button name="icon" class="btn btn-default iconpicker-container" data-icon="<?php echo $icon; ?>"></button>
<input type="checkbox" name="dont-use-icon"> Don't use icon
</div>
</div>
<div class="form-group">
<label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
<div class="col-md-2">

+ 10
- 0
css/bootstrap-iconpicker.min.css View File

@@ -0,0 +1,10 @@
/*!
* Bootstrap-iconpicker v1.5.0
*
* Copyright 2013-2014 Victor Valencia Rico.
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @recktoner.
*/
.iconpicker .caret{margin-left:10px!important}.iconpicker{min-width:60px}.table-icons .btn{min-height:30px;min-width:35px;text-align:center;padding:0;margin:2px}.table-icons td{min-width:39px}.popover{max-width:inherit!important}.iconpicker-popover{z-index:1050!important}.iconpicker-popover .search-control{margin-bottom:6px;margin-top:6px}

+ 3
- 0
inc/headerAdmin.inc.php View File

@@ -59,11 +59,14 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<?php } ?>
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" type="text/css">
<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.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/modsForHesk-javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
<script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-datepicker.js"></script>
<script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset/iconset-fontawesome-4.2.0.min.js"></script>
<script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.min.js"></script>

<?php
/* Prepare Javascript that browser should load on page load */

+ 19
- 0
js/bootstrap-iconpicker.min.js
File diff suppressed because it is too large
View File


+ 22
- 0
js/iconset/iconset-fontawesome-4.2.0.min.js
File diff suppressed because it is too large
View File


+ 5
- 0
js/modsForHesk-javascript.js View File

@@ -25,10 +25,15 @@ var loadJquery = function()
todayBtn: "linked",
clearBtn: true,
autoclose: true,
autoclose: true,
todayHighlight: true,
format: "yyyy-mm-dd"
});
});

$('.iconpicker-container').iconpicker({
iconset: 'fontawesome'
});
};

function selectAll(id) {

+ 3
- 1
language/en/text.php View File

@@ -22,7 +22,9 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
$hesklang['EMAIL_HR']='------ Reply above this line ------';

// ADDED OR MODIFIED IN Mods for HESK 2.1.0
$hesklang['e_mfh_settings']='You will not be able to save your settings unless this file is writable by the script (CHMOD to 666)!';
$hesklang['e_mfh_settings'] = 'You will not be able to save your settings unless this file is writable by the script (CHMOD to 666)!';
$hesklang['sm_icon'] = 'Icon';
$hesklang['sm_icon_type'] = 'Icon Type';

// ADDED OR MODIFIED IN Mods For HESK 2.0.0
$hesklang['saved_ticket_tpl'] = 'Saved Templates';

Loading…
Cancel
Save