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,18 +9,25 @@
       .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';
+      L.Icon.Default.imagePath = 'img';
 
-    L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+      L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
-      attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+        attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-    }).addTo(map);
+      }).addTo(map);
+
+      L.marker([51.5, -0.09]).addTo(map)
+          .bindPopup('A pretty CSS3 popup.<br> Easily customizable.')
+          .openPopup();
+    }
+
+    $timeout(function(){
+      initialize();
+    }, 100);
 
-    L.marker([51.5, -0.09]).addTo(map)
-        .bindPopup('A pretty CSS3 popup.<br> Easily customizable.')
-        .openPopup();
   }
 
 })();

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
     };
 
-    map.write('map-bubbles');
+    $timeout(function() {
+      map.write('map-bubbles');
+    }, 100);
   }
 
 })();

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

@@ -6,141 +6,73 @@
   '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', {
+      var map = AmCharts.makeChart( 'map-lines', {
-      type: 'map',
+        type: 'map',
-      theme: 'blur',
+        theme: 'blur',
-      dataProvider: {
+        dataProvider: {
-        map: 'worldLow',
+          map: 'worldLow',
-        linkToObject: 'london',
+          linkToObject: 'london',
-        images: [ {
-          id: 'london',
-          color: layoutColors.primaryDark,
-          svgPath: targetSVG,
-          title: 'London',
-          latitude: 51.5002,
-          longitude: -0.1262,
-          scale: 1.5,
-          zoomLevel: 2.74,
-          zoomLongitude: -20.1341,
-          zoomLatitude: 49.1712,
-
-          lines: [ {
-            latitudes: [ 51.5002, 50.4422 ],
-            longitudes: [ -0.1262, 30.5367 ]
-          }, {
-            latitudes: [ 51.5002, 46.9480 ],
-            longitudes: [ -0.1262, 7.4481 ]
-          }, {
-            latitudes: [ 51.5002, 59.3328 ],
-            longitudes: [ -0.1262, 18.0645 ]
-          }, {
-            latitudes: [ 51.5002, 40.4167 ],
-            longitudes: [ -0.1262, -3.7033 ]
-          }, {
-            latitudes: [ 51.5002, 46.0514 ],
-            longitudes: [ -0.1262, 14.5060 ]
-          }, {
-            latitudes: [ 51.5002, 48.2116 ],
-            longitudes: [ -0.1262, 17.1547 ]
-          }, {
-            latitudes: [ 51.5002, 44.8048 ],
-            longitudes: [ -0.1262, 20.4781 ]
-          }, {
-            latitudes: [ 51.5002, 55.7558 ],
-            longitudes: [ -0.1262, 37.6176 ]
-          }, {
-            latitudes: [ 51.5002, 38.7072 ],
-            longitudes: [ -0.1262, -9.1355 ]
-          }, {
-            latitudes: [ 51.5002, 54.6896 ],
-            longitudes: [ -0.1262, 25.2799 ]
-          }, {
-            latitudes: [ 51.5002, 64.1353 ],
-            longitudes: [ -0.1262, -21.8952 ]
-          }, {
-            latitudes: [ 51.5002, 40.4300 ],
-            longitudes: [ -0.1262, -74.0000 ]
-          } ],
-
           images: [ {
-            label: 'Flights from London',
+            id: 'london',
-            svgPath: planeSVG,
-            left: 100,
-            top: 45,
-            labelShiftY: 5,
-            color: layoutColors.danger,
-            labelColor: layoutColors.danger,
-            labelRollOverColor: layoutColors.danger,
-            labelFontSize: 20
-          }, {
-            label: 'show flights from Vilnius',
-            left: 106,
-            top: 70,
-            labelColor: layoutColors.primaryDark,
-            labelRollOverColor: layoutColors.danger,
-            labelFontSize: 11,
-            linkToObject: 'vilnius'
-          } ]
-        },
-
-          {
-            id: 'vilnius',
             color: layoutColors.primaryDark,
             svgPath: targetSVG,
-            title: 'Vilnius',
+            title: 'London',
-            latitude: 54.6896,
+            latitude: 51.5002,
-            longitude: 25.2799,
+            longitude: -0.1262,
             scale: 1.5,
-            zoomLevel: 4.92,
+            zoomLevel: 2.74,
-            zoomLongitude: 15.4492,
+            zoomLongitude: -20.1341,
-            zoomLatitude: 50.2631,
+            zoomLatitude: 49.1712,
 
             lines: [ {
-              latitudes: [ 54.6896, 50.8371 ],
+              latitudes: [ 51.5002, 50.4422 ],
-              longitudes: [ 25.2799, 4.3676 ]
+              longitudes: [ -0.1262, 30.5367 ]
             }, {
-              latitudes: [ 54.6896, 59.9138 ],
+              latitudes: [ 51.5002, 46.9480 ],
-              longitudes: [ 25.2799, 10.7387 ]
+              longitudes: [ -0.1262, 7.4481 ]
             }, {
-              latitudes: [ 54.6896, 40.4167 ],
+              latitudes: [ 51.5002, 59.3328 ],
-              longitudes: [ 25.2799, -3.7033 ]
+              longitudes: [ -0.1262, 18.0645 ]
             }, {
-              latitudes: [ 54.6896, 50.0878 ],
+              latitudes: [ 51.5002, 40.4167 ],
-              longitudes: [ 25.2799, 14.4205 ]
+              longitudes: [ -0.1262, -3.7033 ]
             }, {
-              latitudes: [ 54.6896, 48.2116 ],
+              latitudes: [ 51.5002, 46.0514 ],
-              longitudes: [ 25.2799, 17.1547 ]
+              longitudes: [ -0.1262, 14.5060 ]
             }, {
-              latitudes: [ 54.6896, 44.8048 ],
+              latitudes: [ 51.5002, 48.2116 ],
-              longitudes: [ 25.2799, 20.4781 ]
+              longitudes: [ -0.1262, 17.1547 ]
             }, {
-              latitudes: [ 54.6896, 55.7558 ],
+              latitudes: [ 51.5002, 44.8048 ],
-              longitudes: [ 25.2799, 37.6176 ]
+              longitudes: [ -0.1262, 20.4781 ]
             }, {
-              latitudes: [ 54.6896, 37.9792 ],
+              latitudes: [ 51.5002, 55.7558 ],
-              longitudes: [ 25.2799, 23.7166 ]
+              longitudes: [ -0.1262, 37.6176 ]
             }, {
-              latitudes: [ 54.6896, 54.6896 ],
+              latitudes: [ 51.5002, 38.7072 ],
-              longitudes: [ 25.2799, 25.2799 ]
+              longitudes: [ -0.1262, -9.1355 ]
             }, {
-              latitudes: [ 54.6896, 51.5002 ],
+              latitudes: [ 51.5002, 54.6896 ],
-              longitudes: [ 25.2799, -0.1262 ]
+              longitudes: [ -0.1262, 25.2799 ]
             }, {
-              latitudes: [ 54.6896, 53.3441 ],
+              latitudes: [ 51.5002, 64.1353 ],
-              longitudes: [ 25.2799, -6.2675 ]
+              longitudes: [ -0.1262, -21.8952 ]
+            }, {
+              latitudes: [ 51.5002, 40.4300 ],
+              longitudes: [ -0.1262, -74.0000 ]
             } ],
 
             images: [ {
-              label: 'Flights from Vilnius',
+              label: 'Flights from London',
               svgPath: planeSVG,
               left: 100,
               top: 45,
@@ -150,127 +82,197 @@
               labelRollOverColor: layoutColors.danger,
               labelFontSize: 20
             }, {
-              label: 'show flights from London',
+              label: 'show flights from Vilnius',
               left: 106,
               top: 70,
               labelColor: layoutColors.primaryDark,
               labelRollOverColor: layoutColors.danger,
               labelFontSize: 11,
-              linkToObject: 'london'
+              linkToObject: 'vilnius'
             } ]
-          }, {
+          },
-            svgPath: targetSVG,
-            title: 'Brussels',
-            latitude: 50.8371,
-            longitude: 4.3676
-          }, {
-            svgPath: targetSVG,
-            title: 'Prague',
-            latitude: 50.0878,
-            longitude: 14.4205
-          }, {
-            svgPath: targetSVG,
-            title: 'Athens',
-            latitude: 37.9792,
-            longitude: 23.7166
-          }, {
-            svgPath: targetSVG,
-            title: 'Reykjavik',
-            latitude: 64.1353,
-            longitude: -21.8952
-          }, {
-            svgPath: targetSVG,
-            title: 'Dublin',
-            latitude: 53.3441,
-            longitude: -6.2675
-          }, {
-            svgPath: targetSVG,
-            title: 'Oslo',
-            latitude: 59.9138,
-            longitude: 10.7387
-          }, {
-            svgPath: targetSVG,
-            title: 'Lisbon',
-            latitude: 38.7072,
-            longitude: -9.1355
-          }, {
-            svgPath: targetSVG,
-            title: 'Moscow',
-            latitude: 55.7558,
-            longitude: 37.6176
-          }, {
-            svgPath: targetSVG,
-            title: 'Belgrade',
-            latitude: 44.8048,
-            longitude: 20.4781
-          }, {
-            svgPath: targetSVG,
-            title: 'Bratislava',
-            latitude: 48.2116,
-            longitude: 17.1547
-          }, {
-            svgPath: targetSVG,
-            title: 'Ljubljana',
-            latitude: 46.0514,
-            longitude: 14.5060
-          }, {
-            svgPath: targetSVG,
-            title: 'Madrid',
-            latitude: 40.4167,
-            longitude: -3.7033
-          }, {
-            svgPath: targetSVG,
-            title: 'Stockholm',
-            latitude: 59.3328,
-            longitude: 18.0645
-          }, {
-            svgPath: targetSVG,
-            title: 'Bern',
-            latitude: 46.9480,
-            longitude: 7.4481
-          }, {
-            svgPath: targetSVG,
-            title: 'Kiev',
-            latitude: 50.4422,
-            longitude: 30.5367
-          }, {
-            svgPath: targetSVG,
-            title: 'Paris',
-            latitude: 48.8567,
-            longitude: 2.3510
-          }, {
-            svgPath: targetSVG,
-            title: 'New York',
-            latitude: 40.43,
-            longitude: -74
-          }
-        ]
-      },
 
-      areasSettings: {
+            {
-        unlistedAreasColor: layoutColors.warning
+              id: 'vilnius',
-      },
+              color: layoutColors.primaryDark,
+              svgPath: targetSVG,
+              title: 'Vilnius',
+              latitude: 54.6896,
+              longitude: 25.2799,
+              scale: 1.5,
+              zoomLevel: 4.92,
+              zoomLongitude: 15.4492,
+              zoomLatitude: 50.2631,
 
-      imagesSettings: {
+              lines: [ {
-        color: layoutColors.danger,
+                latitudes: [ 54.6896, 50.8371 ],
-        rollOverColor: layoutColors.danger,
+                longitudes: [ 25.2799, 4.3676 ]
-        selectedColor: layoutColors.primaryDark
+              }, {
-      },
+                latitudes: [ 54.6896, 59.9138 ],
+                longitudes: [ 25.2799, 10.7387 ]
+              }, {
+                latitudes: [ 54.6896, 40.4167 ],
+                longitudes: [ 25.2799, -3.7033 ]
+              }, {
+                latitudes: [ 54.6896, 50.0878 ],
+                longitudes: [ 25.2799, 14.4205 ]
+              }, {
+                latitudes: [ 54.6896, 48.2116 ],
+                longitudes: [ 25.2799, 17.1547 ]
+              }, {
+                latitudes: [ 54.6896, 44.8048 ],
+                longitudes: [ 25.2799, 20.4781 ]
+              }, {
+                latitudes: [ 54.6896, 55.7558 ],
+                longitudes: [ 25.2799, 37.6176 ]
+              }, {
+                latitudes: [ 54.6896, 37.9792 ],
+                longitudes: [ 25.2799, 23.7166 ]
+              }, {
+                latitudes: [ 54.6896, 54.6896 ],
+                longitudes: [ 25.2799, 25.2799 ]
+              }, {
+                latitudes: [ 54.6896, 51.5002 ],
+                longitudes: [ 25.2799, -0.1262 ]
+              }, {
+                latitudes: [ 54.6896, 53.3441 ],
+                longitudes: [ 25.2799, -6.2675 ]
+              } ],
 
-      linesSettings: {
+              images: [ {
-        color: layoutColors.danger,
+                label: 'Flights from Vilnius',
-        alpha: 0.4
+                svgPath: planeSVG,
-      },
+                left: 100,
+                top: 45,
+                labelShiftY: 5,
+                color: layoutColors.danger,
+                labelColor: layoutColors.danger,
+                labelRollOverColor: layoutColors.danger,
+                labelFontSize: 20
+              }, {
+                label: 'show flights from London',
+                left: 106,
+                top: 70,
+                labelColor: layoutColors.primaryDark,
+                labelRollOverColor: layoutColors.danger,
+                labelFontSize: 11,
+                linkToObject: 'london'
+              } ]
+            }, {
+              svgPath: targetSVG,
+              title: 'Brussels',
+              latitude: 50.8371,
+              longitude: 4.3676
+            }, {
+              svgPath: targetSVG,
+              title: 'Prague',
+              latitude: 50.0878,
+              longitude: 14.4205
+            }, {
+              svgPath: targetSVG,
+              title: 'Athens',
+              latitude: 37.9792,
+              longitude: 23.7166
+            }, {
+              svgPath: targetSVG,
+              title: 'Reykjavik',
+              latitude: 64.1353,
+              longitude: -21.8952
+            }, {
+              svgPath: targetSVG,
+              title: 'Dublin',
+              latitude: 53.3441,
+              longitude: -6.2675
+            }, {
+              svgPath: targetSVG,
+              title: 'Oslo',
+              latitude: 59.9138,
+              longitude: 10.7387
+            }, {
+              svgPath: targetSVG,
+              title: 'Lisbon',
+              latitude: 38.7072,
+              longitude: -9.1355
+            }, {
+              svgPath: targetSVG,
+              title: 'Moscow',
+              latitude: 55.7558,
+              longitude: 37.6176
+            }, {
+              svgPath: targetSVG,
+              title: 'Belgrade',
+              latitude: 44.8048,
+              longitude: 20.4781
+            }, {
+              svgPath: targetSVG,
+              title: 'Bratislava',
+              latitude: 48.2116,
+              longitude: 17.1547
+            }, {
+              svgPath: targetSVG,
+              title: 'Ljubljana',
+              latitude: 46.0514,
+              longitude: 14.5060
+            }, {
+              svgPath: targetSVG,
+              title: 'Madrid',
+              latitude: 40.4167,
+              longitude: -3.7033
+            }, {
+              svgPath: targetSVG,
+              title: 'Stockholm',
+              latitude: 59.3328,
+              longitude: 18.0645
+            }, {
+              svgPath: targetSVG,
+              title: 'Bern',
+              latitude: 46.9480,
+              longitude: 7.4481
+            }, {
+              svgPath: targetSVG,
+              title: 'Kiev',
+              latitude: 50.4422,
+              longitude: 30.5367
+            }, {
+              svgPath: targetSVG,
+              title: 'Paris',
+              latitude: 48.8567,
+              longitude: 2.3510
+            }, {
+              svgPath: targetSVG,
+              title: 'New York',
+              latitude: 40.43,
+              longitude: -74
+            }
+          ]
+        },
+
+        areasSettings: {
+          unlistedAreasColor: layoutColors.warning
+        },
+
+        imagesSettings: {
+          color: layoutColors.danger,
+          rollOverColor: layoutColors.danger,
+          selectedColor: layoutColors.primaryDark
+        },
+
+        linesSettings: {
+          color: layoutColors.danger,
+          alpha: 0.4
+        },
 
 
-      backgroundZoomsToTop: true,
+        backgroundZoomsToTop: true,
-      linesAboveImages: true,
+        linesAboveImages: true,
+
+        export: {
+          'enabled': true
+        },
+        pathToImages: 'img/'
+      } );
+    }, 100);
 
-      export: {
-        'enabled': true
-      },
-      pathToImages: 'img/'
-    } );
   }
 
 })();

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;
+      }
+    };
+  }
+
+})();