version 1.6 - design updated to match Jira 7

velias · Sep 3, 2018 · 79eccf8 · 79eccf8
1 parent 3d4259c
commit 79eccf8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,9 @@ Plugin .jar file is then placed in /target subfolder
 Changelog
 -------------
 
+1.6 - 2018-09-03
+- design updated to match Jira 7 
+
 1.5 - 2018-08-16
 - correct XML sanitization of some characters in messages which made xml invalid so nothing showed  
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.labs.jira.plugin</groupId>
 	<artifactId>livelogviewer</artifactId>
-	<version>1.5</version>
+	<version>1.6</version>
 
 	<name>Live Log Viewer</name>
 	<packaging>atlassian-plugin</packaging>

diff --git a/src/main/resources/css/log4j.css b/src/main/resources/css/log4j.css
@@ -1,16 +1,16 @@
 .FATAL {
-	background-color: #ff3c3c;
+	background-color: #ff3c3c !important;
 	font-weight: bold;
 	font-size:10px;
 }
 
 .ERROR {
-	background-color: #ff8282;
+	background-color: #ff8282 !important;
 	font-size:10px;
 }
 
 .WARN {
-	background-color: #ffb366;
+	background-color: #ffb366 !important;
 	font-size:9px;
 }
 
@@ -23,15 +23,6 @@
 	background-color: #EAEAFF;
 }
 
-thead {
-	background-color: #f0f0f0;
-}
-
-#contentTable th, #contentTable td {
-	text-align: left;
-	border: 1px solid #cccccc;
-}
-
 #contentTable pre {
   font-size:9px;
 }
diff --git a/src/main/resources/js/log.js b/src/main/resources/js/log.js
@@ -31,10 +31,11 @@ function loadLog() {
 				loadXml(xmlHttp.responseXML);
 			}
 		}
-		document.getElementById("log-loading-progress-indicator").style.visibility = "hidden";
+		AJS.progressBars.update("#log-loading-progress-indicator",1);
 	}
 
-    document.getElementById("log-loading-progress-indicator").style.visibility = "visible";
+    AJS.progressBars.setIndeterminate("#log-loading-progress-indicator");
+
 
     xmlHttp.open("GET",contextPath + "/plugins/servlet/log?level="+levelFilter+"&from=" + lastTime ,true);
     lastTime = new Date().getTime();

diff --git a/src/main/resources/secure/admin/log/LiveLogViewer.vm b/src/main/resources/secure/admin/log/LiveLogViewer.vm
@@ -6,20 +6,20 @@
     </script>
   </head>
   <body>
-    <br />
-    <form name="filterForm" onsubmit="return false;">
+    <h2>${action.getText("liveLog.page.title")}</h2>
+    <form name="filterForm" onsubmit="return false;" class="aui">
     	<table>
     		<tr>
     			<td>Filter Mode:</td>  
     			<td valign="middle">
-    				<select id="filterMode" name="filterMode" onChange="setFilterMode(event)"> 
+    				<select id="filterMode" name="filterMode" onChange="setFilterMode(event)" class="select"> 
     					<option value="AT_LEAST">At least</option>
     					<option value="ONLY">Only</option>
     				</select>
     			</td>
     			<td>log level</td>  
     			<td valign="middle">
-    				<select id="logLevel" name="logLevel" onChange="setLevelFilter(event)"> 
+    				<select id="logLevel" name="logLevel" onChange="setLevelFilter(event)" class="select"> 
     					<option value="All">All</option>
     					<option value="FATAL">Fatal</option>
     					<option value="ERROR">Error</option>
@@ -30,25 +30,25 @@
     			</td>
           <td valign="middle">Ordering:</td>  
           <td valign="middle">
-            <select id="ordering" name="ordering" onChange="setOrdering(event)"> 
+            <select id="ordering" name="ordering" onChange="setOrdering(event)" class="select"> 
               <option value="-1">New at bottom</option>
               <option value="0">New at top</option>
             </select>
           </td>
           <td width="10px">&nbsp;</td>
     			<td>Refresh interval (in Sec.):</td>  
-    			<td valign="middle"><input type="text" id="intervalDelay" name="intervalDelay" value="5" size="2" onChange="setIntervalDelay(event)"/></td>
-    			<td valign="middle"><input type="submit" id="refresh" name="refresh" value="Refresh now" onclick="loadLog(); return false;"/></td>
+    			<td valign="middle"><input type="text" id="intervalDelay" name="intervalDelay" value="5" size="2" onChange="setIntervalDelay(event)" class="text"/></td>
+    			<td valign="middle"><input type="submit" id="refresh" name="refresh" value="Refresh now" onclick="loadLog(); return false;" class="submit button"/></td>
     		</tr>
     	</table>
     </form>
 
-    <div id="log-loading-progress-indicator" class="aui-progress-indicator" style="visibility: hidden">
+    <div id="log-loading-progress-indicator" class="aui-progress-indicator">
         <span class="aui-progress-indicator-value"></span>
     </div>
 
-    <h2>Log Contents</h2>
-    <table id="contentTable" border="0" cellpadding="2" cellspacing="0" width="100%">
+    <h3>Log Contents</h3>
+    <table id="contentTable" border="0" cellpadding="2" cellspacing="0" width="100%" class="aui">
     	<thead>
     		<tr>
     			<th>Time</th>