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 17:11:59 UTC
svn commit: r1537154 - in /incubator/sirona/trunk/reporting/src:
main/resources/resources/css/ main/resources/templates/
main/resources/templates/jmx/ main/resources/templates/jta/
main/resources/templates/jvm/ main/resources/templates/report/ main/res...
Author: rmannibucau
Date: Wed Oct 30 16:11:58 2013
New Revision: 1537154
URL: http://svn.apache.org/r1537154
Log:
fixing css after the upgrade to bootstrap 3 and sb-admin theme - still some enhancement todo but at least we are as good as before
Modified:
incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css
incubator/sirona/trunk/reporting/src/main/resources/resources/css/sb-admin.css
incubator/sirona/trunk/reporting/src/main/resources/resources/css/sirona.css
incubator/sirona/trunk/reporting/src/main/resources/templates/jmx/main.vm
incubator/sirona/trunk/reporting/src/main/resources/templates/jta/jta.vm
incubator/sirona/trunk/reporting/src/main/resources/templates/jvm/jvm.vm
incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm
incubator/sirona/trunk/reporting/src/main/resources/templates/report/report.vm
incubator/sirona/trunk/reporting/src/main/resources/templates/threads/threads.vm
incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java
Modified: incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css Wed Oct 30 16:11:58 2013
@@ -417,7 +417,7 @@ h6 small,
h1,
h2,
h3 {
- margin-top: 20px;
+ margin-top: 5px;
margin-bottom: 10px;
}
h4,
@@ -466,7 +466,6 @@ h4 small,
}
.page-header {
padding-bottom: 9px;
- margin: 40px 0 20px;
border-bottom: 1px solid #eeeeee;
}
ul,
@@ -750,8 +749,6 @@ pre code {
.col-lg-12 {
position: relative;
min-height: 1px;
- padding-left: 15px;
- padding-right: 15px;
}
.col-xs-1,
.col-xs-2,
@@ -1296,7 +1293,7 @@ th {
.table thead > tr > td,
.table tbody > tr > td,
.table tfoot > tr > td {
- padding: 8px;
+ padding: 4px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #dddddd;
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=1537154&r1=1537153&r2=1537154&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 16:11:58 2013
@@ -20,7 +20,7 @@ body {
#page-wrapper {
width: 100%;
- padding: 5px 15px;
+ padding: 15px 5px;
}
/* Nav Messages */
@@ -93,7 +93,7 @@ table.tablesorter thead tr th:hover {
}
#page-wrapper {
- padding: 15px 25px;
+ padding: 15px 5px;
}
/* Side Nav */
Modified: incubator/sirona/trunk/reporting/src/main/resources/resources/css/sirona.css
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/resources/css/sirona.css?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/resources/css/sirona.css (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/resources/css/sirona.css Wed Oct 30 16:11:58 2013
@@ -14,25 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-table .blue {
- color: #049cdb;
- border-bottom-color: #049cdb;
+.smooth-box {
+ border: 1px solid #cccccc;
+ border-radius: 4px;
}
-
-th#report-table {
- text-align: center;
-}
-
-.tablesorter-headerAsc {
- background-image: url('$mapping/resources/images/asc.gif');
- background-repeat: no-repeat;
- background-position: right;
+.align-bottom {
+ margin-bottom: 0;
}
-.tablesorter-headerDesc {
- background-image: url('$mapping/resources/images/desc.gif');
- background-repeat: no-repeat;
- background-position: right;
+.space {
+ margin-left: 5px;
}
ul.jmx {
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/jmx/main.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/jmx/main.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/jmx/main.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/jmx/main.vm Wed Oct 30 16:11:58 2013
@@ -31,10 +31,10 @@
<div class="container-fluid">
<div class="row-fluid">
- <div id="jmx-tree" class="span2">
+ <div id="jmx-tree" class="col-lg-2">
#tree ( $jmxTree )
</div>
- <div id="jmx-info" class="span10">
+ <div id="jmx-info" class="col-lg-10">
Click on the left tree to select a leaf to show the attributes of a MBean.
</div>
</div>
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/jta/jta.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/jta/jta.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/jta/jta.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/jta/jta.vm Wed Oct 30 16:11:58 2013
@@ -15,7 +15,7 @@
limitations under the License.
*#
#macro ( graph $name )
-<div class="span4">
+<div class="col-lg-4">
<div class="page-header">
<h2>$name</h2>
</div>
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/jvm/jvm.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/jvm/jvm.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/jvm/jvm.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/jvm/jvm.vm Wed Oct 30 16:11:58 2013
@@ -16,7 +16,7 @@
*#
<div class="container-fluid">
<div class="row-fluid">
- <div class="span6">
+ <div class="col-lg-6">
<div class="page-header">
<h2>CPU</h2>
</div>
@@ -34,7 +34,7 @@
</tbody>
</table>
</div>
- <div class="span6">
+ <div class="col-lg-6">
<div class="page-header">
<h2>Memory</h2>
</div>
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm Wed Oct 30 16:11:58 2013
@@ -15,19 +15,19 @@
limitations under the License.
*#
#macro ( datePicker $label $id )
-<div id="$id" class="input-append date">
- <label for="$id">$label</label>
- <input data-format="dd/MM/yyyy hh:mm:ss" type="text">
+<span id="$id" class="col-lg-6">
+ <label for="l$id">$label</label>
<span class="add-on">
<i data-time-icon="icon-time" data-date-icon="icon-calendar" class="icon-calendar"></i>
</span>
-</div>
+ <input data-format="dd/MM/yyyy hh:mm:ss" type="text" class="form-control" id="l$id">
+</span>
#end
#macro (dateForm $id)
-<form class="form-inline" id="update-$id">
+<form class="form-inline" id="update-$id" role="form">
#datePicker("From", "${id}-datetimepicker-start")
#datePicker("To", "${id}-datetimepicker-end")
- <button type="submit" class="btn btn-primary">Update</button>
+ <button type="submit" class="btn btn-primary col-lg-12">Update</button>
</form>
#end
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/report/report.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/report/report.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/report/report.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/report/report.vm Wed Oct 30 16:11:58 2013
@@ -41,11 +41,11 @@
</li>
</ul>
-<table id="report-table" class="table table-bordered table-striped table-hover">
+<table id="report-table" class="table table-bordered table-hover table-striped tablesorter">
<thead>
<tr>
#foreach( $header in $headers )
- <th>$header</th>
+ <th>$header <i class="icon-sort"></i></th>
#end
</tr>
</thead>
@@ -94,6 +94,8 @@
}
});
- $("table#report-table tr th div").addClass("blue");
+ // input search box shouldn't force the width of columns
+ $('input[type="search"].tablesorter-filter').addClass('col-lg-12')
+ $('input[type="search"].tablesorter-filter').addClass('smooth-box')
});
</script>
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/threads/threads.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/threads/threads.vm?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/threads/threads.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/threads/threads.vm Wed Oct 30 16:11:58 2013
@@ -20,15 +20,15 @@
<div class="container-fluid">
<div class="row-fluid">
- <div class="span2" style="word-break: break-all; word-wrap: break-word;">
+ <div class="col-lg-2" style="word-break: break-all; word-wrap: break-word;">
#foreach ($thread in $threads.entrySet())
<ul>
<li><a id="$thread.value" class="thread" href="#">$thread.key</a></li>
</ul>
#end
</div>
- <div class="span6">
- <div id="thread-info" class="span10">
+ <div class="col-lg-6 space">
+ <div id="thread-info" class="col-lg-10">
Click on the left list to select a thread to show.
</div>
</div>
Modified: incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java?rev=1537154&r1=1537153&r2=1537154&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java (original)
+++ incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java Wed Oct 30 16:11:58 2013
@@ -72,7 +72,7 @@ public class ReportTest extends SironaRe
final String text = page.getElementById("report-table").asText();
assertEquals("Counter\tRole\tHits\tMax\tMean\tMin\tStandardDeviation\tSum\tVariance\tValue\tConcurrency\tMaxConcurrency" + lineSeparator +
- "counter \t role (u) \t 1.00 \t 55.00 \t 55.00 \t 55.00 \t 0.00 \t 55.00 \t 0.00 \t 55.00 \t 0.00 \t 0.00", text);
+ "counter\trole(u)\t1.00\t55.00\t55.00\t55.00\t0.00\t55.00\t0.00\t55.00\t0.00\t0.00", text.replace(" ", ""));
}
@Test