Change note color scheme, fix add note button

merge-requests/31/head
Mike Koch 7 years ago
parent 76d47a6f64
commit d3dfd7f326

@ -1046,7 +1046,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
</div> </div>
</div> </div>
<div class="box box-warning box-solid"> <div class="box box-warning">
<div class="box-header with-border"> <div class="box-header with-border">
<h1 class="box-title"> <h1 class="box-title">
<?php echo $hesklang['notes']; ?> <?php echo $hesklang['notes']; ?>
@ -1153,7 +1153,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="text-right"> <div class="text-right">
<i><?php echo $hesklang['nhid']; ?></i>&nbsp; <i><?php echo $hesklang['nhid']; ?></i>&nbsp;
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-danger" onclick="hesk_toggleLayerDisplay('noteform')"><?php echo $hesklang['cancel']; ?></button> <button type="button" class="btn btn-danger" data-show="note-footer" data-hide="noteform"><?php echo $hesklang['cancel']; ?></button>
<input type="submit" class="btn btn-success" value="<?php echo $hesklang['s']; ?>"> <input type="submit" class="btn btn-success" value="<?php echo $hesklang['s']; ?>">
</div> </div>
<input type="hidden" name="track" value="<?php echo $trackingID; ?>"> <input type="hidden" name="track" value="<?php echo $trackingID; ?>">
@ -1163,8 +1163,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
</div> </div>
<?php if ($can_reply): ?> <?php if ($can_reply): ?>
<div class="box-footer"> <div class="box-footer" id="note-footer">
<button class="btn btn-default pull-right" onclick="hesk_toggleLayerDisplay('noteform')"> <button class="btn btn-default pull-right" data-show="noteform" data-hide="note-footer">
<i class="fa fa-plus-circle"></i> <?php echo $hesklang['addnote']; ?> <i class="fa fa-plus-circle"></i> <?php echo $hesklang['addnote']; ?>
</button> </button>
</div> </div>

@ -219,10 +219,6 @@ button.dropdown-submit {
border-top: 1px solid #f39c12; border-top: 1px solid #f39c12;
} }
.box-warning .box-footer {
background: #f39c12;
}
#noteform { #noteform {
background: white; background: white;
margin: 10px -10px -10px; margin: 10px -10px -10px;

@ -89,6 +89,16 @@ var loadJquery = function()
$('.box-header h1.box-title').click(function() { $('.box-header h1.box-title').click(function() {
$(this).parent().find('[data-widget="collapse"]').click(); $(this).parent().find('[data-widget="collapse"]').click();
}); });
$('[data-show]').click(function() {
var show = $(this).attr('data-show');
$('#' + show).show();
});
$('[data-hide]').click(function() {
var hide = $(this).attr('data-hide');
$('#' + hide).hide();
})
}; };
function calculateGrayCount(background) { function calculateGrayCount(background) {
@ -102,7 +112,7 @@ function calculateGrayCount(background) {
var setIcon = function(icon) { var setIcon = function(icon) {
$('[data-toggle="iconpicker"]').iconpicker('setIcon', icon); $('[data-toggle="iconpicker"]').iconpicker('setIcon', icon);
} };
// Deprecated. Use data-select-all="id" instead // Deprecated. Use data-select-all="id" instead
function selectAll(id) { function selectAll(id) {

Loading…
Cancel
Save