From ab26929ab835fab9e596bc075e5c6044cf56e58f Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Thu, 17 Dec 2015 14:31:11 +0300 Subject: [PATCH] refactor(images): images mostly fixed --- bower.json | 3 + gulp/watch.js | 4 +- .../amCharts/areaChart/AreaChartCtrl.js | 4 +- .../charts/amCharts/barChart/BarChartCtrl.js | 4 +- .../amCharts/funnelChart/FunnelChartCtrl.js | 4 +- .../amCharts/lineChart/LineChartCtrl.js | 4 +- .../charts/amCharts/pieChart/PieChartCtrl.js | 4 +- .../pages/dashboard/blurFeed/BlurFeedCtrl.js | 6 +- .../pages/dashboard/blurFeed/blurFeed.html | 6 +- .../DashboardLineChartCtrl.js | 4 +- .../dashboardMap/DashboardMapCtrl.js | 4 +- .../dashboard/popularApp/popularApp.html | 2 +- src/app/pages/icons/IconsPageCtrl.js | 92 +++++++++--------- src/app/pages/icons/widgets/kameleon.html | 2 +- .../pages/icons/widgets/kameleonRounded.html | 2 +- .../maps/map-bubbles/MapBubblePageCtrl.js | 4 +- .../pages/maps/map-lines/MapLinesPageCtrl.js | 4 +- src/app/pages/profile/ProfilePageCtrl.js | 6 +- src/app/pages/tables/TablesPageCtrl.js | 10 +- .../pages/tables/widgets/borderedTable.html | 2 +- src/app/pages/tables/widgets/hoverRows.html | 2 +- src/app/pages/typography/typography.html | 12 +-- src/app/theme/components/pageTop/pageTop.html | 2 +- src/app/theme/filters/image/appImage.js | 18 ++++ src/app/theme/filters/image/kameleonImg.js | 18 ++++ src/app/theme/filters/image/profilePicture.js | 19 ++++ src/app/theme/theme.constants.js | 9 ++ .../{pictures => img/app/browsers}/chrome.svg | 0 .../app/browsers}/firefox.svg | 0 .../{pictures => img/app/browsers}/ie.svg | 0 .../{pictures => img/app/browsers}/opera.svg | 0 .../{pictures => img/app/browsers}/safari.svg | 0 .../img/{ => app/feed}/my-little-kitten.png | Bin .../img/{ => app/feed}/new-york-location.png | Bin .../{ => app/feed}/vader-and-me-preview.png | Bin src/assets/img/{ => app}/my-app-logo.png | Bin .../{pictures => img/app/profile}/Andrey.png | Bin .../{pictures => img/app/profile}/Kostya.png | Bin .../{pictures => img/app/profile}/Nasta.png | Bin .../{pictures => img/app/profile}/Nick.png | Bin .../{pictures => img/app/profile}/Vlad.png | Bin .../app/typography}/banner.png | Bin .../app/typography}/typo01.png | Bin .../app/typography}/typo03.png | Bin .../app/typography}/typo04.png | Bin .../app/typography}/typo05.png | Bin .../app/typography}/typo06.png | Bin .../app/typography}/typo07.png | Bin .../img/{ => theme/icon/feed}/feed-image.svg | 0 .../{ => theme/icon/feed}/feed-location.svg | 0 .../img/{ => theme/icon/feed}/feed-video.svg | 0 .../img/theme/icon/kameleon}/Alien.svg | 0 .../img/theme/icon/kameleon}/Analytics.svg | 0 .../img/theme/icon/kameleon}/Apartment.svg | 0 .../img/theme/icon/kameleon}/Batman.svg | 0 .../img/theme/icon/kameleon}/Beach.svg | 0 .../img/theme/icon/kameleon}/Bell.svg | 0 .../img/theme/icon/kameleon}/Bonsai.svg | 0 .../img/theme/icon/kameleon}/Boss-3.svg | 0 .../img/theme/icon/kameleon}/Boss-5.svg | 0 .../img/theme/icon/kameleon}/Burglar.svg | 0 .../img/theme/icon/kameleon}/Bus.svg | 0 .../img/theme/icon/kameleon}/Candy.svg | 0 .../img/theme/icon/kameleon}/Checklist.svg | 0 .../img/theme/icon/kameleon}/Cheese.svg | 0 .../img/theme/icon/kameleon}/Chessboard.svg | 0 .../theme/icon/kameleon}/Clipboard-Plan.svg | 0 .../img/theme/icon/kameleon}/Desert.svg | 0 .../img/theme/icon/kameleon}/Dna.svg | 0 .../img/theme/icon/kameleon}/Euro-Coin.svg | 0 .../img/theme/icon/kameleon}/Food-Dome.svg | 0 .../img/theme/icon/kameleon}/Hacker.svg | 0 .../img/theme/icon/kameleon}/Images.svg | 0 .../img/theme/icon/kameleon}/Key.svg | 0 .../theme/icon/kameleon}/Laptop-Signal.svg | 0 .../img/theme/icon/kameleon}/Locked-Cloud.svg | 0 .../img/theme/icon/kameleon}/Love-Letter.svg | 0 .../img/theme/icon/kameleon}/Magician.svg | 0 .../img/theme/icon/kameleon}/Makeup.svg | 0 .../img/theme/icon/kameleon}/Medal-2.svg | 0 .../img/theme/icon/kameleon}/Microscope.svg | 0 .../theme/icon/kameleon}/Mind-Map-Paper.svg | 0 .../theme/icon/kameleon}/Money-Increase.svg | 0 .../theme/icon/kameleon}/Music-Equalizer.svg | 0 .../img/theme/icon/kameleon}/Ninja.svg | 0 .../theme/icon/kameleon}/Online-Shopping.svg | 0 .../img/theme/icon/kameleon}/Pantone.svg | 0 .../theme/icon/kameleon}/Party-Poppers.svg | 0 .../img/theme/icon/kameleon}/Phone-Booth.svg | 0 .../img/theme/icon/kameleon}/Programming.svg | 0 .../img/theme/icon/kameleon}/Santa.svg | 0 .../img/theme/icon/kameleon}/Shop.svg | 0 .../img/theme/icon/kameleon}/Street-View.svg | 0 .../img/theme/icon/kameleon}/Student-3.svg | 0 .../img/theme/icon/kameleon}/Surfer.svg | 0 .../img/theme/icon/kameleon}/Surgeon.svg | 0 .../img/theme/icon/kameleon}/Tower.svg | 0 .../img/theme/icon/kameleon}/Vector.svg | 0 .../img => assets/img/theme}/no-photo.png | Bin src/assets/img/{ => theme}/palette.png | Bin src/sass/theme/_socicon.scss | 12 +-- src/sass/theme/components/_pageTop.scss | 2 +- src/sass/theme/conf/_mixins.scss | 3 + src/sass/theme/conf/_variables.scss | 3 +- src/sass/theme/dashboard/_blurFeed.scss | 6 +- 105 files changed, 174 insertions(+), 103 deletions(-) create mode 100644 src/app/theme/filters/image/appImage.js create mode 100644 src/app/theme/filters/image/kameleonImg.js create mode 100644 src/app/theme/filters/image/profilePicture.js rename src/assets/{pictures => img/app/browsers}/chrome.svg (100%) rename src/assets/{pictures => img/app/browsers}/firefox.svg (100%) rename src/assets/{pictures => img/app/browsers}/ie.svg (100%) rename src/assets/{pictures => img/app/browsers}/opera.svg (100%) rename src/assets/{pictures => img/app/browsers}/safari.svg (100%) rename src/assets/img/{ => app/feed}/my-little-kitten.png (100%) rename src/assets/img/{ => app/feed}/new-york-location.png (100%) rename src/assets/img/{ => app/feed}/vader-and-me-preview.png (100%) rename src/assets/img/{ => app}/my-app-logo.png (100%) rename src/assets/{pictures => img/app/profile}/Andrey.png (100%) rename src/assets/{pictures => img/app/profile}/Kostya.png (100%) rename src/assets/{pictures => img/app/profile}/Nasta.png (100%) rename src/assets/{pictures => img/app/profile}/Nick.png (100%) rename src/assets/{pictures => img/app/profile}/Vlad.png (100%) rename src/assets/{pictures => img/app/typography}/banner.png (100%) rename src/assets/{pictures => img/app/typography}/typo01.png (100%) rename src/assets/{pictures => img/app/typography}/typo03.png (100%) rename src/assets/{pictures => img/app/typography}/typo04.png (100%) rename src/assets/{pictures => img/app/typography}/typo05.png (100%) rename src/assets/{pictures => img/app/typography}/typo06.png (100%) rename src/assets/{pictures => img/app/typography}/typo07.png (100%) rename src/assets/img/{ => theme/icon/feed}/feed-image.svg (100%) rename src/assets/img/{ => theme/icon/feed}/feed-location.svg (100%) rename src/assets/img/{ => theme/icon/feed}/feed-video.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Alien.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Analytics.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Apartment.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Batman.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Beach.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Bell.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Bonsai.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Boss-3.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Boss-5.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Burglar.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Bus.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Candy.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Checklist.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Cheese.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Chessboard.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Clipboard-Plan.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Desert.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Dna.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Euro-Coin.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Food-Dome.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Hacker.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Images.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Key.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Laptop-Signal.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Locked-Cloud.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Love-Letter.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Magician.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Makeup.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Medal-2.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Microscope.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Mind-Map-Paper.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Money-Increase.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Music-Equalizer.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Ninja.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Online-Shopping.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Pantone.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Party-Poppers.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Phone-Booth.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Programming.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Santa.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Shop.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Street-View.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Student-3.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Surfer.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Surgeon.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Tower.svg (100%) rename src/{app/pages/icons/widgets/kameleon-img => assets/img/theme/icon/kameleon}/Vector.svg (100%) rename src/{app/pages/profile/img => assets/img/theme}/no-photo.png (100%) rename src/assets/img/{ => theme}/palette.png (100%) diff --git a/bower.json b/bower.json index ba520ba..87ee5f5 100644 --- a/bower.json +++ b/bower.json @@ -73,6 +73,9 @@ }, "slimScroll": { "main": "./jquery.slimscroll.js" + }, + "font-awesome": { + "main": "css/font-awesome.css" } }, "devDependencies": { diff --git a/gulp/watch.js b/gulp/watch.js index f748ccb..d140558 100644 --- a/gulp/watch.js +++ b/gulp/watch.js @@ -15,8 +15,8 @@ gulp.task('watch', ['inject'], function () { gulp.watch([path.join(conf.paths.src, '/*.html'), 'bower.json'], ['inject-reload']); gulp.watch([ - path.join(conf.paths.src, '/app/**/*.css'), - path.join(conf.paths.src, '/app/**/*.scss') + path.join(conf.paths.src, '/sass/**/*.css'), + path.join(conf.paths.src, '/sass/**/*.scss') ], function(event) { if(isOnlyChange(event)) { gulp.start('styles-reload'); diff --git a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js index b273670..d946c26 100644 --- a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js +++ b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js @@ -9,7 +9,7 @@ .controller('AreaChartCtrl', AreaChartCtrl); /** @ngInject */ - function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var areaChart = AmCharts.makeChart(id, { type: 'serial', @@ -131,7 +131,7 @@ export: { enabled: true }, - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart); diff --git a/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js b/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js index beed31f..3996f23 100644 --- a/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js +++ b/src/app/pages/charts/amCharts/barChart/BarChartCtrl.js @@ -9,7 +9,7 @@ .controller('BarChartCtrl', BarChartCtrl); /** @ngInject */ - function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var barChart = AmCharts.makeChart(id, { type: 'serial', @@ -79,7 +79,7 @@ enabled: true }, creditsPosition: 'top-right', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart); diff --git a/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js b/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js index 26fcc9e..bc0099a 100644 --- a/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js +++ b/src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js @@ -9,7 +9,7 @@ .controller('FunnelChartCtrl', FunnelChartCtrl); /** @ngInject */ - function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper) { + function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var funnelChart = AmCharts.makeChart(id, { type: 'funnel', @@ -60,7 +60,7 @@ enabled: true }, creditsPosition: 'bottom-left', - pathToImages: 'img/' + pathToImages: layoutPaths }); tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart); diff --git a/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js b/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js index 074e514..5864df8 100644 --- a/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js +++ b/src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js @@ -9,7 +9,7 @@ .controller('LineChartCtrl', LineChartCtrl); /** @ngInject */ - function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { + function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var lineChart = AmCharts.makeChart(id, { type: 'serial', @@ -137,7 +137,7 @@ enabled: true }, creditsPosition: 'bottom-right', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart); diff --git a/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js b/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js index c9a6570..eb3158f 100644 --- a/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js +++ b/src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js @@ -9,7 +9,7 @@ .controller('PieChartCtrl', PieChartCtrl); /** @ngInject */ - function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper) { + function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) { var id = $element[0].getAttribute('id'); var pieChart = AmCharts.makeChart(id, { type: 'pie', @@ -94,7 +94,7 @@ marginLeft: 0, marginRight: 0, pullOutRadius: 0, - pathToImages: 'img/', + pathToImages: layoutPaths.images.amChart, responsive: { enabled: true, rules: [ diff --git a/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js b/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js index 90f7247..4bb826a 100644 --- a/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js +++ b/src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js @@ -23,7 +23,7 @@ author: 'Andrey', header: 'added new video', text: 'Vader and Me', - preview: 'vader-and-me-preview', + preview: 'app/feed/vader-and-me-preview.png', link: 'https://www.youtube.com/watch?v=IfcpzBbbamk', time: 'Today 9:30 pm', ago: '3 hrs ago', @@ -32,7 +32,7 @@ author: 'Vlad', header: 'added new image', text: 'My little kitten', - preview: 'my-little-kitten', + preview: 'app/feed/my-little-kitten.png', link: 'http://api.ning.com/files/DtcI2O2Ry7A7VhVxeiWfGU9WkHcMy4WSTWZ79oxJq*h0iXvVGndfD7CIYy-Ax-UAFCBCdqXI4GCBw3FOLKTTjQc*2cmpdOXJ/1082127884.jpeg', time: 'Today 2:20 pm', ago: '10 hrs ago', @@ -48,7 +48,7 @@ author: 'Nick', header: 'posted location', text: 'New York, USA', - preview: 'new-york-location', + preview: 'app/feed/new-york-location.png', link: 'https://www.google.by/maps/place/New+York,+NY,+USA/@40.7201111,-73.9893872,14z', time: '11.11.2015', ago: '2 days ago', diff --git a/src/app/pages/dashboard/blurFeed/blurFeed.html b/src/app/pages/dashboard/blurFeed/blurFeed.html index 40c1dc6..1422ff5 100644 --- a/src/app/pages/dashboard/blurFeed/blurFeed.html +++ b/src/app/pages/dashboard/blurFeed/blurFeed.html @@ -2,11 +2,11 @@
- +
- +
@@ -17,7 +17,7 @@
- +
diff --git a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js index 0482c6f..9bf5ada 100644 --- a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js +++ b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js @@ -9,7 +9,7 @@ .controller('DashboardLineChartCtrl', DashboardLineChartCtrl); /** @ngInject */ - function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors) { + function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors, layoutPaths) { var chartData = [ { date: new Date(2012, 11), value: 0, value0: 0 }, { date: new Date(2013, 0), value: 15000, value0: 19000}, @@ -111,7 +111,7 @@ backgroundAlpha: 0 }, zoomOutText: '', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart); diff --git a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js b/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js index ed7e5d3..014d7d0 100644 --- a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js +++ b/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js @@ -9,7 +9,7 @@ .controller('DashboardMapCtrl', DashboardMapCtrl); /** @ngInject */ - function DashboardMapCtrl(layoutColors) { + function DashboardMapCtrl(layoutColors, layoutPaths) { var map = AmCharts.makeChart('amChartMap', { type: 'map', theme: 'blur', @@ -96,7 +96,7 @@ enabled: true }, creditsPosition: 'bottom-right', - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart }); } })(); \ No newline at end of file diff --git a/src/app/pages/dashboard/popularApp/popularApp.html b/src/app/pages/dashboard/popularApp/popularApp.html index fb02b23..724bafe 100644 --- a/src/app/pages/dashboard/popularApp/popularApp.html +++ b/src/app/pages/dashboard/popularApp/popularApp.html @@ -1,5 +1,5 @@
- +
diff --git a/src/app/pages/icons/IconsPageCtrl.js b/src/app/pages/icons/IconsPageCtrl.js index f279bbe..6ac1d7e 100644 --- a/src/app/pages/icons/IconsPageCtrl.js +++ b/src/app/pages/icons/IconsPageCtrl.js @@ -14,205 +14,205 @@ kameleonIcons: [ { name: 'Beach', - img: 'Beach.svg' + img: 'Beach' }, { name: 'Bus', - img: 'Bus.svg' + img: 'Bus' }, { name: 'Cheese', - img: 'Cheese.svg' + img: 'Cheese' }, { name: 'Desert', - img: 'Desert.svg' + img: 'Desert' }, { name: 'Images', - img: 'Images.svg' + img: 'Images' }, { name: 'Magician', - img: 'Magician.svg' + img: 'Magician' }, { name: 'Makeup', - img: 'Makeup.svg' + img: 'Makeup' }, { name: 'Programming', - img: 'Programming.svg' + img: 'Programming' }, { name: 'Shop', - img: 'Shop.svg' + img: 'Shop' }, { name: 'Surfer', - img: 'Surfer.svg' + img: 'Surfer' }, { name: 'Phone Booth', - img: 'Phone-Booth.svg' + img: 'Phone-Booth' }, { name: 'Ninja', - img: 'Ninja.svg' + img: 'Ninja' }, { name: 'Apartment', - img: 'Apartment.svg' + img: 'Apartment' }, { name: 'Batman', - img: 'Batman.svg' + img: 'Batman' }, { name: 'Medal', - img: 'Medal-2.svg' + img: 'Medal-2' }, { name: 'Money', - img: 'Money-Increase.svg' + img: 'Money-Increase' }, { name: 'Street View', - img: 'Street-View.svg' + img: 'Street-View' }, { name: 'Student', - img: 'Student-3.svg' + img: 'Student-3' }, { name: 'Bell', - img: 'Bell.svg' + img: 'Bell' }, { name: 'Woman', - img: 'Boss-5.svg' + img: 'Boss-5' }, { name: 'Euro', - img: 'Euro-Coin.svg' + img: 'Euro-Coin' }, { name: 'Chessboard', - img: 'Chessboard.svg' + img: 'Chessboard' }, { name: 'Burglar', - img: 'Burglar.svg' + img: 'Burglar' }, { name: 'Dna', - img: 'Dna.svg' + img: 'Dna' }, { name: 'Clipboard Plan', - img: 'Clipboard-Plan.svg' + img: 'Clipboard-Plan' }, { name: 'Boss', - img: 'Boss-3.svg' + img: 'Boss-3' }, { name: 'Key', - img: 'Key.svg' + img: 'Key' }, { name: 'Surgeon', - img: 'Surgeon.svg' + img: 'Surgeon' }, { name: 'Hacker', - img: 'Hacker.svg' + img: 'Hacker' }, { name: 'Santa', - img: 'Santa.svg' + img: 'Santa' } ], kameleonRoundedIcons: [ { color: 'success', - img: 'Apartment.svg', + img: 'Apartment', name: 'Apartment' }, { color: 'warning', - img: 'Bus.svg', + img: 'Bus', name: 'Bus' }, { color: 'primary', - img: 'Checklist.svg', + img: 'Checklist', name: 'Checklist' }, { color: 'warning', - img: 'Desert.svg', + img: 'Desert', name: 'Desert' }, { color: 'danger', - img: 'Laptop-Signal.svg', + img: 'Laptop-Signal', name: 'Laptop Signal' }, { color: 'info', - img: 'Love-Letter.svg', + img: 'Love-Letter', name: 'Love Letter' }, { color: 'success', - img: 'Makeup.svg', + img: 'Makeup', name: 'Makeup' }, { color: 'primary', - img: 'Santa.svg', + img: 'Santa', name: 'Santa' }, { color: 'success', - img: 'Surfer.svg', + img: 'Surfer', name: 'Surfer' }, { color: 'info', - img: 'Vector.svg', + img: 'Vector', name: 'Vector' }, { color: 'warning', - img: 'Money-Increase.svg', + img: 'Money-Increase', name: 'Money Increase' }, { color: 'info', - img: 'Alien.svg', + img: 'Alien', name: 'Alien' }, { color: 'danger', - img: 'Online-Shopping.svg', + img: 'Online-Shopping', name: 'Online Shopping' }, { color: 'warning', - img: 'Euro-Coin.svg', + img: 'Euro-Coin', name: 'Euro' }, { color: 'info', - img: 'Boss-3.svg', + img: 'Boss-3', 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', ',', ';', ':', '+', '@', '=', '-', '^', '?', '$', '*', '&', '(', '#', '.', '_', ']', ')', '?', '\'', '"', '}', '{'] + 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', ',', ';', ':', '+', '@', '=', '-', '^', '?', '$', '*', '&', '(', '#', '.', '_', ']', ')', '\'', '"', '}', '{'] } } diff --git a/src/app/pages/icons/widgets/kameleon.html b/src/app/pages/icons/widgets/kameleon.html index 9faece0..1211b7f 100644 --- a/src/app/pages/icons/widgets/kameleon.html +++ b/src/app/pages/icons/widgets/kameleon.html @@ -1,6 +1,6 @@
-
{{icon.name}}
+
{{icon.name}}
diff --git a/src/app/pages/icons/widgets/kameleonRounded.html b/src/app/pages/icons/widgets/kameleonRounded.html index 001e9f3..2d9eabf 100644 --- a/src/app/pages/icons/widgets/kameleonRounded.html +++ b/src/app/pages/icons/widgets/kameleonRounded.html @@ -1,6 +1,6 @@
-
{{ icon.name }}
+
{{ icon.name }}
diff --git a/src/app/pages/maps/map-bubbles/MapBubblePageCtrl.js b/src/app/pages/maps/map-bubbles/MapBubblePageCtrl.js index 4a48957..279a483 100644 --- a/src/app/pages/maps/map-bubbles/MapBubblePageCtrl.js +++ b/src/app/pages/maps/map-bubbles/MapBubblePageCtrl.js @@ -9,7 +9,7 @@ .controller('MapBubblePageCtrl', MapBubblePageCtrl); /** @ngInject */ - function MapBubblePageCtrl(layoutColors, $timeout) { + function MapBubblePageCtrl(layoutColors, $timeout, layoutPaths) { var latlong = {}; latlong['AD'] = {'latitude': 42.5, 'longitude': 1.5}; latlong['AE'] = {'latitude': 24, 'longitude': 54}; @@ -452,7 +452,7 @@ unlistedAreasAlpha: 0.1 }; map.imagesSettings.balloonText = '[[title]]: [[value]]'; - map.pathToImages = 'img/'; + map.pathToImages = layoutPaths.images.amChart; var dataProvider = { mapVar: AmCharts.maps.worldLow, diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js index 4e9680e..10ede67 100644 --- a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js +++ b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js @@ -9,7 +9,7 @@ .controller('MapLinesPageCtrl', MapLinesPageCtrl); /** @ngInject */ - function MapLinesPageCtrl(layoutColors, $timeout) { + function MapLinesPageCtrl(layoutColors, $timeout, layoutPaths) { // svg path for target icon var targetSVG = 'M9,0C4.029,0,0,4.029,0,9s4.029,9,9,9s9-4.029,9-9S13.971,0,9,0z M9,15.93 c-3.83,0-6.93-3.1-6.93-6.93S5.17,2.07,9,2.07s6.93,3.1,6.93,6.93S12.83,15.93,9,15.93 M12.5,9c0,1.933-1.567,3.5-3.5,3.5S5.5,10.933,5.5,9S7.067,5.5,9,5.5 S12.5,7.067,12.5,9z'; // svg path for plane icon @@ -269,7 +269,7 @@ export: { 'enabled': true }, - pathToImages: 'img/' + pathToImages: layoutPaths.images.amChart } ); }, 100); diff --git a/src/app/pages/profile/ProfilePageCtrl.js b/src/app/pages/profile/ProfilePageCtrl.js index 24ecc64..8e117f1 100644 --- a/src/app/pages/profile/ProfilePageCtrl.js +++ b/src/app/pages/profile/ProfilePageCtrl.js @@ -9,11 +9,11 @@ .controller('ProfilePageCtrl', ProfilePageCtrl); /** @ngInject */ - function ProfilePageCtrl($scope, fileReader) { - $scope.picture = 'img/pic-profile.png'; + function ProfilePageCtrl($scope, fileReader, $filter) { + $scope.picture = $filter('profilePicture')('Nasta'); $scope.removePicture = function () { - $scope.picture = 'img/no-photo.png'; + $scope.picture = $filter('appImage')('theme/no-photo.png'); $scope.noPicture = true; }; diff --git a/src/app/pages/tables/TablesPageCtrl.js b/src/app/pages/tables/TablesPageCtrl.js index ce6291a..6c884bb 100644 --- a/src/app/pages/tables/TablesPageCtrl.js +++ b/src/app/pages/tables/TablesPageCtrl.js @@ -178,7 +178,7 @@ $scope.metricsTableData = [ { - image: 'img/chrome.svg', + image: 'app/browsers/chrome.svg', browser: 'Google Chrome', visits: '10,392', isVisitsUp: true, @@ -188,7 +188,7 @@ isPercentUp: true }, { - image: 'img/firefox.svg', + image: 'app/browsers/firefox.svg', browser: 'Mozilla Firefox', visits: '7,873', isVisitsUp: true, @@ -198,7 +198,7 @@ isPercentUp: true }, { - image: 'img/ie.svg', + image: 'app/browsers/ie.svg', browser: 'Internet Explorer', visits: '5,890', isVisitsUp: false, @@ -208,7 +208,7 @@ isPercentUp: false }, { - image: 'img/safari.svg', + image: 'app/browsers/safari.svg', browser: 'Safari', visits: '4,001', isVisitsUp: false, @@ -218,7 +218,7 @@ isPercentUp: true }, { - image: 'img/opera.svg', + image: 'app/browsers/opera.svg', browser: 'Opera', visits: '1,833', isVisitsUp: true, diff --git a/src/app/pages/tables/widgets/borderedTable.html b/src/app/pages/tables/widgets/borderedTable.html index 3385336..1a4906a 100644 --- a/src/app/pages/tables/widgets/borderedTable.html +++ b/src/app/pages/tables/widgets/borderedTable.html @@ -11,7 +11,7 @@ - + {{item.browser}} {{item.visits}} {{item.purchases}} diff --git a/src/app/pages/tables/widgets/hoverRows.html b/src/app/pages/tables/widgets/hoverRows.html index d2805c7..9d51013 100644 --- a/src/app/pages/tables/widgets/hoverRows.html +++ b/src/app/pages/tables/widgets/hoverRows.html @@ -14,7 +14,7 @@ - + {{item.browser}} {{item.visits}} diff --git a/src/app/pages/typography/typography.html b/src/app/pages/typography/typography.html index 20705c0..b7d3b23 100644 --- a/src/app/pages/typography/typography.html +++ b/src/app/pages/typography/typography.html @@ -170,7 +170,7 @@