Skip to content

Commit ab26929

Browse files
committed
refactor(images): images mostly fixed
1 parent 1cff1f2 commit ab26929

105 files changed

Lines changed: 174 additions & 103 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bower.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
},
7474
"slimScroll": {
7575
"main": "./jquery.slimscroll.js"
76+
},
77+
"font-awesome": {
78+
"main": "css/font-awesome.css"
7679
}
7780
},
7881
"devDependencies": {

‎gulp/watch.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ gulp.task('watch', ['inject'], function () {
1515
gulp.watch([path.join(conf.paths.src, '/*.html'), 'bower.json'], ['inject-reload']);
1616

1717
gulp.watch([
18-
path.join(conf.paths.src, '/app/**/*.css'),
19-
path.join(conf.paths.src, '/app/**/*.scss')
18+
path.join(conf.paths.src, '/sass/**/*.css'),
19+
path.join(conf.paths.src, '/sass/**/*.scss')
2020
], function(event) {
2121
if(isOnlyChange(event)) {
2222
gulp.start('styles-reload');

‎src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('AreaChartCtrl', AreaChartCtrl);
1010

1111
/** @ngInject */
12-
function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) {
12+
function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
1313
var id = $element[0].getAttribute('id');
1414
var areaChart = AmCharts.makeChart(id, {
1515
type: 'serial',
@@ -131,7 +131,7 @@
131131
export: {
132132
enabled: true
133133
},
134-
pathToImages: 'img/'
134+
pathToImages: layoutPaths.images.amChart
135135
});
136136

137137
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart);

‎src/app/pages/charts/amCharts/barChart/BarChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('BarChartCtrl', BarChartCtrl);
1010

1111
/** @ngInject */
12-
function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) {
12+
function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
1313
var id = $element[0].getAttribute('id');
1414
var barChart = AmCharts.makeChart(id, {
1515
type: 'serial',
@@ -79,7 +79,7 @@
7979
enabled: true
8080
},
8181
creditsPosition: 'top-right',
82-
pathToImages: 'img/'
82+
pathToImages: layoutPaths.images.amChart
8383
});
8484

8585
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart);

‎src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('FunnelChartCtrl', FunnelChartCtrl);
1010

1111
/** @ngInject */
12-
function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper) {
12+
function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) {
1313
var id = $element[0].getAttribute('id');
1414
var funnelChart = AmCharts.makeChart(id, {
1515
type: 'funnel',
@@ -60,7 +60,7 @@
6060
enabled: true
6161
},
6262
creditsPosition: 'bottom-left',
63-
pathToImages: 'img/'
63+
pathToImages: layoutPaths
6464
});
6565

6666
tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart);

‎src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('LineChartCtrl', LineChartCtrl);
1010

1111
/** @ngInject */
12-
function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) {
12+
function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
1313
var id = $element[0].getAttribute('id');
1414
var lineChart = AmCharts.makeChart(id, {
1515
type: 'serial',
@@ -137,7 +137,7 @@
137137
enabled: true
138138
},
139139
creditsPosition: 'bottom-right',
140-
pathToImages: 'img/'
140+
pathToImages: layoutPaths.images.amChart
141141
});
142142

143143
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart);

‎src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('PieChartCtrl', PieChartCtrl);
1010

1111
/** @ngInject */
12-
function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper) {
12+
function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) {
1313
var id = $element[0].getAttribute('id');
1414
var pieChart = AmCharts.makeChart(id, {
1515
type: 'pie',
@@ -94,7 +94,7 @@
9494
marginLeft: 0,
9595
marginRight: 0,
9696
pullOutRadius: 0,
97-
pathToImages: 'img/',
97+
pathToImages: layoutPaths.images.amChart,
9898
responsive: {
9999
enabled: true,
100100
rules: [

‎src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
author: 'Andrey',
2424
header: 'added new video',
2525
text: 'Vader and Me',
26-
preview: 'vader-and-me-preview',
26+
preview: 'app/feed/vader-and-me-preview.png',
2727
link: 'https://www.youtube.com/watch?v=IfcpzBbbamk',
2828
time: 'Today 9:30 pm',
2929
ago: '3 hrs ago',
@@ -32,7 +32,7 @@
3232
author: 'Vlad',
3333
header: 'added new image',
3434
text: 'My little kitten',
35-
preview: 'my-little-kitten',
35+
preview: 'app/feed/my-little-kitten.png',
3636
link: 'http://api.ning.com/files/DtcI2O2Ry7A7VhVxeiWfGU9WkHcMy4WSTWZ79oxJq*h0iXvVGndfD7CIYy-Ax-UAFCBCdqXI4GCBw3FOLKTTjQc*2cmpdOXJ/1082127884.jpeg',
3737
time: 'Today 2:20 pm',
3838
ago: '10 hrs ago',
@@ -48,7 +48,7 @@
4848
author: 'Nick',
4949
header: 'posted location',
5050
text: 'New York, USA',
51-
preview: 'new-york-location',
51+
preview: 'app/feed/new-york-location.png',
5252
link: 'https://www.google.by/maps/place/New+York,+NY,+USA/@40.7201111,-73.9893872,14z',
5353
time: '11.11.2015',
5454
ago: '2 days ago',

‎src/app/pages/dashboard/blurFeed/blurFeed.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<div class="feed-messages-container" track-width="smallContainerWidth" min-width="360">
33
<div class="feed-message" ng-repeat="message in feed" ng-class="{'left': $index%2==0, 'right': $index%2==1}">
44
<div class="message-icon" ng-if="message.type == 'text-message'">
5-
<img class="photo-icon" ng-src="img/{{ ::message.author }}.png">
5+
<img class="photo-icon" ng-src="{{::( message.author | profilePicture )}}">
66
</div>
77
<div class="message-icon" ng-if="message.type != 'text-message'">
88
<span class="media-icon" ng-class="::message.type"></span>
9-
<img class="sub-photo-icon" ng-src="img/{{ ::message.author }}.png">
9+
<img class="sub-photo-icon" ng-src="{{::( message.author | profilePicture )}}">
1010
</div>
1111
<div class="text-block" ng-class="{'small-message': smallContainerWidth && message.type != 'text-message', '{{::message.type}}': true}">
1212
<div class="message-header">
@@ -17,7 +17,7 @@
1717
</div>
1818
<div class="preview" ng-if="message.preview">
1919
<a href="{{::message.link}}" target="_blank">
20-
<img ng-src="img/{{ ::message.preview }}.png">
20+
<img ng-src="{{ ::( message.preview | appImage )}}">
2121
</a>
2222
</div>
2323
<div class="message-time">

‎src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.controller('DashboardLineChartCtrl', DashboardLineChartCtrl);
1010

1111
/** @ngInject */
12-
function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors) {
12+
function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors, layoutPaths) {
1313
var chartData = [
1414
{ date: new Date(2012, 11), value: 0, value0: 0 },
1515
{ date: new Date(2013, 0), value: 15000, value0: 19000},
@@ -111,7 +111,7 @@
111111
backgroundAlpha: 0
112112
},
113113
zoomOutText: '',
114-
pathToImages: 'img/'
114+
pathToImages: layoutPaths.images.amChart
115115
});
116116

117117
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart);

0 commit comments

Comments
 (0)