diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java index c104ecd2..a0214600 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java @@ -11,6 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.openqa.selenium.JavascriptExecutor; + /** * * @author ghollins @@ -209,7 +211,12 @@ public void runHelloWorldTest() { waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input"); - driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click(); + WebElement filter = driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")); + + JavascriptExecutor js = (JavascriptExecutor) driver; + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", filter); + // filter.click(); + driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_hello_world"); driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER); @@ -217,6 +224,14 @@ public void runHelloWorldTest() { waitForElementXPath("//a[contains(text(),'History')]"); WebElement historyButton = driver.findElement(By.xpath("//a[contains(text(),'History')]")); + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", historyButton); + + try { + File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); + // Now you can do whatever you need to do with it, for example copy somewhere + FileUtils.copyFile(scrFile, new File("/tmp/history_button.png")); + } catch(IOException e) {} + historyButton.click(); sleep(1000); @@ -252,7 +267,12 @@ public void runGroovyTest() { waitForElementXPath("//div[@id=\'processes-table_filter\']/label/input"); - driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).click(); + WebElement filter = driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")); + + JavascriptExecutor js = (JavascriptExecutor) driver; + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", filter); + + // filter.click(); driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys("test_groovy_script"); driver.findElement(By.xpath("//div[@id=\'processes-table_filter\']/label/input")).sendKeys(Keys.ENTER); @@ -260,9 +280,23 @@ public void runGroovyTest() { waitForElementXPath("//a[contains(text(),'History')]"); WebElement historyButton = driver.findElement(By.xpath("//a[contains(text(),'History')]")); + js.executeScript("arguments[0].scrollIntoViewIfNeeded();", historyButton); + + try { + File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); + // Now you can do whatever you need to do with it, for example copy somewhere + FileUtils.copyFile(scrFile, new File("/tmp/groovy_button.png")); + } catch(IOException e) {} historyButton.click(); + sleep(1000); + try { + File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); + // Now you can do whatever you need to do with it, for example copy somewhere + FileUtils.copyFile(scrFile, new File("/tmp/groovy.png")); + } catch(IOException e) {} + findOnPage("Groovy."); sleep(9000); diff --git a/cws-ui/src/main/webapp/css/dashboard.css b/cws-ui/src/main/webapp/css/dashboard.css index 0a7b1aef..3f7bbab6 100644 --- a/cws-ui/src/main/webapp/css/dashboard.css +++ b/cws-ui/src/main/webapp/css/dashboard.css @@ -430,6 +430,7 @@ a.nav-link img { margin-top: 13px; position: absolute; left: 75px; + width: calc(100% - 100px); } :target { diff --git a/cws-ui/src/main/webapp/images/check_green.svg b/cws-ui/src/main/webapp/images/check_green.svg new file mode 100644 index 00000000..4dfc9d17 --- /dev/null +++ b/cws-ui/src/main/webapp/images/check_green.svg @@ -0,0 +1,3 @@ + + + diff --git a/cws-ui/src/main/webapp/images/minus_red.svg b/cws-ui/src/main/webapp/images/minus_red.svg new file mode 100644 index 00000000..29dcf70e --- /dev/null +++ b/cws-ui/src/main/webapp/images/minus_red.svg @@ -0,0 +1,3 @@ + + + diff --git a/cws-ui/src/main/webapp/images/pen.svg b/cws-ui/src/main/webapp/images/pen.svg new file mode 100644 index 00000000..25f2d49f --- /dev/null +++ b/cws-ui/src/main/webapp/images/pen.svg @@ -0,0 +1,4 @@ + + + + diff --git a/cws-ui/src/main/webapp/images/save.svg b/cws-ui/src/main/webapp/images/save.svg new file mode 100644 index 00000000..495fe961 --- /dev/null +++ b/cws-ui/src/main/webapp/images/save.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/cws-ui/src/main/webapp/images/waterfall.svg b/cws-ui/src/main/webapp/images/waterfall.svg new file mode 100644 index 00000000..e4a1e9a7 --- /dev/null +++ b/cws-ui/src/main/webapp/images/waterfall.svg @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/install/cws-ui/configuration.ftl b/install/cws-ui/configuration.ftl index 53cc7083..93d29805 100755 --- a/install/cws-ui/configuration.ftl +++ b/install/cws-ui/configuration.ftl @@ -179,7 +179,7 @@
<#include "sidebar.ftl"> -
+

${msg}

diff --git a/install/cws-ui/deployments.ftl b/install/cws-ui/deployments.ftl index a928b55f..27859ced 100644 --- a/install/cws-ui/deployments.ftl +++ b/install/cws-ui/deployments.ftl @@ -420,7 +420,7 @@ } returnVal += `` - + `` + + `` + `` + ``; @@ -598,16 +598,14 @@ var procDefKey = this.data()["key"]; var procDefId = this.data()["id"]; if (status == "false") { - $("#suspend-" + procDefKey).removeClass("glyphicon-play"); - $("#suspend-" + procDefKey).addClass("glyphicon-pause"); + $("#suspend-" + procDefKey).attr("src", "/${base}/images/pin_pause.svg"); $("#suspend-" + procDefKey).css("color", "#d9534f"); $("#btn-suspend-" + procDefKey).attr("onclick", "suspendProcDef('" + procDefId + "', '" + procDefKey + "')"); $("#status-txt-" + procDefKey).html("Active"); $("#" + procDefKey).removeClass("disabled"); $("#pv-" + procDefKey).removeClass("disabled"); } else { - $("#suspend-" + procDefKey).removeClass("glyphicon-pause"); - $("#suspend-" + procDefKey).addClass("glyphicon-play"); + $("#suspend-" + procDefKey).attr("src", "/${base}/images/play.svg"); $("#suspend-" + procDefKey).css("color", "green"); $("#btn-suspend-" + procDefKey).attr("onclick", "resumeProcDef('" + procDefId + "', '" + procDefKey + "')"); $("#status-txt-" + procDefKey).html("Suspended"); @@ -749,8 +747,7 @@ success: function (data) { console.log("successfully suspended"); //change the glyphicon to play & make green - $("#suspend-" + procDefKey).removeClass("glyphicon-pause"); - $("#suspend-" + procDefKey).addClass("glyphicon-play"); + $("#suspend-" + procDefKey).attr("src", "/${base}/images/play.svg"); $("#suspend-" + procDefKey).css("color", "green"); $("#btn-suspend-" + procDefKey).attr("onclick", "resumeProcDef('" + procDefId + "', '" + procDefKey + "')"); $("#status-txt-" + procDefKey).html("Suspended"); @@ -775,8 +772,7 @@ success: function (data) { console.log("successfully activated"); //change the glyphicon to pause & make color #d9534f - $("#suspend-" + procDefKey).removeClass("glyphicon-play"); - $("#suspend-" + procDefKey).addClass("glyphicon-pause"); + $("#suspend-" + procDefKey).attr("src", "/${base}/images/pin_pause.svg"); $("#suspend-" + procDefKey).css("color", "#d9534f"); $("#btn-suspend-" + procDefKey).attr("onclick", "suspendProcDef('" + procDefId + "', '" + procDefKey + "')"); $("#status-txt-" + procDefKey).html("Active"); diff --git a/install/cws-ui/documentation.ftl b/install/cws-ui/documentation.ftl index 2b630f1e..e49ab939 100644 --- a/install/cws-ui/documentation.ftl +++ b/install/cws-ui/documentation.ftl @@ -57,7 +57,7 @@
<#include "sidebar.ftl"> -
+

${msg}

diff --git a/install/cws-ui/initiators.ftl b/install/cws-ui/initiators.ftl index d8680da5..4a75e8d9 100644 --- a/install/cws-ui/initiators.ftl +++ b/install/cws-ui/initiators.ftl @@ -56,7 +56,7 @@
<#include "sidebar.ftl"> -
+

${msg}

Initiators

diff --git a/install/cws-ui/logs.ftl b/install/cws-ui/logs.ftl index 9789b7a3..04501187 100644 --- a/install/cws-ui/logs.ftl +++ b/install/cws-ui/logs.ftl @@ -164,7 +164,7 @@ $("#logData").DataTable({ language: { searchBuilder: { - add: "Add Local Filter", + add: " Add Local Filter", } }, deferRender: true, @@ -647,7 +647,7 @@
<#include "sidebar.ftl"> -
+

${msg}

diff --git a/install/cws-ui/processes.ftl b/install/cws-ui/processes.ftl index c6a3aa3f..08973d3b 100644 --- a/install/cws-ui/processes.ftl +++ b/install/cws-ui/processes.ftl @@ -45,7 +45,7 @@
<#include "sidebar.ftl"> -
+

${msg}

@@ -979,7 +979,7 @@ }); //add our action dropdown button to the div that datatables created (created in dom: above) - $('
' + '