diff --git a/backend/assets/MyAsset.php b/backend/assets/MyAsset.php index 3a1ad18..8188383 100644 --- a/backend/assets/MyAsset.php +++ b/backend/assets/MyAsset.php @@ -17,7 +17,7 @@ class MyAsset extends AssetBundle { public $basePath = '@webroot'; public $baseUrl = '@web'; - + public $jsOptions = ['position' => \yii\web\View::POS_HEAD]; public $css = [ 'css/site.css', 'css/bootstrap.min.css', diff --git a/backend/views/accounts/_form.php b/backend/views/accounts/_form.php index 5455d2d..55d6dfe 100644 --- a/backend/views/accounts/_form.php +++ b/backend/views/accounts/_form.php @@ -8,23 +8,33 @@ use yii\helpers\ArrayHelper; /* @var $model common\models\Accounts */ /* @var $form yii\widgets\ActiveForm */ ?> + +
-
- -
- Hide Element 1
- Hide Element 2 +
+
-
+
field($model, 'if_manager')->checkbox() ?> field($model, 'email')->textInput(['maxlength' => true]) ?> @@ -58,7 +68,7 @@ use yii\helpers\ArrayHelper; field($model, 'scode')->textInput() ?>
-
+
field($model, 'is_firm')->textInput() ?> field($model, 'company')->textInput(['maxlength' => true]) ?> diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index 23005fa..439dd1e 100644 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -9,7 +9,7 @@ use yii\helpers\Html; MyAsset::register($this); ?> beginPage() ?> - + diff --git a/backend/web/js/pages/dashboard.js b/backend/web/js/pages/dashboard.js index befdb05..91ce90d 100644 --- a/backend/web/js/pages/dashboard.js +++ b/backend/web/js/pages/dashboard.js @@ -26,28 +26,8 @@ $(function () { zIndex: 999999 }); - //bootstrap WYSIHTML5 - text editor - $(".textarea").wysihtml5(); - - $('.daterange').daterangepicker( - { - 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')] - }, - startDate: moment().subtract(29, 'days'), - endDate: moment() - }, - function (start, end) { - alert("You chose: " + start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY')); - }); - /* jQueryKnob */ - $(".knob").knob(); + //jvectormap data var visitorsData = { @@ -63,31 +43,7 @@ $(function () { "GB": 320, //Great Britain "RU": 3000 //Russia }; - //World map by jvectormap - $('#world-map').vectorMap({ - map: 'world_mill_en', - backgroundColor: "transparent", - regionStyle: { - initial: { - fill: '#e4e4e4', - "fill-opacity": 1, - stroke: 'none', - "stroke-width": 0, - "stroke-opacity": 1 - } - }, - series: { - regions: [{ - values: visitorsData, - scale: ["#92c1dc", "#ebf4f9"], - normalizeFunction: 'polynomial' - }] - }, - onRegionLabelShow: function (e, el, code) { - if (typeof visitorsData[code] != "undefined") - el.html(el.html() + ': ' + visitorsData[code] + ' new visitors'); - } - }); + //Sparkline charts var myvalues = [1000, 1200, 920, 927, 931, 1027, 819, 930, 1021]; @@ -123,77 +79,9 @@ $(function () { height: '250px' }); - /* Morris.js Charts */ - // Sales chart - var area = new Morris.Area({ - element: 'revenue-chart', - resize: true, - data: [ - {y: '2011 Q1', item1: 2666, item2: 2666}, - {y: '2011 Q2', item1: 2778, item2: 2294}, - {y: '2011 Q3', item1: 4912, item2: 1969}, - {y: '2011 Q4', item1: 3767, item2: 3597}, - {y: '2012 Q1', item1: 6810, item2: 1914}, - {y: '2012 Q2', item1: 5670, item2: 4293}, - {y: '2012 Q3', item1: 4820, item2: 3795}, - {y: '2012 Q4', item1: 15073, item2: 5967}, - {y: '2013 Q1', item1: 10687, item2: 4460}, - {y: '2013 Q2', item1: 8432, item2: 5713} - ], - xkey: 'y', - ykeys: ['item1', 'item2'], - labels: ['Item 1', 'Item 2'], - lineColors: ['#a0d0e0', '#3c8dbc'], - hideHover: 'auto' - }); - var line = new Morris.Line({ - element: 'line-chart', - resize: true, - data: [ - {y: '2011 Q1', item1: 2666}, - {y: '2011 Q2', item1: 2778}, - {y: '2011 Q3', item1: 4912}, - {y: '2011 Q4', item1: 3767}, - {y: '2012 Q1', item1: 6810}, - {y: '2012 Q2', item1: 5670}, - {y: '2012 Q3', item1: 4820}, - {y: '2012 Q4', item1: 15073}, - {y: '2013 Q1', item1: 10687}, - {y: '2013 Q2', item1: 8432} - ], - xkey: 'y', - ykeys: ['item1'], - labels: ['Item 1'], - lineColors: ['#efefef'], - lineWidth: 2, - hideHover: 'auto', - gridTextColor: "#fff", - gridStrokeWidth: 0.4, - pointSize: 4, - pointStrokeColors: ["#efefef"], - gridLineColor: "#efefef", - gridTextFamily: "Open Sans", - gridTextSize: 10 - }); - //Donut Chart - var donut = new Morris.Donut({ - element: 'sales-chart', - resize: true, - colors: ["#3c8dbc", "#f56954", "#00a65a"], - data: [ - {label: "Download Sales", value: 12}, - {label: "In-Store Sales", value: 30}, - {label: "Mail-Order Sales", value: 20} - ], - hideHover: 'auto' - }); - //Fix for charts under tabs - $('.box ul.nav a').on('shown.bs.tab', function (e) { - area.redraw(); - donut.redraw(); - }); + /* BOX REFRESH PLUGIN EXAMPLE (usage with morris charts) */ -- libgit2 0.21.4