Updated code consitency

pull/54/head
Aigars Silkalns 2016-03-06 22:47:46 +02:00
parent 28b9c466e2
commit 0d2f865adb
2 changed files with 1805 additions and 1791 deletions

View File

@ -482,9 +482,13 @@
</div> </div>
</div> </div>
<div class="view-mail"> <div class="view-mail">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
<p>Riusmod tempor incididunt ut labor erem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p>
<p>Modesed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> <p>Riusmod tempor incididunt ut labor erem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.</p>
<p>Modesed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div> </div>
<div class="attachment"> <div class="attachment">
<p> <p>

View File

@ -1122,12 +1122,28 @@
<script type="text/javascript" src="js/flot/curvedLines.js"></script> <script type="text/javascript" src="js/flot/curvedLines.js"></script>
<script type="text/javascript" src="js/flot/jquery.flot.resize.js"></script> <script type="text/javascript" src="js/flot/jquery.flot.resize.js"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function() {
// [17, 74, 6, 39, 20, 85, 7] // [17, 74, 6, 39, 20, 85, 7]
//[82, 23, 66, 9, 99, 6, 2] //[82, 23, 66, 9, 99, 6, 2]
var data1 = [[gd(2012, 1, 1), 17], [gd(2012, 1, 2), 74], [gd(2012, 1, 3), 6], [gd(2012, 1, 4), 39], [gd(2012, 1, 5), 20], [gd(2012, 1, 6), 85], [gd(2012, 1, 7), 7]]; var data1 = [
[gd(2012, 1, 1), 17],
[gd(2012, 1, 2), 74],
[gd(2012, 1, 3), 6],
[gd(2012, 1, 4), 39],
[gd(2012, 1, 5), 20],
[gd(2012, 1, 6), 85],
[gd(2012, 1, 7), 7]
];
var data2 = [[gd(2012, 1, 1), 82], [gd(2012, 1, 2), 23], [gd(2012, 1, 3), 66], [gd(2012, 1, 4), 9], [gd(2012, 1, 5), 119], [gd(2012, 1, 6), 6], [gd(2012, 1, 7), 9]]; var data2 = [
[gd(2012, 1, 1), 82],
[gd(2012, 1, 2), 23],
[gd(2012, 1, 3), 66],
[gd(2012, 1, 4), 9],
[gd(2012, 1, 5), 119],
[gd(2012, 1, 6), 6],
[gd(2012, 1, 7), 9]
];
$("#canvas_dahs").length && $.plot($("#canvas_dahs"), [ $("#canvas_dahs").length && $.plot($("#canvas_dahs"), [
data1, data2 data1, data2
], { ], {
@ -1190,7 +1206,7 @@
<!-- pace --> <!-- pace -->
<script src="js/pace/pace.min.js"></script> <script src="js/pace/pace.min.js"></script>
<script> <script>
$(function () { $(function() {
$('#world-map-gdp').vectorMap({ $('#world-map-gdp').vectorMap({
map: 'world_mill_en', map: 'world_mill_en',
backgroundColor: 'transparent', backgroundColor: 'transparent',
@ -1202,7 +1218,7 @@
normalizeFunction: 'polynomial' normalizeFunction: 'polynomial'
}] }]
}, },
onRegionTipShow: function (e, el, code) { onRegionTipShow: function(e, el, code) {
el.html(el.html() + ' (GDP - ' + gdpData[code] + ')'); el.html(el.html() + ' (GDP - ' + gdpData[code] + ')');
} }
}); });
@ -1229,36 +1245,30 @@
<!-- dashbord linegraph --> <!-- dashbord linegraph -->
<script> <script>
var doughnutData = [ var doughnutData = [{
{
value: 30, value: 30,
color: "#455C73" color: "#455C73"
}, }, {
{
value: 30, value: 30,
color: "#9B59B6" color: "#9B59B6"
}, }, {
{
value: 60, value: 60,
color: "#BDC3C7" color: "#BDC3C7"
}, }, {
{
value: 100, value: 100,
color: "#26B99A" color: "#26B99A"
}, }, {
{
value: 120, value: 120,
color: "#3498DB" color: "#3498DB"
} }];
];
var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData); var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
</script> </script>
<!-- /dashbord linegraph --> <!-- /dashbord linegraph -->
<!-- datepicker --> <!-- datepicker -->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function() {
var cb = function (start, end, label) { var cb = function(start, end, label) {
console.log(start.toISOString(), end.toISOString(), label); console.log(start.toISOString(), end.toISOString(), label);
$('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY')); $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
//alert("Callback has fired: [" + start.format('MMMM D, YYYY') + " to " + end.format('MMMM D, YYYY') + ", label = " + label + "]"); //alert("Callback has fired: [" + start.format('MMMM D, YYYY') + " to " + end.format('MMMM D, YYYY') + ", label = " + label + "]");
@ -1304,25 +1314,25 @@
}; };
$('#reportrange span').html(moment().subtract(29, 'days').format('MMMM D, YYYY') + ' - ' + moment().format('MMMM D, YYYY')); $('#reportrange span').html(moment().subtract(29, 'days').format('MMMM D, YYYY') + ' - ' + moment().format('MMMM D, YYYY'));
$('#reportrange').daterangepicker(optionSet1, cb); $('#reportrange').daterangepicker(optionSet1, cb);
$('#reportrange').on('show.daterangepicker', function () { $('#reportrange').on('show.daterangepicker', function() {
console.log("show event fired"); console.log("show event fired");
}); });
$('#reportrange').on('hide.daterangepicker', function () { $('#reportrange').on('hide.daterangepicker', function() {
console.log("hide event fired"); console.log("hide event fired");
}); });
$('#reportrange').on('apply.daterangepicker', function (ev, picker) { $('#reportrange').on('apply.daterangepicker', function(ev, picker) {
console.log("apply event fired, start/end dates are " + picker.startDate.format('MMMM D, YYYY') + " to " + picker.endDate.format('MMMM D, YYYY')); console.log("apply event fired, start/end dates are " + picker.startDate.format('MMMM D, YYYY') + " to " + picker.endDate.format('MMMM D, YYYY'));
}); });
$('#reportrange').on('cancel.daterangepicker', function (ev, picker) { $('#reportrange').on('cancel.daterangepicker', function(ev, picker) {
console.log("cancel event fired"); console.log("cancel event fired");
}); });
$('#options1').click(function () { $('#options1').click(function() {
$('#reportrange').data('daterangepicker').setOptions(optionSet1, cb); $('#reportrange').data('daterangepicker').setOptions(optionSet1, cb);
}); });
$('#options2').click(function () { $('#options2').click(function() {
$('#reportrange').data('daterangepicker').setOptions(optionSet2, cb); $('#reportrange').data('daterangepicker').setOptions(optionSet2, cb);
}); });
$('#destroy').click(function () { $('#destroy').click(function() {
$('#reportrange').data('daterangepicker').remove(); $('#reportrange').data('daterangepicker').remove();
}); });
}); });