Author: rmannibucau
Date: Wed Jul 31 12:04:36 2013
New Revision: 1508826
URL: http://svn.apache.org/r1508826
Log:
avoiding css ambiguity + adding bootstrap-dropdown to replace the breadcrumb in
report page
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/js/bootstrap-dropdown.js
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/NOTICE.txt
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report/report.vm
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/NOTICE.txt?rev=1508826&r1=1508825&r2=1508826&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/NOTICE.txt
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/NOTICE.txt
Wed Jul 31 12:04:36 2013
@@ -1,3 +1,10 @@
+Twitter bootstrap
+
+website: http://getbootstrap.com/2.3.2
+license: Apache v2
+
+------------------------
+
Table sorter
Used to handle table sorting/filtering in report page.
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css?rev=1508826&r1=1508825&r2=1508826&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
Wed Jul 31 12:04:36 2013
@@ -35,22 +35,14 @@ th#report-table {
background-position: right;
}
-ul {
+ul.jmx {
list-style: none;
margin: 0;
padding: 0;
}
-li {
- /*
- background-image: url(page.png);
- background-position: 0 1px;
- background-repeat: no-repeat;
- */
+li.jmx {
padding-left: 20px;
}
-li.node {
- /*background-image: url(folder.png);*/
-}
a.nodeText {
color: #000000;
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/js/bootstrap-dropdown.js
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/js/bootstrap-dropdown.js?rev=1508826&view=auto
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/js/bootstrap-dropdown.js
(added)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/js/bootstrap-dropdown.js
Wed Jul 31 12:04:36 2013
@@ -0,0 +1,169 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.3.2
+ * http://twbs.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+ "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+ * ========================= */
+
+ var toggle = '[data-toggle=dropdown]'
+ , Dropdown = function (element) {
+ var $el = $(element).on('click.dropdown.data-api', this.toggle)
+ $('html').on('click.dropdown.data-api', function () {
+ $el.parent().removeClass('open')
+ })
+ }
+
+ Dropdown.prototype = {
+
+ constructor: Dropdown
+
+ , toggle: function (e) {
+ var $this = $(this)
+ , $parent
+ , isActive
+
+ if ($this.is('.disabled, :disabled')) return
+
+ $parent = getParent($this)
+
+ isActive = $parent.hasClass('open')
+
+ clearMenus()
+
+ if (!isActive) {
+ if ('ontouchstart' in document.documentElement) {
+ // if mobile we we use a backdrop because click events don't delegate
+ $('<div
class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
+ }
+ $parent.toggleClass('open')
+ }
+
+ $this.focus()
+
+ return false
+ }
+
+ , keydown: function (e) {
+ var $this
+ , $items
+ , $active
+ , $parent
+ , isActive
+ , index
+
+ if (!/(38|40|27)/.test(e.keyCode)) return
+
+ $this = $(this)
+
+ e.preventDefault()
+ e.stopPropagation()
+
+ if ($this.is('.disabled, :disabled')) return
+
+ $parent = getParent($this)
+
+ isActive = $parent.hasClass('open')
+
+ if (!isActive || (isActive && e.keyCode == 27)) {
+ if (e.which == 27) $parent.find(toggle).focus()
+ return $this.click()
+ }
+
+ $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+ if (!$items.length) return
+
+ index = $items.index($items.filter(':focus'))
+
+ if (e.keyCode == 38 && index > 0) index--
// up
+ if (e.keyCode == 40 && index < $items.length - 1) index++
// down
+ if (!~index) index = 0
+
+ $items
+ .eq(index)
+ .focus()
+ }
+
+ }
+
+ function clearMenus() {
+ $('.dropdown-backdrop').remove()
+ $(toggle).each(function () {
+ getParent($(this)).removeClass('open')
+ })
+ }
+
+ function getParent($this) {
+ var selector = $this.attr('data-target')
+ , $parent
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && /#/.test(selector) &&
selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+ }
+
+ $parent = selector && $(selector)
+
+ if (!$parent || !$parent.length) $parent = $this.parent()
+
+ return $parent
+ }
+
+
+ /* DROPDOWN PLUGIN DEFINITION
+ * ========================== */
+
+ var old = $.fn.dropdown
+
+ $.fn.dropdown = function (option) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('dropdown')
+ if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+ if (typeof option == 'string') data[option].call($this)
+ })
+ }
+
+ $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+ * ==================== */
+
+ $.fn.dropdown.noConflict = function () {
+ $.fn.dropdown = old
+ return this
+ }
+
+
+ /* APPLY TO STANDARD DROPDOWN ELEMENTS
+ * =================================== */
+
+ $(document)
+ .on('click.dropdown.data-api', clearMenus)
+ .on('click.dropdown.data-api', '.dropdown form', function (e) {
e.stopPropagation() })
+ .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
+ .on('keydown.dropdown.data-api', toggle + ', [role=menu]' ,
Dropdown.prototype.keydown)
+
+}(window.jQuery);
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm?rev=1508826&r1=1508825&r2=1508826&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
Wed Jul 31 12:04:36 2013
@@ -15,12 +15,12 @@
limitations under the License.
*#
#macro ( tree $tree )
- <ul>
+ <ul class="jmx">
#foreach( $node in $tree.children )
#if ( $node.isLeaf() )
- <li id="$node.base64" class="leaf">
+ <li id="$node.base64" class="jmx leaf">
#else
- <li>
+ <li class="jmx">
#end
$node.name
#tree ( $node )
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report/report.vm
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report/report.vm?rev=1508826&r1=1508825&r2=1508826&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report/report.vm
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report/report.vm
Wed Jul 31 12:04:36 2013
@@ -67,6 +67,7 @@
</tbody>
</table>
+<script type="text/javascript"
src="$mapping/resources/js/bootstrap-dropdown.js"></script>
<script type="text/javascript"
src="$mapping/resources/js/jquery.tablesorter.js"></script>
<script type="text/javascript"
src="$mapping/resources/js/jquery.tablesorter.widgets.js"></script>
<script type="text/javascript">
