refactor(images): images mostly fixed

pull/3/head
Vladimir Lugovsky 2015-12-17 14:31:11 +03:00
parent 1cff1f2a1c
commit ab26929ab8
105 changed files with 174 additions and 103 deletions

View File

@ -73,6 +73,9 @@
}, },
"slimScroll": { "slimScroll": {
"main": "./jquery.slimscroll.js" "main": "./jquery.slimscroll.js"
},
"font-awesome": {
"main": "css/font-awesome.css"
} }
}, },
"devDependencies": { "devDependencies": {

View File

@ -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, '/*.html'), 'bower.json'], ['inject-reload']);
gulp.watch([ gulp.watch([
path.join(conf.paths.src, '/app/**/*.css'), path.join(conf.paths.src, '/sass/**/*.css'),
path.join(conf.paths.src, '/app/**/*.scss') path.join(conf.paths.src, '/sass/**/*.scss')
], function(event) { ], function(event) {
if(isOnlyChange(event)) { if(isOnlyChange(event)) {
gulp.start('styles-reload'); gulp.start('styles-reload');

View File

@ -9,7 +9,7 @@
.controller('AreaChartCtrl', AreaChartCtrl); .controller('AreaChartCtrl', AreaChartCtrl);
/** @ngInject */ /** @ngInject */
function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
var id = $element[0].getAttribute('id'); var id = $element[0].getAttribute('id');
var areaChart = AmCharts.makeChart(id, { var areaChart = AmCharts.makeChart(id, {
type: 'serial', type: 'serial',
@ -131,7 +131,7 @@
export: { export: {
enabled: true enabled: true
}, },
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
}); });
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart);

View File

@ -9,7 +9,7 @@
.controller('BarChartCtrl', BarChartCtrl); .controller('BarChartCtrl', BarChartCtrl);
/** @ngInject */ /** @ngInject */
function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
var id = $element[0].getAttribute('id'); var id = $element[0].getAttribute('id');
var barChart = AmCharts.makeChart(id, { var barChart = AmCharts.makeChart(id, {
type: 'serial', type: 'serial',
@ -79,7 +79,7 @@
enabled: true enabled: true
}, },
creditsPosition: 'top-right', creditsPosition: 'top-right',
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
}); });
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart);

View File

@ -9,7 +9,7 @@
.controller('FunnelChartCtrl', FunnelChartCtrl); .controller('FunnelChartCtrl', FunnelChartCtrl);
/** @ngInject */ /** @ngInject */
function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper) { function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) {
var id = $element[0].getAttribute('id'); var id = $element[0].getAttribute('id');
var funnelChart = AmCharts.makeChart(id, { var funnelChart = AmCharts.makeChart(id, {
type: 'funnel', type: 'funnel',
@ -60,7 +60,7 @@
enabled: true enabled: true
}, },
creditsPosition: 'bottom-left', creditsPosition: 'bottom-left',
pathToImages: 'img/' pathToImages: layoutPaths
}); });
tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart); tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart);

View File

@ -9,7 +9,7 @@
.controller('LineChartCtrl', LineChartCtrl); .controller('LineChartCtrl', LineChartCtrl);
/** @ngInject */ /** @ngInject */
function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper) { function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
var id = $element[0].getAttribute('id'); var id = $element[0].getAttribute('id');
var lineChart = AmCharts.makeChart(id, { var lineChart = AmCharts.makeChart(id, {
type: 'serial', type: 'serial',
@ -137,7 +137,7 @@
enabled: true enabled: true
}, },
creditsPosition: 'bottom-right', creditsPosition: 'bottom-right',
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
}); });
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart);

View File

@ -9,7 +9,7 @@
.controller('PieChartCtrl', PieChartCtrl); .controller('PieChartCtrl', PieChartCtrl);
/** @ngInject */ /** @ngInject */
function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper) { function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths) {
var id = $element[0].getAttribute('id'); var id = $element[0].getAttribute('id');
var pieChart = AmCharts.makeChart(id, { var pieChart = AmCharts.makeChart(id, {
type: 'pie', type: 'pie',
@ -94,7 +94,7 @@
marginLeft: 0, marginLeft: 0,
marginRight: 0, marginRight: 0,
pullOutRadius: 0, pullOutRadius: 0,
pathToImages: 'img/', pathToImages: layoutPaths.images.amChart,
responsive: { responsive: {
enabled: true, enabled: true,
rules: [ rules: [

View File

@ -23,7 +23,7 @@
author: 'Andrey', author: 'Andrey',
header: 'added new video', header: 'added new video',
text: 'Vader and Me', 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', link: 'https://www.youtube.com/watch?v=IfcpzBbbamk',
time: 'Today 9:30 pm', time: 'Today 9:30 pm',
ago: '3 hrs ago', ago: '3 hrs ago',
@ -32,7 +32,7 @@
author: 'Vlad', author: 'Vlad',
header: 'added new image', header: 'added new image',
text: 'My little kitten', 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', link: 'http://api.ning.com/files/DtcI2O2Ry7A7VhVxeiWfGU9WkHcMy4WSTWZ79oxJq*h0iXvVGndfD7CIYy-Ax-UAFCBCdqXI4GCBw3FOLKTTjQc*2cmpdOXJ/1082127884.jpeg',
time: 'Today 2:20 pm', time: 'Today 2:20 pm',
ago: '10 hrs ago', ago: '10 hrs ago',
@ -48,7 +48,7 @@
author: 'Nick', author: 'Nick',
header: 'posted location', header: 'posted location',
text: 'New York, USA', 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', link: 'https://www.google.by/maps/place/New+York,+NY,+USA/@40.7201111,-73.9893872,14z',
time: '11.11.2015', time: '11.11.2015',
ago: '2 days ago', ago: '2 days ago',

View File

@ -2,11 +2,11 @@
<div class="feed-messages-container" track-width="smallContainerWidth" min-width="360"> <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="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'"> <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>
<div class="message-icon" ng-if="message.type != 'text-message'"> <div class="message-icon" ng-if="message.type != 'text-message'">
<span class="media-icon" ng-class="::message.type"></span> <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>
<div class="text-block" ng-class="{'small-message': smallContainerWidth && message.type != 'text-message', '{{::message.type}}': true}"> <div class="text-block" ng-class="{'small-message': smallContainerWidth && message.type != 'text-message', '{{::message.type}}': true}">
<div class="message-header"> <div class="message-header">
@ -17,7 +17,7 @@
</div> </div>
<div class="preview" ng-if="message.preview"> <div class="preview" ng-if="message.preview">
<a href="{{::message.link}}" target="_blank"> <a href="{{::message.link}}" target="_blank">
<img ng-src="img/{{ ::message.preview }}.png"> <img ng-src="{{ ::( message.preview | appImage )}}">
</a> </a>
</div> </div>
<div class="message-time"> <div class="message-time">

View File

@ -9,7 +9,7 @@
.controller('DashboardLineChartCtrl', DashboardLineChartCtrl); .controller('DashboardLineChartCtrl', DashboardLineChartCtrl);
/** @ngInject */ /** @ngInject */
function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors) { function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors, layoutPaths) {
var chartData = [ var chartData = [
{ date: new Date(2012, 11), value: 0, value0: 0 }, { date: new Date(2012, 11), value: 0, value0: 0 },
{ date: new Date(2013, 0), value: 15000, value0: 19000}, { date: new Date(2013, 0), value: 15000, value0: 19000},
@ -111,7 +111,7 @@
backgroundAlpha: 0 backgroundAlpha: 0
}, },
zoomOutText: '', zoomOutText: '',
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
}); });
tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart); tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart);

View File

@ -9,7 +9,7 @@
.controller('DashboardMapCtrl', DashboardMapCtrl); .controller('DashboardMapCtrl', DashboardMapCtrl);
/** @ngInject */ /** @ngInject */
function DashboardMapCtrl(layoutColors) { function DashboardMapCtrl(layoutColors, layoutPaths) {
var map = AmCharts.makeChart('amChartMap', { var map = AmCharts.makeChart('amChartMap', {
type: 'map', type: 'map',
theme: 'blur', theme: 'blur',
@ -96,7 +96,7 @@
enabled: true enabled: true
}, },
creditsPosition: 'bottom-right', creditsPosition: 'bottom-right',
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
}); });
} }
})(); })();

View File

@ -1,5 +1,5 @@
<div class="popular-app-img"> <div class="popular-app-img">
<img src="img/my-app-logo.png"/> <img ng-src="{{::( 'app/my-app-logo.png' | appImage )}}"/>
</div> </div>
<div class="popular-app-cost row"> <div class="popular-app-cost row">
<div class="col-xs-9"> <div class="col-xs-9">

View File

@ -14,205 +14,205 @@
kameleonIcons: [ kameleonIcons: [
{ {
name: 'Beach', name: 'Beach',
img: 'Beach.svg' img: 'Beach'
}, },
{ {
name: 'Bus', name: 'Bus',
img: 'Bus.svg' img: 'Bus'
}, },
{ {
name: 'Cheese', name: 'Cheese',
img: 'Cheese.svg' img: 'Cheese'
}, },
{ {
name: 'Desert', name: 'Desert',
img: 'Desert.svg' img: 'Desert'
}, },
{ {
name: 'Images', name: 'Images',
img: 'Images.svg' img: 'Images'
}, },
{ {
name: 'Magician', name: 'Magician',
img: 'Magician.svg' img: 'Magician'
}, },
{ {
name: 'Makeup', name: 'Makeup',
img: 'Makeup.svg' img: 'Makeup'
}, },
{ {
name: 'Programming', name: 'Programming',
img: 'Programming.svg' img: 'Programming'
}, },
{ {
name: 'Shop', name: 'Shop',
img: 'Shop.svg' img: 'Shop'
}, },
{ {
name: 'Surfer', name: 'Surfer',
img: 'Surfer.svg' img: 'Surfer'
}, },
{ {
name: 'Phone Booth', name: 'Phone Booth',
img: 'Phone-Booth.svg' img: 'Phone-Booth'
}, },
{ {
name: 'Ninja', name: 'Ninja',
img: 'Ninja.svg' img: 'Ninja'
}, },
{ {
name: 'Apartment', name: 'Apartment',
img: 'Apartment.svg' img: 'Apartment'
}, },
{ {
name: 'Batman', name: 'Batman',
img: 'Batman.svg' img: 'Batman'
}, },
{ {
name: 'Medal', name: 'Medal',
img: 'Medal-2.svg' img: 'Medal-2'
}, },
{ {
name: 'Money', name: 'Money',
img: 'Money-Increase.svg' img: 'Money-Increase'
}, },
{ {
name: 'Street View', name: 'Street View',
img: 'Street-View.svg' img: 'Street-View'
}, },
{ {
name: 'Student', name: 'Student',
img: 'Student-3.svg' img: 'Student-3'
}, },
{ {
name: 'Bell', name: 'Bell',
img: 'Bell.svg' img: 'Bell'
}, },
{ {
name: 'Woman', name: 'Woman',
img: 'Boss-5.svg' img: 'Boss-5'
}, },
{ {
name: 'Euro', name: 'Euro',
img: 'Euro-Coin.svg' img: 'Euro-Coin'
}, },
{ {
name: 'Chessboard', name: 'Chessboard',
img: 'Chessboard.svg' img: 'Chessboard'
}, },
{ {
name: 'Burglar', name: 'Burglar',
img: 'Burglar.svg' img: 'Burglar'
}, },
{ {
name: 'Dna', name: 'Dna',
img: 'Dna.svg' img: 'Dna'
}, },
{ {
name: 'Clipboard Plan', name: 'Clipboard Plan',
img: 'Clipboard-Plan.svg' img: 'Clipboard-Plan'
}, },
{ {
name: 'Boss', name: 'Boss',
img: 'Boss-3.svg' img: 'Boss-3'
}, },
{ {
name: 'Key', name: 'Key',
img: 'Key.svg' img: 'Key'
}, },
{ {
name: 'Surgeon', name: 'Surgeon',
img: 'Surgeon.svg' img: 'Surgeon'
}, },
{ {
name: 'Hacker', name: 'Hacker',
img: 'Hacker.svg' img: 'Hacker'
}, },
{ {
name: 'Santa', name: 'Santa',
img: 'Santa.svg' img: 'Santa'
} }
], ],
kameleonRoundedIcons: [ kameleonRoundedIcons: [
{ {
color: 'success', color: 'success',
img: 'Apartment.svg', img: 'Apartment',
name: 'Apartment' name: 'Apartment'
}, },
{ {
color: 'warning', color: 'warning',
img: 'Bus.svg', img: 'Bus',
name: 'Bus' name: 'Bus'
}, },
{ {
color: 'primary', color: 'primary',
img: 'Checklist.svg', img: 'Checklist',
name: 'Checklist' name: 'Checklist'
}, },
{ {
color: 'warning', color: 'warning',
img: 'Desert.svg', img: 'Desert',
name: 'Desert' name: 'Desert'
}, },
{ {
color: 'danger', color: 'danger',
img: 'Laptop-Signal.svg', img: 'Laptop-Signal',
name: 'Laptop Signal' name: 'Laptop Signal'
}, },
{ {
color: 'info', color: 'info',
img: 'Love-Letter.svg', img: 'Love-Letter',
name: 'Love Letter' name: 'Love Letter'
}, },
{ {
color: 'success', color: 'success',
img: 'Makeup.svg', img: 'Makeup',
name: 'Makeup' name: 'Makeup'
}, },
{ {
color: 'primary', color: 'primary',
img: 'Santa.svg', img: 'Santa',
name: 'Santa' name: 'Santa'
}, },
{ {
color: 'success', color: 'success',
img: 'Surfer.svg', img: 'Surfer',
name: 'Surfer' name: 'Surfer'
}, },
{ {
color: 'info', color: 'info',
img: 'Vector.svg', img: 'Vector',
name: 'Vector' name: 'Vector'
}, },
{ {
color: 'warning', color: 'warning',
img: 'Money-Increase.svg', img: 'Money-Increase',
name: 'Money Increase' name: 'Money Increase'
}, },
{ {
color: 'info', color: 'info',
img: 'Alien.svg', img: 'Alien',
name: 'Alien' name: 'Alien'
}, },
{ {
color: 'danger', color: 'danger',
img: 'Online-Shopping.svg', img: 'Online-Shopping',
name: 'Online Shopping' name: 'Online Shopping'
}, },
{ {
color: 'warning', color: 'warning',
img: 'Euro-Coin.svg', img: 'Euro-Coin',
name: 'Euro' name: 'Euro'
}, },
{ {
color: 'info', color: 'info',
img: 'Boss-3.svg', img: 'Boss-3',
name: 'Boss' 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'], 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'], 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', ',', ';', ':', '+', '@', '=', '-', '^', '?', '$', '*', '&', '(', '#', '.', '_', ']', ')', '\'', '"', '}', '{']
} }
} }

View File

@ -1,6 +1,6 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="kameleon-row" ng-repeat="icon in icons.kameleonIcons"> <div class="kameleon-row" ng-repeat="icon in icons.kameleonIcons">
<div class="kameleon-icon"><img ng-src="img/{{icon.img}}"><span>{{icon.name}}</span></div> <div class="kameleon-icon"><img ng-src="{{:: (icon.img | kameleonImg )}}"><span>{{icon.name}}</span></div>
</div> </div>
</div> </div>

View File

@ -1,6 +1,6 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="kameleon-row" ng-repeat="icon in icons.kameleonRoundedIcons"> <div class="kameleon-row" ng-repeat="icon in icons.kameleonRoundedIcons">
<div class="kameleon-icon with-round-bg {{icon.color}}"><img ng-src="img/{{icon.img}}"><span>{{ icon.name }}</span></div> <div class="kameleon-icon with-round-bg {{icon.color}}"><img ng-src="{{::( icon.img | kameleonImg )}}"><span>{{ icon.name }}</span></div>
</div> </div>
</div> </div>

View File

@ -9,7 +9,7 @@
.controller('MapBubblePageCtrl', MapBubblePageCtrl); .controller('MapBubblePageCtrl', MapBubblePageCtrl);
/** @ngInject */ /** @ngInject */
function MapBubblePageCtrl(layoutColors, $timeout) { function MapBubblePageCtrl(layoutColors, $timeout, layoutPaths) {
var latlong = {}; var latlong = {};
latlong['AD'] = {'latitude': 42.5, 'longitude': 1.5}; latlong['AD'] = {'latitude': 42.5, 'longitude': 1.5};
latlong['AE'] = {'latitude': 24, 'longitude': 54}; latlong['AE'] = {'latitude': 24, 'longitude': 54};
@ -452,7 +452,7 @@
unlistedAreasAlpha: 0.1 unlistedAreasAlpha: 0.1
}; };
map.imagesSettings.balloonText = '<span style="font-size:14px;"><b>[[title]]</b>: [[value]]</span>'; map.imagesSettings.balloonText = '<span style="font-size:14px;"><b>[[title]]</b>: [[value]]</span>';
map.pathToImages = 'img/'; map.pathToImages = layoutPaths.images.amChart;
var dataProvider = { var dataProvider = {
mapVar: AmCharts.maps.worldLow, mapVar: AmCharts.maps.worldLow,

View File

@ -9,7 +9,7 @@
.controller('MapLinesPageCtrl', MapLinesPageCtrl); .controller('MapLinesPageCtrl', MapLinesPageCtrl);
/** @ngInject */ /** @ngInject */
function MapLinesPageCtrl(layoutColors, $timeout) { function MapLinesPageCtrl(layoutColors, $timeout, layoutPaths) {
// svg path for target icon // 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'; 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 // svg path for plane icon
@ -269,7 +269,7 @@
export: { export: {
'enabled': true 'enabled': true
}, },
pathToImages: 'img/' pathToImages: layoutPaths.images.amChart
} ); } );
}, 100); }, 100);

View File

@ -9,11 +9,11 @@
.controller('ProfilePageCtrl', ProfilePageCtrl); .controller('ProfilePageCtrl', ProfilePageCtrl);
/** @ngInject */ /** @ngInject */
function ProfilePageCtrl($scope, fileReader) { function ProfilePageCtrl($scope, fileReader, $filter) {
$scope.picture = 'img/pic-profile.png'; $scope.picture = $filter('profilePicture')('Nasta');
$scope.removePicture = function () { $scope.removePicture = function () {
$scope.picture = 'img/no-photo.png'; $scope.picture = $filter('appImage')('theme/no-photo.png');
$scope.noPicture = true; $scope.noPicture = true;
}; };

View File

@ -178,7 +178,7 @@
$scope.metricsTableData = [ $scope.metricsTableData = [
{ {
image: 'img/chrome.svg', image: 'app/browsers/chrome.svg',
browser: 'Google Chrome', browser: 'Google Chrome',
visits: '10,392', visits: '10,392',
isVisitsUp: true, isVisitsUp: true,
@ -188,7 +188,7 @@
isPercentUp: true isPercentUp: true
}, },
{ {
image: 'img/firefox.svg', image: 'app/browsers/firefox.svg',
browser: 'Mozilla Firefox', browser: 'Mozilla Firefox',
visits: '7,873', visits: '7,873',
isVisitsUp: true, isVisitsUp: true,
@ -198,7 +198,7 @@
isPercentUp: true isPercentUp: true
}, },
{ {
image: 'img/ie.svg', image: 'app/browsers/ie.svg',
browser: 'Internet Explorer', browser: 'Internet Explorer',
visits: '5,890', visits: '5,890',
isVisitsUp: false, isVisitsUp: false,
@ -208,7 +208,7 @@
isPercentUp: false isPercentUp: false
}, },
{ {
image: 'img/safari.svg', image: 'app/browsers/safari.svg',
browser: 'Safari', browser: 'Safari',
visits: '4,001', visits: '4,001',
isVisitsUp: false, isVisitsUp: false,
@ -218,7 +218,7 @@
isPercentUp: true isPercentUp: true
}, },
{ {
image: 'img/opera.svg', image: 'app/browsers/opera.svg',
browser: 'Opera', browser: 'Opera',
visits: '1,833', visits: '1,833',
isVisitsUp: true, isVisitsUp: true,

View File

@ -11,7 +11,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in metricsTableData"> <tr ng-repeat="item in metricsTableData">
<td><img ng-src="{{item.image}}" width="20" height="20"></td> <td><img ng-src="{{::( item.image | appImage )}}" width="20" height="20"></td>
<td ng-class="nowrap">{{item.browser}}</td> <td ng-class="nowrap">{{item.browser}}</td>
<td class="align-right">{{item.visits}}</td> <td class="align-right">{{item.visits}}</td>
<td class="align-right">{{item.purchases}}</td> <td class="align-right">{{item.purchases}}</td>

View File

@ -14,7 +14,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in metricsTableData"> <tr ng-repeat="item in metricsTableData">
<td><img ng-src="{{item.image}}" width="20" height="20"></td> <td><img ng-src="{{::( item.image | appImage )}}" width="20" height="20"></td>
<td ng-class="nowrap">{{item.browser}}</td> <td ng-class="nowrap">{{item.browser}}</td>
<td class="align-right">{{item.visits}}</td> <td class="align-right">{{item.visits}}</td>
<td class="table-arr"><i ng-class="{'icon-up': item.isVisitsUp, 'icon-down': !item.isVisitsUp }"></i></td> <td class="table-arr"><i ng-class="{'icon-up': item.isVisitsUp, 'icon-down': !item.isVisitsUp }"></i></td>

View File

@ -170,7 +170,7 @@
<blur-panel class-container="banner-column-panel"> <blur-panel class-container="banner-column-panel">
<div class="banner"> <div class="banner">
<div class="large-banner-wrapper"> <div class="large-banner-wrapper">
<img src="img/banner.png" alt=""/> <img ng-src="{{::( 'app/typography/banner.png' | appImage )}}" alt=""/>
</div> </div>
<div class="banner-text-wrapper"> <div class="banner-text-wrapper">
<div class="banner-text"> <div class="banner-text">
@ -187,7 +187,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="img-wrapper"><img src="img/typo03.png" alt="" title=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo03.png' | appImage )}}" alt="" title=""/></div>
<p>Vel elit, eros elementum, id lacinia, duis non ut ut tortor blandit. Mauris <a <p>Vel elit, eros elementum, id lacinia, duis non ut ut tortor blandit. Mauris <a
href>dapibus</a> magna rutrum. Ornare neque suspendisse <a href>dapibus</a> magna rutrum. Ornare neque suspendisse <a
href>phasellus wisi</a>, quam cras pede rutrum suspendisse, <a href>phasellus wisi</a>, quam cras pede rutrum suspendisse, <a
@ -197,7 +197,7 @@
arcu nulla.</p> arcu nulla.</p>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="img-wrapper"><img src="img/typo01.png" alt="" title=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo01.png' | appImage )}}" alt="" title=""/></div>
<p>Et suspendisse, adipiscing fringilla ornare sit ligula sed, vel nam. Interdum et justo nulla, <p>Et suspendisse, adipiscing fringilla ornare sit ligula sed, vel nam. Interdum et justo nulla,
fermentum fermentum
lobortis purus ut eu, duis nibh dolor massa tristique elementum, nibh iste potenti risus fusce lobortis purus ut eu, duis nibh dolor massa tristique elementum, nibh iste potenti risus fusce
@ -221,20 +221,20 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="img-wrapper"><img src="img/typo04.png" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo04.png' | appImage )}}" alt=""/></div>
<p>Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna <p>Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna
maecenas</p> maecenas</p>
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="img-wrapper"><img src="img/typo05.png" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo05.png' | appImage )}}" alt=""/></div>
<p>Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat <p>Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat
in in
velit</p> velit</p>
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="img-wrapper"><img src="img/typo06.png" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo06.png' | appImage )}}" alt=""/></div>
<p>Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam</p> <p>Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam</p>
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>
</div> </div>

View File

@ -10,7 +10,7 @@
<div class="user-profile clearfix"> <div class="user-profile clearfix">
<div class="al-user-profile dropdown"> <div class="al-user-profile dropdown">
<a href class="dropdown-toggle" data-toggle="dropdown"> <a href class="dropdown-toggle" data-toggle="dropdown">
<img src="img/Nasta.png"> <img ng-src="{{::( 'Nasta' | profilePicture )}}">
</a> </a>
<div class="dropdown-menu top-dropdown-menu profile-dropdown"> <div class="dropdown-menu top-dropdown-menu profile-dropdown">
<i class="dropdown-arr"></i> <i class="dropdown-arr"></i>

View File

@ -0,0 +1,18 @@
/**
* @author v.lugovsky
* created on 17.12.2015
*/
(function () {
'use strict';
angular.module('BlurAdmin.theme')
.filter('appImage', appImage);
/** @ngInject */
function appImage(layoutPaths) {
return function(input) {
return layoutPaths.images.root + input;
};
}
})();

View File

@ -0,0 +1,18 @@
/**
* @author v.lugovsky
* created on 17.12.2015
*/
(function () {
'use strict';
angular.module('BlurAdmin.theme')
.filter('kameleonImg', kameleonImg);
/** @ngInject */
function kameleonImg(layoutPaths) {
return function(input) {
return layoutPaths.images.root + 'theme/icon/kameleon/' + input + '.svg';
};
}
})();

View File

@ -0,0 +1,19 @@
/**
* @author v.lugovsky
* created on 17.12.2015
*/
(function () {
'use strict';
angular.module('BlurAdmin.theme')
.filter('profilePicture', profilePicture);
/** @ngInject */
function profilePicture(layoutPaths) {
return function(input, ext) {
ext = ext || 'png';
return layoutPaths.images.profile + input + '.' + ext;
};
}
})();

View File

@ -5,6 +5,8 @@
(function () { (function () {
'use strict'; 'use strict';
var IMAGES_ROOT = 'assets/img/';
angular.module('BlurAdmin.theme') angular.module('BlurAdmin.theme')
.constant('layoutColors', { .constant('layoutColors', {
primary: '#41bee9', primary: '#41bee9',
@ -30,6 +32,13 @@
.constant('layoutSizes', { .constant('layoutSizes', {
resWidthCollapseSidebar: 1200, resWidthCollapseSidebar: 1200,
resWidthHideSidebar: 500 resWidthHideSidebar: 500
})
.constant('layoutPaths', {
images: {
root: IMAGES_ROOT,
profile: IMAGES_ROOT + 'app/profile/',
amChart: 'bower_components/amcharts/dist/amcharts/images/'
}
}); });
})(); })();

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 619 B

View File

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

View File

Before

Width:  |  Height:  |  Size: 736 KiB

After

Width:  |  Height:  |  Size: 736 KiB

View File

Before

Width:  |  Height:  |  Size: 287 KiB

After

Width:  |  Height:  |  Size: 287 KiB

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 207 KiB

View File

Before

Width:  |  Height:  |  Size: 350 KiB

After

Width:  |  Height:  |  Size: 350 KiB

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

Before

Width:  |  Height:  |  Size: 335 KiB

After

Width:  |  Height:  |  Size: 335 KiB

View File

Before

Width:  |  Height:  |  Size: 553 KiB

After

Width:  |  Height:  |  Size: 553 KiB

View File

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 698 KiB

View File

Before

Width:  |  Height:  |  Size: 549 KiB

After

Width:  |  Height:  |  Size: 549 KiB

View File

Before

Width:  |  Height:  |  Size: 592 KiB

After

Width:  |  Height:  |  Size: 592 KiB

View File

Before

Width:  |  Height:  |  Size: 818 KiB

After

Width:  |  Height:  |  Size: 818 KiB

View File

Before

Width:  |  Height:  |  Size: 799 KiB

After

Width:  |  Height:  |  Size: 799 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 989 B

After

Width:  |  Height:  |  Size: 989 B

View File

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 647 B

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Some files were not shown because too many files have changed in this diff Show More