From 44504feeb9101d5abf947b3c0a60f3577bc0c237 Mon Sep 17 00:00:00 2001
From: Charbel <charbel.f.rami@gmail.com>
Date: Mon, 22 Aug 2016 15:38:17 -0300
Subject: [PATCH] [Frontend] Tweak markup

---
 index.html                                    | 21 ++++----
 .../forms/res/templates/controls/color.html   |  8 +--
 .../res/templates/controls/composite.html     | 26 +++++-----
 platform/forms/res/templates/toolbar.html     | 52 +++++++++----------
 4 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/index.html b/index.html
index e47efe91b5..fcd37cfb0b 100644
--- a/index.html
+++ b/index.html
@@ -19,16 +19,15 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<!DOCTYPE html>
-<html>
-<head lang="en">
-    <meta charset="UTF-8">
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title></title>
-    <script type="text/javascript"
-            src="bower_components/requirejs/require.js">
+    <script src="bower_components/requirejs/require.js">
     </script>
-    <script type="text/javascript">
+    <script>
         require(['main'], function (mct) {
             require([
                 './example/imagery/bundle',
@@ -39,10 +38,10 @@
     </script>
     <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
     <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
-	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
-	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
-	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
-	<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
 </head>
 <body class="user-environ">
     <div class="l-splash-holder s-splash-holder">
diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html
index e7e4913341..c9a4bbdd4a 100644
--- a/platform/forms/res/templates/controls/color.html
+++ b/platform/forms/res/templates/controls/color.html
@@ -36,18 +36,18 @@
         ng-controller="ColorController as colors"
         ng-show="toggle.isActive()">
         <div
-	        class="l-palette-row l-option-row"
-	        ng-if="!structure.mandatory">
+            class="l-palette-row l-option-row"
+            ng-if="!structure.mandatory">
             <div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
                 ng-click="ngModel[field] = 'transparent'">
             </div>
             <span class="l-palette-item-label">None</span>
         </div>
         <div
-	        class="l-palette-row"
+            class="l-palette-row"
             ng-repeat="group in colors.groups()">
             <div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}"
-	            ng-repeat="color in group"
+                ng-repeat="color in group"
                 ng-style="{ background: color }"
                 ng-click="ngModel[field] = color">
             </div>
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html
index 1c3559e2fc..e036617c3c 100644
--- a/platform/forms/res/templates/controls/composite.html
+++ b/platform/forms/res/templates/controls/composite.html
@@ -21,18 +21,18 @@
 -->
 <span ng-controller="CompositeController as compositeCtrl">
     <ng-form name="mctFormItem" ng-repeat="item in structure.items">
-	    <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
-	        <mct-control key="item.control"
-	                     ng-model="ngModel[field]"
-	                     ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
-	                     ng-pattern="ngPattern"
-	                     options="item.options"
-	                     structure="row"
-	                     field="$index">
-	        </mct-control>
-	        <span class="composite-control-label">
-	            {{item.name}}
-	        </span>
-	    </div>
+        <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
+            <mct-control key="item.control"
+                         ng-model="ngModel[field]"
+                         ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
+                         ng-pattern="ngPattern"
+                         options="item.options"
+                         structure="row"
+                         field="$index">
+            </mct-control>
+            <span class="composite-control-label">
+                {{item.name}}
+            </span>
+        </div>
     </ng-form>
 </span>
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
index 58923e0314..f109b670e7 100644
--- a/platform/forms/res/templates/toolbar.html
+++ b/platform/forms/res/templates/toolbar.html
@@ -20,31 +20,31 @@
  at runtime from the About dialog for additional information.
 -->
 <form novalidate>
-	<div class="tool-bar btn-bar contents abs">
-	    <span ng-repeat="section in structure.sections"
-	          class="l-control-group"
-	          ng-if="!section.hidden"
-	          title="{{section.description}}">
-	        <ng-form ng-repeat="item in section.items"
-	                 ng-class="{ 'input-labeled': item.name }"
-	                 ng-hide="item.hidden"
-	                 class="inline"
-	                 title="{{item.description}}"
-	                 name="mctFormInner">
+    <div class="tool-bar btn-bar contents abs">
+        <span ng-repeat="section in structure.sections"
+              class="l-control-group"
+              ng-if="!section.hidden"
+              title="{{section.description}}">
+            <ng-form ng-repeat="item in section.items"
+                     ng-class="{ 'input-labeled': item.name }"
+                     ng-hide="item.hidden"
+                     class="inline"
+                     title="{{item.description}}"
+                     name="mctFormInner">
 
-	            <label ng-if="item.name">
-	                {{item.name}}:
-	            </label>
-	            <mct-control key="item.control"
-	                         ng-class="{ disabled: item.disabled }"
-	                         ng-model="ngModel"
-	                         ng-required="item.required"
-	                         ng-pattern="getRegExp(item.pattern)"
-	                         options="item.options"
-	                         structure="item"
-	                         field="item.key">
-	            </mct-control>
-	        </ng-form>
-	    </span>
-	</div>
+                <label ng-if="item.name">
+                    {{item.name}}:
+                </label>
+                <mct-control key="item.control"
+                             ng-class="{ disabled: item.disabled }"
+                             ng-model="ngModel"
+                             ng-required="item.required"
+                             ng-pattern="getRegExp(item.pattern)"
+                             options="item.options"
+                             structure="item"
+                             field="item.key">
+                </mct-control>
+            </ng-form>
+        </span>
+    </div>
 </form>
\ No newline at end of file
