[Indicators] Support template override

Allow indicators to include their own custom templates.
WTD-608.

platform/commonUI/general/bundle.json

@@ -11,6 +11,10 @@
             {
                 "key": "action-button",
                 "templateUrl": "templates/controls/action-button.html"
+            },
+            {
+                "key": "indicator",
+                "templateUrl": "templates/indicator.html"
             }
         ],
         "controllers": [

platform/commonUI/general/res/templates/bottombar.html

@@ -1,23 +1,9 @@
 <div class='abs bottom-bar ue-bottom-bar' ng-controller="BottomBarController as bar">
     <div id='status' class='status-holder abs'>
-        <div ng-repeat="indicator in bar.getIndicators()"
+        <mct-include ng-repeat="indicator in bar.getIndicators()"
-             class='status block'
+                     ng-model="indicator.ngModel"
-             ng-class='indicator.getClass()'>
+                     key="indicator.template">
-            <span class="ui-symbol status-indicator"
+        </mct-include>
-                  ng-class='indicator.getGlyphClass()'>
-                {{indicator.getGlyph()}}
-            </span>
-            <span class="label"
-                  ng-class='indicator.getTextClass()'>
-                {{indicator.getText()}}
-            </span>
-            <a href=''
-               class="ui-symbol"
-               ng-if="indicator.configure"
-               ng-click="indicator.configure()">
-                G
-            </a>
-        </div>
     </div>
     <!--mct-include key="'app-logo'"></mct-include-->
 </div>

platform/commonUI/general/res/templates/indicator.html

@@ -0,0 +1,17 @@
+<div class='status block'
+     ng-click='ngModel.configure()'
+     ng-class='ngModel.getClass()'>
+    <span class="ui-symbol status-indicator"
+          ng-class='ngModel.getGlyphClass()'>
+        {{ngModel.getGlyph()}}
+    </span>
+    <span class="label"
+          ng-class='ngModel.getTextClass()'>
+        {{ngModel.getText()}}
+    </span>
+    <a href=''
+       class="ui-symbol"
+       ng-if="ngModel.configure">
+        G
+    </a>
+</div>

platform/commonUI/general/src/BottomBarController.js

@@ -11,13 +11,17 @@ define(
          * @constructor
          */
         function BottomBarController(indicators) {
-            // Utility function used to instantiate indicators
+            // Utility function used to make indicators presentable
-            // from their injected constructors.
+            // for display.
-            function instantiate(Indicator) {
+            function present(Indicator) {
-                return new Indicator();
+                return {
+                    template: Indicator.template || "indicator",
+                    ngModel: typeof Indicator === 'function' ?
+                            new Indicator() : Indicator
+                };
             }
 
-            indicators = indicators.map(instantiate);
+            indicators = indicators.map(present);
 
             return {
                 /**