refactor(routing): fixed most of the pages

src/app/pages/buttons/ButtonPageCtrl.js

@@ -6,7 +6,7 @@
   'use strict';
 
   angular.module('BlurAdmin.pages.buttons')
-      .service('ButtonPageCtrl', ButtonPageCtrl);
+      .controller('ButtonPageCtrl', ButtonPageCtrl);
 
   /** @ngInject */
   function ButtonPageCtrl($scope) {

src/app/pages/icons/IconsPageCtrl.js

@@ -6,7 +6,7 @@
   'use strict';
 
   angular.module('BlurAdmin.pages.icons')
-      .service('IconsPageCtrl', IconsPageCtrl);
+      .controller('IconsPageCtrl', IconsPageCtrl);
 
   /** @ngInject */
   function IconsPageCtrl($scope) {

src/app/pages/icons/icons.html

@@ -3,21 +3,21 @@
   <div class="row">
     <div class="col-md-6">
       <blur-panel title="Kameleon SVG Icons" class-container="with-scroll">
-        <div ng-include="'app/pages/icons/widgets/kameleon.html'"></div>
+        <div include-with-scope="app/pages/icons/widgets/kameleon.html"></div>
       </blur-panel>
       <blur-panel title="Socicon" class-container="with-scroll">
-        <div ng-include="'app/pages/icons/widgets/socicon.html'"></div>
+        <div include-with-scope="app/pages/icons/widgets/socicon.html"></div>
       </blur-panel>
     </div>
     <div class="col-md-6">
       <blur-panel title="Icons With Rounded Background" class-container="with-scroll" >
-        <div ng-include="'app/pages/icons/widgets/kameleonRounded.html'"></div>
+        <div include-with-scope="app/pages/icons/widgets/kameleonRounded.html"></div>
       </blur-panel>
       <blur-panel title="ionicons" class-container="with-scroll">
-        <div ng-include="'app/pages/icons/widgets/ionicons.html'"></div>
+        <div include-with-scope="app/pages/icons/widgets/ionicons.html"></div>
       </blur-panel>
       <blur-panel title="Font Awesome Icons" class-container="with-scroll">
-        <div ng-include="'app/pages/icons/widgets/fontAwesomeIcons.html'"></div>
+        <div include-with-scope="app/pages/icons/widgets/fontAwesomeIcons.html"></div>
       </blur-panel>
     </div>
   </div>

src/app/pages/icons/widgets/fontAwesomeIcons.html

@@ -1,4 +1,4 @@
-<div class="row icons-list success" ng-controller="iconsPageCtrl">
+<div class="row icons-list success">
   <div class="col-xs-2" ng-repeat="icon in icons.fontAwesomeIcons"><i class="fa {{icon}}"></i></div>
 </div>
 <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" class="see-all-icons">See all Font Awesome icons</a>

src/app/pages/icons/widgets/ionicons.html

@@ -1,4 +1,4 @@
-<div class="row icons-list primary" ng-controller="iconsPageCtrl">
+<div class="row icons-list primary">
   <div class="col-xs-2" ng-repeat="icon in icons.ionicons"><i class="{{icon}}"></i></div>
 </div>
 <a href="http://ionicons.com/" target="_blank" class="see-all-icons">See all ionicons icons</a>

src/app/pages/icons/widgets/kameleon.html

@@ -1,4 +1,4 @@
-<div class="row clearfix" ng-controller="iconsPageCtrl">
+<div class="row clearfix">
   <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>

src/app/pages/icons/widgets/kameleonRounded.html

@@ -1,4 +1,4 @@
-<div class="row clearfix" ng-controller="iconsPageCtrl">
+<div class="row clearfix">
   <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>

src/app/pages/icons/widgets/socicon.html

@@ -1,4 +1,4 @@
-<div class="row icons-list danger" ng-controller="iconsPageCtrl">
+<div class="row icons-list danger">
   <div class="col-xs-2" ng-repeat="icon in icons.socicon"><i class="socicon">{{ icon }}</i></div>
 </div>
 <a href="http://www.socicon.com/chart.php" target="_blank" class="see-all-icons">See all Socicon icons</a>

src/app/pages/maps/leaflet/LeafletPageCtrl.js

@@ -9,8 +9,9 @@
       .controller('LeafletPageCtrl', LeafletPageCtrl);
 
   /** @ngInject */
-  function LeafletPageCtrl() {
+  function LeafletPageCtrl($timeout) {
-    var map = L.map('leaflet-map').setView([51.505, -0.09], 13);
+    function initialize() {
+      var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13);
 
       L.Icon.Default.imagePath = 'img';
 
@@ -23,4 +24,10 @@
           .openPopup();
     }
 
+    $timeout(function(){
+      initialize();
+    }, 100);
+
+  }
+
 })();

src/app/pages/maps/map-bubbles/MapBubblePageCtrl.js

@@ -9,7 +9,7 @@
       .controller('MapBubblePageCtrl', MapBubblePageCtrl);
 
   /** @ngInject */
-  function MapBubblePageCtrl(layoutColors) {
+  function MapBubblePageCtrl(layoutColors, $timeout) {
     var latlong = {};
     latlong['AD'] = {'latitude': 42.5, 'longitude': 1.5};
     latlong['AE'] = {'latitude': 24, 'longitude': 54};
@@ -492,7 +492,9 @@
       enabled: true
     };
 
+    $timeout(function() {
       map.write('map-bubbles');
+    }, 100);
   }
 
 })();

src/app/pages/maps/map-lines/MapLinesPageCtrl.js

@@ -6,15 +6,15 @@
   'use strict';
 
   angular.module('BlurAdmin.pages.maps')
-      .service('MapLinesPageCtrl', MapLinesPageCtrl);
+      .controller('MapLinesPageCtrl', MapLinesPageCtrl);
 
   /** @ngInject */
-  function MapLinesPageCtrl(layoutColors) {
+  function MapLinesPageCtrl(layoutColors, $timeout) {
     // 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
     var planeSVG = 'M19.671,8.11l-2.777,2.777l-3.837-0.861c0.362-0.505,0.916-1.683,0.464-2.135c-0.518-0.517-1.979,0.278-2.305,0.604l-0.913,0.913L7.614,8.804l-2.021,2.021l2.232,1.061l-0.082,0.082l1.701,1.701l0.688-0.687l3.164,1.504L9.571,18.21H6.413l-1.137,1.138l3.6,0.948l1.83,1.83l0.947,3.598l1.137-1.137V21.43l3.725-3.725l1.504,3.164l-0.687,0.687l1.702,1.701l0.081-0.081l1.062,2.231l2.02-2.02l-0.604-2.689l0.912-0.912c0.326-0.326,1.121-1.789,0.604-2.306c-0.452-0.452-1.63,0.101-2.135,0.464l-0.861-3.838l2.777-2.777c0.947-0.947,3.599-4.862,2.62-5.839C24.533,4.512,20.618,7.163,19.671,8.11z';
-
+    $timeout(function() {
       var map = AmCharts.makeChart( 'map-lines', {
         type: 'map',
         theme: 'blur',
@@ -271,6 +271,8 @@
         },
         pathToImages: 'img/'
       } );
+    }, 100);
+
   }
 
 })();

src/app/pages/modals/modals.html

@@ -3,7 +3,7 @@
   <div class="row">
     <div class="col-md-12">
       <blur-panel title="Modals" class-container="with-scroll">
-        <div ng-include="'app/pages/modals/widgets/modals.html'"></div>
+        <div ng-include="'app/pages/modals/modalsPanel.html'"></div>
       </blur-panel>
     </div>
   </div>
@@ -11,12 +11,12 @@
   <div class="row">
     <div class="col-md-6">
       <blur-panel title="Message Modals" class-container="with-scroll">
-        <div ng-include="'app/pages/modals/widgets/message-modals.html'"></div>
+        <div ng-include="'app/pages/modals/message-modals.html'"></div>
       </blur-panel>
     </div>
     <div class="col-md-6">
       <blur-panel title="Notifications" class-container="with-scroll" >
-        <div ng-include="'app/pages/modals/widgets/notifications/notifications.html'"></div>
+        <div ng-include="'app/pages/modals/notifications/notifications.html'"></div>
       </blur-panel>
     </div>
   </div>

src/app/pages/tables/TablesPageCtrl.js

@@ -6,7 +6,7 @@
   'use strict';
 
   angular.module('BlurAdmin.pages.tables')
-      .service('TablesPageCtrl', TablesPageCtrl);
+      .controller('TablesPageCtrl', TablesPageCtrl);
 
   /** @ngInject */
   function TablesPageCtrl($scope) {

src/app/pages/tables/tables.html

@@ -3,7 +3,7 @@
   <div class="row">
     <div class="col-md-12">
       <blur-panel title="Smart Table" class-container="with-scroll">
-        <div ng-include="'app/pages/tables/widgets/smartTable.html'"></div>
+        <div include-with-scope="app/pages/tables/widgets/smartTable.html"></div>
       </blur-panel>
     </div>
   </div>
@@ -11,18 +11,18 @@
   <div class="row">
     <div class="col-md-6">
       <blur-panel title="Hover Tows and Fix Headers" class-container="with-scroll">
-        <div ng-include="'app/pages/tables/widgets/hoverRows.html'"></div>
+        <div include-with-scope="app/pages/tables/widgets/hoverRows.html"></div>
       </blur-panel>
       <blur-panel title="Condensed Table" class-container="with-scroll">
-        <div ng-include="'app/pages/tables/widgets/condensedTable.html'"></div>
+        <div include-with-scope="app/pages/tables/widgets/condensedTable.html"></div>
       </blur-panel>
     </div>
     <div class="col-md-6">
       <blur-panel title="Striped Rows" class-container="with-scroll" >
-        <div ng-include="'app/pages/tables/widgets/stripedRows.html'"></div>
+        <div include-with-scope="app/pages/tables/widgets/stripedRows.html"></div>
       </blur-panel>
       <blur-panel title="Bordered Table" class-container="with-scroll" >
-        <div ng-include="'app/pages/tables/widgets/borderedTable.html'"></div>
+        <div include-with-scope="app/pages/tables/widgets/borderedTable.html"></div>
       </blur-panel>
     </div>
   </div>

src/app/pages/tables/widgets/borderedTable.html

@@ -1,4 +1,4 @@
-<div class="horizontal-scroll" ng-controller="tablesPageCtrl">
+<div class="horizontal-scroll">
   <table class="table table-bordered">
     <thead>
     <tr>

src/app/pages/tables/widgets/condensedTable.html

@@ -1,4 +1,4 @@
-<div class="horizontal-scroll" ng-controller="tablesPageCtrl">
+<div class="horizontal-scroll">
   <table class="table table-condensed">
     <thead>
     <tr>

src/app/pages/tables/widgets/hoverRows.html

@@ -1,4 +1,4 @@
-<div class="horizontal-scroll" ng-controller="tablesPageCtrl">
+<div class="horizontal-scroll">
   <table class="table table-hover">
     <thead>
     <tr>

src/app/pages/tables/widgets/smartTable.html

@@ -1,5 +1,5 @@
 <div class="horizontal-scroll">
-  <table class="table" st-table="smartTableData" ng-controller="tablesPageCtrl">
+  <table class="table" st-table="smartTableData">
     <thead>
     <tr class="sortable">
       <th class="table-id" st-sort="id">#</th>

src/app/pages/tables/widgets/stripedRows.html

@@ -1,4 +1,4 @@
-<div class="vertical-scroll" ng-controller="tablesPageCtrl">
+<div class="vertical-scroll">
   <table class="table table-striped">
     <thead>
     <tr>

src/app/theme/directives/includeWithScope.js

@@ -0,0 +1,21 @@
+/**
+ * @author v.lugovsky
+ * created on 16.12.2015
+ */
+(function () {
+  'use strict';
+
+  angular.module('BlurAdmin.theme')
+      .directive('includeWithScope', includeWithScope);
+
+  /** @ngInject */
+  function includeWithScope() {
+    return {
+      restrict: 'AE',
+      templateUrl: function(ele, attrs) {
+        return attrs.includeWithScope;
+      }
+    };
+  }
+
+})();