From 60292c7687fea7299c19a94846eedfc2955d44c5 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Tue, 27 Aug 2024 22:00:55 +0200 Subject: [PATCH] http-old: use common CSS for pool manager configuration section Motivation: Harmonise colors of old pages Modification: Use common CSS. Update css class of generated table rows to match with entries in common css. Result: more harmonized colors (I hope) Acked-by: Karen Hoyos Target: master Require-book: no Require-notes: yes --- .../poolManager/HttpPoolMgrEngineV3.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java index 132f7323f2d..77162b1f014 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java +++ b/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java @@ -65,6 +65,9 @@ public class HttpPoolMgrEngineV3 implements private static final Logger LOGGER = LoggerFactory.getLogger(HttpPoolMgrEngineV3.class); + // ROW_ODDNESS is used to alternate the row colors in the HTML table + private static final String[] ROW_ODDNESS = {"even", "odd"}; + private static final long TIMEOUT = 20000; private final Thread _restoreCollector; @@ -97,7 +100,7 @@ protected SimpleDateFormat initialValue() { private final Object _updateLock = new Object(); private boolean _addStorageInfo; private String[] _siDetails; - private String _cssFile = "/poolInfo/css/default.css"; + private String _cssFile = "/styles/common.css"; private Map _context; private CellEndpoint _endpoint; @@ -532,6 +535,7 @@ public void queryUrl(HttpRequest request) throws HttpException { } pw.println(""); } finally { + pw.println(""); pw.println(""); pw.println(""); } @@ -544,6 +548,7 @@ private void printConfigurationHeader(PrintWriter pw) { pw.println(""); pw.println(""); + pw.println("
"); pw.println(""); } @@ -644,7 +649,6 @@ private void printParameterInMatrix(PrintWriter pw, Map param Map defaultMap = new TreeMap<>(defaultParas.toMap()); row = 0; String[] setColor = {"s-table-disabled", "s-table-regular"}; - String[] rowClass = {"s-table-a", "s-table-b"}; for (Map.Entry entry : defaultMap.entrySet()) { String key = entry.getKey(); @@ -655,10 +659,10 @@ private void printParameterInMatrix(PrintWriter pw, Map param // // the keys // - pw.print(""); - pw.print(""); + pw.print(""); + pw.print(""); pw.print(key); - pw.print(""); + pw.print(""); // // default values // @@ -1364,10 +1368,9 @@ private void queryLinkList(PrintWriter pw) pw.print("CacheP2p"); pw.println(""); int row = 0; - String[] rowColor = {"s-table-a", "s-table-b"}; for (LinkProperties lp : list) { - pw.println(""); + pw.println(""); printLinkPropertyRow(pw, lp); pw.println(""); row++;