refactor(images): images mostly fixed

qiqo · Dec 17, 2015 · ab26929 · ab26929
1 parent 1cff1f2
commit ab26929
Show file tree

Hide file tree

Showing 105 changed files with 174 additions and 103 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,11 +2,11 @@
 <div class="feed-messages-container" track-width="smallContainerWidth" min-width="360">
   <div class="feed-message" ng-repeat="message in feed" ng-class="{'left': $index%2==0, 'right': $index%2==1}">
     <div class="message-icon" ng-if="message.type == 'text-message'">
-      <img class="photo-icon" ng-src="img/{{ ::message.author }}.png">
+      <img class="photo-icon" ng-src="{{::( message.author | profilePicture )}}">
     </div>
     <div class="message-icon" ng-if="message.type != 'text-message'">
       <span class="media-icon" ng-class="::message.type"></span>
-      <img class="sub-photo-icon" ng-src="img/{{ ::message.author }}.png">
+      <img class="sub-photo-icon" ng-src="{{::( message.author | profilePicture )}}">
     </div>
     <div class="text-block" ng-class="{'small-message': smallContainerWidth && message.type != 'text-message', '{{::message.type}}': true}">
       <div class="message-header">
@@ -17,7 +17,7 @@
       </div>
       <div class="preview" ng-if="message.preview">
         <a href="{{::message.link}}" target="_blank">
-          <img ng-src="img/{{ ::message.preview }}.png">
+          <img ng-src="{{ ::( message.preview | appImage )}}">
         </a>
       </div>
       <div class="message-time">

diff --git 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
@@ -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
     });
   }
 })();
diff --git a/src/app/pages/dashboard/popularApp/popularApp.html b/src/app/pages/dashboard/popularApp/popularApp.html
@@ -1,5 +1,5 @@
 <div class="popular-app-img">
-  <img src="img/my-app-logo.png"/>
+  <img ng-src="{{::( 'app/my-app-logo.png' | appImage )}}"/>
 </div>
 <div class="popular-app-cost row">
   <div class="col-xs-9">