You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/10/30 15:11:45 UTC

svn commit: r1537097 - in /incubator/sirona/trunk/reporting/src/main: java/org/apache/sirona/reporting/web/MonitoringController.java resources/resources/css/sb-admin.css

Author: rmannibucau
Date: Wed Oct 30 14:11:44 2013
New Revision: 1537097

URL: http://svn.apache.org/r1537097
Log:
oops removed an important line in last commit + fixing menu width

Modified:
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java
    incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css

Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java?rev=1537097&r1=1537096&r2=1537097&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java Wed Oct 30 14:11:44 2013
@@ -131,12 +131,12 @@ public class MonitoringController implem
 
         for (final Map.Entry<Pattern, Invoker> entry : invokers.entrySet()) {
             final Pattern pattern = entry.getKey();
-            if (pattern.matcher(path).matches()) {
+            if ((matcher = pattern.matcher(path)).matches()) {
                 invoker = entry.getValue();
                 if (!entry.getKey().pattern().endsWith(".*")) {
                     break;
                 }
-            } else if (pattern.matcher(pathWithoutParams).matches()) {
+            } else if ((matcher = pattern.matcher(pathWithoutParams)).matches()) {
                 invoker = entry.getValue(); // continue since that's a not perfect matching
             }
         }

Modified: incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css?rev=1537097&r1=1537096&r2=1537097&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css Wed Oct 30 14:11:44 2013
@@ -99,9 +99,9 @@ table.tablesorter thead tr th:hover {
   /* Side Nav */
 
   .side-nav {
-	margin-left: -225px;
-	left: 225px;
-	width: 225px;
+	margin-left: -100px;
+	left: 100px;
+	width: 100px;
 	position: fixed;
 	top: 50px;
 	height: 100%;