瀏覽代碼

Merge pull request #12920 from miguelvazq/KunalShareBtn

HPCC-22361 Add share URL for widgets

Reviewed-By: Kunal Aswani <kunal.aswani@lexisnexis.com>
Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 年之前
父節點
當前提交
8e7c6002e6

+ 6 - 2
esp/src/eclwatch/WUDetailsWidget.js

@@ -129,11 +129,11 @@ define([
                 this.emailSubject = registry.byId(this.id + "EmailSubject");
                 this.emailBody = registry.byId(this.id + "EmailBody");
                 this.protected = registry.byId(this.id + "Protected");
-
                 this.infoGridWidget = registry.byId(this.id + "InfoContainer");
                 this.zapDialog = registry.byId(this.id + "ZapDialog");
 
                 Clippy.attach(this.id + "ClippyButton");
+                Clippy.attach(this.id + "ShareWUClippy");
 
                 this.wuStatus = new WUStatusModule.WUStatus()
                     .baseUrl("")
@@ -310,6 +310,8 @@ define([
 
                 this.graphLink = dom.byId(this.id + "ActiveGraph");
 
+                domAttr.set(this.id + "ShareWUClippy", "data-clipboard-text", this.getURL());
+
                 if (params.Wuid) {
                     this.summaryWidget.set("title", params.Wuid);
 
@@ -337,7 +339,9 @@ define([
 
                 this.protected.on("change", function (evt) {
                     context._onSave();
-                })
+                });
+
+                this.refreshActionState();
             },
 
             initTab: function () {

+ 1 - 1
esp/src/eclwatch/css/hpcc.css

@@ -1637,7 +1637,7 @@ margin-left:-20px;
 }
 
 button.clippy img {
-    margin:2px 0 0;
+    margin:0px 0 0;
     padding:0px;
     width:13px;
     height:16px;

+ 3 - 1
esp/src/eclwatch/nls/hpcc.js

@@ -115,8 +115,9 @@ define({root:
     Contents: "Contents",
     ContentType: "Content Type",
     Copy: "Copy",
-    CopyToClipboard: "Copy to clipboard",
+    CopyURLToClipboard: "Copy URL to clipboard",
     CopyWUIDs: "Copy WUIDs to clipboard",
+    CopyWUIDToClipboard: "Copy WUID to clipboard",
     Copied: "Copied!",
     Count: "Count",
     CPULoad: "CPU Load",
@@ -666,6 +667,7 @@ define({root:
     SetTextError: "Failed to display text (too large?).  Use &lsquo;helpers&rsquo; to download.",
     SetToFailed: "Set To Failed",
     Severity: "Severity",
+    ShareWorkunit:"Share Workunit URL",
     Show: "Show",
     ShowProcessesUsingFilter: "Show Processes Using Filter",
     ShowSVG: "Show SVG",

+ 2 - 1
esp/src/eclwatch/templates/WUDetailsWidget.html

@@ -80,7 +80,8 @@
                     <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>
-                            <button id="${id}ClippyButton" class="clippy" data-clipboard-target="#${id}Wuid"><img src="${dojoConfig.urlInfo.resourcePath}/img/clippy.png" alt="${i18n.CopyToClipboard}"></button>
+                            <button id="${id}ClippyButton" class="clippy" data-clipboard-target="#${id}Wuid"><i class="fa fa-clipboard" title="${i18n.CopyWUIDToClipboard}"></i></button>
+                            <button id="${id}ShareWUClippy" class="clippy" data-clipboard-text=""><i class="fa fa-share" title="${i18n.CopyURLToClipboard}"></i></button>
                         </h2>
                     </div>
                     <div id="${id}WUStatus" style="width:512px;height:64px;float:right">