From d54d3604ec92e01a844c4b93d2248975ae76d6c2 Mon Sep 17 00:00:00 2001 From: Nasta Date: Wed, 9 Sep 2015 17:14:43 +0300 Subject: [PATCH] fix image roots, refactoring --- gulpfile.js | 2 +- .../charts/widgets/areaChart/areaChart.js | 148 ++++++------ .../pages/charts/widgets/barChart/barChart.js | 90 ++++---- .../charts/widgets/funnelChart/funnelChart.js | 66 +++--- .../charts/widgets/lineChart/lineChart.js | 171 +++++++------- .../pages/charts/widgets/pieChart/pieChart.js | 100 ++++---- .../dashboard/widgets/amChart/amChart.js | 218 +++++++++--------- .../widgets/amChartMap/amChartMap.js | 8 +- .../dashboard/widgets/timeline/timeline.html | 6 +- src/app/pages/icons/icons.js | 206 +++++++++++++++++ .../pages/icons/widgets/fontAwesomeIcons.html | 38 +-- src/app/pages/icons/widgets/ionicons.html | 73 +----- .../{kameleon => kameleon-img}/Alien.svg | 0 .../{kameleon => kameleon-img}/Analytics.svg | 0 .../{kameleon => kameleon-img}/Apartment.svg | 0 .../{kameleon => kameleon-img}/Batman.svg | 0 .../{kameleon => kameleon-img}/Beach.svg | 0 .../{kameleon => kameleon-img}/Bell.svg | 0 .../{kameleon => kameleon-img}/Bonsai.svg | 0 .../{kameleon => kameleon-img}/Boss-3.svg | 0 .../{kameleon => kameleon-img}/Boss-5.svg | 0 .../{kameleon => kameleon-img}/Burglar.svg | 0 .../{kameleon => kameleon-img}/Bus.svg | 0 .../{kameleon => kameleon-img}/Candy.svg | 0 .../{kameleon => kameleon-img}/Checklist.svg | 0 .../{kameleon => kameleon-img}/Cheese.svg | 0 .../{kameleon => kameleon-img}/Chessboard.svg | 0 .../Clipboard-Plan.svg | 0 .../{kameleon => kameleon-img}/Desert.svg | 0 .../{kameleon => kameleon-img}/Dna.svg | 0 .../{kameleon => kameleon-img}/Euro-Coin.svg | 0 .../{kameleon => kameleon-img}/Food-Dome.svg | 0 .../{kameleon => kameleon-img}/Hacker.svg | 0 .../{kameleon => kameleon-img}/Images.svg | 0 .../{kameleon => kameleon-img}/Key.svg | 0 .../Laptop-Signal.svg | 0 .../Locked-Cloud.svg | 0 .../Love-Letter.svg | 0 .../{kameleon => kameleon-img}/Magician.svg | 0 .../{kameleon => kameleon-img}/Makeup.svg | 0 .../{kameleon => kameleon-img}/Medal-2.svg | 0 .../{kameleon => kameleon-img}/Microscope.svg | 0 .../Mind-Map-Paper.svg | 0 .../Money-Increase.svg | 0 .../Music-Equalizer.svg | 0 .../{kameleon => kameleon-img}/Ninja.svg | 0 .../Online-Shopping.svg | 0 .../{kameleon => kameleon-img}/Pantone.svg | 0 .../Party-Poppers.svg | 0 .../Phone-Booth.svg | 0 .../Programming.svg | 0 .../{kameleon => kameleon-img}/Santa.svg | 0 .../{kameleon => kameleon-img}/Shop.svg | 0 .../Street-View.svg | 0 .../{kameleon => kameleon-img}/Student-3.svg | 0 .../{kameleon => kameleon-img}/Surfer.svg | 0 .../{kameleon => kameleon-img}/Surgeon.svg | 0 .../{kameleon => kameleon-img}/Tower.svg | 0 .../{kameleon => kameleon-img}/Vector.svg | 0 src/app/pages/icons/widgets/kameleon.html | 93 +------- .../pages/icons/widgets/kameleonRounded.html | 51 +--- src/app/pages/icons/widgets/socicon.html | 87 +------ .../pages/maps/widgets/leaflet/_leaflet.scss | 4 +- src/app/pages/maps/widgets/leaflet/leaflet.js | 2 +- .../maps/widgets/map-bubbles/map-bubbles.js | 2 +- .../pages/maps/widgets/map-lines/map-lines.js | 2 +- src/app/pages/profile/profile.js | 2 +- src/app/pages/tables/widgets/basicTable.html | 10 +- .../pages/tables/widgets/borderedTable.html | 10 +- src/app/pages/tables/widgets/hoverRows.html | 10 +- src/app/pages/typography/typography.html | 12 +- src/assets/css/_layout.scss | 4 +- src/assets/css/_mixins.scss | 2 +- src/assets/css/_socicon.scss | 12 +- 74 files changed, 658 insertions(+), 771 deletions(-) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Alien.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Analytics.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Apartment.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Batman.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Beach.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Bell.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Bonsai.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Boss-3.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Boss-5.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Burglar.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Bus.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Candy.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Checklist.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Cheese.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Chessboard.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Clipboard-Plan.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Desert.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Dna.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Euro-Coin.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Food-Dome.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Hacker.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Images.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Key.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Laptop-Signal.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Locked-Cloud.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Love-Letter.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Magician.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Makeup.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Medal-2.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Microscope.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Mind-Map-Paper.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Money-Increase.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Music-Equalizer.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Ninja.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Online-Shopping.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Pantone.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Party-Poppers.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Phone-Booth.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Programming.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Santa.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Shop.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Street-View.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Student-3.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Surfer.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Surgeon.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Tower.svg (100%) rename src/app/pages/icons/widgets/{kameleon => kameleon-img}/Vector.svg (100%) diff --git a/gulpfile.js b/gulpfile.js index e76d4c8b8..9ad6288e9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,7 +48,7 @@ var imgSrc = [ './src/assets/pictures/*', './src/app/pages/dashboard/widgets/timeline/img/*', './src/app/pages/profile/img/*', - './src/app/pages/icons/widgets/kameleon/*', + './src/app/pages/icons/widgets/kameleon-img/*', './src/assets/js/lib/amChart/images/*', './src/app/pages/maps/widgets/leaflet/images/*', ]; diff --git a/src/app/pages/charts/widgets/areaChart/areaChart.js b/src/app/pages/charts/widgets/areaChart/areaChart.js index 55b368994..a674dd87c 100644 --- a/src/app/pages/charts/widgets/areaChart/areaChart.js +++ b/src/app/pages/charts/widgets/areaChart/areaChart.js @@ -3,126 +3,126 @@ app.controller('areaChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) { var id = $element[0].getAttribute('id'); var areaChart = AmCharts.makeChart(id, { - "type": "serial", - "theme": "blur", - "dataProvider": [ + type: "serial", + theme: "blur", + dataProvider: [ { - "lineColor": colorDanger, - "date": "2012-01-01", - "duration": 408 + lineColor: colorDanger, + date: "2012-01-01", + duration: 408 }, { - "date": "2012-01-02", - "duration": 482 + date: "2012-01-02", + duration: 482 }, { - "date": "2012-01-03", - "duration": 562 + date: "2012-01-03", + duration: 562 }, { - "date": "2012-01-04", - "duration": 379 + date: "2012-01-04", + duration: 379 }, { - "lineColor": colorSuccess, - "date": "2012-01-05", - "duration": 501 + lineColor: colorSuccess, + date: "2012-01-05", + duration: 501 }, { - "date": "2012-01-06", - "duration": 443 + date: "2012-01-06", + duration: 443 }, { - "date": "2012-01-07", - "duration": 405 + date: "2012-01-07", + duration: 405 }, { - "date": "2012-01-08", - "duration": 309, - "lineColor": colorPrimary + date: "2012-01-08", + duration: 309, + lineColor: colorPrimary }, { - "date": "2012-01-09", - "duration": 287 + date: "2012-01-09", + duration: 287 }, { - "date": "2012-01-10", - "duration": 485 + date: "2012-01-10", + duration: 485 }, { - "date": "2012-01-11", - "duration": 890 + date: "2012-01-11", + duration: 890 }, { - "date": "2012-01-12", - "duration": 810 + date: "2012-01-12", + duration: 810 } ], - "balloon": { - "cornerRadius": 6, - "horizontalPadding": 15, - "verticalPadding": 10 + balloon: { + cornerRadius: 6, + horizontalPadding: 15, + verticalPadding: 10 }, - "valueAxes": [ + valueAxes: [ { - "duration": "mm", - "durationUnits": { - "hh": "h ", - "mm": "min" + duration: "mm", + durationUnits: { + hh: "h ", + mm: "min" }, - "axisAlpha": 0 + axisAlpha: 0 } ], - "graphs": [ + graphs: [ { - "bullet": "square", - "bulletBorderAlpha": 1, - "bulletBorderThickness": 1, - "fillAlphas": 0.3, - "fillColorsField": "lineColor", - "legendValueText": "[[value]]", - "lineColorField": "lineColor", - "title": "duration", - "valueField": "duration" + bullet: "square", + bulletBorderAlpha: 1, + bulletBorderThickness: 1, + fillAlphas: 0.3, + fillColorsField: "lineColor", + legendValueText: "[[value]]", + lineColorField: "lineColor", + title: "duration", + valueField: "duration" } ], - "chartCursor": { - "categoryBalloonDateFormat": "YYYY MMM DD", - "cursorAlpha": 0, - "fullWidth": true + chartCursor: { + categoryBalloonDateFormat: "YYYY MMM DD", + cursorAlpha: 0, + fullWidth: true }, - "dataDateFormat": "YYYY-MM-DD", - "categoryField": "date", - "categoryAxis": { - "dateFormats": [ + dataDateFormat: "YYYY-MM-DD", + categoryField: "date", + categoryAxis: { + dateFormats: [ { - "period": "DD", - "format": "DD" + period: "DD", + format: "DD" }, { - "period": "WW", - "format": "MMM DD" + period: "WW", + format: "MMM DD" }, { - "period": "MM", - "format": "MMM" + period: "MM", + format: "MMM" }, { - "period": "YYYY", - "format": "YYYY" + period: "YYYY", + format: "YYYY" } ], - "parseDates": true, - "autoGridCount": false, - "axisColor": "#555555", - "gridAlpha": 0, - "gridCount": 50 + parseDates: true, + autoGridCount: false, + axisColor: "#555555", + gridAlpha: 0, + gridCount: 50 }, - "export": { - "enabled": true + export: { + enabled: true }, - "pathToImages": '/release/img/' + pathToImages: 'release/img/' }); areaChart.addListener("dataUpdated", zoomAreaChart); diff --git a/src/app/pages/charts/widgets/barChart/barChart.js b/src/app/pages/charts/widgets/barChart/barChart.js index 891edffbb..1c5e03b16 100644 --- a/src/app/pages/charts/widgets/barChart/barChart.js +++ b/src/app/pages/charts/widgets/barChart/barChart.js @@ -3,73 +3,73 @@ app.controller('barChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) { var id = $element[0].getAttribute('id'); var barChart = AmCharts.makeChart(id, { - "type": "serial", - "theme": "blur", - "dataProvider": [ + type: "serial", + theme: "blur", + dataProvider: [ { - "country": "USA", - "visits": 3025, - "color": colorPrimary + country: "USA", + visits: 3025, + color: colorPrimary }, { - "country": "China", - "visits": 1882, - "color": colorDanger + country: "China", + visits: 1882, + color: colorDanger }, { - "country": "Japan", - "visits": 1809, - "color": colorPrimaryLight + country: "Japan", + visits: 1809, + color: colorPrimaryLight }, { - "country": "Germany", - "visits": 1322, - "color": colorSuccess + country: "Germany", + visits: 1322, + color: colorSuccess }, { - "country": "UK", - "visits": 1122, - "color": colorWarning + country: "UK", + visits: 1122, + color: colorWarning }, { - "country": "France", - "visits": 1114, - "color": colorDefault + country: "France", + visits: 1114, + color: colorDefault } ], - "valueAxes": [ + valueAxes: [ { - "axisAlpha": 0, - "position": "left", - "title": "Visitors from country" + axisAlpha: 0, + position: "left", + title: "Visitors from country" } ], - "startDuration": 1, - "graphs": [ + startDuration: 1, + graphs: [ { - "balloonText": "[[category]]: [[value]]", - "fillColorsField": "color", - "fillAlphas": 0.9, - "lineAlpha": 0.2, - "type": "column", - "valueField": "visits" + balloonText: "[[category]]: [[value]]", + fillColorsField: "color", + fillAlphas: 0.9, + lineAlpha: 0.2, + type: "column", + valueField: "visits" } ], - "chartCursor": { - "categoryBalloonEnabled": false, - "cursorAlpha": 0, - "zoomable": false + chartCursor: { + categoryBalloonEnabled: false, + cursorAlpha: 0, + zoomable: false }, - "categoryField": "country", - "categoryAxis": { - "gridPosition": "start", - "labelRotation": 45 + categoryField: "country", + categoryAxis: { + gridPosition: "start", + labelRotation: 45 }, - "export": { - "enabled": true + export: { + enabled: true }, - "creditsPosition": "top-right", - "pathToImages": '/release/img/' + creditsPosition: "top-right", + pathToImages: "release/img/" }); }]); \ No newline at end of file diff --git a/src/app/pages/charts/widgets/funnelChart/funnelChart.js b/src/app/pages/charts/widgets/funnelChart/funnelChart.js index a3129bc98..fd7ece7d3 100644 --- a/src/app/pages/charts/widgets/funnelChart/funnelChart.js +++ b/src/app/pages/charts/widgets/funnelChart/funnelChart.js @@ -3,54 +3,54 @@ app.controller('funnelChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) { var id = $element[0].getAttribute('id'); var funnelChart = AmCharts.makeChart(id, { - "type": "funnel", - "theme": "blur", - "dataProvider": [ + type: "funnel", + theme: "blur", + dataProvider: [ { - "title": "Website visits", - "value": 300 + title: "Website visits", + value: 300 }, { - "title": "Downloads", - "value": 123 + title: "Downloads", + value: 123 }, { - "title": "Requested prices", - "value": 98 + title: "Requested prices", + value: 98 }, { - "title": "Contaced", - "value": 72 + title: "Contaced", + value: 72 }, { - "title": "Purchased", - "value": 35 + title: "Purchased", + value: 35 }, { - "title": "Asked for support", - "value": 25 + title: "Asked for support", + value: 25 }, { - "title": "Purchased more", - "value": 18 + title: "Purchased more", + value: 18 } ], - "titleField": "title", - "marginRight": 160, - "marginLeft": 15, - "labelPosition": "right", - "funnelAlpha": 0.9, - "valueField": "value", - "startX": 0, - "neckWidth": "0%", - "startAlpha": 0, - "outlineThickness": 1, - "neckHeight": "0%", - "balloonText": "[[title]]:[[value]]", - "export": { - "enabled": true + titleField: "title", + marginRight: 160, + marginLeft: 15, + labelPosition: "right", + funnelAlpha: 0.9, + valueField: "value", + startX: 0, + neckWidth: "0%", + startAlpha: 0, + outlineThickness: 1, + neckHeight: "0%", + balloonText: "[[title]]:[[value]]", + export: { + enabled: true }, - "creditsPosition": "bottom-left", - "pathToImages": '/release/img/' + creditsPosition: "bottom-left", + pathToImages: "release/img/" }); }]); \ No newline at end of file diff --git a/src/app/pages/charts/widgets/lineChart/lineChart.js b/src/app/pages/charts/widgets/lineChart/lineChart.js index d9f7274ef..e4fcb9de5 100644 --- a/src/app/pages/charts/widgets/lineChart/lineChart.js +++ b/src/app/pages/charts/widgets/lineChart/lineChart.js @@ -3,133 +3,132 @@ app.controller('lineChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) { var id = $element[0].getAttribute('id'); var lineChart = AmCharts.makeChart(id, { - "type": "serial", - "theme": "blur", - "marginTop": 0, - "marginRight": 15, - "dataProvider": [ - { - "year": "1990", - "value": -0.17 + type: "serial", + theme: "blur", + marginTop: 0, + marginRight: 15, + dataProvider: [ + { + year: "1990", + value: -0.17 }, { - "year": "1991", - "value": -0.254 + year: "1991", + value: -0.254 }, { - "year": "1992", - "value": 0.019 + year: "1992", + value: 0.019 }, { - "year": "1993", - "value": -0.063 + year: "1993", + value: -0.063 }, { - "year": "1994", - "value": 0.005 + year: "1994", + value: 0.005 }, { - "year": "1995", - "value": 0.077 + year: "1995", + value: 0.077 }, { - "year": "1996", - "value": 0.12 + year: "1996", + value: 0.12 }, { - "year": "1997", - "value": 0.011 + year: "1997", + value: 0.011 }, { - "year": "1998", - "value": 0.177 + year: "1998", + value: 0.177 }, { - "year": "1999", - "value": -0.021 + year: "1999", + value: -0.021 }, { - "year": "2000", - "value": -0.037 + year: "2000", + value: -0.037 }, { - "year": "2001", - "value": 0.03 + year: "2001", + value: 0.03 }, { - "year": "2002", - "value": 0.179 + year: "2002", + value: 0.179 }, { - "year": "2003", - "value": 0.2 + year: "2003", + value: 0.2 }, { - "year": "2004", - "value": 0.180 + year: "2004", + value: 0.180 }, { - "year": "2005", - "value": 0.21 + year: "2005", + value: 0.21 } ], - "valueAxes": [ + valueAxes: [ { - "axisAlpha": 0, - "position": "left" + axisAlpha: 0, + position: "left" } ], - "graphs": [ - { - "id": "g1", - "balloonText": "[[value]]", - "bullet": "round", - "bulletSize": 8, - "lineColor": colorDanger, - "lineThickness": 1, - "negativeLineColor": colorPrimary, - "type": "smoothedLine", - "valueField": "value" + graphs: [ + { + id: "g1", + balloonText: "[[value]]", + bullet: "round", + bulletSize: 8, + lineColor: colorDanger, + lineThickness: 1, + negativeLineColor: colorPrimary, + type: "smoothedLine", + valueField: "value" } ], - "chartScrollbar": { - "graph": "g1", - "gridAlpha": 0, - "color": "#888888", - "scrollbarHeight": 55, - "backgroundAlpha": 0, - "selectedBackgroundAlpha": 0.1, - "selectedBackgroundColor": "#888888", - "graphFillAlpha": 0, - "autoGridCount": true, - "selectedGraphFillAlpha": 0, - "graphLineAlpha": 0.2, - "graphLineColor": "#c2c2c2", - "selectedGraphLineColor": "#888888", - "selectedGraphLineAlpha": 1 - + chartScrollbar: { + graph: "g1", + gridAlpha: 0, + color: "#888888", + scrollbarHeight: 55, + backgroundAlpha: 0, + selectedBackgroundAlpha: 0.1, + selectedBackgroundColor: "#888888", + graphFillAlpha: 0, + autoGridCount: true, + selectedGraphFillAlpha: 0, + graphLineAlpha: 0.2, + graphLineColor: "#c2c2c2", + selectedGraphLineColor: "#888888", + selectedGraphLineAlpha: 1 }, - "chartCursor": { - "categoryBalloonDateFormat": "YYYY", - "cursorAlpha": 0, - "valueLineEnabled": true, - "valueLineBalloonEnabled": true, - "valueLineAlpha": 0.5, - "fullWidth": true + chartCursor: { + categoryBalloonDateFormat: "YYYY", + cursorAlpha: 0, + valueLineEnabled: true, + valueLineBalloonEnabled: true, + valueLineAlpha: 0.5, + fullWidth: true }, - "dataDateFormat": "YYYY", - "categoryField": "year", - "categoryAxis": { - "minPeriod": "YYYY", - "parseDates": true, - "minorGridAlpha": 0.1, - "minorGridEnabled": true + dataDateFormat: "YYYY", + categoryField: "year", + categoryAxis: { + minPeriod: "YYYY", + parseDates: true, + minorGridAlpha: 0.1, + minorGridEnabled: true }, - "export": { - "enabled": true + export: { + enabled: true }, - "creditsPosition": "bottom-right", - "pathToImages": '/release/img/' + creditsPosition: "bottom-right", + pathToImages: "release/img/" }); lineChart.addListener("rendered", zoomChart); diff --git a/src/app/pages/charts/widgets/pieChart/pieChart.js b/src/app/pages/charts/widgets/pieChart/pieChart.js index c5e62bd20..479859a4d 100644 --- a/src/app/pages/charts/widgets/pieChart/pieChart.js +++ b/src/app/pages/charts/widgets/pieChart/pieChart.js @@ -3,81 +3,81 @@ app.controller('pieChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) { var id = $element[0].getAttribute('id'); var pieChart = AmCharts.makeChart(id, { - "type": "pie", - "startDuration": 0, - "theme": "blur", - "addClassNames": true, - "legend": { - "position": "right", - "marginRight": 100, - "autoMargins": false + type: "pie", + startDuration: 0, + theme: "blur", + addClassNames: true, + legend: { + position: "right", + marginRight: 100, + autoMargins: false }, - "innerRadius": "40%", - "defs": { - "filter": [ + innerRadius: "40%", + defs: { + filter: [ { - "id": "shadow", - "width": "200%", - "height": "200%", - "feOffset": { - "result": "offOut", - "in": "SourceAlpha", - "dx": 0, - "dy": 0 + id: "shadow", + width: "200%", + height: "200%", + feOffset: { + result: "offOut", + in: "SourceAlpha", + dx: 0, + dy: 0 }, - "feGaussianBlur": { - "result": "blurOut", - "in": "offOut", - "stdDeviation": 5 + feGaussianBlur: { + result: "blurOut", + in: "offOut", + stdDeviation: 5 }, - "feBlend": { - "in": "SourceGraphic", - "in2": "blurOut", - "mode": "normal" + feBlend: { + in: "SourceGraphic", + in2: "blurOut", + mode: "normal" } } ] }, - "dataProvider": [ + dataProvider: [ { - "country": "Lithuania", - "litres": 501.9 + country: "Lithuania", + litres: 501.9 }, { - "country": "Czech Republic", - "litres": 301.9 + country: "Czech Republic", + litres: 301.9 }, { - "country": "Ireland", - "litres": 201.1 + country: "Ireland", + litres: 201.1 }, { - "country": "Germany", - "litres": 165.8 + country: "Germany", + litres: 165.8 }, { - "country": "Australia", - "litres": 139.9 + country: "Australia", + litres: 139.9 }, { - "country": "Austria", - "litres": 128.3 + country: "Austria", + litres: 128.3 }, { - "country": "UK", - "litres": 99 + country: "UK", + litres: 99 }, { - "country": "Belgium", - "litres": 60 + country: "Belgium", + litres: 60 } ], - "valueField": "litres", - "titleField": "country", - "export": { - "enabled": true + valueField: "litres", + titleField: "country", + export: { + enabled: true }, - "creditsPosition": "bottom-left", + creditsPosition: "bottom-left", autoMargins: false, marginTop: 10, @@ -85,7 +85,7 @@ app.controller('pieChartCtrl', ['$scope', '$timeout', '$element', function($scop marginLeft: 0, marginRight: 0, pullOutRadius: 0, - "pathToImages": '/release/img/' + pathToImages: "release/img/" }); pieChart.addListener("init", handleInit); diff --git a/src/app/pages/dashboard/widgets/amChart/amChart.js b/src/app/pages/dashboard/widgets/amChart/amChart.js index f4c076d85..cfe00b290 100644 --- a/src/app/pages/dashboard/widgets/amChart/amChart.js +++ b/src/app/pages/dashboard/widgets/amChart/amChart.js @@ -2,132 +2,132 @@ app.controller('amChartCtrl', ['$scope', '$timeout', '$element', function ($scope, $timeout, $element) { var chartData = [ - { "date": new Date(2011, 0), "value": -30700}, - { "date": new Date(2011, 1), "value": -16800}, - { "date": new Date(2011, 2), "value": -7300}, - { "date": new Date(2011, 3), "value": -2700}, - { "date": new Date(2011, 4), "value": -25100}, - { "date": new Date(2011, 5), "value": -28100}, - { "date": new Date(2011, 6), "value": -34800}, - { "date": new Date(2011, 7), "value": -7400}, - { "date": new Date(2011, 8), "value": -1100}, - { "date": new Date(2011, 9), "value": -7400}, - { "date": new Date(2011, 10), "value": -12400}, - { "date": new Date(2011, 11), "value": -2400}, - { "date": new Date(2012, 0), "value": -2200}, - { "date": new Date(2012, 1), "value": 0}, - { "date": new Date(2012, 2), "value": -29600}, - { "date": new Date(2012, 3), "value": -21700}, - { "date": new Date(2012, 4), "value": -14700}, - { "date": new Date(2012, 5), "value": -1500}, - { "date": new Date(2012, 6), "value": -1600}, - { "date": new Date(2012, 7), "value": -1100}, - { "date": new Date(2012, 8), "value": -6800}, - { "date": new Date(2012, 9), "value": -1900}, - { "date": new Date(2012, 10), "value": -5600}, - { "date": new Date(2012, 11), "value": -7700}, - { "date": new Date(2013, 0), "value": -21300}, - { "date": new Date(2013, 1), "value": -13700}, - { "date": new Date(2013, 2), "value": -300}, - { "date": new Date(2013, 3), "value": 10900}, - { "date": new Date(2013, 4), "value": 20300}, - { "date": new Date(2013, 5), "value": 25500}, - { "date": new Date(2013, 6), "value": 10700}, - { "date": new Date(2013, 7), "value": -4200}, - { "date": new Date(2013, 8), "value": -5000}, - { "date": new Date(2013, 9), "value": 17700}, - { "date": new Date(2013, 10), "value": 25100}, - { "date": new Date(2013, 11), "value": 37000}, - { "date": new Date(2014, 0), "value": 300}, - { "date": new Date(2014, 1), "value": 17900}, - { "date": new Date(2014, 2), "value": 1800}, - { "date": new Date(2014, 3), "value": 10400}, - { "date": new Date(2014, 4), "value": 25500}, - { "date": new Date(2014, 5), "value": 2100}, - { "date": new Date(2014, 6), "value": 6500}, - { "date": new Date(2014, 7), "value": 1100}, - { "date": new Date(2014, 8), "value": 17200}, - { "date": new Date(2014, 9), "value": 26900}, - { "date": new Date(2014, 10), "value": 14100}, - { "date": new Date(2014, 11), "value": 35300}, - { "date": new Date(2015, 0), "value": 54800}, - { "date": new Date(2015, 1), "value": 29800}, - { "date": new Date(2015, 2), "value": 26700}, - { "date": new Date(2015, 3), "value": 41100}, - { "date": new Date(2015, 4), "value": 46200}, - { "date": new Date(2015, 5), "value": 4700}, - { "date": new Date(2015, 6), "value": 44500}, - { "date": new Date(2015, 7), "value": 4700} + { date: new Date(2011, 0), value: -30700}, + { date: new Date(2011, 1), value: -16800}, + { date: new Date(2011, 2), value: -7300}, + { date: new Date(2011, 3), value: -2700}, + { date: new Date(2011, 4), value: -25100}, + { date: new Date(2011, 5), value: -28100}, + { date: new Date(2011, 6), value: -34800}, + { date: new Date(2011, 7), value: -7400}, + { date: new Date(2011, 8), value: -1100}, + { date: new Date(2011, 9), value: -7400}, + { date: new Date(2011, 10), value: -12400}, + { date: new Date(2011, 11), value: -2400}, + { date: new Date(2012, 0), value: -2200}, + { date: new Date(2012, 1), value: 0}, + { date: new Date(2012, 2), value: -29600}, + { date: new Date(2012, 3), value: -21700}, + { date: new Date(2012, 4), value: -14700}, + { date: new Date(2012, 5), value: -1500}, + { date: new Date(2012, 6), value: -1600}, + { date: new Date(2012, 7), value: -1100}, + { date: new Date(2012, 8), value: -6800}, + { date: new Date(2012, 9), value: -1900}, + { date: new Date(2012, 10), value: -5600}, + { date: new Date(2012, 11), value: -7700}, + { date: new Date(2013, 0), value: -21300}, + { date: new Date(2013, 1), value: -13700}, + { date: new Date(2013, 2), value: -300}, + { date: new Date(2013, 3), value: 10900}, + { date: new Date(2013, 4), value: 20300}, + { date: new Date(2013, 5), value: 25500}, + { date: new Date(2013, 6), value: 10700}, + { date: new Date(2013, 7), value: -4200}, + { date: new Date(2013, 8), value: -5000}, + { date: new Date(2013, 9), value: 17700}, + { date: new Date(2013, 10), value: 25100}, + { date: new Date(2013, 11), value: 37000}, + { date: new Date(2014, 0), value: 300}, + { date: new Date(2014, 1), value: 17900}, + { date: new Date(2014, 2), value: 1800}, + { date: new Date(2014, 3), value: 10400}, + { date: new Date(2014, 4), value: 25500}, + { date: new Date(2014, 5), value: 2100}, + { date: new Date(2014, 6), value: 6500}, + { date: new Date(2014, 7), value: 1100}, + { date: new Date(2014, 8), value: 17200}, + { date: new Date(2014, 9), value: 26900}, + { date: new Date(2014, 10), value: 14100}, + { date: new Date(2014, 11), value: 35300}, + { date: new Date(2015, 0), value: 54800}, + { date: new Date(2015, 1), value: 29800}, + { date: new Date(2015, 2), value: 26700}, + { date: new Date(2015, 3), value: 41100}, + { date: new Date(2015, 4), value: 46200}, + { date: new Date(2015, 5), value: 4700}, + { date: new Date(2015, 6), value: 44500}, + { date: new Date(2015, 7), value: 4700} ]; var id = $element[0].getAttribute('id'); var chart = AmCharts.makeChart(id, { - "type": "serial", - "theme": "blur", - "marginTop": 0, - "marginRight": 15, - "dataProvider": chartData, - "valueAxes": [ + type: "serial", + theme: "blur", + marginTop: 0, + marginRight: 15, + dataProvider: chartData, + valueAxes: [ { - "gridAlpha": 0 + gridAlpha: 0 } ], - "graphs": [ + graphs: [ { - "id": "g1", - "bullet": "round", - "bulletSize": 8, - "useLineColorForBulletBorder": true, - "lineColor": colorSuccess, - "lineThickness": 1, - "negativeLineColor": colorDanger, - "type": "smoothedLine", - "valueField": "value", - "fillAlphas": 0.3, - "fillColorsField": "lineColor" + id: "g1", + bullet: "round", + bulletSize: 8, + useLineColorForBulletBorder: true, + lineColor: colorSuccess, + lineThickness: 1, + negativeLineColor: colorDanger, + type: "smoothedLine", + valueField: "value", + fillAlphas: 0.3, + fillColorsField: "lineColor" } ], - "chartScrollbar": { - "graph": "g1", - "gridAlpha": 0, - "color": "#888888", - "scrollbarHeight": 55, - "backgroundAlpha": 0, - "selectedBackgroundAlpha": 0.1, - "selectedBackgroundColor": "#ffffff", - "graphFillAlpha": 0, - "autoGridCount": true, - "selectedGraphFillAlpha": 0, - "graphLineAlpha": 0.2, - "graphLineColor": "#c2c2c2", - "selectedGraphLineColor": "#888888", - "selectedGraphLineAlpha": 1 + chartScrollbar: { + graph: "g1", + gridAlpha: 0, + color: "#888888", + scrollbarHeight: 55, + backgroundAlpha: 0, + selectedBackgroundAlpha: 0.1, + selectedBackgroundColor: "#ffffff", + graphFillAlpha: 0, + autoGridCount: true, + selectedGraphFillAlpha: 0, + graphLineAlpha: 0.2, + graphLineColor: "#c2c2c2", + selectedGraphLineColor: "#888888", + selectedGraphLineAlpha: 1 }, - "chartCursor": { - "categoryBalloonDateFormat": "MM YYYY", - "categoryBalloonColor": "#4285F4", - "categoryBalloonAlpha": 0.7, - "cursorAlpha": 0, - "valueLineEnabled": true, - "valueLineBalloonEnabled": true, - "valueLineAlpha": 0.5 + chartCursor: { + categoryBalloonDateFormat: "MM YYYY", + categoryBalloonColor: "#4285F4", + categoryBalloonAlpha: 0.7, + cursorAlpha: 0, + valueLineEnabled: true, + valueLineBalloonEnabled: true, + valueLineAlpha: 0.5 }, - "dataDateFormat": "MM YYYY", - "categoryField": "date", - "categoryAxis": { - "parseDates": true, - "gridAlpha": 0 + dataDateFormat: "MM YYYY", + categoryField: "date", + categoryAxis: { + parseDates: true, + gridAlpha: 0 }, - "export": { - "enabled": true + export: { + enabled: true }, - "creditsPosition": "bottom-right", - "zoomOutButton": { + creditsPosition: "bottom-right", + zoomOutButton: { backgroundColor: '#fff', backgroundAlpha: 0 }, - "zoomOutText": "", - "pathToImages": '/release/img/' + zoomOutText: "", + pathToImages: "release/img/" }); function zoomChart() { diff --git a/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js b/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js index f1102af2f..59ad221e2 100644 --- a/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js +++ b/src/app/pages/dashboard/widgets/amChartMap/amChartMap.js @@ -254,10 +254,10 @@ app.controller('amMapCtrl', ['$scope', '$timeout', '$element', function ($scope, } ] }, - "export": { - "enabled": true + export: { + enabled: true }, - "creditsPosition": "bottom-right", - "pathToImages": '/release/img/' + creditsPosition: "bottom-right", + pathToImages: "release/img/" }); }]); \ No newline at end of file diff --git a/src/app/pages/dashboard/widgets/timeline/timeline.html b/src/app/pages/dashboard/widgets/timeline/timeline.html index 487cda694..841dd02d0 100644 --- a/src/app/pages/dashboard/widgets/timeline/timeline.html +++ b/src/app/pages/dashboard/widgets/timeline/timeline.html @@ -1,7 +1,7 @@
- Picture + Picture
@@ -15,7 +15,7 @@
Title of section 1
- Movie + Movie
@@ -29,7 +29,7 @@
Title of section 2
- Location + Location
diff --git a/src/app/pages/icons/icons.js b/src/app/pages/icons/icons.js index e16c1fa41..5cb7bcdc1 100644 --- a/src/app/pages/icons/icons.js +++ b/src/app/pages/icons/icons.js @@ -39,4 +39,210 @@ angular.module('BlurAdmin.iconsPage', ['ngRoute']) ] } ]; + + $scope.icons = { + kameleonIcons: [ + { + name: "Beach", + img: "Beach.svg" + }, + { + name: "Bus", + img: "Bus.svg" + }, + { + name: "Cheese", + img: "Cheese.svg" + }, + { + name: "Desert", + img: "Desert.svg" + }, + { + name: "Images", + img: "Images.svg" + }, + { + name: "Magician", + img: "Magician.svg" + }, + { + name: "Makeup", + img: "Makeup.svg" + }, + { + name: "Programming", + img: "Programming.svg" + }, + { + name: "Shop", + img: "Shop.svg" + }, + { + name: "Surfer", + img: "Surfer.svg" + }, + { + name: "Phone Booth", + img: "Phone-Booth.svg" + }, + { + name: "Ninja", + img: "Ninja.svg" + }, + { + name: "Apartment", + img: "Apartment.svg" + }, + { + name: "Batman", + img: "Batman.svg" + }, + { + name: "Medal", + img: "Medal-2.svg" + }, + { + name: "Money", + img: "Money-Increase.svg" + }, + { + name: "Street View", + img: "Street-View.svg" + }, + { + name: "Student", + img: "Student-3.svg" + }, + { + name: "Bell", + img: "Bell.svg" + }, + { + name: "Woman", + img: "Boss-5.svg" + }, + { + name: "Euro", + img: "Euro-Coin.svg" + }, + { + name: "Chessboard", + img: "Chessboard.svg" + }, + { + name: "Burglar", + img: "Burglar.svg" + }, + { + name: "Dna", + img: "Dna.svg" + }, + { + name: "Clipboard Plan", + img: "Clipboard-Plan.svg" + }, + { + name: "Boss", + img: "Boss-3.svg" + }, + { + name: "Key", + img: "Key.svg" + }, + { + name: "Surgeon", + img: "Surgeon.svg" + }, + { + name: "Hacker", + img: "Hacker.svg" + }, + { + name: "Santa", + img: "Santa.svg" + } + ], + kameleonRoundedIcons: [ + { + color: "success", + img: "Apartment.svg", + name: "Apartment" + }, + { + color: "warning", + img: "Bus.svg", + name: "Bus" + }, + { + color: "primary", + img: "Checklist.svg", + name: "Checklist" + }, + { + color: "warning", + img: "Desert.svg", + name: "Desert" + }, + { + color: "danger", + img: "Laptop-Signal.svg", + name: "Laptop Signal" + }, + { + color: "info", + img: "Love-Letter.svg", + name: "Love Letter" + }, + { + color: "success", + img: "Makeup.svg", + name: "Makeup" + }, + { + color: "primary", + img: "Santa.svg", + name: "Santa" + }, + { + color: "success", + img: "Surfer.svg", + name: "Surfer" + }, + { + color: "info", + img: "Vector.svg", + name: "Vector" + }, + { + color: "warning", + img: "Money-Increase.svg", + name: "Money Increase" + }, + { + color: "info", + img: "Alien.svg", + name: "Alien" + }, + { + color: "danger", + img: "Online-Shopping.svg", + name: "Online Shopping" + }, + { + color: "warning", + img: "Euro-Coin.svg", + name: "Euro" + }, + { + color: "info", + img: "Boss-3.svg", + name: "Boss" + } + ], + ionicons: ["ion-ionic", "ion-arrow-right-b", "ion-arrow-down-b", "ion-arrow-left-b", "ion-arrow-up-c", "ion-arrow-right-c", "ion-arrow-down-c", "ion-arrow-left-c", "ion-arrow-return-right", "ion-arrow-return-left", "ion-arrow-swap", "ion-arrow-shrink", "ion-arrow-expand", "ion-arrow-move", "ion-arrow-resize", "ion-chevron-up", "ion-chevron-right", "ion-chevron-down", "ion-chevron-left", "ion-navicon-round", "ion-navicon", "ion-drag", "ion-log-in", "ion-log-out", "ion-checkmark-round", "ion-checkmark", "ion-checkmark-circled", "ion-close-round", "ion-plus-round", "ion-minus-round", "ion-information", "ion-help", "ion-backspace-outline", "ion-help-buoy", "ion-asterisk", "ion-alert", "ion-alert-circled", "ion-refresh", "ion-loop", "ion-shuffle", "ion-home", "ion-search", "ion-flag", "ion-star", "ion-heart", "ion-heart-broken", "ion-gear-a", "ion-gear-b", "ion-toggle-filled", "ion-toggle", "ion-settings", "ion-wrench", "ion-hammer", "ion-edit", "ion-trash-a", "ion-trash-b", "ion-document", "ion-document-text", "ion-clipboard", "ion-scissors", "ion-funnel", "ion-bookmark", "ion-email", "ion-email-unread", "ion-folder", "ion-filing", "ion-archive", "ion-reply", "ion-reply-all", "ion-forward"], + fontAwesomeIcons: ["fa fa-adjust", "fa fa-anchor", "fa fa-archive", "fa fa-area-chart", "fa fa-arrows", "fa fa-arrows-h", "fa fa-arrows-v", "fa fa-asterisk", "fa fa-at", "fa fa-automobile", "fa fa-ban", "fa fa-bank", "fa fa-bar-chart", "fa fa-bar-chart-o", "fa fa-barcode", "fa fa-bars", "fa fa-bed", "fa fa-beer", "fa fa-bell", "fa fa-bell-o", "fa fa-bell-slash", "fa fa-bell-slash-o", "fa fa-bicycle", "fa fa-binoculars", "fa fa-birthday-cake", "fa fa-bolt", "fa fa-bomb", "fa fa-book", "fa fa-bookmark", "fa fa-bookmark-o", "fa fa-briefcase", "fa fa-bug", "fa fa-building", "fa fa-building-o", "fa fa-bullhorn"], + socicon: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", ",", ";", ":", "+", "@", "=", "-", "^", "¨", "$", "*", "&", "(", "#", ".", "_", "]", ")", "£", "'", "\"", "}", "{"] + } + }]); \ No newline at end of file diff --git a/src/app/pages/icons/widgets/fontAwesomeIcons.html b/src/app/pages/icons/widgets/fontAwesomeIcons.html index d07f9a4ae..0661bbd55 100644 --- a/src/app/pages/icons/widgets/fontAwesomeIcons.html +++ b/src/app/pages/icons/widgets/fontAwesomeIcons.html @@ -1,38 +1,4 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
See all Font Awesome icons \ No newline at end of file diff --git a/src/app/pages/icons/widgets/ionicons.html b/src/app/pages/icons/widgets/ionicons.html index f3132b5f2..38b8399c6 100644 --- a/src/app/pages/icons/widgets/ionicons.html +++ b/src/app/pages/icons/widgets/ionicons.html @@ -1,73 +1,4 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
See all ionicons icons \ No newline at end of file diff --git a/src/app/pages/icons/widgets/kameleon/Alien.svg b/src/app/pages/icons/widgets/kameleon-img/Alien.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Alien.svg rename to src/app/pages/icons/widgets/kameleon-img/Alien.svg diff --git a/src/app/pages/icons/widgets/kameleon/Analytics.svg b/src/app/pages/icons/widgets/kameleon-img/Analytics.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Analytics.svg rename to src/app/pages/icons/widgets/kameleon-img/Analytics.svg diff --git a/src/app/pages/icons/widgets/kameleon/Apartment.svg b/src/app/pages/icons/widgets/kameleon-img/Apartment.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Apartment.svg rename to src/app/pages/icons/widgets/kameleon-img/Apartment.svg diff --git a/src/app/pages/icons/widgets/kameleon/Batman.svg b/src/app/pages/icons/widgets/kameleon-img/Batman.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Batman.svg rename to src/app/pages/icons/widgets/kameleon-img/Batman.svg diff --git a/src/app/pages/icons/widgets/kameleon/Beach.svg b/src/app/pages/icons/widgets/kameleon-img/Beach.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Beach.svg rename to src/app/pages/icons/widgets/kameleon-img/Beach.svg diff --git a/src/app/pages/icons/widgets/kameleon/Bell.svg b/src/app/pages/icons/widgets/kameleon-img/Bell.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Bell.svg rename to src/app/pages/icons/widgets/kameleon-img/Bell.svg diff --git a/src/app/pages/icons/widgets/kameleon/Bonsai.svg b/src/app/pages/icons/widgets/kameleon-img/Bonsai.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Bonsai.svg rename to src/app/pages/icons/widgets/kameleon-img/Bonsai.svg diff --git a/src/app/pages/icons/widgets/kameleon/Boss-3.svg b/src/app/pages/icons/widgets/kameleon-img/Boss-3.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Boss-3.svg rename to src/app/pages/icons/widgets/kameleon-img/Boss-3.svg diff --git a/src/app/pages/icons/widgets/kameleon/Boss-5.svg b/src/app/pages/icons/widgets/kameleon-img/Boss-5.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Boss-5.svg rename to src/app/pages/icons/widgets/kameleon-img/Boss-5.svg diff --git a/src/app/pages/icons/widgets/kameleon/Burglar.svg b/src/app/pages/icons/widgets/kameleon-img/Burglar.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Burglar.svg rename to src/app/pages/icons/widgets/kameleon-img/Burglar.svg diff --git a/src/app/pages/icons/widgets/kameleon/Bus.svg b/src/app/pages/icons/widgets/kameleon-img/Bus.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Bus.svg rename to src/app/pages/icons/widgets/kameleon-img/Bus.svg diff --git a/src/app/pages/icons/widgets/kameleon/Candy.svg b/src/app/pages/icons/widgets/kameleon-img/Candy.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Candy.svg rename to src/app/pages/icons/widgets/kameleon-img/Candy.svg diff --git a/src/app/pages/icons/widgets/kameleon/Checklist.svg b/src/app/pages/icons/widgets/kameleon-img/Checklist.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Checklist.svg rename to src/app/pages/icons/widgets/kameleon-img/Checklist.svg diff --git a/src/app/pages/icons/widgets/kameleon/Cheese.svg b/src/app/pages/icons/widgets/kameleon-img/Cheese.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Cheese.svg rename to src/app/pages/icons/widgets/kameleon-img/Cheese.svg diff --git a/src/app/pages/icons/widgets/kameleon/Chessboard.svg b/src/app/pages/icons/widgets/kameleon-img/Chessboard.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Chessboard.svg rename to src/app/pages/icons/widgets/kameleon-img/Chessboard.svg diff --git a/src/app/pages/icons/widgets/kameleon/Clipboard-Plan.svg b/src/app/pages/icons/widgets/kameleon-img/Clipboard-Plan.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Clipboard-Plan.svg rename to src/app/pages/icons/widgets/kameleon-img/Clipboard-Plan.svg diff --git a/src/app/pages/icons/widgets/kameleon/Desert.svg b/src/app/pages/icons/widgets/kameleon-img/Desert.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Desert.svg rename to src/app/pages/icons/widgets/kameleon-img/Desert.svg diff --git a/src/app/pages/icons/widgets/kameleon/Dna.svg b/src/app/pages/icons/widgets/kameleon-img/Dna.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Dna.svg rename to src/app/pages/icons/widgets/kameleon-img/Dna.svg diff --git a/src/app/pages/icons/widgets/kameleon/Euro-Coin.svg b/src/app/pages/icons/widgets/kameleon-img/Euro-Coin.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Euro-Coin.svg rename to src/app/pages/icons/widgets/kameleon-img/Euro-Coin.svg diff --git a/src/app/pages/icons/widgets/kameleon/Food-Dome.svg b/src/app/pages/icons/widgets/kameleon-img/Food-Dome.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Food-Dome.svg rename to src/app/pages/icons/widgets/kameleon-img/Food-Dome.svg diff --git a/src/app/pages/icons/widgets/kameleon/Hacker.svg b/src/app/pages/icons/widgets/kameleon-img/Hacker.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Hacker.svg rename to src/app/pages/icons/widgets/kameleon-img/Hacker.svg diff --git a/src/app/pages/icons/widgets/kameleon/Images.svg b/src/app/pages/icons/widgets/kameleon-img/Images.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Images.svg rename to src/app/pages/icons/widgets/kameleon-img/Images.svg diff --git a/src/app/pages/icons/widgets/kameleon/Key.svg b/src/app/pages/icons/widgets/kameleon-img/Key.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Key.svg rename to src/app/pages/icons/widgets/kameleon-img/Key.svg diff --git a/src/app/pages/icons/widgets/kameleon/Laptop-Signal.svg b/src/app/pages/icons/widgets/kameleon-img/Laptop-Signal.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Laptop-Signal.svg rename to src/app/pages/icons/widgets/kameleon-img/Laptop-Signal.svg diff --git a/src/app/pages/icons/widgets/kameleon/Locked-Cloud.svg b/src/app/pages/icons/widgets/kameleon-img/Locked-Cloud.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Locked-Cloud.svg rename to src/app/pages/icons/widgets/kameleon-img/Locked-Cloud.svg diff --git a/src/app/pages/icons/widgets/kameleon/Love-Letter.svg b/src/app/pages/icons/widgets/kameleon-img/Love-Letter.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Love-Letter.svg rename to src/app/pages/icons/widgets/kameleon-img/Love-Letter.svg diff --git a/src/app/pages/icons/widgets/kameleon/Magician.svg b/src/app/pages/icons/widgets/kameleon-img/Magician.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Magician.svg rename to src/app/pages/icons/widgets/kameleon-img/Magician.svg diff --git a/src/app/pages/icons/widgets/kameleon/Makeup.svg b/src/app/pages/icons/widgets/kameleon-img/Makeup.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Makeup.svg rename to src/app/pages/icons/widgets/kameleon-img/Makeup.svg diff --git a/src/app/pages/icons/widgets/kameleon/Medal-2.svg b/src/app/pages/icons/widgets/kameleon-img/Medal-2.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Medal-2.svg rename to src/app/pages/icons/widgets/kameleon-img/Medal-2.svg diff --git a/src/app/pages/icons/widgets/kameleon/Microscope.svg b/src/app/pages/icons/widgets/kameleon-img/Microscope.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Microscope.svg rename to src/app/pages/icons/widgets/kameleon-img/Microscope.svg diff --git a/src/app/pages/icons/widgets/kameleon/Mind-Map-Paper.svg b/src/app/pages/icons/widgets/kameleon-img/Mind-Map-Paper.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Mind-Map-Paper.svg rename to src/app/pages/icons/widgets/kameleon-img/Mind-Map-Paper.svg diff --git a/src/app/pages/icons/widgets/kameleon/Money-Increase.svg b/src/app/pages/icons/widgets/kameleon-img/Money-Increase.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Money-Increase.svg rename to src/app/pages/icons/widgets/kameleon-img/Money-Increase.svg diff --git a/src/app/pages/icons/widgets/kameleon/Music-Equalizer.svg b/src/app/pages/icons/widgets/kameleon-img/Music-Equalizer.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Music-Equalizer.svg rename to src/app/pages/icons/widgets/kameleon-img/Music-Equalizer.svg diff --git a/src/app/pages/icons/widgets/kameleon/Ninja.svg b/src/app/pages/icons/widgets/kameleon-img/Ninja.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Ninja.svg rename to src/app/pages/icons/widgets/kameleon-img/Ninja.svg diff --git a/src/app/pages/icons/widgets/kameleon/Online-Shopping.svg b/src/app/pages/icons/widgets/kameleon-img/Online-Shopping.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Online-Shopping.svg rename to src/app/pages/icons/widgets/kameleon-img/Online-Shopping.svg diff --git a/src/app/pages/icons/widgets/kameleon/Pantone.svg b/src/app/pages/icons/widgets/kameleon-img/Pantone.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Pantone.svg rename to src/app/pages/icons/widgets/kameleon-img/Pantone.svg diff --git a/src/app/pages/icons/widgets/kameleon/Party-Poppers.svg b/src/app/pages/icons/widgets/kameleon-img/Party-Poppers.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Party-Poppers.svg rename to src/app/pages/icons/widgets/kameleon-img/Party-Poppers.svg diff --git a/src/app/pages/icons/widgets/kameleon/Phone-Booth.svg b/src/app/pages/icons/widgets/kameleon-img/Phone-Booth.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Phone-Booth.svg rename to src/app/pages/icons/widgets/kameleon-img/Phone-Booth.svg diff --git a/src/app/pages/icons/widgets/kameleon/Programming.svg b/src/app/pages/icons/widgets/kameleon-img/Programming.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Programming.svg rename to src/app/pages/icons/widgets/kameleon-img/Programming.svg diff --git a/src/app/pages/icons/widgets/kameleon/Santa.svg b/src/app/pages/icons/widgets/kameleon-img/Santa.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Santa.svg rename to src/app/pages/icons/widgets/kameleon-img/Santa.svg diff --git a/src/app/pages/icons/widgets/kameleon/Shop.svg b/src/app/pages/icons/widgets/kameleon-img/Shop.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Shop.svg rename to src/app/pages/icons/widgets/kameleon-img/Shop.svg diff --git a/src/app/pages/icons/widgets/kameleon/Street-View.svg b/src/app/pages/icons/widgets/kameleon-img/Street-View.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Street-View.svg rename to src/app/pages/icons/widgets/kameleon-img/Street-View.svg diff --git a/src/app/pages/icons/widgets/kameleon/Student-3.svg b/src/app/pages/icons/widgets/kameleon-img/Student-3.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Student-3.svg rename to src/app/pages/icons/widgets/kameleon-img/Student-3.svg diff --git a/src/app/pages/icons/widgets/kameleon/Surfer.svg b/src/app/pages/icons/widgets/kameleon-img/Surfer.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Surfer.svg rename to src/app/pages/icons/widgets/kameleon-img/Surfer.svg diff --git a/src/app/pages/icons/widgets/kameleon/Surgeon.svg b/src/app/pages/icons/widgets/kameleon-img/Surgeon.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Surgeon.svg rename to src/app/pages/icons/widgets/kameleon-img/Surgeon.svg diff --git a/src/app/pages/icons/widgets/kameleon/Tower.svg b/src/app/pages/icons/widgets/kameleon-img/Tower.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Tower.svg rename to src/app/pages/icons/widgets/kameleon-img/Tower.svg diff --git a/src/app/pages/icons/widgets/kameleon/Vector.svg b/src/app/pages/icons/widgets/kameleon-img/Vector.svg similarity index 100% rename from src/app/pages/icons/widgets/kameleon/Vector.svg rename to src/app/pages/icons/widgets/kameleon-img/Vector.svg diff --git a/src/app/pages/icons/widgets/kameleon.html b/src/app/pages/icons/widgets/kameleon.html index 8e27ffc62..706d33eb4 100644 --- a/src/app/pages/icons/widgets/kameleon.html +++ b/src/app/pages/icons/widgets/kameleon.html @@ -1,93 +1,6 @@ -
-
-
Beach
-
-
-
Bus
-
-
-
Cheese
-
-
-
Desert
-
-
-
Images
-
-
-
Magician
-
-
-
Makeup
-
-
-
Programming
-
-
-
Shop
-
-
-
Surfer
-
-
-
Phone Booth
-
-
-
Ninja
-
-
-
Apartment
-
-
-
Batman
-
-
-
Medal
-
-
-
Money
-
-
-
Street View
-
-
-
Student
-
-
-
Bell
-
-
-
Woman
-
-
-
Euro
-
-
-
Chessboard
-
-
-
Burglar
-
-
-
Dna
-
-
-
Clipboard Plan
-
-
-
Boss
-
-
-
Key
-
-
-
Surgeon
-
-
-
Hacker
-
-
-
Santa
+
+
+
{{icon.name}}
diff --git a/src/app/pages/icons/widgets/kameleonRounded.html b/src/app/pages/icons/widgets/kameleonRounded.html index 8f2313edb..b57ca183f 100644 --- a/src/app/pages/icons/widgets/kameleonRounded.html +++ b/src/app/pages/icons/widgets/kameleonRounded.html @@ -1,51 +1,6 @@ -
-
-
Apartment
-
-
-
Bus
-
-
-
Checklist
-
-
-
Desert
-
-
-
Laptop Signal -
-
-
-
Love Letter
-
-
-
Makeup
-
-
-
Santa
-
-
-
Surfer
-
-
-
Vector
-
-
-
Money Increase
-
-
-
Alien
-
-
-
Online Shopping
-
-
-
Euro
-
-
-
Boss
+
+
+
{{ icon.name }}
diff --git a/src/app/pages/icons/widgets/socicon.html b/src/app/pages/icons/widgets/socicon.html index 8b97e5415..4ca0ab798 100644 --- a/src/app/pages/icons/widgets/socicon.html +++ b/src/app/pages/icons/widgets/socicon.html @@ -1,87 +1,4 @@ -
-
a
-
b
-
c
-
d
-
e
-
f
-
g
-
h
-
i
-
j
-
k
-
l
-
m
-
n
-
o
-
p
-
q
-
r
-
s
-
t
-
u
-
v
-
w
-
x
-
y
-
A
-
B
-
C
-
D
-
E
-
F
-
G
-
H
-
I
-
J
-
K
-
L
-
M
-
N
-
O
-
P
-
Q
-
R
-
S
-
T
-
U
-
V
-
W
-
X
-
Y
-
Z
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
,
-
;
-
:
-
+
-
@
-
=
-
-
-
^
-
¨
-
$
-
*
-
&
-
(
-
#
-
.
-
_
-
]
-
)
-
£
-
'
-
"
-
}
-
{
+
+
{{ icon }}
See all Socicon icons \ No newline at end of file diff --git a/src/app/pages/maps/widgets/leaflet/_leaflet.scss b/src/app/pages/maps/widgets/leaflet/_leaflet.scss index 111a0a50e..a27422d0f 100644 --- a/src/app/pages/maps/widgets/leaflet/_leaflet.scss +++ b/src/app/pages/maps/widgets/leaflet/_leaflet.scss @@ -296,13 +296,13 @@ } .leaflet-control-layers-toggle { - background-image: url(/src/release/img/layers.png); + background-image: url(../release/img/layers.png); width: 36px; height: 36px; } .leaflet-retina .leaflet-control-layers-toggle { - background-image: url(/src/release/img/layers-2x.png); + background-image: url(../release/img/layers-2x.png); background-size: 26px 26px; } diff --git a/src/app/pages/maps/widgets/leaflet/leaflet.js b/src/app/pages/maps/widgets/leaflet/leaflet.js index d3cf01e6d..ad969bccc 100644 --- a/src/app/pages/maps/widgets/leaflet/leaflet.js +++ b/src/app/pages/maps/widgets/leaflet/leaflet.js @@ -3,7 +3,7 @@ app.controller('leafletCtrl', ["$timeout", function ($timeout) { var map = L.map('leaflet-map').setView([51.505, -0.09], 13); - L.Icon.Default.imagePath = '/release/img'; + L.Icon.Default.imagePath = 'release/img'; L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' diff --git a/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js b/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js index dfa95986b..e727da000 100644 --- a/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js +++ b/src/app/pages/maps/widgets/map-bubbles/map-bubbles.js @@ -444,7 +444,7 @@ app.controller('mapBubblesCtrl', [function () { unlistedAreasAlpha: 0.1 }; map.imagesSettings.balloonText = "[[title]]: [[value]]"; - map.pathToImages = "/release/img/"; + map.pathToImages = "release/img/"; var dataProvider = { mapVar: AmCharts.maps.worldLow, diff --git a/src/app/pages/maps/widgets/map-lines/map-lines.js b/src/app/pages/maps/widgets/map-lines/map-lines.js index 3c3810604..8e45a909a 100644 --- a/src/app/pages/maps/widgets/map-lines/map-lines.js +++ b/src/app/pages/maps/widgets/map-lines/map-lines.js @@ -260,6 +260,6 @@ app.controller('mapLinesCtrl', [function () { "export": { "enabled": true }, - "pathToImages": '/release/img/' + "pathToImages": 'release/img/' } ); }]); \ No newline at end of file diff --git a/src/app/pages/profile/profile.js b/src/app/pages/profile/profile.js index bff1cff2e..3c92ea259 100644 --- a/src/app/pages/profile/profile.js +++ b/src/app/pages/profile/profile.js @@ -12,7 +12,7 @@ angular.module('BlurAdmin.profilePage', ['ngRoute']) $scope.picture = "release/img/photo.png"; $scope.removePicture = function () { - $scope.picture = "/release/img/no-photo.png"; + $scope.picture = "release/img/no-photo.png"; $scope.noPicture = true; }; diff --git a/src/app/pages/tables/widgets/basicTable.html b/src/app/pages/tables/widgets/basicTable.html index dd2655a08..035efd4cc 100644 --- a/src/app/pages/tables/widgets/basicTable.html +++ b/src/app/pages/tables/widgets/basicTable.html @@ -22,7 +22,7 @@ - + Google Chrome 10,392 @@ -40,7 +40,7 @@ - + Mozilla Firefox 7,873 @@ -58,7 +58,7 @@ - + Internet Explorer 5,890 @@ -76,7 +76,7 @@ - + Safari 4,001 @@ -94,7 +94,7 @@ - + Opera 1,833 diff --git a/src/app/pages/tables/widgets/borderedTable.html b/src/app/pages/tables/widgets/borderedTable.html index 75e37cc91..58112c3d4 100644 --- a/src/app/pages/tables/widgets/borderedTable.html +++ b/src/app/pages/tables/widgets/borderedTable.html @@ -11,35 +11,35 @@ - + Google Chrome 10,392 4,214 45% - + Mozilla Firefox 7,873 3,031 28% - + Internet Explorer 5,890 2,102 17% - + Safari 4,001 1,001 14% - + Opera 1,833 83 diff --git a/src/app/pages/tables/widgets/hoverRows.html b/src/app/pages/tables/widgets/hoverRows.html index 6d07259cf..bd153ba7b 100644 --- a/src/app/pages/tables/widgets/hoverRows.html +++ b/src/app/pages/tables/widgets/hoverRows.html @@ -14,7 +14,7 @@ - + Google Chrome 10,392 @@ -24,7 +24,7 @@ - + Mozilla Firefox 7,873 @@ -34,7 +34,7 @@ - + Internet Explorer 5,890 @@ -44,7 +44,7 @@ - + Safari 4,001 @@ -54,7 +54,7 @@ - + Opera 1,833 diff --git a/src/app/pages/typography/typography.html b/src/app/pages/typography/typography.html index 6575e3d99..0438c287e 100644 --- a/src/app/pages/typography/typography.html +++ b/src/app/pages/typography/typography.html @@ -66,7 +66,7 @@

Columns

-
+

Vel elit, eros elementum, id lacinia, duis non ut ut tortor blandit. Mauris dapibus magna rutrum. Ornare neque suspendisse phasellus wisi, quam cras pede rutrum suspendisse, Columns arcu nulla.

-
+

Et suspendisse, adipiscing fringilla ornare sit ligula sed, vel nam. Interdum et justo nulla, fermentum lobortis purus ut eu, duis nibh dolor massa tristique elementum, nibh iste potenti risus fusce aliquet fusce, ullamcorper debitis primis arcu tellus vestibulum ac.

@@ -97,19 +97,19 @@

Third column heading example

-
+

Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna maecenas

Lean more
-
+

Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat in velit

Lean more
-
+

Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam

Lean more
@@ -153,7 +153,7 @@
Ordered Lists: