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:32:43 UTC
svn commit: r1537164 - in
/incubator/sirona/trunk/reporting/src/main/resources:
resources/css/bootstrap.css templates/jta/jta.vm templates/jvm/jvm.vm
templates/macro.vm templates/web/web.vm
Author: rmannibucau
Date: Wed Oct 30 16:32:43 2013
New Revision: 1537164
URL: http://svn.apache.org/r1537164
Log:
using sb-admin panel for graphs
Modified:
incubator/sirona/trunk/reporting/src/main/resources/resources/css/bootstrap.css
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/web/web.vm
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=1537164&r1=1537163&r2=1537164&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:32:43 2013
@@ -749,6 +749,8 @@ pre code {
.col-lg-12 {
position: relative;
min-height: 1px;
+ padding-right: 2px;
+ padding-left: 2px;
}
.col-xs-1,
.col-xs-2,
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=1537164&r1=1537163&r2=1537164&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:32:43 2013
@@ -16,12 +16,7 @@
*#
#macro ( graph $name )
<div class="col-lg-4">
- <div class="page-header">
- <h2>$name</h2>
- </div>
-
- <div id="${name}-graph" class="plot"></div>
- #dateForm($name)
+ #graphBlock($name, $name)
</div>
#end
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=1537164&r1=1537163&r2=1537164&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:32:43 2013
@@ -17,38 +17,44 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="col-lg-6">
- <div class="page-header">
- <h2>CPU</h2>
- </div>
-
- <div id="cpu-graph" class="plot"></div>
+ #graphBlock("CPU", "cpu")
- #dateForm('cpu')
-
- <table id="cpu-table" class="table table-bordered table-striped table-hover">
- <tbody>
- <tr><td>OS Name</td><td>$name</td></tr>
- <tr><td>Version</td><td>$version</td></tr>
- <tr><td>Architecture</td><td>$architecture</td></tr>
- <tr><td>Number of processors</td><td>$numberProcessor</td></tr>
- </tbody>
- </table>
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-table"></i>Computer Info
+ </h3>
+ </div>
+ <div class="panel-body">
+ <table id="cpu-table" class="table table-bordered table-striped table-hover">
+ <tbody>
+ <tr><td>OS Name</td><td>$name</td></tr>
+ <tr><td>Version</td><td>$version</td></tr>
+ <tr><td>Architecture</td><td>$architecture</td></tr>
+ <tr><td>Number of processors</td><td>$numberProcessor</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
<div class="col-lg-6">
- <div class="page-header">
- <h2>Memory</h2>
- </div>
-
- <div id="memory-graph" class="plot"></div>
+ #graphBlock("Used Memory", "memory")
- #dateForm('memory')
-
- <table id="memory-table" class="table table-bordered table-striped table-hover">
- <tbody>
- <tr><td>Init</td><td>$initMemory</td></tr>
- <tr><td>Max</td><td>$maxMemory</td></tr>
- </tbody>
- </table>
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-table"></i>Memory Status
+ </h3>
+ </div>
+ <div class="panel-body">
+ <table id="memory-table" class="table table-bordered table-striped table-hover">
+ <tbody>
+ <tr><td>Init</td><td>$initMemory</td></tr>
+ <tr><td>Max</td><td>$maxMemory</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
</div>
</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=1537164&r1=1537163&r2=1537164&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:32:43 2013
@@ -31,3 +31,17 @@
<button type="submit" class="btn btn-primary col-lg-12">Update</button>
</form>
#end
+
+#macro (graphBlock $title $name)
+<div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-bar-chart"></i>$title
+ </h3>
+ </div>
+ <div class="panel-body">
+ <div id="${name}-graph" class="plot"></div>
+ #dateForm($name)
+ </div>
+</div>
+#end
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/web/web.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/web/web.vm?rev=1537164&r1=1537163&r2=1537164&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/web/web.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/web/web.vm Wed Oct 30 16:32:43 2013
@@ -18,12 +18,7 @@
<div class="container-fluid">
<div class="row-fluid">
- <div class="page-header">
- <h2>Sessions</h2>
- </div>
-
- <div id="sessions-graph" class="plot"></div>
- #dateForm("sessions")
+ #graphBlock("Sessions", "sessions")
</div>
</div>