소스 검색

Merge pull request #13369 from miguelvazq/HPCC-23484

HPCC-23484 Search control not visible.

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 년 전
부모
커밋
9a2e4ece42
4개의 변경된 파일33개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 0
      esp/src/eclwatch/HPCCPlatformWidget.js
  2. 27 4
      esp/src/eclwatch/css/hpcc.css
  3. 1 1
      esp/src/eclwatch/stub.js
  4. 3 0
      esp/src/eclwatch/templates/HPCCPlatformWidget.html

+ 2 - 0
esp/src/eclwatch/HPCCPlatformWidget.js

@@ -85,6 +85,7 @@ define([
             this.inherited(arguments);
             this.searchText = registry.byId(this.id + "FindText");
             this.logoutBtn = registry.byId(this.id + "Logout");
+            this.lockBtn = registry.byId(this.id + "Lock");
             this.aboutDialog = registry.byId(this.id + "AboutDialog");
             this.setBannerDialog = registry.byId(this.id + "SetBannerDialog");
             this.setToolbarDialog = registry.byId(this.id + "SetToolbarDialog");
@@ -339,6 +340,7 @@ define([
         checkIfSessionsAreActive: function () {
             if (cookie("ESPSessionTimeoutSeconds")) {
                 this.logoutBtn.set("disabled", false);
+                this.lockBtn.set("disabled", false);
                 dom.byId("UserDivider").textContent = " / ";
                 dom.byId("Lock").textContent = this.i18n.Lock;
             }

+ 27 - 4
esp/src/eclwatch/css/hpcc.css

@@ -351,17 +351,40 @@ hr.dashedLine {
     padding-bottom:10px;
 }
 
-@media (max-width: 959px){
+@media screen and (max-width: 1920px){
     .flat .hpccTitlebar {
-        height:100px;
+        height:50px;
     }
+
     #BannerEnvironmentText{
         width:25%;
         display: none;
         margin-top:10px;
+        border:solid 1px white;
+    }
+
+    .flat .envrionmentText {
+        width: 25%;
+    }
+}
+
+@media screen and (max-width: 1400px){
+    .flat .envrionmentText {
+        display: none;
+    }
+}
+
+@media screen and (max-width: 1040px){
+    #userAccount {
+        display: none;
+    }
+
+    #MonitorStatus {
+        display: none;
     }
-    .seperator:first-child{
-        display:none;
+
+    .seperator {
+        display: none;
     }
 }
 

+ 1 - 1
esp/src/eclwatch/stub.js

@@ -24,7 +24,7 @@ define([
     Utility, Session, KeyValStore, LockDialogWidget,
     entities, Toaster) {
 
-    const store = KeyValStore.globalKeyValStore()
+    var store = KeyValStore.globalKeyValStore();
     store.set("", "", false, "HPCCApps", "ECLWatch");
     Session.initSession();
 

+ 3 - 0
esp/src/eclwatch/templates/HPCCPlatformWidget.html

@@ -40,6 +40,9 @@
                         <span data-dojo-type="dijit.MenuSeparator"></span>
                         <div id="${id}Configuration" data-dojo-attach-event="onClick:_onOpenConfiguration" data-dojo-type="dijit.MenuItem">${i18n.Configuration}</div>
                         <div id="${id}About" data-dojo-attach-event="onClick:_onAbout" data-dojo-type="dijit.MenuItem">${i18n.About}</div>
+                        <span data-dojo-type="dijit.MenuSeparator"></span>
+                        <div id="${id}Lock" data-dojo-attach-event="onClick:_onLock" data-dojo-type="dijit.MenuItem" data-dojo-props="disabled:'false'">Lock</div>
+                        <span data-dojo-type="dijit.MenuSeparator"></span>
                         <div id="${id}Logout" data-dojo-attach-event="onClick:_onLogout" data-dojo-type="dijit.MenuItem" data-dojo-props="disabled:'true'">Logout</div>
                         <div data-dojo-props="hidden:true" data-dojo-type="dijit.PopupMenuItem">
                             <span>${i18n.Debug}</span>