Author: orudyy
Date: Wed Jun 24 13:34:10 2015
New Revision: 1687265
URL: http://svn.apache.org/r1687265
Log:
QPID-6609: Improve Logger UI (work by Lorenz Quack and Alex Rudyy)
Added:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLogger.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLoggerFilter.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/common/warning.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLoggerFilter.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelFilter.java
Wed Jun 24 13:34:10 2015
@@ -32,7 +32,7 @@ public interface BrokerNameAndLevelFilte
String LOGGER_NAME = "loggerName";
String LEVEL = "level";
- @ManagedAttribute( defaultValue = "" )
+ @ManagedAttribute( defaultValue = "", immutable = true )
String getLoggerName();
@ManagedAttribute(defaultValue = "INFO", validValues =
{"org.apache.qpid.server.logging.LogLevel#validValues()"})
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelFilter.java
Wed Jun 24 13:34:10 2015
@@ -31,7 +31,7 @@ public interface VirtualHostNameAndLevel
String LOGGER_NAME = "loggerName";
String LEVEL = "level";
- @ManagedAttribute( defaultValue = "" )
+ @ManagedAttribute( defaultValue = "", immutable = true)
String getLoggerName();
@ManagedAttribute(defaultValue = "INFO", validValues =
{"org.apache.qpid.server.logging.LogLevel#validValues()"})
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLogger.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLogger.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLogger.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLogger.html
Wed Jun 24 13:34:10 2015
@@ -20,54 +20,54 @@
<div class="dijitHidden">
<div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Add Logger'"
id="addLogger">
<form id="addLogger.form" method="post"
data-dojo-type="dijit/form/Form">
+ <div class="hidden infoPane" id="brokerLoggerEditWarning">Changes
will only take effect after Broker restart.</div>
+ <div class="hidden infoPane"
id="virtualHostlLoggerEditWarning">Changes will only take effect after
VirtualHost restart.</div>
<div id="addLogger.contentPane">
- <div class="formBox">
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Name*:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="text" id="addLogger.name"
-
data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="
- name: 'name',
- placeHolder: 'logger name',
- required: true,
- promptMessage: 'Name of logger, must be unique',
- title: 'Enter a unique logger name'" />
- </div>
- </div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Type*:</div>
- <div class="tableContainer-valueCell
formLabel-controlCell">
- <select id="addLogger.type"
data-dojo-type="dijit/form/FilteringSelect"
- data-dojo-props="
- name: 'type',
- required: true,
- placeHolder: 'select logger type',
- promptMessage: 'Type of logger',
- title: 'Select type',
- searchAttr: 'name'">
- </select>
- </div>
- </div>
- <div class="clear">
- <div id="addLogger.categoryFields"></div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Name*:</div>
+ <div class="formLabel-controlCell
tableContainer-valueCell">
+ <input type="text" id="addLogger.name"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'name',
+ placeHolder: 'logger name',
+ required: true,
+ promptMessage: 'Name of logger, must be unique',
+ title: 'Enter a unique logger name'" />
</div>
- <div class="clear">
- <div id="addLogger.typeFields"></div>
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Type*:</div>
+ <div class="tableContainer-valueCell
formLabel-controlCell">
+ <select id="addLogger.type"
data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
+ name: 'type',
+ required: true,
+ placeHolder: 'select logger type',
+ promptMessage: 'Type of logger',
+ title: 'Select type',
+ searchAttr: 'name'">
+ </select>
</div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Durable:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="checkbox" id="addLogger.durable"
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Durable:</div>
+ <div class="formLabel-controlCell
tableContainer-valueCell">
+ <input type="checkbox" id="addLogger.durable"
data-dojo-type="dijit/form/CheckBox"
data-dojo-props="
- name: 'durable',
- required: false,
- title: 'If selected, persists logger in the
configuration store',
- checked: true"/>
- </div>
+ name: 'durable',
+ required: false,
+ title: 'If selected, persists logger in the
configuration store',
+ checked: true"/>
</div>
</div>
+ <div class="clear">
+ <div id="addLogger.categoryFields"></div>
+ </div>
+ <div class="clear">
+ <div id="addLogger.typeFields"></div>
+ </div>
<div class="clear"></div>
</div>
<div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLoggerFilter.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLoggerFilter.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLoggerFilter.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addLoggerFilter.html
Wed Jun 24 13:34:10 2015
@@ -49,9 +49,6 @@
</div>
</div>
<div class="clear">
- <div id="addLoggerFilter.typeFields"></div>
- </div>
- <div class="clear">
<div class="formLabel-labelCell
tableContainer-labelCell">Durable:</div>
<div class="formLabel-controlCell
tableContainer-valueCell">
<input type="checkbox" id="addLoggerFilter.durable"
@@ -62,6 +59,9 @@
checked: true"/>
</div>
</div>
+ <div class="clear">
+ <div id="addLoggerFilter.typeFields"></div>
+ </div>
<div class="clear"></div>
</div>
<div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/common/warning.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/common/warning.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/common/warning.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/common/warning.html
Wed Jun 24 13:34:10 2015
@@ -20,8 +20,7 @@
-->
<div class="dijit dijitReset" id="widget_${id}" role="presentation">
<div class="warningPane">
- <div class="warningIcon"></div>
- <div data-dojo-attach-point='warningMessage'
class="warningMessage">Not Found</div>
+ <div data-dojo-attach-point='warningMessage'>Not Found</div>
</div>
<div class="clear dijitDialogPaneActionBar">
<button data-dojo-attach-event='ondijitclick:_onButtonClick'
data-dojo-type="dijit/form/Button"
data-dojo-attach-point="closeButton">Close</button>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
Wed Jun 24 13:34:10 2015
@@ -338,27 +338,25 @@ div .messages {
margin-top:5px;
}
-.warningIcon
-{
- width:50px;
- height:50px;
- background:url("../images/warning-yellow.svg") left center no-repeat;
- background-size: contain;
- display: inline-block;
- float: left;
-}
-.warningMessage
+.warningPane
{
font-weight: bold;
color: #f44444;
- padding: 4px;
- margin-left:55px;
- padding-top:10px;
+ padding: 1em 0em 1em 3.2em;
+ background: url("../images/warning-yellow.svg") left center no-repeat;
+ background-size: 3em;
+ vertical-align: middle;
+ width: 100%;
+ height: 100%;
}
-.warningPane
+.infoPane
{
- vertical-align: middle;
+ margin-left: 5px;
+ padding: 5px 5px 5px 1.2em;
+ font-style: italic;
+ background:url("../images/notification.svg") no-repeat left center;
+ background-size: 1em;
width:100%;
height:100%;
}
\ No newline at end of file
Added:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg?rev=1687265&view=auto
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
(added)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
Wed Jun 24 13:34:10 2015
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="359.98813"
+ height="359.98813"
+ id="svg2996"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Notification.svg">
+ <defs
+ id="defs2998" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.49497475"
+ inkscape:cx="-266.92261"
+ inkscape:cy="381.29166"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1151"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata3001">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-0.00349687,-692.36504)">
+ <path
+ sodipodi:type="arc"
+
style="fill:#0000ff;stroke:#000000;stroke-width:53.57142639;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3008"
+ sodipodi:cx="157.14285"
+ sodipodi:cy="332.36218"
+ sodipodi:rx="311.42856"
+ sodipodi:ry="311.42856"
+ d="m 468.57141,332.36218 c 0,171.99725 -139.43131,311.42856
-311.42856,311.42856 -171.997241,0 -311.42856,-139.43131 -311.42856,-311.42856
0,-171.99724 139.431319,-311.428556 311.42856,-311.428556 171.99725,0
311.42856,139.431316 311.42856,311.428556 z"
+ transform="matrix(0.53220699,0,0,0.53220699,96.366225,695.47512)" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text3761"
+ y="1327.0852"
+ x="43.394711"
+
style="font-size:458.96676636px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+ xml:space="preserve"
+ transform="scale(1.3294857,0.75217055)"><tspan
+ y="1327.0852"
+ x="43.394711"
+ id="tspan3763"
+ sodipodi:role="line">!</tspan></text>
+ </g>
+</svg>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLogger.js
Wed Jun 24 13:34:10 2015
@@ -21,6 +21,7 @@
define(["dojo/_base/lang",
"dojo/dom",
"dojo/dom-construct",
+ "dojo/dom-style",
"dijit/registry",
"dojo/parser",
"dojo/store/Memory",
@@ -43,7 +44,7 @@ define(["dojo/_base/lang",
"dijit/layout/ContentPane",
"dojox/layout/TableContainer",
"dojo/domReady!"],
- function (lang, dom, construct, registry, parser, memory, array, event,
json, util, template)
+ function (lang, dom, construct, domStyle, registry, parser, memory, array,
event, json, util, template)
{
var addLogger =
{
@@ -96,6 +97,11 @@ define(["dojo/_base/lang",
this._configure(actualData.type);
}
+ var brokerLoggerEditWarningNode =
dom.byId("brokerLoggerEditWarning");
+ var virtualHostlLoggerEditWarningNode =
dom.byId("virtualHostlLoggerEditWarning");
+ domStyle.set(brokerLoggerEditWarningNode, "display",
!this.isNew && this.category == "BrokerLogger" ? "block" : "none");
+ domStyle.set(virtualHostlLoggerEditWarningNode, "display",
!this.isNew && this.category == "VirtualHostLogger" ? "block" : "none");
+
this._loadCategoryUserInterfacesAndShowDialog(actualData);
},
hide: function()
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLoggerFilter.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLoggerFilter.js?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLoggerFilter.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addLoggerFilter.js
Wed Jun 24 13:34:10 2015
@@ -156,7 +156,11 @@ define(["dojo/_base/lang",
promise.then(
function(instances)
{
-
util.applyToWidgets(that.typeFieldsContainer, that.category, type,
that.initialData, that.management.metadata);
+
util.applyToWidgets(that.typeFieldsContainer, that.category, type,
that.initialData, metadata);
+ if (!this.isNew)
+ {
+
util.disableWidgetsForImmutableFields(that.allFieldsContainer, that.category,
type, metadata);
+ }
});
}
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html
Wed Jun 24 13:34:10 2015
@@ -19,6 +19,18 @@
<div>
<div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Log Message
Format:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="addLogger.layout"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'layout',
+ placeHolder: '%d %-5p [%t] \(%c{2}\) - %m%n',
+ promptMessage: 'Enter the format of the log
messages using logback formating',
+ title: 'Enter the format of the log messages
using logback formating'"/>
+ </div>
+ </div>
+ <div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">File
Name:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addLogger.fileName"
@@ -30,89 +42,76 @@
promptMessage: 'Enter the log file path',
title: 'Path to the log file on the file
system'"/>
</div>
-
- <div class="formBox">
- <fieldset>
- <legend>Rolling Options</legend>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Roll Daily:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="checkbox" id="addLogger.rollDaily"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
+ </div>
+ <div class="formBox clear">
+ <fieldset>
+ <legend>Rolling Options</legend>
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Roll
Daily:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="checkbox" id="addLogger.rollDaily"
+ data-dojo-type="dijit/form/CheckBox"
+ data-dojo-props="
name: 'rollDaily',
required: false"/>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:
['addLogger.rollDaily'],
+ <div data-dojo-type="dijit/Tooltip"
+ data-dojo-props="connectId: ['addLogger.rollDaily'],
label: 'If selected, files will be
rolled over daily'">
- </div>
</div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Roll on Restart:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="checkbox" id="addLogger.rollOnRestart"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Roll
on Restart:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="checkbox" id="addLogger.rollOnRestart"
+ data-dojo-type="dijit/form/CheckBox"
+ data-dojo-props="
name: 'rollOnRestart',
required: false"/>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:
['addLogger.rollOnRestart'],
+ <div data-dojo-type="dijit/Tooltip"
+ data-dojo-props="connectId:
['addLogger.rollOnRestart'],
label: 'If selected, files will be
rolled over on every restart'">
- </div>
</div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Compress Rolled Files:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="checkbox" id="addLogger.compressOldFiles"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Compress Rolled Files:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="checkbox" id="addLogger.compressOldFiles"
+ data-dojo-type="dijit/form/CheckBox"
+ data-dojo-props="
name: 'compressOldFiles',
required: false"/>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:
['addLogger.compressOldFiles'],
+ <div data-dojo-type="dijit/Tooltip"
+ data-dojo-props="connectId:
['addLogger.compressOldFiles'],
label: 'If selected, rolled over files
will be compressed'">
- </div>
</div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Maximum Number of Rolled Files:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="text" id="addLogger.maxHistory"
- data-dojo-type="dijit/form/NumberTextBox"
- data-dojo-props="
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Maximum Number of Rolled Files:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="addLogger.maxHistory"
+ data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-props="
name: 'maxHistory',
placeHolder: 'maximum number of files to keep in
history',
promptMessage: 'Enter the maximum number of
files to keep in history',
title: 'Enter the maximum number of files to
keep in history'"/>
- </div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Maximum File Size:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="text" id="addLogger.maxFileSize"
- data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="
+ </div>
+ <div class="clear">
+ <div class="formLabel-labelCell
tableContainer-labelCell">Maximum File Size:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="addLogger.maxFileSize"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
name: 'maxFileSize',
placeHolder: 'maximum file size',
promptMessage: 'Enter file size limit of log
files before they roll over. You cann append logback size specifiers (e.g., mb
or kb)',
title: 'Enter file size limit of logfiles before
they roll over'"/>
- </div>
- </div>
- <div class="clear">
- <div class="formLabel-labelCell
tableContainer-labelCell">Log Message Format:</div>
- <div class="formLabel-controlCell
tableContainer-valueCell">
- <input type="text" id="addLogger.layout"
- data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="
- name: 'layout',
- placeHolder: '%d %-5p [%t] \(%c{2}\) - %m%n',
- promptMessage: 'Enter the format of the log
messages using logback formating',
- title: 'Enter the format of the log messages
using logback formating'"/>
- </div>
</div>
- </fieldset>
- </div>
+ </div>
+ </fieldset>
</div>
</div>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html
Wed Jun 24 13:34:10 2015
@@ -20,10 +20,14 @@
-->
<div>
<div class="clear">
+ <div class="formLabel-labelCell">Log Message Format:</div>
+ <div class="layout formValue-valueCell"></div>
+ </div>
+ <div class="clear">
<div class="formLabel-labelCell">File Name:</div>
<div class="fileName"></div>
</div>
- <div class="formBox">
+ <div class="formBox clear">
<fieldset>
<legend>Rolling Options</legend>
<div class="alignLeft">
@@ -49,10 +53,6 @@
<div class="formLabel-labelCell">Maximum File Size:</div>
<div class="maxFileSize formValue-valueCell"></div>
</div>
- <div class="clear">
- <div class="formLabel-labelCell">Log Message Format:</div>
- <div class="layout formValue-valueCell"></div>
- </div>
</div>
</fieldset>
</div>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html?rev=1687265&r1=1687264&r2=1687265&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html
Wed Jun 24 13:34:10 2015
@@ -46,7 +46,7 @@
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Filters'"
class="clear filterGridPanel">
<div class="filterGrid" style="display:none"></div>
- <div class="filterWarning warningPane" style="display:none"><div
class="warningIcon"></div><div class="warningMessage">Logger will not log
anything without filters.</div></div>
+ <div class="filterWarning warningPane hidden">Logger will not log
anything without filters.</div>
<div class="clear">
<button data-dojo-type="dijit.form.Button"
class="addFilterButton">Add</button>
<button data-dojo-type="dijit.form.Button"
class="deleteFilterButton">Delete</button>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
