You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/05/12 15:07:50 UTC
svn commit: r1743513 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources:
css/common.css index.html login.html
Author: orudyy
Date: Thu May 12 15:07:50 2016
New Revision: 1743513
URL: http://svn.apache.org/viewvc?rev=1743513&view=rev
Log:
QPID-7217: [Java Broker, WMC] Change html layout of WMC to scroll long tab content with body scrollbar rather than with inner tab scrollbar; place copyrights at the bottom of the tab container
Modified:
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/index.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/login.html
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=1743513&r1=1743512&r2=1743513&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 Thu May 12 15:07:50 2016
@@ -21,16 +21,38 @@
html, body {
height: 100%;
+ width: 100%;
margin: 0;
- margin-right: 40px;
padding: 0;
- overflow: hidden;
font-family: Lucida Sans,Lucida Grande,Arial !important;
font-size: 13px !important;
background: white;
color: #333;
}
+body {
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+#pageLayout, #main {
+ height: 100%;
+ padding: 0;
+ margin: 0px;
+ overflow: visible;
+}
+
+#main {
+ width:80%;
+ padding:5px;
+ overflow: visible;
+}
+
+#tree {
+ width:20%;
+ overflow: visible;
+}
+
.clear {
clear: both;
}
@@ -39,9 +61,6 @@ html, body {
display: none;
}
-#pageLayout {
- height: 100%;
-}
button {
-webkit-transition: background-color 0.2s linear;
border-radius:4px;
@@ -64,9 +83,11 @@ h1 {
font-size:1.5em;
}
-.header {
+#header {
height:100px;
- background:url("../images/qpid-logo.png") left center no-repeat
+ background:url("../images/qpid-logo.png") left center no-repeat;
+ float: left;
+ width: 300px;
}
.logo {
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html?rev=1743513&r1=1743512&r2=1743513&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Thu May 12 15:07:50 2016
@@ -150,10 +150,10 @@
</head>
<body class="claro qpid">
-<div id="pageLayout" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design: 'headline', gutters: false">
- <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
- <div id="header" class="header" style="float: left; width: 300px"></div>
- <div style="float: right;">
+<div id="pageLayout" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design: 'headline', gutters: false, isLayoutContainer:false">
+ <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top', isLayoutContainer:false">
+ <div id="header"></div>
+ <div class="alignRight">
<div id="login" class="hidden"><span id="authenticatedUser" class="hidden"></span>
<div id="authenticatedUserControls" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass: 'preferencesIcon'">
<div data-dojo-type="dijit.Menu">
@@ -170,15 +170,16 @@
</div>
</div>
</div>
- <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'leading', splitter: true" style="width:20%">
+ <div id="tree" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'leading', splitter: true, isLayoutContainer:false">
<div qpid-type="treeView" qpid-props="query: 'service/structure'" ></div>
</div>
- <div id="managedViews" data-dojo-type="dijit.layout.TabContainer" data-dojo-props="region:'center', tabPosition: 'top'">
- </div>
- <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'">
- <div qpid-type="footer"></div>
+ <div id="main" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center', gutters: true, isLayoutContainer:false">
+ <div id="managedViews" data-dojo-type="dijit.layout.TabContainer" data-dojo-props="tabPosition: 'top', doLayout:false, isLayoutContainer:false">
+ </div>
+ <div>
+ <div qpid-type="footer" ></div>
+ </div>
</div>
-
<div class="dijitHidden">
<div data-dojo-type="dijit.Dialog" data-dojo-props="title: 'Error'" id="errorDialog">
<div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/login.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/login.html?rev=1743513&r1=1743512&r2=1743513&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/login.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/login.html Thu May 12 15:07:50 2016
@@ -85,7 +85,7 @@
<div id="pageLayout" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design: 'headline', gutters: false">
<div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
- <div id="header" class="header" style="float: left; width: 300px"></div>
+ <div id="header"></div>
<div id="login" style="float: right"></div>
</div>
<div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org