Merge pull request #12864 from GordonSmith/HPCC-22635

HPCC-22635 ECL Watch fix minor HTML issues

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/templates/DFUQueryWidget.html

@@ -35,7 +35,7 @@
                                         <input title="${i18n.NoSplit}:" name="nosplit" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.Compress}:" name="compress" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.Wrap}:" name="Wrap" data-dojo-type="dijit.form.CheckBox" />
-                                        <input id="${id}RemoteCopyReplicate"title="${i18n.Replicate}:" name="replicate" data-dojo-type="dijit.form.CheckBox" />
+                                        <input id="${id}RemoteCopyReplicate" title="${i18n.Replicate}:" name="replicate" data-dojo-type="dijit.form.CheckBox" />
                                         <input title="${i18n.RetainSuperfileStructure}:" name="superCopy" data-dojo-type="dijit.form.CheckBox" />
                                     </div>
                                 </div>
@@ -53,7 +53,7 @@
                                 <div data-dojo-type="dijit.Fieldset">
                                     <legend>${i18n.Target}</legend>
                                     <div data-dojo-type="hpcc.TableContainer">
-                                        <input id="${id}CopyTargetSelect" title="${i18n.Group}:" name="destGroup" style="width:100%;" data-dojo-type="TargetSelectWidget" style="display: inline-block; vertical-align: middle" />
+                                        <input id="${id}CopyTargetSelect" title="${i18n.Group}:" name="destGroup" style="width:100%;display: inline-block; vertical-align: middle" data-dojo-type="TargetSelectWidget" />
                                     </div>
                                     <div id="${id}CopyGrid" data-dojo-type="SelectionGridWidget">
                                     </div>
@@ -101,13 +101,13 @@
                     <div id="${id}AddtoDropDown" data-dojo-type="dijit.form.DropDownButton">
                         <span>${i18n.AddToSuperfile}</span>
                         <div data-dojo-type="dijit.TooltipDialog">
-                            <div id="${id}AddToSuperfileForm" style="width:680px" onsubmit="return false;" data-dojo-type="dijit.form.Form" >
+                            <div id="${id}AddToSuperfileForm" style="width:680px" onsubmit="return false;" data-dojo-type="dijit.form.Form">
                                 <div data-dojo-type="dijit.Fieldset">
                                     <legend>${i18n.Target}</legend>
                                     <div class="dijitDialogPaneContentArea" data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
-                                        <input id="${id}CreateNewSuperRadio" title="${i18n.CreateANewFile}" checked="true" data-dojo-type="dijit.form.RadioButton"></input>
+                                        <input id="${id}CreateNewSuperRadio" title="${i18n.CreateANewFile}" checked="true" data-dojo-type="dijit.form.RadioButton" />
                                         <input id="${id}AddToSuperfileTargetName" style="width:100%;" name="Superfile" required="true" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
-                                        <input id="${id}AddToSuperfileTargetAppend" name="ExistingFile" title="${i18n.AddToExistingSuperfile}" data-dojo-type="dijit.form.RadioButton"></input>
+                                        <input id="${id}AddToSuperfileTargetAppend" name="ExistingFile" title="${i18n.AddToExistingSuperfile}" data-dojo-type="dijit.form.RadioButton" />
                                     </div>
                                     <div id="${id}AddToSuperfileGrid" data-dojo-type="SelectionGridWidget"></div>
                                 </div>
@@ -177,10 +177,10 @@
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <img src="${dojoConfig.urlInfo.resourcePath}/img/person.png" style="vertical-align: middle" alt="${i18n.Mine}">
                     <label for="Mine" class="bold" style="vertical-align: middle;">${i18n.Mine}</label>
-                    <input id="${id}Mine" name="Owner" title="${i18n.Mine}" data-dojo-attach-event="onChange:_onMine" data-dojo-type="dijit.form.CheckBox"/>
+                    <input id="${id}Mine" name="Owner" title="${i18n.Mine}" data-dojo-attach-event="onChange:_onMine" data-dojo-type="dijit.form.CheckBox" />
                     <div class="right" data-dojo-attach-event="onChange:_onMaximize" data-dojo-props="iconClass:'iconMaximize', showLabel:false" checked=false data-dojo-type="dijit.form.ToggleButton">${i18n.MaximizeRestore}</div>
                     <div id="${id}NewPage" class="right" data-dojo-attach-event="onClick:_onNewPage" data-dojo-props="iconClass:'iconNewPage', showLabel:false" data-dojo-type="dijit.form.Button">${i18n.OpenInNewPage}</div>
-                     <div id="${id}DownloadToList" class="right" data-dojo-attach-event="onClick:_onDownloadToList" data-dojo-type="dijit.form.Button">
+                    <div id="${id}DownloadToList" class="right" data-dojo-attach-event="onClick:_onDownloadToList" data-dojo-type="dijit.form.Button">
                         <span>${i18n.DownloadToCSV}</span>
                     </div>
                 </div>

esp/src/eclwatch/templates/DFUSearchWidget.html

@@ -2,82 +2,79 @@
     <div id="${id}BorderContainer" class="${baseClass}BorderContainer" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.BorderContainer">
         <div id="${id}ContentPane" data-dojo-props="region: 'center', tabPosition: 'top'" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.ContentPane">
             <div style="width: 100%; height: 100%" data-dojo-type="dijit.layout.BorderContainer">
-                <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">                	                    
+                <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <form>
-                    	<ul>
-                    		<li>
-		                    	<h2>Open DFU Workunit</h2>
-			                    <label for="WorkUnitId" class="Prompt">Workunit ID:</label>
-			                    <div><input name="FindDfuWu" type="text" data-dojo-type="dijit.form.TextBox" placeholder="enter workunit id"
-			                    data-dojo-props="trim:true, propercase:true"/>
-								</div>
-							</li>
-							<li>
-								<div>
-							<button data-dojo-type="dijit.form.Button" type="button">Load Below
-			                </button>
-			                	</div>
-			                </li>
-						</ul>	
-						<ul>
-							<li>			
-						<h2>Search DFU Workunits</h2>
-						<label for="Type" class="Prompt">Type:</label>
-						<div>
-							<select name="SelectType" data-dojo-type="dijit.form.Select">
-    							<option value="NA">Non&ndash;Archived Workunits</option>
-    							<option value="A" selected="Selected">Archived Workunits</option>    
-							</select>
-						</div>
-						</li>
-						<li>
-						<label for="Username" class="Prompt">Username:</label>
-						<div>
-							<input id="Username" data-dojo-type="dijit.form.TextBox" placeholder="enter username"
-                                data-dojo-props="trim:true, propercase:true">
-                        </div>
-                        </li>
-                        <li>
-                        <label for="Cluster" class="Prompt">Cluster:</label>
-                        <div>
-                        	<select name="SelectCluster" data-dojo-type="TargetSelectWidget">    								  
-							</select>
-						</div>
-						</li>
-						<li>
-						<label for="State" class="Prompt">State:</label>
-						<div>
-							<select name="SelectState" data-dojo-type="dijit.form.Select">
-	                            	<option>unknown</option>
-									<option>scheduled</option>
-									<option>compiled</option>
-									<option>running</option>
-									<option>finished</option>
-									<option>failed</option>
-									<option>aborting</option>
-									<option>aborted</option>
-									<option>blocked</option>
-									<option>monitoring</option>
-							</select>
-						</div>
-					</li>
-					<li>
-						<label for="Jobname" class="Prompt">Jobname:</label>
-						<div>
-							<input id="FindJobName" data-dojo-type="dijit.form.TextBox" placeholder="enter jobname"
-                                data-dojo-props="trim:true, propercase:true">
-                        </div>
-                    </li>
-                     <li>
-                        <div>
-                        	<button data-dojo-type="dijit.form.Button" type="button">Search
-                            </button>
-                        </div>
-                       </li>
-					</form>
-				</div>
-             	<div id="${id}InfoContainer" style="height: 35%" data-dojo-props="region: 'bottom', splitter: true, minSize: 120" data-dojo-type="InfoGridWidget">  </div>
-     		
+                        <ul>
+                            <li>
+                                <h2>Open DFU Workunit</h2>
+                                <label for="WorkUnitId" class="Prompt">Workunit ID:</label>
+                                <div><input name="FindDfuWu" type="text" data-dojo-type="dijit.form.TextBox" placeholder="enter workunit id" data-dojo-props="trim:true, propercase:true" />
+                                </div>
+                            </li>
+                            <li>
+                                <div>
+                                    <button data-dojo-type="dijit.form.Button" type="button">Load Below
+                                    </button>
+                                </div>
+                            </li>
+                        </ul>
+                        <ul>
+                            <li>
+                                <h2>Search DFU Workunits</h2>
+                                <label for="Type" class="Prompt">Type:</label>
+                                <div>
+                                    <select name="SelectType" data-dojo-type="dijit.form.Select">
+                                        <option value="NA">Non&ndash;Archived Workunits</option>
+                                        <option value="A" selected="Selected">Archived Workunits</option>
+                                    </select>
+                                </div>
+                            </li>
+                            <li>
+                                <label for="Username" class="Prompt">Username:</label>
+                                <div>
+                                    <input id="Username" data-dojo-type="dijit.form.TextBox" placeholder="enter username" data-dojo-props="trim:true, propercase:true">
+                                </div>
+                            </li>
+                            <li>
+                                <label for="Cluster" class="Prompt">Cluster:</label>
+                                <div>
+                                    <select name="SelectCluster" data-dojo-type="TargetSelectWidget">
+                                    </select>
+                                </div>
+                            </li>
+                            <li>
+                                <label for="State" class="Prompt">State:</label>
+                                <div>
+                                    <select name="SelectState" data-dojo-type="dijit.form.Select">
+                                        <option>unknown</option>
+                                        <option>scheduled</option>
+                                        <option>compiled</option>
+                                        <option>running</option>
+                                        <option>finished</option>
+                                        <option>failed</option>
+                                        <option>aborting</option>
+                                        <option>aborted</option>
+                                        <option>blocked</option>
+                                        <option>monitoring</option>
+                                    </select>
+                                </div>
+                            </li>
+                            <li>
+                                <label for="Jobname" class="Prompt">Jobname:</label>
+                                <div>
+                                    <input id="FindJobName" data-dojo-type="dijit.form.TextBox" placeholder="enter jobname" data-dojo-props="trim:true, propercase:true">
+                                </div>
+                            </li>
+                            <li>
+                                <div>
+                                    <button data-dojo-type="dijit.form.Button" type="button">Search</button>
+                                </div>
+                            </li>
+                        </ul>
+                    </form>
+                </div>
+                <div id="${id}InfoContainer" style="height: 35%" data-dojo-props="region: 'bottom', splitter: true, minSize: 120" data-dojo-type="InfoGridWidget"></div>
+            </div>
         </div>
-	</div>
-</div>
+    </div>
+</div>

esp/src/eclwatch/templates/HPCCPlatformWidget.html

@@ -12,10 +12,10 @@
                 </form>
                 <div class="seperator grey"></div>
                 <div id="userAccount">
-                    <span class="navBarLoggedin">${i18n.LoggedInAs}:  </span>
+                    <span class="navBarLoggedin">${i18n.LoggedInAs}: </span>
                     <a id="${id}UserID" href="#" data-dojo-attach-event="onClick:_onUserID"></a>
                     <span id="UserDivider"></span>
-                    <a id="Lock" href="#" data-dojo-attach-event="onClick:_onLock"/></a>
+                    <a id="Lock" href="#" data-dojo-attach-event="onClick:_onLock"></a>
                 </div>
                 <div class="seperator grey"></div>
                 <div id="${id}More" class="left glow" data-dojo-props="iconClass:'iconAdvanced', showLabel:false" data-dojo-type="dijit.form.DropDownButton">

esp/src/eclwatch/templates/LFDetailsWidget.html

@@ -15,7 +15,7 @@
                                 <div data-dojo-type="dijit.Fieldset">
                                     <legend>${i18n.Target}</legend>
                                     <div data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
-                                        <input id="${id}CopyTargetSelect" title="${i18n.Group}:" name="destGroup" colspan="2" style="width:100%;" data-dojo-type="TargetSelectWidget" style="display: inline-block; vertical-align: middle" />
+                                        <input id="${id}CopyTargetSelect" title="${i18n.Group}:" name="destGroup" colspan="2" style="width:100%;display: inline-block; vertical-align: middle" data-dojo-type="TargetSelectWidget" />
                                         <input id="${id}CopyTargetName" title="${i18n.TargetName}:" name="destLogicalName" colspan="2" style="width:100%;" required="true" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
                                     </div>
                                 </div>
@@ -29,7 +29,7 @@
                                         <input id="${id}CopyTargetWrap" title="${i18n.Wrap}:" name="Wrap" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}CopyTargetRetainSuperfileStructure" title="${i18n.RetainSuperfileStructure}:" name="superCopy" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}CopyPreserveCompression" title="${i18n.PreserveCompression}:" checked="true" name="preserveCompression" data-dojo-type="dijit.form.CheckBox" />
-                                        <input id="${id}CopyExpireDays" title="${i18n.ExpireDays}:" name="ExpireDays" data-dojo-type="dijit.form.NumberTextBox", />
+                                        <input id="${id}CopyExpireDays" title="${i18n.ExpireDays}:" name="ExpireDays" data-dojo-type="dijit.form.NumberTextBox" />
                                     </div>
                                 </div>
                                 <div class="dijitDialogPaneActionBar">
@@ -112,7 +112,7 @@
                 </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <h2>
-                        <img id="${id}CompressedImage"/>&nbsp;
+                        <img id="${id}CompressedImage" />&nbsp;
                         <img id="${id}ProtectedImage" src="${dojoConfig.urlInfo.resourcePath}/img/unlocked.png" />&nbsp;<img id="${id}StateIdImage" class="iconLogicalFile" />&nbsp;<span id="${id}Name" class="bold"></span>
                         <button id="${id}ClippyButton" class="clippy" data-clipboard-target="#${id}Name"><img src="${dojoConfig.urlInfo.resourcePath}/img/clippy.png" alt="${i18n.CopyToClipboard}"></button>
                     </h2>
@@ -144,7 +144,7 @@
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}isProtected">${i18n.Protected}:</label>
-                                <div><input id="${id}isProtected" data-dojo-type="dijit.form.CheckBox"/></div>
+                                <div><input id="${id}isProtected" data-dojo-type="dijit.form.CheckBox" /></div>
                             </li>
                             <li>
                                 <label for="${id}ContentType">${i18n.ContentType}: </label>

esp/src/eclwatch/templates/LogVisualizationWidget.html

@@ -8,8 +8,7 @@
                     <div class="right" data-dojo-attach-event="onChange:_onMaximize" data-dojo-props="iconClass:'iconMaximize', showLabel:false" checked=false data-dojo-type="dijit.form.ToggleButton">${i18n.MaximizeRestore}</div>
                     <div id="${id}NewPage" class="right" data-dojo-attach-event="onClick:_onNewPage" data-dojo-props="iconClass:'iconNewPage', showLabel:false" data-dojo-type="dijit.form.Button">${i18n.OpenInNewPage}</div>
                 </div>
-                </div>
             </div>
         </div>
     </div>
-</div>
+</div>

esp/src/eclwatch/templates/UserQueryWidget.html

@@ -120,7 +120,7 @@
                     <div id="${id}AdvancedPermissions" data-dojo-type="dijit.form.DropDownButton">
                         <span>${i18n.Advanced}</span>
                         <div data-dojo-type="dijit.DropDownMenu">
-                            <div data-dojo-attach-event="onClick:_onEnableScopeScans "id="${id}EnableScopeScans" data-dojo-type="dijit.MenuItem">${i18n.EnableScopeScans}</div>
+                            <div data-dojo-attach-event="onClick:_onEnableScopeScans" id="${id}EnableScopeScans" data-dojo-type="dijit.MenuItem">${i18n.EnableScopeScans}</div>
                             <div data-dojo-attach-event="onClick:_onDisableScopeScans" id="${id}DisableScopeScans" data-dojo-type="dijit.MenuItem">${i18n.DisableScopeScans}</div>
                             <span data-dojo-type="dijit.MenuSeparator"></span>
                             <div data-dojo-attach-event="onClick:_onFileScopeDefaultPermissions" id="${id}FileScopeDefaultPermissions" data-dojo-type="dijit.MenuItem">${i18n.FileScopeDefaultPermissions}</div>
@@ -145,7 +145,7 @@
         <div id="${id}FilePermissionForm" style="width:460px" data-dojo-type="dijit.form.Form">
             <div data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
                 <p>${i18n.PleaseSelectAUserOrGroup}</p>
-                <input id="${id}NameSelect" title="${i18n.Name}:" name="FileName" required="true" colspan="2" data-dojo-props="trim: true, required: true"  data-dojo-type="dijit.form.ValidationTextBox" />
+                <input id="${id}NameSelect" title="${i18n.Name}:" name="FileName" required="true" colspan="2" data-dojo-props="trim: true, required: true" data-dojo-type="dijit.form.ValidationTextBox" />
                 <input id="${id}UsersSelect" title="${i18n.Users}:" name="UserName" colspan="2" data-dojo-type="TargetSelectWidget" />
                 <input id="${id}GroupsSelect" title="${i18n.Groups}:" name="GroupName" colspan="2" data-dojo-type="TargetSelectWidget" />
             </div>

esp/src/eclwatch/templates/WUDetailsWidget.html

@@ -28,11 +28,11 @@
                         <div data-dojo-type="dijit.TooltipDialog">
                             <div id="${id}PublishForm" style="width:460px" onsubmit="return false;" data-dojo-type="dijit.form.Form">
                                 <div class="dijitDialogPaneContentArea" data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
-                                    <input id="${id}Jobname2" title="${i18n.JobName}:" colspan="2" style="width:100%" required="true" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox"/>
-                                     <input id="${id}RemoteDali" title="${i18n.RemoteDali}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox"/>
-                                     <input id="${id}SourceProcess" title="${i18n.SourceProcess}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox"/>
-                                     <input id="${id}Comment" title="${i18n.Comment}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox"/>
-                                     <select id="${id}Priority" title="${i18n.Priority}:" colspan="2" data-dojo-type="dijit.form.Select">
+                                    <input id="${id}Jobname2" title="${i18n.JobName}:" colspan="2" style="width:100%" required="true" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
+                                    <input id="${id}RemoteDali" title="${i18n.RemoteDali}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
+                                    <input id="${id}SourceProcess" title="${i18n.SourceProcess}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
+                                    <input id="${id}Comment" title="${i18n.Comment}:" colspan="2" style="width:100%" required="false" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
+                                    <select id="${id}Priority" title="${i18n.Priority}:" colspan="2" data-dojo-type="dijit.form.Select">
                                         <option value="" selected="selected">${i18n.None}</option>
                                         <option value="SLA">${i18n.SLA}</option>
                                         <option value="Low">${i18n.Low}</option>
@@ -48,29 +48,29 @@
                         </div>
                     </div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
-                    <div id="${id}ZapReport"  title="${i18n.ZippedAnalysisPackage}" data-dojo-attach-event="onClick:_onZapReport" data-dojo-props="iconClass:'iconZap'" data-dojo-type="dijit.form.Button">${i18n.ZAP}</div>
+                    <div id="${id}ZapReport" title="${i18n.ZippedAnalysisPackage}" data-dojo-attach-event="onClick:_onZapReport" data-dojo-props="iconClass:'iconZap'" data-dojo-type="dijit.form.Button">${i18n.ZAP}</div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <div id="${id}SlaveLogs" data-dojo-type="dijit.form.DropDownButton">
                         <span>${i18n.SlaveLogs}</span>
                         <div data-dojo-type="dijit.TooltipDialog">
-                        <div id="${id}LogsForm" style="width:460px" onsubmit="return false;" data-dojo-type="dijit.form.Form">
-                            <div class="dijitDialogPaneContentArea" data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
-                                <select id="${id}ThorProcess" title="${i18n.ThorProcess}:" name="ThorProcess" colspan="2" data-dojo-type="dijit.form.Select" /></select>
-                                <input id="${id}SlaveNumber" maxlength="" title="${i18n.SlaveNumber}:" name="SlaveNumber" value="1" required="true" data-dojo-props="trim: true, placeHolder:'1'" data-dojo-type="dijit.form.NumberTextBox"/>
-                                <select id="${id}FileFormat" title="${i18n.File}:" name="ThorProcess" colspan="2" data-dojo-type="dijit.form.Select" />
-                                    <option value="1">${i18n.OriginalFile}</option>
-                                    <option value="2">${i18n.Zip}</option>
-                                    <option value="3">${i18n.GZip}</option>
-                                </select>
-                            </div>
-                            </br>
-                            <div><span id="SlavesMaxNumber" class="bold"></span></div>
-                            <div><span id="AllowOnlyNumber" class="boldRed"></span></div>
-                            <div class="dijitDialogPaneActionBar">
-                                <button type="submit" data-dojo-attach-event="onClick:_getDownload" data-dojo-type="dijit.form.Button">${i18n.Download}</button>
+                            <div id="${id}LogsForm" style="width:460px" onsubmit="return false;" data-dojo-type="dijit.form.Form">
+                                <div class="dijitDialogPaneContentArea" data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
+                                    <select id="${id}ThorProcess" title="${i18n.ThorProcess}:" name="ThorProcess" colspan="2" data-dojo-type="dijit.form.Select"></select>
+                                    <input id="${id}SlaveNumber" maxlength="" title="${i18n.SlaveNumber}:" name="SlaveNumber" value="1" required="true" data-dojo-props="trim: true, placeHolder:'1'" data-dojo-type="dijit.form.NumberTextBox" />
+                                    <select id="${id}FileFormat" title="${i18n.File}:" name="ThorProcess" colspan="2" data-dojo-type="dijit.form.Select">
+                                        <option value="1">${i18n.OriginalFile}</option>
+                                        <option value="2">${i18n.Zip}</option>
+                                        <option value="3">${i18n.GZip}</option>
+                                    </select>
+                                </div>
+                                <br />
+                                <div><span id="SlavesMaxNumber" class="bold"></span></div>
+                                <div><span id="AllowOnlyNumber" class="boldRed"></span></div>
+                                <div class="dijitDialogPaneActionBar">
+                                    <button type="submit" data-dojo-attach-event="onClick:_getDownload" data-dojo-type="dijit.form.Button">${i18n.Download}</button>
+                                </div>
                             </div>
                         </div>
-                        </div>
                     </div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <div class="right" data-dojo-attach-event="onChange:_onMaximize" data-dojo-props="iconClass:'iconMaximize', showLabel:false" checked=false data-dojo-type="dijit.form.ToggleButton">${i18n.MaximizeRestore}</div>
@@ -79,7 +79,7 @@
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <div style="display:inline-block">
                         <h2>
-                            <img id="${id}ProtectedImage" src="${dojoConfig.urlInfo.resourcePath}/img/locked.png" />&nbsp;<div id="${id}StateIdImage" class="iconWorkunit" ></div>&nbsp;<span id="${id}Wuid" class="bold">${i18n.WUID}</span>
+                            <img id="${id}ProtectedImage" src="${dojoConfig.urlInfo.resourcePath}/img/locked.png" />&nbsp;<div id="${id}StateIdImage" class="iconWorkunit"></div>&nbsp;<span id="${id}Wuid" class="bold">${i18n.WUID}</span>
                             <button id="${id}ClippyButton" class="clippy" data-clipboard-target="#${id}Wuid"><img src="${dojoConfig.urlInfo.resourcePath}/img/clippy.png" alt="${i18n.CopyToClipboard}"></button>
                         </h2>
                     </div>
@@ -101,24 +101,24 @@
                             </li>
                             <li id="scopeOptional" class="hidden">
                                 <label class="Prompt" for="${id}Scope">${i18n.Scope}:</label>
-                                <div><input id="${id}Scope" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox"/></div>
+                                <div><input id="${id}Scope" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox" /></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}Jobname">${i18n.JobName}:</label>
-                                <div><input id="${id}Jobname" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox"/></div>
+                                <div><input id="${id}Jobname" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox" /></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}Description">${i18n.Description}:</label>
-                                <div><input id="${id}Description" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox"/></div>
+                                <div><input id="${id}Description" data-dojo-props="trim:true" data-dojo-type="dijit.form.TextBox" /></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}Protected">${i18n.Protected}:</label>
-                                <div><input id="${id}Protected" data-dojo-type="dijit.form.CheckBox"/></div>
+                                <div><input id="${id}Protected" data-dojo-type="dijit.form.CheckBox" /></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}Cluster">${i18n.Cluster}:</label>
                                 <div id="${id}Cluster"></div>
-                                <div id="${id}AllowedClusters" data-dojo-type="dijit.form.Select"/></div>
+                                <div id="${id}AllowedClusters" data-dojo-type="dijit.form.Select"></div>
                             </li>
                             <li>
                                 <label class="Prompt" for="${id}TotalClusterTime">${i18n.TotalClusterTime}:</label>
@@ -134,9 +134,9 @@
                             </li>
                         </ul>
                     </form>
-            </div>
-            <div id="${id}InfoContainer" class="wrap" style="height: 33%" data-dojo-props="region: 'bottom', splitter: true, minSize: 120, showToolbar: true" data-dojo-type="InfoGridWidget">
-            </div>
+                </div>
+                <div id="${id}InfoContainer" class="wrap" style="height: 33%" data-dojo-props="region: 'bottom', splitter: true, minSize: 120, showToolbar: true" data-dojo-type="InfoGridWidget">
+                </div>
             </div>
             <div id="${id}_Variables" title="${i18n.Variables}" data-dojo-props="delayWidget: 'VariablesWidget', disabled: true" data-dojo-type="DelayLoadWidget">
             </div>
@@ -163,23 +163,23 @@
         </div>
     </div>
     <div id="${id}ZapDialog" data-dojo-type="dijit.Dialog" title="${i18n.ZippedAnalysisPackage}">
-        <div id="${id}ZapForm" style="width:460px;" method="post" encType="application/x-www-form-urlencoded" data-dojo-type="dijit.form.Form">
+        <div id="${id}ZapForm" style="width:460px;" method="post" enctype="application/x-www-form-urlencoded" data-dojo-type="dijit.form.Form">
             <div data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
                 <input id="${id}ZapName" title="${i18n.FileName}:" name="ZAPFileName" colspan="2" data-dojo-props="trim: true," data-dojo-type="dijit.form.TextBox" />
                 <input id="${id}ZapWUID" title="${i18n.WUID}:" name="Wuid" colspan="2" data-dojo-props="trim: true, readonly: true," data-dojo-type="dijit.form.TextBox" />
                 <input id="${id}BuildVersion" title="${i18n.ESPBuildVersion}:" name="BuildVersion" colspan="2" data-dojo-props="trim: true, readonly: true," data-dojo-type="dijit.form.TextBox" />
                 <input id="${id}ESPIPAddress" title="${i18n.ESPNetworkAddress}:" name="ESPIPAddress" colspan="2" data-dojo-props="trim: true, readonly: true," data-dojo-type="dijit.form.TextBox" />
                 <input id="${id}ThorIPAddress" title="${i18n.ThorNetworkAddress}:" name="ThorIPAddress" colspan="2" data-dojo-props="trim: true, readonly: true," data-dojo-type="dijit.form.TextBox" />
-                <input id="${id}ZapDescription" title="${i18n.Description}:" name="ProblemDescription" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea"/>
-                <input id="${id}WarnHistory" title="${i18n.History}:" name="WhatChanged" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea"/>
-                <input id="${id}WarnTimings" title="${i18n.Timings}:" name="WhereSlow" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea"/>
+                <input id="${id}ZapDescription" title="${i18n.Description}:" name="ProblemDescription" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea" />
+                <input id="${id}WarnHistory" title="${i18n.History}:" name="WhatChanged" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea" />
+                <input id="${id}WarnTimings" title="${i18n.Timings}:" name="WhereSlow" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea" />
                 <input id="${id}Password" title="${i18n.PasswordOpenZAP}:" name="Password" cols="22" colspan="2" type="password" data-dojo-props="trim: true" data-dojo-type="dijit.form.ValidationTextBox" />
                 <input id="${id}IncludeSlaveLogsCheckbox" title="${i18n.IncludeSlaveLogs}:" name="IncludeThorSlaveLog" cols="22" colspan="2" type="checkbox" data-dojo-type="dijit.form.CheckBox" />
                 <input id="${id}EmailCheckbox" title="${i18n.SendEmail}:" name="SendEmail" cols="22" colspan="2" type="checkbox" data-dojo-type="dijit.form.CheckBox" />
-                <input id="${id}EmailTo" title="${i18n.EmailTo}:" name="EmailTo" colspan="2" data-dojo-props="trim:true, readonly:true, placeHolder:'See Configuration Manager.'" data-dojo-type="dijit.form.TextBox"/>
-                <input id="${id}EmailFrom" title="${i18n.EmailFrom}:" name="EmailFrom" colspan="2" data-dojo-props="trim:true, placeHolder:'See Configuration Manager.'" data-dojo-type="dijit.form.TextBox"/>
-                <input id="${id}EmailSubject" title="${i18n.EmailSubject}:" name="EmailSubject" colspan="2" data-dojo-props="trim:true" data-dojo-type="dijit.form.ValidationTextBox" required="false"/>
-                <input id="${id}EmailBody" title="${i18n.EmailBody}:" name="EmailBody" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea"/>
+                <input id="${id}EmailTo" title="${i18n.EmailTo}:" name="EmailTo" colspan="2" data-dojo-props="trim:true, readonly:true, placeHolder:'See Configuration Manager.'" data-dojo-type="dijit.form.TextBox" />
+                <input id="${id}EmailFrom" title="${i18n.EmailFrom}:" name="EmailFrom" colspan="2" data-dojo-props="trim:true, placeHolder:'See Configuration Manager.'" data-dojo-type="dijit.form.TextBox" />
+                <input id="${id}EmailSubject" title="${i18n.EmailSubject}:" name="EmailSubject" colspan="2" data-dojo-props="trim:true" data-dojo-type="dijit.form.ValidationTextBox" required="false" />
+                <input id="${id}EmailBody" title="${i18n.EmailBody}:" name="EmailBody" cols="22" colspan="2" data-dojo-type="dijit.form.SimpleTextarea" />
             </div>
             <div class="dijitDialogPaneActionBar">
                 <button id="${id}onZapSubmit" data-dojo-attach-event="onClick:_onSubmitDialog" type="submit" data-dojo-type="dijit.form.Button">${i18n.Apply}</button>