Merge pull request #54 from christianesperar/master

Fix error and warning found on console. Outstanding comtribution by @christianesperar
pull/57/head
Aigars Silkalns 2016-03-13 08:29:48 +02:00
commit 2fcc912e42
31 changed files with 368 additions and 234 deletions

View File

@ -472,8 +472,7 @@
<script src="js/bootstrap.min.js"></script>
<script src="js/nprogress.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -734,8 +734,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -519,9 +519,7 @@
</div>
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -190,7 +190,7 @@
<!-- icheck -->
<script src="js/icheck/icheck.min.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<script src="js/custom.js"></script>

View File

@ -1403,8 +1403,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -1415,7 +1413,7 @@
<!-- switchery -->
<script src="js/switchery/switchery.min.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min2.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<!-- richtext editor -->
<script src="js/editor/bootstrap-wysiwyg.js"></script>

View File

@ -1820,8 +1820,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -803,8 +803,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -400,8 +400,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -471,8 +471,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -654,8 +654,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -1673,8 +1673,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -1784,8 +1784,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -2388,8 +2388,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -590,8 +590,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -1096,16 +1096,16 @@
<!-- gauge js -->
<script type="text/javascript" src="js/gauge/gauge.min.js"></script>
<script type="text/javascript" src="js/gauge/gauge_demo.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
<!-- icheck -->
<script src="js/icheck/icheck.min.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<script src="js/custom.js"></script>
@ -1244,23 +1244,43 @@
<!-- dashbord linegraph -->
<script>
var doughnutData = [{
value: 30,
color: "#455C73"
}, {
value: 30,
color: "#9B59B6"
}, {
value: 60,
color: "#BDC3C7"
}, {
value: 100,
color: "#26B99A"
}, {
value: 120,
color: "#3498DB"
}];
var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
Chart.defaults.global.legend = {
enabled: false
};
var data = {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
};
var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
type: 'doughnut',
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: data
});
</script>
<!-- /dashbord linegraph -->
<!-- datepicker -->

View File

@ -813,15 +813,15 @@
<script src="js/bootstrap.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<!-- icheck -->
<script src="js/icheck/icheck.min.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min2.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- sparkline -->
<script src="js/sparkline/jquery.sparkline.min.js"></script>
@ -996,9 +996,109 @@
value: 120,
color: "#3498DB"
}];
var myDoughnut = new Chart(document.getElementById("canvas1i").getContext("2d")).Doughnut(doughnutData);
var myDoughnut = new Chart(document.getElementById("canvas1i2").getContext("2d")).Doughnut(doughnutData);
var myDoughnut = new Chart(document.getElementById("canvas1i3").getContext("2d")).Doughnut(doughnutData);
Chart.defaults.global.legend = {
enabled: false
};
var canvasDoughnut = new Chart(document.getElementById("canvas1i"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
var canvasDoughnut = new Chart(document.getElementById("canvas1i2"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
var canvasDoughnut = new Chart(document.getElementById("canvas1i3"), {
type: 'doughnut',
showTooltips: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
}]
}
});
});
</script>
<!-- -->

View File

@ -927,8 +927,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -938,8 +936,10 @@
<script type="text/javascript" src="js/gauge/gauge.min.js"></script>
<script type="text/javascript" src="js/gauge/gauge_demo.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min2.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- sparkline -->
<script src="js/sparkline/jquery.sparkline.min.js"></script>
@ -1044,26 +1044,44 @@
minSpotColor: '#26B99A'
});
var doughnutData = [{
value: 30,
color: "#455C73"
}, {
value: 30,
color: "#9B59B6"
}, {
value: 60,
color: "#BDC3C7"
}, {
value: 100,
color: "#26B99A"
}, {
value: 120,
color: "#3498DB"
}];
var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
Chart.defaults.global.legend = {
enabled: false
};
var data = {
labels: [
"Symbian",
"Blackberry",
"Other",
"Android",
"IOS"
],
datasets: [{
data: [15, 20, 30, 10, 30],
backgroundColor: [
"#BDC3C7",
"#9B59B6",
"#455C73",
"#26B99A",
"#3498DB"
],
hoverBackgroundColor: [
"#CFD4D8",
"#B370CF",
"#34495E",
"#36CAAB",
"#49A9EA"
]
})
}]
};
var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
type: 'doughnut',
tooltipFillColor: "rgba(51, 51, 51, 0.55)",
data: data
});
});
</script>
<!-- -->
<!-- datepicker -->
@ -1143,7 +1161,7 @@
<!-- moris js -->
<script src="js/moris/raphael-min.js"></script>
<script src="js/moris/morris.js"></script>
<script src="js/moris/morris.min.js"></script>
<script>
$(function() {
var day_data = [{

View File

@ -547,8 +547,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -586,8 +586,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -504,6 +504,7 @@
<script type="text/javascript" src="js/maps/jquery-jvectormap-us-aea-en.js"></script>
<!-- chart js -->
<script src="js/moment/moment.min.js"></script>
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>

View File

@ -82,8 +82,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -82,8 +82,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -389,8 +389,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -399,10 +397,6 @@
<script src="js/custom.js"></script>
<!-- moris js -->
<script src="js/moris/raphael-min.js"></script>
<script src="js/moris/morris.js"></script>
<script src="js/moris/example.js"></script>
<!-- pace -->
<script src="js/pace/pace.min.js"></script>

View File

@ -534,9 +534,7 @@
</div>
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -545,10 +543,6 @@
<script src="js/custom.js"></script>
<!-- moris js -->
<script src="js/moris/raphael-min.js"></script>
<script src="js/moris/morris.js"></script>
<script src="js/moris/example.js"></script>
<!-- pace -->
<script src="js/pace/pace.min.js"></script>

View File

@ -690,9 +690,7 @@
</div>
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -705,13 +703,16 @@
<script src="js/cropping/cropper.min.js"></script>
<script src="js/cropping/main.js"></script>
<!-- daterangepicker -->
<script type="text/javascript" src="js/moment.min.js"></script>
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- moris js -->
<script src="js/moris/raphael-min.js"></script>
<script src="js/moris/morris.js"></script>
<script src="js/moris/morris.min.js"></script>
<!-- pace -->
<script src="js/pace/pace.min.js"></script>

View File

@ -526,8 +526,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -386,16 +386,16 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -424,10 +424,10 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -456,13 +456,13 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -491,16 +491,16 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -529,13 +529,13 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -564,16 +564,16 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -602,10 +602,10 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -634,13 +634,13 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -669,16 +669,16 @@
<td>
<ul class="list-inline">
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
<img src="images/user.png" class="avatar" alt="Avatar">
</li>
</ul>
</td>
@ -732,8 +732,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -798,8 +798,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -961,8 +961,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@ -1001,7 +999,7 @@
"sPaginationType": "full_numbers",
"dom": 'T<"clear">lfrtip',
"tableTools": {
"sSwfPath": "<?php echo base_url('assets2/js/Datatables/tools/swf/copy_csv_xls_pdf.swf'); ?>"
"sSwfPath": "js/datatables/tools/swf/copy_csv_xls_pdf.swf"
}
});
$("tfoot input").keyup(function() {

View File

@ -428,8 +428,6 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
<script src="js/nicescroll/jquery.nicescroll.min.js"></script>

View File

@ -600,7 +600,7 @@
</a>
</li>
<li>
<img src="http://localhost/personal/njoroge/assets3/130.jpg" alt="..." class="img-circle profile_img">
<img src="images/user.png" alt="..." class="img-circle profile_img">
</li>
<li>
<a>
@ -960,6 +960,7 @@
<script src="js/bootstrap.min.js"></script>
<!-- chart js -->
<script type="text/javascript" src="js/moment/moment.min.js"></script>
<script src="js/chartjs/chart.min.js"></script>
<!-- bootstrap progress js -->
<script src="js/progressbar/bootstrap-progressbar.min.js"></script>
@ -972,9 +973,6 @@
<!-- pace -->
<script src="js/pace/pace.min.js"></script>
<!-- chart js -->
<script src="js/chartjs/chart.min.js"></script>
<!-- sparkline -->
<script src="js/sparkline/jquery.sparkline.min.js"></script>
<!-- easypie -->
@ -1002,98 +1000,149 @@
</script>
<script>
var lineChartData = {
labels: ["", "", "", "", "", "", ""],
datasets: [{
label: "My First dataset",
fillColor: "rgba(38, 185, 154, 0.11)", //rgba(220,220,220,0.2)
strokeColor: "rgba(38, 185, 154, 0.7)", //rgba(220,220,220,1)
pointColor: "rgba(38, 185, 154, 0.7)", //rgba(220,220,220,1)
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(220,220,220,1)",
data: [10, 30, 42, 23, 35, 55, 77]
}]
$(document).ready(function() {
Chart.defaults.global.legend = {
enabled: false
};
}
new Chart(document.getElementById("canvas_line"), {
type: 'line',
data: {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: "My First dataset",
backgroundColor: "rgba(38, 185, 154, 0.31)",
borderColor: "rgba(38, 185, 154, 0.7)",
pointBorderColor: "rgba(38, 185, 154, 0.7)",
pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(220,220,220,1)",
pointBorderWidth: 1,
data: [31, 74, 6, 39, 20, 85, 7]
}, {
label: "My Second dataset",
backgroundColor: "rgba(3, 88, 106, 0.3)",
borderColor: "rgba(3, 88, 106, 0.70)",
pointBorderColor: "rgba(3, 88, 106, 0.70)",
pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(151,187,205,1)",
pointBorderWidth: 1,
data: [82, 23, 66, 9, 99, 4, 2]
}]
},
});
$(document).ready(function() {
new Chart(document.getElementById("canvas_line").getContext("2d")).Line(lineChartData, {
responsive: true,
scaleShowLabels: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
new Chart(document.getElementById("canvas_line1"), {
type: 'line',
data: {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: "My First dataset",
backgroundColor: "rgba(38, 185, 154, 0.31)",
borderColor: "rgba(38, 185, 154, 0.7)",
pointBorderColor: "rgba(38, 185, 154, 0.7)",
pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(220,220,220,1)",
pointBorderWidth: 1,
data: [31, 74, 6, 39, 20, 85, 7]
}, {
label: "My Second dataset",
backgroundColor: "rgba(3, 88, 106, 0.3)",
borderColor: "rgba(3, 88, 106, 0.70)",
pointBorderColor: "rgba(3, 88, 106, 0.70)",
pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(151,187,205,1)",
pointBorderWidth: 1,
data: [82, 23, 66, 9, 99, 4, 2]
}]
},
});
});
$(document).ready(function() {
new Chart(document.getElementById("canvas_line1").getContext("2d")).Line(lineChartData, {
responsive: true,
scaleShowLabels: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
});
});
$(document).ready(function() {
new Chart(document.getElementById("canvas_line2").getContext("2d")).Line(lineChartData, {
responsive: true,
scaleShowLabels: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
});
});
$(document).ready(function() {
new Chart(document.getElementById("canvas_line3").getContext("2d")).Line(lineChartData, {
responsive: true,
scaleShowLabels: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
});
});
$(document).ready(function() {
new Chart(document.getElementById("canvas_line4").getContext("2d")).Line(lineChartData, {
responsive: true,
scaleShowLabels: false,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
});
});
var sharePiePolorDoughnutData = [{
value: 125,
color: "rgba(38, 185, 154, 0.7)",
highlight: "rgba(38, 185, 154, 0.7)",
label: ""
}, {
value: 25,
color: "rgba(38, 185, 154, 0.01)",
highlight: "rgba(38, 185, 154, 0.01)",
label: ""
}];
$(document).ready(function() {
window.myDoughnut = new Chart(document.getElementById("canvas_doughnut").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
responsive: true,
scaleShowLabels: false,
segmentStrokeWidth: 2,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
new Chart(document.getElementById("canvas_line2"), {
type: 'line',
data: {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: "My First dataset",
backgroundColor: "rgba(38, 185, 154, 0.31)",
borderColor: "rgba(38, 185, 154, 0.7)",
pointBorderColor: "rgba(38, 185, 154, 0.7)",
pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(220,220,220,1)",
pointBorderWidth: 1,
data: [31, 74, 6, 39, 20, 85, 7]
}, {
label: "My Second dataset",
backgroundColor: "rgba(3, 88, 106, 0.3)",
borderColor: "rgba(3, 88, 106, 0.70)",
pointBorderColor: "rgba(3, 88, 106, 0.70)",
pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(151,187,205,1)",
pointBorderWidth: 1,
data: [82, 23, 66, 9, 99, 4, 2]
}]
},
});
});
$(document).ready(function() {
window.myDoughnut = new Chart(document.getElementById("canvas_doughnut2").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
responsive: true,
scaleShowLabels: false,
segmentStrokeWidth: 2,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
new Chart(document.getElementById("canvas_line3"), {
type: 'line',
data: {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: "My First dataset",
backgroundColor: "rgba(38, 185, 154, 0.31)",
borderColor: "rgba(38, 185, 154, 0.7)",
pointBorderColor: "rgba(38, 185, 154, 0.7)",
pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(220,220,220,1)",
pointBorderWidth: 1,
data: [31, 74, 6, 39, 20, 85, 7]
}, {
label: "My Second dataset",
backgroundColor: "rgba(3, 88, 106, 0.3)",
borderColor: "rgba(3, 88, 106, 0.70)",
pointBorderColor: "rgba(3, 88, 106, 0.70)",
pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(151,187,205,1)",
pointBorderWidth: 1,
data: [82, 23, 66, 9, 99, 4, 2]
}]
},
});
});
$(document).ready(function() {
window.myDoughnut = new Chart(document.getElementById("canvas_doughnut3").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
responsive: true,
scaleShowLabels: false,
segmentStrokeWidth: 2,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
});
});
$(document).ready(function() {
window.myDoughnut = new Chart(document.getElementById("canvas_doughnut4").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
responsive: true,
scaleShowLabels: false,
segmentStrokeWidth: 2,
tooltipFillColor: "rgba(51, 51, 51, 0.55)"
new Chart(document.getElementById("canvas_line4"), {
type: 'line',
data: {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [{
label: "My First dataset",
backgroundColor: "rgba(38, 185, 154, 0.31)",
borderColor: "rgba(38, 185, 154, 0.7)",
pointBorderColor: "rgba(38, 185, 154, 0.7)",
pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(220,220,220,1)",
pointBorderWidth: 1,
data: [31, 74, 6, 39, 20, 85, 7]
}, {
label: "My Second dataset",
backgroundColor: "rgba(3, 88, 106, 0.3)",
borderColor: "rgba(3, 88, 106, 0.70)",
pointBorderColor: "rgba(3, 88, 106, 0.70)",
pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
pointHoverBackgroundColor: "#fff",
pointHoverBorderColor: "rgba(151,187,205,1)",
pointBorderWidth: 1,
data: [82, 23, 66, 9, 99, 4, 2]
}]
},
});
});
</script>