Revert "#141 Implement the icon picker"

This reverts commit e6bef55986.
merge-requests/2/head
Mike Koch 9 years ago
parent 87be96ff49
commit 7aabc1a4ae

@ -342,7 +342,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
//
?>
<div class="col-md-10">
<select class="form-control" name="icon" data-toggle="iconpicker"></select>
<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">

@ -59,14 +59,11 @@ 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/jquery.fonticonpicker.min.css" type="text/css">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fonticonpicker.bootstrap.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/jquery.fonticonpicker.min.js"></script>
<?php
/* Prepare Javascript that browser should load on page load */

@ -30,11 +30,6 @@ var loadJquery = function()
format: "yyyy-mm-dd"
});
});
//-- Activate jQuery iconpicker
$(function() {
$('[data-toggle="iconpicker"]').fontIconPicker();
});
};
function selectAll(id) {

Loading…
Cancel
Save