Skip to content

Commit

Permalink
Merge branch 'fix-graph-color-setting'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bochoven
bochoven committed Dec 21, 2016
2 parents 6ff0140 + 4586908 commit e2cea3b
Show file tree
Hide file tree
Showing 4 changed files with 234 additions and 236 deletions.
15 changes: 5 additions & 10 deletions app/modules/network/views/network_vlan_widget.php
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="col-lg-12">

<div class="panel panel-default">
<div class="panel panel-default" id="network-vlan-widget">

<div class="panel-heading">

<h3 class="panel-title"><i class="fa fa-globe"></i> <span data-i18n="widget.network_vlan.title"></span></h3>

</div>

<div id="ip-panel" class="panel-body" style="overflow-x: auto; padding: 0">
<div class="panel-body" style="overflow-x: auto; padding: 0">

<svg style="height: 200px" id="ip-plot"></svg>

Expand All @@ -29,7 +29,7 @@
d3.json(url, function(err, data){

var minWidth = data.length * 60 + 175
var panelWidth = d3.select('#ip-panel').style("width");
var panelWidth = d3.select('#network-vlan-widget .panel-body').style("width");

var width = Math.max(minWidth, parseInt(panelWidth))

Expand All @@ -45,6 +45,7 @@
.staggerLabels(true)
.valueFormat(d3.format(','))
.showValues(true)
.color(mr.getGraphPref('barColor', 'network-vlan-widget', []))
.duration(250)
;
chart.tooltip.enabled(false);
Expand All @@ -54,7 +55,7 @@
.call(chart)
;
nv.utils.windowResize(function(){
panelWidth = d3.select('#ip-panel').style("width");
panelWidth = d3.select('#network-vlan-widget .panel-body').style("width");
width = Math.max(minWidth, parseInt(panelWidth))
d3.select('#ip-plot')
.style("width", width + "px")
Expand All @@ -64,12 +65,6 @@

return chart;
});






});

});
Expand Down
4 changes: 4 additions & 0 deletions app/views/partials/foot.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@
<script src="<?php echo conf('subdirectory'); ?>assets/js/d3/d3.min.js"></script>
<script src="<?php echo conf('subdirectory'); ?>assets/js/nv.d3.min.js"></script>
<script src="<?php echo conf('subdirectory'); ?>assets/js/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.settings.js"></script>

<script>


</script>


<?php if(conf('custom_js')): ?>
<script src="<?php echo conf('custom_js'); ?>"></script>
<?php endif; ?>
Expand Down
226 changes: 0 additions & 226 deletions assets/js/munkireport.js
View file
Original file line number Diff line number Diff line change
@@ -1,231 +1,5 @@
// Global functions

// Global munkireport object
var mr = {
dt:{},

statusFormat: {
install_failed: {type: 'danger'},
install_succeeded: {type: 'success'},
installed: {type: 'info'},
pending_install: {type: 'warning'},
pending_removal: {type: 'warning'},
removed: {type: 'info'},
uninstall_failed: {type: 'danger'},
uninstalled: {type: 'success'}
},

// Graphing defaults
graph: {
barColor: ['steelBlue']
},

// Localstorage handler
state: function(id, data){

if( data == undefined)
{
// Get data
return JSON.parse( localStorage.getItem(id) );

}
else
{
// Set data
localStorage.setItem( id, JSON.stringify(data) );
}
},

// Set Preference handler (uses localstorage)
setPref: function(key, val){
var globalPrefs = mr.state('global') || {};
globalPrefs[key] = val;
mr.state('global', globalPrefs);
},

// Get Preference handler (uses localstorage)
getPref: function(key){
var globalPrefs = mr.state('global') || {};
return globalPrefs[key];
},

// Integer or integer string OS Version to semantic OS version
integerToVersion: function(osvers)
{
osvers = "" + osvers
// If osvers contains a dot, don't convert
if( osvers.indexOf(".") == -1)
{
// Remove non-numerical string
osvers = isNaN(osvers) ? "" : osvers;

// Left pad with zeroes if necessary
osvers = ("000000" + osvers).substr(-6)
osvers = osvers.match(/.{2}/g).map(function(x){return +x}).join('.')
}
return osvers
},

// Get client detail link
getClientDetailLink: function(name, sn, hash)
{
hash = (typeof hash === "undefined") ? "" : hash;
return '<div class="machine">\
<a class="btn btn-default btn-xs" href="'+appUrl+'/clients/detail/'+sn+hash+'">'+name+'</a>\
<a href="'+appUrl+'/manager/delete_machine/'+sn+'" class="btn btn-xs btn-danger">\
<i class="fa fa-times"></i></a></div>';
},

/*
* Natural Sort algorithm for Javascript - Version 0.8.1 - Released under MIT license
* Author: Jim Palmer (based on chunking idea from Dave Koelle)
*/
naturalSort: function(a, b) {
var re = /(^([+\-]?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?(?=\D|\s|$))|^0x[\da-fA-F]+$|\d+)/g,
sre = /^\s+|\s+$/g, // trim pre-post whitespace
snre = /\s+/g, // normalize all whitespace to single ' ' character
dre = /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,
hre = /^0x[0-9a-f]+$/i,
ore = /^0/,
insensitive = true,
i = function(s) {
return (insensitive && ('' + s).toLowerCase() || '' + s).replace(sre, '');
},
// convert all to strings strip whitespace
x = i(a),
y = i(b),
// chunk/tokenize
xN = x.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),
yN = y.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),
// numeric, hex or date detection
xD = parseInt(x.match(hre), 16) || (xN.length !== 1 && Date.parse(x)),
yD = parseInt(y.match(hre), 16) || xD && y.match(dre) && Date.parse(y) || null,
normChunk = function(s, l) {
// normalize spaces; find floats not starting with '0', string or 0 if not defined (Clint Priest)
return (!s.match(ore) || l == 1) && parseFloat(s) || s.replace(snre, ' ').replace(sre, '') || 0;
},
oFxNcL, oFyNcL;
// first try and sort Hex codes or Dates
if (yD) {
if (xD < yD) { return -1; }
else if (xD > yD) { return 1; }
}
// natural sorting through split numeric strings and default strings
for(var cLoc = 0, xNl = xN.length, yNl = yN.length, numS = Math.max(xNl, yNl); cLoc < numS; cLoc++) {
oFxNcL = normChunk(xN[cLoc] || '', xNl);
oFyNcL = normChunk(yN[cLoc] || '', yNl);
// handle numeric vs string comparison - number < string - (Kyle Adams)
if (isNaN(oFxNcL) !== isNaN(oFyNcL)) {
return isNaN(oFxNcL) ? 1 : -1;
}
// if unicode use locale comparison
if (/[^\x00-\x80]/.test(oFxNcL + oFyNcL) && oFxNcL.localeCompare) {
var comp = oFxNcL.localeCompare(oFyNcL);
return comp / Math.abs(comp);
}
if (oFxNcL < oFyNcL) { return -1; }
else if (oFxNcL > oFyNcL) { return 1; }
}
}, // End naturalSort

// Draw graph for nvd3 and update graph
drawGraph: function(conf){
var graphData = [{"key": " ", "values": []}];
d3.json(conf.url, function(data) {
graphData[0].values = data;
height = data.length * 26 + 40;
conf.chart.height(height);

d3.select(conf.svg)
.attr('height', height)
.datum(graphData)
.transition()
.duration(500)
.call(conf.chart);

conf.chart.update();

});

},

// Get preference for graph in this order: conf, default for graph, default
getGraphPref: function(setting, graphName, conf){
if(conf[setting]) return conf[setting];
if(mr.graph[graphName] && mr.graph[graphName][setting]) return mr.graph[graphName][setting];
mr.graph[setting];
},

// Add nvd3 graph
addGraph: function(conf){
// Sanity check
if( ! conf.widget){
alert('no widget provided for addGraph');
return;
};

// Assemble svg identifier
conf.svg = '#' + conf.widget + ' svg';

nv.addGraph(function() {
conf.chart = nv.models.multiBarHorizontalChart()
.x(function(d) { return conf.labelModifier ? conf.labelModifier(d.label) : d.label })
.y(function(d) { return d.count })
.margin(conf.margin ? conf.margin : {top: 20, right: 10, bottom: 20, left: 70})
.showValues(true)
.valueFormat(d3.format(''))
.tooltips(false)
.showControls(false)
.showLegend(false)
.barColor(mr.getGraphPref('barColor', conf.widget, conf))//conf.barColor ? conf.barColor : (graphSettings.barColor ? mr.graph.barColor))
.height(0);

conf.chart.yAxis
.tickFormat(d3.format(''));

d3.select(conf.svg)
.attr('height', 0)
.datum([{"key": " ","values": []}])
.call(conf.chart);

// Callback for click events
if(conf.elementClickCallback){
// visit page on click
conf.chart.multibar.dispatch.on("elementClick", function(e) {
conf.elementClickCallback(e)
});

d3.select(conf.svg).attr("class", "clickLabels");
}

// Call the munkireport drawGraph routine
mr.drawGraph(conf);

// update chart data on appUpdate
$(document).on('appUpdate', function(){mr.drawGraph(conf)});

// update chart data on Resize
nv.utils.windowResize(conf.chart.update);

});

},

loadTheme: function() {
// Get global state
var theme = mr.getPref('theme') || 'Default';
var theme_dir = baseUrl + 'assets/themes/' + theme + '/';
var theme_file = theme_dir + 'bootstrap.min.css';
$('#bootstrap-stylesheet').attr('href', theme_dir + 'bootstrap.min.css');
$('#nvd3-override-stylesheet').attr('href', theme_dir + 'nvd3.override.css');

// Add active to menu item
$('[data-switch]').parent().removeClass('active');
$('[data-switch="'+theme+'"]').parent().addClass('active');
}

};

// Load theme files
mr.loadTheme();

Expand Down
Loading

0 comments on commit e2cea3b

Please sign in to comment.