Переглянути джерело

HPCC-10066 Add missing "Open in new window" buttons

Add missing Open In New Window buttons.
Moved Hex Preview to "Open" location.

Fixes HPCC-10066

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Gordon Smith 11 роки тому
батько
коміт
aa50a2b64a

+ 1 - 1
esp/files/scripts/HPCCPlatformECLWidget.js

@@ -61,7 +61,7 @@ define([
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
             }
         }

+ 1 - 1
esp/files/scripts/HPCCPlatformFilesWidget.js

@@ -68,7 +68,7 @@ define([
                         style: "border: 0; width: 100%; height: 100%"
                     }));
                 } else if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
                 currSel.initalized = true;
             }

+ 1 - 1
esp/files/scripts/HPCCPlatformMainWidget.js

@@ -63,7 +63,7 @@ define([
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
             }
         }

+ 1 - 1
esp/files/scripts/HPCCPlatformOpsWidget.js

@@ -96,7 +96,7 @@ define([
                         style: "border: 0; width: 100%; height: 100%"
                     }));
                 } else if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
                 currSel.initalized = true;
             }

+ 1 - 1
esp/files/scripts/HPCCPlatformRoxieWidget.js

@@ -67,7 +67,7 @@ define([
                     }));
                     currSel.initalized = true;
                 } else if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
             }
         }

+ 1 - 1
esp/files/scripts/HPCCPlatformWidget.js

@@ -122,7 +122,7 @@ define([
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.init) {
-                    currSel.init(currSel.params);
+                    currSel.init({});
                 }
             }
         }

+ 1 - 1
esp/files/scripts/LFDetailsWidget.js

@@ -189,7 +189,7 @@ define([
                 if (currSel.id == this.summaryWidget.id) {
                 } else if (currSel.id == this.contentWidget.id) {
                     this.contentWidget.init({
-                        result: this.logicalFile.result
+                        LogicalName: this.logicalFile.Name
                     });
                 } else if (currSel.id == this.sourceWidget.id) {
                     this.sourceWidget.init({

+ 6 - 0
esp/files/scripts/SearchResultsWidget.js

@@ -48,6 +48,9 @@ define([
         idProperty: "id",
 
         doSearch: function (searchText) {
+            this.params = {
+                searchText: searchText
+            };
             this.searchText = searchText;
             this.selectChild(this.gridTab);
             this.refreshGrid();
@@ -57,6 +60,9 @@ define([
             if (this.inherited(arguments))
                 return;
 
+            if (params.searchText) {
+                this.doSearch(params.searchText);
+            }
             this._refreshActionState();
         },
 

+ 7 - 5
esp/files/templates/ECLPlaygroundWidget.html

@@ -1,13 +1,15 @@
 <div class="${baseClass}">
     <div id="${id}BorderContainer" class="${baseClass}BorderContainer" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.BorderContainer">
-        <div id="${id}TopPane" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.layout.ContentPane">
-            <div id="${id}Title" style="display: inline-block; vertical-align: middle; font-weight: bold; font-size: x-large">
+        <div id="${id}TopPane" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
+            <span id="${id}Title" style="font-weight: bold; font-size: x-large">
                 ECL Playground
-            </div>
-            <div style="float: right; display: inline-block; vertical-align: middle">
+            </span>
+            <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">Open in New Page</div>
+            <div style="float: right; display: inline-block;">
                 <label id="${id}SampleSelectLabel" for="${id}SampleSelect">Sample:</label>
-                <div id="${id}SampleSelect" style="display: inline-block; vertical-align: middle" data-dojo-type="TargetSelectWidget">
+                <div id="${id}SampleSelect" data-dojo-type="TargetSelectWidget">
                 </div>
+                <span data-dojo-type="dijit.ToolbarSeparator"></span>
             </div>
         </div>
         <div id="${id}Source" class="centerPanel" data-dojo-props="region: 'center'" data-dojo-type="ECLSourceWidget">

+ 2 - 1
esp/files/templates/HexViewWidget.html

@@ -1,11 +1,12 @@
 <div class="${baseClass}">
     <div id="${id}BorderContainer" class="${baseClass}BorderContainer" style="width: 100%; height: 100%" data-dojo-props="splitter: false" data-dojo-type="dijit.layout.BorderContainer">
-        <div id="${id}Toolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.layout.ContentPane">
+        <div id="${id}Toolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
             <label class="Prompt" for="${id}Width">Width:</label>
             <input id="${id}Width" data-dojo-attach-event="onChange:_onWidthChange" data-dojo-props="smallDelta:1, constraints:{min:1, max:32000, places:0}, intermediateChanges:true, value:16" data-dojo-type="dijit.form.NumberSpinner" />
             <label class="Prompt" for="${id}EBCDIC">EBCDIC:</label>
             <input id="${id}EBCDIC" data-dojo-attach-event="onChange:_onEbcdicChange" data-dojo-props="value:false" data-dojo-type="dijit.form.CheckBox" />
             <span data-dojo-type="dijit.ToolbarSeparator"></span>
+            <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">Open in New Page</div>
         </div>
         <div id="${id}HexView" data-dojo-props="region: 'center', WUXml: true" data-dojo-type="ECLSourceWidget">
         </div>

+ 2 - 2
esp/files/templates/LZBrowseWidget.html

@@ -5,12 +5,12 @@
                 <div id="${id}Toolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
                     <div id="${id}Refresh" data-dojo-attach-event="onClick:_onRefresh" data-dojo-props="iconClass:'iconRefresh'" data-dojo-type="dijit.form.Button">Refresh</div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
+                    <div id="${id}HexPreview" data-dojo-attach-event="onClick:_onHexPreview" data-dojo-type="dijit.form.Button">Hex Preview</div>
+                    <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <input id="${id}Upload" label="Upload" type="file" data-dojo-attach-event="onChange:_onUpload" data-dojo-props='multiple: true' data-dojo-type="dojox.form.Uploader"/>
                     <div id="${id}Download" data-dojo-attach-event="onClick:_onDownload" data-dojo-type="dijit.form.Button">Download</div>
                     <div id="${id}Delete" data-dojo-attach-event="onClick:_onDelete" data-dojo-type="dijit.form.Button">Delete</div>
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
-                    <div id="${id}HexPreview" data-dojo-attach-event="onClick:_onHexPreview" data-dojo-type="dijit.form.Button">Hex Preview</div>
-                    <span data-dojo-type="dijit.ToolbarSeparator"></span>
                     <b>Spray:</b>
                     <div id="${id}SprayFixedDropDown" data-dojo-type="dijit.form.DropDownButton">
                         <span>Fixed</span>