From 0fd585bac8601bcb425808d6e4e7ed1f014b2ace Mon Sep 17 00:00:00 2001 From: Nicolae Gabriel Date: Tue, 3 Jan 2017 15:15:50 +0200 Subject: [PATCH] #346 Sumenu labels over footer buttons -solved that issue. --- README.md | 10 +- build/css/style.css | 3 +- build/js/custom.js | 4 +- build/js/new-custom.js | 48 +- build/js/new-custom2.js | 871 ++++++++++++ documentation/index.html | 8 +- documentation/index_cn.html | 8 +- package.json | 2 +- production/calendar.html | 106 +- production/chartjs.html | 204 ++- production/chartjs2.html | 204 ++- production/contacts.html | 6 +- production/e_commerce.html | 6 +- production/echarts.html | 2201 +++++++++++++++++++++++++++++- production/fixed_footer.html | 6 +- production/fixed_sidebar.html | 6 +- production/form.html | 218 ++- production/form_advanced.html | 628 ++++++++- production/form_buttons.html | 6 +- production/form_upload.html | 6 +- production/form_validation.html | 38 +- production/form_wizards.html | 22 +- production/general_elements.html | 89 +- production/glyphicons.html | 6 +- production/icons.html | 6 +- production/inbox.html | 80 +- production/index.html | 12 +- production/index2.html | 269 +--- production/index3.html | 27 +- production/invoice.html | 6 +- production/level2.html | 6 +- production/login.html | 2 +- production/map.html | 6 +- production/media_gallery.html | 6 +- production/morisjs.html | 136 +- production/other_charts.html | 143 +- production/page_403.html | 4 +- production/page_404.html | 4 +- production/page_500.html | 4 +- production/plain_page.html | 6 +- production/pricing_tables.html | 6 +- production/profile.html | 112 +- production/project_detail.html | 8 +- production/projects.html | 6 +- production/tables.html | 6 +- production/tables_dynamic.html | 88 +- production/typography.html | 6 +- production/widgets.html | 20 +- 48 files changed, 5225 insertions(+), 450 deletions(-) diff --git a/README.md b/README.md index 94c756ff..dfd00d02 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # gentelella -Gentellela Admin is a free to use Bootstrap admin template. +Gentelella Admin is a free to use Bootstrap admin template. This template uses the default Bootstrap 3 styles along with a variety of powerful jQuery plugins and tools to create a powerful framework for creating admin panels or back-end dashboards. Theme uses several libraries for charts, calendar, form validation, wizard style interface, off-canvas navigation menu, text forms, date range, upload area, form autocomplete, range slider, progress bars, notifications and much more. @@ -80,11 +80,11 @@ If `gulp` is installed, follow the steps below. * validator - HTML from validator using jQuery * jQuery Smart Wizard -## Gentellela for other platforms and frameworks +## Gentelella for other platforms and frameworks * [Gentelella on Ruby on Rails 4](https://github.com/iogbole/gentelella_on_rails) thanks to Israel Ogbole. -* [Gentellela on Smarty 3](https://github.com/microvb/otp-thing) with one time password generator, validator, and QR code generator that has no web dependencies (self-contained) in PHP thanks to MicroVB INC -* [Gentellela integrated into Symfony 3](https://github.com/krzysiekpiasecki/Gentelella) full stack PHP framework thanks to Krzysztof Piasecki. +* [Gentelella on Smarty 3](https://github.com/microvb/otp-thing) with one time password generator, validator, and QR code generator that has no web dependencies (self-contained) in PHP thanks to MicroVB INC +* [Gentelella integrated into Symfony 3](https://github.com/krzysiekpiasecki/Gentelella) full stack PHP framework thanks to Krzysztof Piasecki. * [Gentelella on Yii framework 2](https://github.com/yiister/yii2-gentelella) with an asset bundle, a layout template and some widgets. * [Gentelella on Angular 2](https://github.com/kmkatsma/angular2-webpack-starter-gentelella) Angular Webpack Starter modified to utilize the Gentelella. * [Gentelella on Aurelia](https://github.com/kmkatsma/aurelia-gentelella) Typescript webpack skeleton modified to utilize the Gentelella. @@ -101,6 +101,6 @@ Let us know if you have done integration for this admin template on other platfo * [WordPress Themes](https://colorlib.com/wp/free-wordpress-themes/ "List of Free WordPress themes by Colorlib") - A huge selection of the best free WordPress themes that are all licensed under GPL and are available for personal and commercial use without restrictions. ## License information -Gentellela is licensed under The MIT License (MIT). Which means that you can use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software. But you always need to state that Colorlib is the original author of this template. +Gentelella is licensed under The MIT License (MIT). Which means that you can use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software. But you always need to state that Colorlib is the original author of this template. Project is developed and maintained by [Colorlib](https://colorlib.com/ "Colorlib - Make Your First Blog") and Aigars Silkalns diff --git a/build/css/style.css b/build/css/style.css index 1a7eeffd..3dddc094 100644 --- a/build/css/style.css +++ b/build/css/style.css @@ -1648,7 +1648,8 @@ span.right { padding: 5px 0 0 0; position: fixed; width: 230px; - background: #2A3F54 + background: #2A3F54; + z-index:999; } .sidebar-footer a { padding: 7px 0 3px; diff --git a/build/js/custom.js b/build/js/custom.js index cb6c7040..e3b449db 100644 --- a/build/js/custom.js +++ b/build/js/custom.js @@ -190,9 +190,9 @@ $(document).ready(function() { // iCheck $(document).ready(function() { - if ($("input.checkbox")[0]) { + if ($("input.flat")[0]) { $(document).ready(function () { - $('input.checkbox').iCheck({ + $('input.flat').iCheck({ checkboxClass: 'icheckbox_flat-green', radioClass: 'iradio_flat-green' }); diff --git a/build/js/new-custom.js b/build/js/new-custom.js index 75a02f05..441fe0a7 100644 --- a/build/js/new-custom.js +++ b/build/js/new-custom.js @@ -4345,31 +4345,31 @@ function init_gauge() { - if( typeof (Gauge) === 'undefined'){ return; } - console.log('init_gauge'); - - var opts = { - lines: 12, - angle: 0, - lineWidth: 0.4, - pointer: { - length: 0.75, - strokeWidth: 0.042, - color: '#1D212A' - }, - limitMax: 'false', - colorStart: '#1ABC9C', - colorStop: '#1ABC9C', - strokeColor: '#F0F3F3', - generateGradient: true - }; - var target = document.getElementById('foo'), - gauge = new Gauge(target).setOptions(opts); + if( typeof (Gauge) === 'undefined'){ return; } + console.log('init_gauge'); + + var opts = { + lines: 12, + angle: 0, + lineWidth: 0.4, + pointer: { + length: 0.75, + strokeWidth: 0.042, + color: '#1D212A' + }, + limitMax: 'false', + colorStart: '#1ABC9C', + colorStop: '#1ABC9C', + strokeColor: '#F0F3F3', + generateGradient: true + }; + var target = document.getElementById('foo'), + gauge = new Gauge(target).setOptions(opts); - gauge.maxValue = 6000; - gauge.animationSpeed = 32; - gauge.set(3200); - gauge.setTextField(document.getElementById("gauge-text")); + gauge.maxValue = 6000; + gauge.animationSpeed = 32; + gauge.set(3200); + gauge.setTextField(document.getElementById("gauge-text")); } diff --git a/build/js/new-custom2.js b/build/js/new-custom2.js index e69de29b..8f78b8c3 100644 --- a/build/js/new-custom2.js +++ b/build/js/new-custom2.js @@ -0,0 +1,871 @@ +/** + * Resize function without multiple trigger + * + * Usage: + * $(window).smartresize(function(){ + * // code here + * }); + */ +(function($,sr){ + // debouncing function from John Hann + // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/ + var debounce = function (func, threshold, execAsap) { + var timeout; + + return function debounced () { + var obj = this, args = arguments; + function delayed () { + if (!execAsap) + func.apply(obj, args); + timeout = null; + } + + if (timeout) + clearTimeout(timeout); + else if (execAsap) + func.apply(obj, args); + + timeout = setTimeout(delayed, threshold || 100); + }; + }; + + // smartresize + jQuery.fn[sr] = function(fn){ return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); }; + +})(jQuery,'smartresize'); +/** + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var CURRENT_URL = window.location.href.split('#')[0].split('?')[0], + $BODY = $('body'), + $MENU_TOGGLE = $('#menu_toggle'), + $SIDEBAR_MENU = $('#sidebar-menu'), + $SIDEBAR_FOOTER = $('.sidebar-footer'), + $LEFT_COL = $('.left_col'), + $RIGHT_COL = $('.right_col'), + $NAV_MENU = $('.nav_menu'), + $FOOTER = $('footer'); + + + +// Sidebar +function init_sidebar() { +// TODO: This is some kind of easy fix, maybe we can improve this +var setContentHeight = function () { + // reset height + $RIGHT_COL.css('min-height', $(window).height()); + + var bodyHeight = $BODY.outerHeight(), + footerHeight = $BODY.hasClass('footer_fixed') ? -10 : $FOOTER.height(), + leftColHeight = $LEFT_COL.eq(1).height() + $SIDEBAR_FOOTER.height(), + contentHeight = bodyHeight < leftColHeight ? leftColHeight : bodyHeight; + + // normalize content + contentHeight -= $NAV_MENU.height() + footerHeight; + + $RIGHT_COL.css('min-height', contentHeight); +}; + +$SIDEBAR_MENU.find('a').on('click', function(ev) { + var $li = $(this).parent(); + + if ($li.is('.active')) { + $li.removeClass('active active-sm'); + $('ul:first', $li).slideUp(function() { + setContentHeight(); + }); + } else { + // prevent closing menu if we are on child menu + if (!$li.parent().is('.child_menu')) { + $SIDEBAR_MENU.find('li').removeClass('active active-sm'); + $SIDEBAR_MENU.find('li ul').slideUp(); + } + + $li.addClass('active'); + + $('ul:first', $li).slideDown(function() { + setContentHeight(); + }); + } +}); + +// toggle small or large menu +$MENU_TOGGLE.on('click', function() { + if ($BODY.hasClass('nav-md')) { + $SIDEBAR_MENU.find('li.active ul').hide(); + $SIDEBAR_MENU.find('li.active').addClass('active-sm').removeClass('active'); + } else { + $SIDEBAR_MENU.find('li.active-sm ul').show(); + $SIDEBAR_MENU.find('li.active-sm').addClass('active').removeClass('active-sm'); + } + + $BODY.toggleClass('nav-md nav-sm'); + + setContentHeight(); +}); + + // check active menu + $SIDEBAR_MENU.find('a[href="' + CURRENT_URL + '"]').parent('li').addClass('current-page'); + + $SIDEBAR_MENU.find('a').filter(function () { + return this.href == CURRENT_URL; + }).parent('li').addClass('current-page').parents('ul').slideDown(function() { + setContentHeight(); + }).parent().addClass('active'); + + // recompute content when resizing + $(window).smartresize(function(){ + setContentHeight(); + }); + + setContentHeight(); + + // fixed sidebar + if ($.fn.mCustomScrollbar) { + $('.menu_fixed').mCustomScrollbar({ + autoHideScrollbar: true, + theme: 'minimal', + mouseWheel:{ preventDefault: true } + }); + } +}; +// /Sidebar + + + +// Panel toolbox +$(document).ready(function() { + $('.collapse-link').on('click', function() { + var $BOX_PANEL = $(this).closest('.x_panel'), + $ICON = $(this).find('i'), + $BOX_CONTENT = $BOX_PANEL.find('.x_content'); + + // fix for some div with hardcoded fix class + if ($BOX_PANEL.attr('style')) { + $BOX_CONTENT.slideToggle(200, function(){ + $BOX_PANEL.removeAttr('style'); + }); + } else { + $BOX_CONTENT.slideToggle(200); + $BOX_PANEL.css('height', 'auto'); + } + + $ICON.toggleClass('fa-chevron-up fa-chevron-down'); + }); + + $('.close-link').click(function () { + var $BOX_PANEL = $(this).closest('.x_panel'); + + $BOX_PANEL.remove(); + }); +}); +// /Panel toolbox + +// Tooltip +$(document).ready(function() { + $('[data-toggle="tooltip"]').tooltip({ + container: 'body' + }); +}); +// /Tooltip + +// Progressbar +if ($(".progress .progress-bar")[0]) { + $('.progress .progress-bar').progressbar(); +} +// /Progressbar + +// Switchery +$(document).ready(function() { + if ($(".js-switch")[0]) { + var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch')); + elems.forEach(function (html) { + var switchery = new Switchery(html, { + color: '#26B99A' + }); + }); + } +}); +// /Switchery + + +// iCheck +$(document).ready(function() { + if ($("input.flat")[0]) { + $(document).ready(function () { + $('input.flat').iCheck({ + checkboxClass: 'icheckbox_flat-green', + radioClass: 'iradio_flat-green' + }); + }); + } +}); +// /iCheck + + +// Table +$('table input').on('ifChecked', function () { + checkState = ''; + $(this).parent().parent().parent().addClass('selected'); + countChecked(); +}); +$('table input').on('ifUnchecked', function () { + checkState = ''; + $(this).parent().parent().parent().removeClass('selected'); + countChecked(); +}); + +var checkState = ''; + +$('.bulk_action input').on('ifChecked', function () { + checkState = ''; + $(this).parent().parent().parent().addClass('selected'); + countChecked(); +}); +$('.bulk_action input').on('ifUnchecked', function () { + checkState = ''; + $(this).parent().parent().parent().removeClass('selected'); + countChecked(); +}); +$('.bulk_action input#check-all').on('ifChecked', function () { + checkState = 'all'; + countChecked(); +}); +$('.bulk_action input#check-all').on('ifUnchecked', function () { + checkState = 'none'; + countChecked(); +}); + +function countChecked() { + if (checkState === 'all') { + $(".bulk_action input[name='table_records']").iCheck('check'); + } + if (checkState === 'none') { + $(".bulk_action input[name='table_records']").iCheck('uncheck'); + } + + var checkCount = $(".bulk_action input[name='table_records']:checked").length; + + if (checkCount) { + $('.column-title').hide(); + $('.bulk-actions').show(); + $('.action-cnt').html(checkCount + ' Records Selected'); + } else { + $('.column-title').show(); + $('.bulk-actions').hide(); + } +} + + + +// Accordion +$(document).ready(function() { + $(".expand").on("click", function () { + $(this).next().slideToggle(200); + $expand = $(this).find(">:first-child"); + + if ($expand.text() == "+") { + $expand.text("-"); + } else { + $expand.text("+"); + } + }); +}); + +// NProgress +if (typeof NProgress != 'undefined') { + $(document).ready(function () { + NProgress.start(); + }); + + $(window).load(function () { + NProgress.done(); + }); +} + + + function gd(year, month, day) { + return new Date(year, month - 1, day).getTime(); + } + + function init_flot_chart(){ + + if( typeof ($.plot) === 'undefined'){ return; } + + console.log('init_flot_chart'); + + + + var arr_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 arr_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 arr_data3 = [ + [0, 1], + [1, 9], + [2, 6], + [3, 10], + [4, 5], + [5, 17], + [6, 6], + [7, 10], + [8, 7], + [9, 11], + [10, 35], + [11, 9], + [12, 12], + [13, 5], + [14, 3], + [15, 4], + [16, 9] + ]; + + + + + //flot options + var plot3_options = { + series: { + curvedLines: { + apply: true, + active: true, + monotonicFit: true + } + }, + colors: ["#26B99A"], + grid: { + borderWidth: { + top: 0, + right: 0, + bottom: 1, + left: 1 + }, + borderColor: { + bottom: "#7F8790", + left: "#7F8790" + } + } + }; + + + var plot2_options = { + series: { + lines: { + show: false, + fill: true + }, + splines: { + show: true, + tension: 0.4, + lineWidth: 1, + fill: 0.4 + }, + points: { + radius: 0, + show: true + }, + shadowSize: 2 + }, + grid: { + verticalLines: true, + hoverable: true, + clickable: true, + tickColor: "#d5d5d5", + borderWidth: 1, + color: '#fff' + }, + colors: ["rgba(38, 185, 154, 0.38)", "rgba(3, 88, 106, 0.38)"], + xaxis: { + tickColor: "rgba(51, 51, 51, 0.06)", + mode: "time", + tickSize: [1, "day"], + //tickLength: 10, + axisLabel: "Date", + axisLabelUseCanvas: true, + axisLabelFontSizePixels: 12, + axisLabelFontFamily: 'Verdana, Arial', + axisLabelPadding: 10 + }, + yaxis: { + ticks: 8, + tickColor: "rgba(51, 51, 51, 0.06)", + }, + tooltip: false + }; + + console.log('Placeholder: ' + $("#placeholder33x").length ); + + var plot = $.plot($("#placeholder33x"), [{ + label: "Registrations", + data: arr_data3, + lines: { + fillColor: "rgba(150, 202, 89, 0.12)" + }, + points: { + fillColor: "#fff" + } + }], plot3_options); + /* + */ + + + $("#canvas_dahs").length && $.plot($("#canvas_dahs"), [ + arr_data1, arr_data2 + ], plot2_options); + + + function flot2(){ + + if(typeof ($.plot) === 'undefined'){ return; } + console.log('init_flot_chart2'); + + //define chart clolors ( you maybe add more colors if you want or flot will add it automatic ) + var chartColours = ['#96CA59', '#3F97EB', '#72c380', '#6f7a8a', '#f7cb38', '#5a8022', '#2c7282']; + + //generate random number for charts + randNum = function() { + return (Math.floor(Math.random() * (1 + 40 - 20))) + 20; + }; + + var d1 = []; + //var d2 = []; + + //here we generate data for chart + for (var i = 0; i < 30; i++) { + d1.push([new Date(Date.today().add(i).days()).getTime(), randNum() + i + i + 10]); + // d2.push([new Date(Date.today().add(i).days()).getTime(), randNum()]); + } + + var chartMinDate = d1[0][0]; //first day + var chartMaxDate = d1[20][0]; //last day + + var tickSize = [1, "day"]; + var tformat = "%d/%m/%y"; + + //graph options + var options = { + grid: { + show: true, + aboveData: true, + color: "#3f3f3f", + labelMargin: 10, + axisMargin: 0, + borderWidth: 0, + borderColor: null, + minBorderMargin: 5, + clickable: true, + hoverable: true, + autoHighlight: true, + mouseActiveRadius: 100 + }, + series: { + lines: { + show: true, + fill: true, + lineWidth: 2, + steps: false + }, + points: { + show: true, + radius: 4.5, + symbol: "circle", + lineWidth: 3.0 + } + }, + legend: { + position: "ne", + margin: [0, -25], + noColumns: 0, + labelBoxBorderColor: null, + labelFormatter: function(label, series) { + // just add some space to labes + return label + '  '; + }, + width: 40, + height: 1 + }, + colors: chartColours, + shadowSize: 0, + tooltip: true, //activate tooltip + tooltipOpts: { + content: "%s: %y.0", + xDateFormat: "%d/%m", + shifts: { + x: -30, + y: -50 + }, + defaultTheme: false + }, + yaxis: { + min: 0 + }, + xaxis: { + mode: "time", + minTickSize: tickSize, + timeformat: tformat, + min: chartMinDate, + max: chartMaxDate + } + }; + var plot = $.plot($("#placeholder33x"), [{ + label: "Email Sent", + data: d1, + lines: { + fillColor: "rgba(150, 202, 89, 0.12)" + }, //#96CA59 rgba(150, 202, 89, 0.42) + points: { + fillColor: "#fff" + } + }], options); + + } + + } + + + function init_JQVmap(){ + + //console.log('check init_JQVmap [' + typeof (VectorCanvas) + '][' + typeof (jQuery.fn.vectorMap) + ']' ); + + if(typeof (jQuery.fn.vectorMap) === 'undefined'){ return; } + + console.log('init_JQVmap'); + + $('#world-map-gdp').vectorMap({ + map: 'world_en', + backgroundColor: null, + color: '#ffffff', + hoverOpacity: 0.7, + selectedColor: '#666666', + enableZoom: true, + showTooltip: true, + values: sample_data, + scaleColors: ['#E6F2F0', '#149B7E'], + normalizeFunction: 'polynomial' + }); + }; + + + function init_skycons(){ + + if( typeof (Skycons) === 'undefined'){ return; } + console.log('init_skycons'); + + var icons = new Skycons({ + "color": "#73879C" + }), + list = [ + "clear-day", "clear-night", "partly-cloudy-day", + "partly-cloudy-night", "cloudy", "rain", "sleet", "snow", "wind", + "fog" + ], + i; + + for (i = list.length; i--;) + icons.set(list[i], list[i]); + + icons.play(); + + } + + + function init_chart_doughnut(){ + + if( typeof (Chart) === 'undefined'){ return; } + console.log('init_chart_doughnut'); + + if ($('.canvasDoughnut').length){ + + var chart_doughnut_el = $('.canvasDoughnut'); + var chart_doughnut_options = { legend: false, responsive: false }; + var chart_doughnut_settings = { + type: 'doughnut', + tooltipFillColor: "rgba(51, 51, 51, 0.55)", + data: { + labels: [ + "Symbian", + "Blackberry", + "Other", + "Android", + "IOS" + ], + datasets: [{ + data: [15, 20, 30, 10, 30], + backgroundColor: [ + "#BDC3C7", + "#9B59B6", + "#E74C3C", + "#26B99A", + "#3498DB" + ], + hoverBackgroundColor: [ + "#CFD4D8", + "#B370CF", + "#E95E4F", + "#36CAAB", + "#49A9EA" + ] + }] + }, + options: chart_doughnut_options + } + + var chart_doughnut = new Chart(chart_doughnut_el, chart_doughnut_settings); + + } + + } + + function init_gauge() { + + if( typeof (Gauge) === 'undefined'){ return; } + console.log('init_gauge'); + + var opts = { + lines: 12, + angle: 0, + lineWidth: 0.4, + pointer: { + length: 0.75, + strokeWidth: 0.042, + color: '#1D212A' + }, + limitMax: 'false', + colorStart: '#1ABC9C', + colorStop: '#1ABC9C', + strokeColor: '#F0F3F3', + generateGradient: true + }; + var target = document.getElementById('foo'), + gauge = new Gauge(target).setOptions(opts); + + gauge.maxValue = 6000; + gauge.animationSpeed = 32; + gauge.set(3200); + gauge.setTextField(document.getElementById("gauge-text")); + + } + + /* BOOTSTRAP DATERANGEPICKER */ + + //1 + function init_bootstrap_daterangepicker() { + + if( typeof (daterangepicker) === 'undefined'){ return; } + console.log('init_bootstrap_daterangepicker'); + + var cb = function(start, end, label) { + console.log(start.toISOString(), end.toISOString(), label); + $('#reportrange_right span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY')); + }; + + var optionSet1 = { + startDate: moment().subtract(29, 'days'), + endDate: moment(), + minDate: '01/01/2012', + maxDate: '12/31/2020', + dateLimit: { + days: 60 + }, + showDropdowns: true, + showWeekNumbers: true, + timePicker: false, + timePickerIncrement: 1, + timePicker12Hour: true, + ranges: { + 'Today': [moment(), moment()], + 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], + 'Last 7 Days': [moment().subtract(6, 'days'), moment()], + 'Last 30 Days': [moment().subtract(29, 'days'), moment()], + 'This Month': [moment().startOf('month'), moment().endOf('month')], + 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] + }, + opens: 'right', + buttonClasses: ['btn btn-default'], + applyClass: 'btn-small btn-primary', + cancelClass: 'btn-small', + format: 'MM/DD/YYYY', + separator: ' to ', + locale: { + applyLabel: 'Submit', + cancelLabel: 'Clear', + fromLabel: 'From', + toLabel: 'To', + customRangeLabel: 'Custom', + daysOfWeek: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'], + monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], + firstDay: 1 + } + }; + + $('#reportrange_right span').html(moment().subtract(29, 'days').format('MMMM D, YYYY') + ' - ' + moment().format('MMMM D, YYYY')); + + $('#reportrange_right').daterangepicker(optionSet1, cb); + + $('#reportrange_right').on('show.daterangepicker', function() { + console.log("show event fired"); + }); + $('#reportrange_right').on('hide.daterangepicker', function() { + console.log("hide event fired"); + }); + $('#reportrange_right').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')); + }); + $('#reportrange_right').on('cancel.daterangepicker', function(ev, picker) { + console.log("cancel event fired"); + }); + + $('#options1').click(function() { + $('#reportrange_right').data('daterangepicker').setOptions(optionSet1, cb); + }); + + $('#options2').click(function() { + $('#reportrange_right').data('daterangepicker').setOptions(optionSet2, cb); + }); + + $('#destroy').click(function() { + $('#reportrange_right').data('daterangepicker').remove(); + }); + + }; + + /* SPARKLINES */ + + function init_sparklines() { + + if( typeof (sparkline) === 'undefined'){ return; } + console.log('init_sparklines'); + + + $(".sparkline_one").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 5, 6, 4, 5, 6, 3, 5, 4, 5, 4, 5, 4, 3, 4, 5, 6, 7, 5, 4, 3, 5, 6], { + type: 'bar', + height: '125', + barWidth: 13, + colorMap: { + '7': '#a1a1a1' + }, + barSpacing: 2, + barColor: '#26B99A' + }); + + $(".sparkline_two").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 5, 6, 7, 5, 4, 3, 5, 6], { + type: 'bar', + height: '40', + barWidth: 9, + colorMap: { + '7': '#a1a1a1' + }, + barSpacing: 2, + barColor: '#26B99A' + }); + + $(".sparkline_three").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 5, 6, 7, 5, 4, 3, 5, 6], { + type: 'line', + width: '200', + height: '40', + lineColor: '#26B99A', + fillColor: 'rgba(223, 223, 223, 0.57)', + lineWidth: 2, + spotColor: '#26B99A', + minSpotColor: '#26B99A' + }); + + $(".sparkline11").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 6, 2, 4, 3, 4, 5, 4, 5, 4, 3], { + type: 'bar', + height: '40', + barWidth: 8, + colorMap: { + '7': '#a1a1a1' + }, + barSpacing: 2, + barColor: '#26B99A' + }); + + $(".sparkline22").sparkline([2, 4, 3, 4, 7, 5, 4, 3, 5, 6, 2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 6], { + type: 'line', + height: '40', + width: '200', + lineColor: '#26B99A', + fillColor: '#ffffff', + lineWidth: 3, + spotColor: '#34495E', + minSpotColor: '#34495E' + }); + + $(".sparkline_bar").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 5, 6, 4, 5, 6, 3, 5], { + type: 'bar', + colorMap: { + '7': '#a1a1a1' + }, + barColor: '#26B99A' + }); + + $(".sparkline_area").sparkline([5, 6, 7, 9, 9, 5, 3, 2, 2, 4, 6, 7], { + type: 'line', + lineColor: '#26B99A', + fillColor: '#26B99A', + spotColor: '#4578a0', + minSpotColor: '#728fb2', + maxSpotColor: '#6d93c4', + highlightSpotColor: '#ef5179', + highlightLineColor: '#8ba8bf', + spotRadius: 2.5, + width: 85 + }); + + $(".sparkline_line").sparkline([2, 4, 3, 4, 5, 4, 5, 4, 3, 4, 5, 6, 4, 5, 6, 3, 5], { + type: 'line', + lineColor: '#26B99A', + fillColor: '#ffffff', + width: 85, + spotColor: '#34495E', + minSpotColor: '#34495E' + }); + + $(".sparkline_pie").sparkline([1, 1, 2, 1], { + type: 'pie', + sliceColors: ['#26B99A', '#ccc', '#75BCDD', '#D66DE2'] + }); + + $(".sparkline_discreet").sparkline([4, 6, 7, 7, 4, 3, 2, 1, 4, 4, 2, 4, 3, 7, 8, 9, 7, 6, 4, 3], { + type: 'discrete', + barWidth: 3, + lineColor: '#26B99A', + width: '85', + }); + + }; + + $(document).ready(function() { + + init_sparklines(); + init_flot_chart(); + init_sidebar(); + init_JQVmap(); + init_skycons(); + init_chart_doughnut(); + init_gauge(); + init_bootstrap_daterangepicker(); + + }); + + diff --git a/documentation/index.html b/documentation/index.html index 44b426bc..9e6663f2 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -57,7 +57,7 @@ - Gentellela Alela! - Documentation + Gentelella Alela! - Documentation @@ -151,7 +151,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -185,7 +185,7 @@
- Gentellela Alela! + Gentelella Alela!
diff --git a/documentation/index_cn.html b/documentation/index_cn.html index f0dfc37c..8e04e2ed 100644 --- a/documentation/index_cn.html +++ b/documentation/index_cn.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -61,7 +61,7 @@ - Gentellela Alela! - 文档 + Gentelella Alela! - 文档
@@ -174,7 +174,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -219,7 +219,7 @@
- Gentellela Alela! + Gentelella Alela!
diff --git a/package.json b/package.json index b0a6f162..8fb63f0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "gentelella", "version": "1.3.0", - "description": "Gentellela Admin is a free to use Bootstrap admin template", + "description": "Gentelella Admin is a free to use Bootstrap admin template", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/production/calendar.html b/production/calendar.html index 8b83c6bc..918157d8 100755 --- a/production/calendar.html +++ b/production/calendar.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -29,7 +29,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -422,7 +422,107 @@ - + + + + + \ No newline at end of file diff --git a/production/chartjs.html b/production/chartjs.html index f477f397..8939fd8c 100755 --- a/production/chartjs.html +++ b/production/chartjs.html @@ -7,7 +7,7 @@ - Chart JS Graph Examples | Gentellela Alela! by Colorlib + Chart JS Graph Examples | Gentelella Alela! by Colorlib @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -481,7 +481,205 @@ - + + + + + \ No newline at end of file diff --git a/production/chartjs2.html b/production/chartjs2.html index ff7ee84d..18677f8e 100755 --- a/production/chartjs2.html +++ b/production/chartjs2.html @@ -7,7 +7,7 @@ - Chart JS Graph Examples Part 2 | Gentellela Alela! by Colorlib + Chart JS Graph Examples Part 2 | Gentelella Alela! by Colorlib @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -479,7 +479,205 @@ - + + + + + \ No newline at end of file diff --git a/production/contacts.html b/production/contacts.html index 92caa0b4..8d53d729 100755 --- a/production/contacts.html +++ b/production/contacts.html @@ -7,7 +7,7 @@ - Contact Form | Gentellela Alela! by Colorlib + Contact Form | Gentelella Alela! by Colorlib @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -680,6 +680,6 @@ - + \ No newline at end of file diff --git a/production/e_commerce.html b/production/e_commerce.html index 766805ed..3de8a014 100755 --- a/production/e_commerce.html +++ b/production/e_commerce.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -470,6 +470,6 @@ - + \ No newline at end of file diff --git a/production/echarts.html b/production/echarts.html index 4f4381e1..ba266f11 100755 --- a/production/echarts.html +++ b/production/echarts.html @@ -7,7 +7,7 @@ - ECharts Chart Bootstrap Examples | Gentellela Alela! by Colorlib + ECharts Chart Bootstrap Examples | Gentelella Alela! by Colorlib @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -666,7 +666,2202 @@ - + + + \ No newline at end of file diff --git a/production/fixed_footer.html b/production/fixed_footer.html index 028b314f..b16d7a49 100644 --- a/production/fixed_footer.html +++ b/production/fixed_footer.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -303,6 +303,6 @@ - + \ No newline at end of file diff --git a/production/fixed_sidebar.html b/production/fixed_sidebar.html index 41703b4f..db5840b1 100644 --- a/production/fixed_sidebar.html +++ b/production/fixed_sidebar.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -302,6 +302,6 @@ - + \ No newline at end of file diff --git a/production/form.html b/production/form.html index 07e045d9..63909aeb 100755 --- a/production/form.html +++ b/production/form.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -38,7 +38,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -1361,7 +1361,219 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/production/form_advanced.html b/production/form_advanced.html index 5c09969e..9993ffec 100755 --- a/production/form_advanced.html +++ b/production/form_advanced.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -36,7 +36,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -1223,7 +1223,629 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/production/form_buttons.html b/production/form_buttons.html index 3c879daa..a28045ac 100755 --- a/production/form_buttons.html +++ b/production/form_buttons.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -744,6 +744,6 @@ - + \ No newline at end of file diff --git a/production/form_upload.html b/production/form_upload.html index 1087cab0..1b688c32 100755 --- a/production/form_upload.html +++ b/production/form_upload.html @@ -8,7 +8,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -29,7 +29,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -350,6 +350,6 @@ - + \ No newline at end of file diff --git a/production/form_validation.html b/production/form_validation.html index 62e4cc00..f8f57806 100755 --- a/production/form_validation.html +++ b/production/form_validation.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -423,7 +423,39 @@ - + + + + + + \ No newline at end of file diff --git a/production/form_wizards.html b/production/form_wizards.html index bbc83404..e1b5a4dd 100755 --- a/production/form_wizards.html +++ b/production/form_wizards.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -597,7 +597,23 @@ - + + + + + \ No newline at end of file diff --git a/production/general_elements.html b/production/general_elements.html index d86b59a7..de708d8b 100755 --- a/production/general_elements.html +++ b/production/general_elements.html @@ -8,7 +8,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -35,7 +35,7 @@
- Gentellela Alela! + Gentelella Alela!
@@ -947,7 +947,7 @@
-

Gentellela provides you with several dropdown designs for your choosing.

+

Gentelella provides you with several dropdown designs for your choosing.

  • Regular link
    • @@ -1655,7 +1655,88 @@ - + + + + + + + + + \ No newline at end of file diff --git a/production/glyphicons.html b/production/glyphicons.html index 0f717a45..8e1854a9 100755 --- a/production/glyphicons.html +++ b/production/glyphicons.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -1735,6 +1735,6 @@ - + \ No newline at end of file diff --git a/production/icons.html b/production/icons.html index 0f1a1343..0f7650b9 100755 --- a/production/icons.html +++ b/production/icons.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -2343,6 +2343,6 @@ - + \ No newline at end of file diff --git a/production/inbox.html b/production/inbox.html index a9f7c5bc..c60926a5 100755 --- a/production/inbox.html +++ b/production/inbox.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -636,7 +636,81 @@ - + + + + + + + > + + \ No newline at end of file diff --git a/production/index.html b/production/index.html index b9d24312..6c04f0eb 100755 --- a/production/index.html +++ b/production/index.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -35,7 +35,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -328,7 +328,7 @@
    - +
    class="demo-placeholder">
    @@ -535,7 +535,7 @@ - + @@ -1021,7 +1021,7 @@ - - + + diff --git a/production/index2.html b/production/index2.html index 81f3f2ab..cb5dc524 100755 --- a/production/index2.html +++ b/production/index2.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -321,7 +321,7 @@
    -
    +
    @@ -472,15 +472,15 @@
    - +

    Bounce Rates

    - +

    New Traffic

    - +

    Device Share

    @@ -766,263 +766,9 @@ - - - - - - - - - - - - - + - \ No newline at end of file diff --git a/production/index3.html b/production/index3.html index f3c9ec76..c6d5bf1e 100755 --- a/production/index3.html +++ b/production/index3.html @@ -8,7 +8,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -31,7 +31,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -882,10 +882,8 @@ - - - - - --> - - - - - - \ No newline at end of file diff --git a/production/invoice.html b/production/invoice.html index 6afa4d91..652a103e 100755 --- a/production/invoice.html +++ b/production/invoice.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -490,6 +490,6 @@ - + \ No newline at end of file diff --git a/production/level2.html b/production/level2.html index f004aef8..1a36b1aa 100644 --- a/production/level2.html +++ b/production/level2.html @@ -8,7 +8,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -27,7 +27,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -299,6 +299,6 @@ - + \ No newline at end of file diff --git a/production/login.html b/production/login.html index 248275bf..c50e2374 100755 --- a/production/login.html +++ b/production/login.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | diff --git a/production/map.html b/production/map.html index a36f67d2..a6a03b04 100755 --- a/production/map.html +++ b/production/map.html @@ -9,7 +9,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -49,7 +49,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -1398,7 +1398,7 @@ - + diff --git a/production/media_gallery.html b/production/media_gallery.html index 8d2ea7b0..18ef1638 100755 --- a/production/media_gallery.html +++ b/production/media_gallery.html @@ -8,7 +8,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -27,7 +27,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -533,6 +533,6 @@ - + \ No newline at end of file diff --git a/production/morisjs.html b/production/morisjs.html index 42b1d7f0..08467ed4 100755 --- a/production/morisjs.html +++ b/production/morisjs.html @@ -7,7 +7,7 @@ - Moris JS Chart Examples | Gentellela Alela! by Colorlib + Moris JS Chart Examples | Gentelella Alela! by Colorlib @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -493,7 +493,137 @@ - + + + + + \ No newline at end of file diff --git a/production/other_charts.html b/production/other_charts.html index 6bf67dc8..97b1d397 100755 --- a/production/other_charts.html +++ b/production/other_charts.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -30,7 +30,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -456,7 +456,144 @@ - + + + + + + + + + + + + + \ No newline at end of file diff --git a/production/page_403.html b/production/page_403.html index bd6527a2..27c42cd9 100755 --- a/production/page_403.html +++ b/production/page_403.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -61,6 +61,6 @@ - + \ No newline at end of file diff --git a/production/page_404.html b/production/page_404.html index 0613be87..7faaf9b8 100755 --- a/production/page_404.html +++ b/production/page_404.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -61,6 +61,6 @@ - + diff --git a/production/page_500.html b/production/page_500.html index 45170f29..12b91434 100755 --- a/production/page_500.html +++ b/production/page_500.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -61,6 +61,6 @@ - + \ No newline at end of file diff --git a/production/plain_page.html b/production/plain_page.html index 08cbfb01..7e0751b6 100755 --- a/production/plain_page.html +++ b/production/plain_page.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -340,6 +340,6 @@ - + diff --git a/production/pricing_tables.html b/production/pricing_tables.html index 99617b85..9fe7ff8a 100755 --- a/production/pricing_tables.html +++ b/production/pricing_tables.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -481,6 +481,6 @@ - + \ No newline at end of file diff --git a/production/profile.html b/production/profile.html index 229fda65..155fe52b 100755 --- a/production/profile.html +++ b/production/profile.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -576,7 +576,113 @@ - + + + + + + + \ No newline at end of file diff --git a/production/project_detail.html b/production/project_detail.html index 8e9a496a..e15d360e 100755 --- a/production/project_detail.html +++ b/production/project_detail.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -478,10 +478,9 @@ - + - \ No newline at end of file diff --git a/production/projects.html b/production/projects.html index cdb6d21e..caf141eb 100755 --- a/production/projects.html +++ b/production/projects.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -684,6 +684,6 @@ - + \ No newline at end of file diff --git a/production/tables.html b/production/tables.html index afda7b2c..ac64a54a 100755 --- a/production/tables.html +++ b/production/tables.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -779,6 +779,6 @@ - + \ No newline at end of file diff --git a/production/tables_dynamic.html b/production/tables_dynamic.html index 64154712..2c9575fc 100755 --- a/production/tables_dynamic.html +++ b/production/tables_dynamic.html @@ -7,7 +7,7 @@ - DataTables | Gentellela + DataTables | Gentelella @@ -34,7 +34,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -3875,7 +3875,89 @@ - + + + + + \ No newline at end of file diff --git a/production/typography.html b/production/typography.html index d114a8c3..aeb088fa 100755 --- a/production/typography.html +++ b/production/typography.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -26,7 +26,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -377,6 +377,6 @@ - + \ No newline at end of file diff --git a/production/widgets.html b/production/widgets.html index 59105f59..9d8ab511 100755 --- a/production/widgets.html +++ b/production/widgets.html @@ -7,7 +7,7 @@ - Gentellela Alela! | + Gentelella Alela! | @@ -28,7 +28,7 @@
    - Gentellela Alela! + Gentelella Alela!
    @@ -909,7 +909,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -928,8 +928,6 @@ - - - - - - \ No newline at end of file