Return-Path: 
 <commits-return-13883-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 29550 invoked from network); 19 Feb 2011 09:26:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Feb 2011 09:26:56 -0000
Received: (qmail 35214 invoked by uid 500); 19 Feb 2011 09:26:56 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 35103 invoked by uid 500); 19 Feb 2011 09:26:54 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 35095 invoked by uid 99); 19 Feb 2011 09:26:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Feb 2011 09:26:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Feb 2011 09:26:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 576EA2388A39; Sat, 19 Feb 2011 09:26:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1072279 - in
 /cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser:
 LogBrowser.gwt.xml client/ui/settings/SettingsView.ui.xml
 client/ui/settings/SettingsViewImpl.java resources/LogBrowser.html
 resources/custom.css
Date: Sat, 19 Feb 2011 09:26:32 -0000
To: commits@cxf.apache.org
From: tomekopo@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110219092632.576EA2388A39@eris.apache.org>

Author: tomekopo
Date: Sat Feb 19 09:26:31 2011
New Revision: 1072279

URL: http://svn.apache.org/viewvc?rev=1072279&view=rev
Log:
Improved layout of settings tab;

Added:
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/custom.css
Modified:
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsView.ui.xml
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsViewImpl.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/LogBrowser.html

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml?rev=1072279&r1=1072278&r2=1072279&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml Sat Feb 19 09:26:31 2011
@@ -31,6 +31,8 @@
     <script src="jstorage.config.js" />
     <script src="jstorage.min.js" />
 
+   <stylesheet src="custom.css" />
+
 	<entry-point class='org.apache.cxf.management.web.browser.client.LogBrowser' />
 
     <public path='resources' />

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsView.ui.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsView.ui.xml?rev=1072279&r1=1072278&r2=1072279&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsView.ui.xml (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsView.ui.xml Sat Feb 19 09:26:31 2011
@@ -19,42 +19,71 @@
   -->
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+             xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 
-    <ui:with field='res'
-             type='org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserResources'/>
+   <ui:with field='res'
+            type='org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserResources'/>
 
-    <g:DockLayoutPanel unit='EM'>
-        <g:north size='7.2'>
-            <g:HTMLPanel>
-                <g:FlowPanel ui:field="navigationHeaderSlot"/>
-
-                <div class="{res.css.settingsTabHeader}">
-                    <g:Label addStyleNames="{res.css.settingsTabTitle}">
-                        Settings
-                    </g:Label>
-                    <g:Hyperlink ui:field="backHyperlink" addStyleNames="{res.css.settingsTabBackButton}">
-                        &#171; Back to Explorer
-                    </g:Hyperlink>
-                </div>
-                <div class="{res.css.settingsTabToolBar}">
-                    <g:Button ui:field="addSubscriptionButton">
+   <ui:style>
+    .content {
+       margin: 0.5em 1em;
+       padding: 3px;
+       background-color: #FC6;
+    }
+
+    .header {
+       width: auto;
+       margin-bottom: 0.5em;
+    }
+
+    .header td {
+       vertical-align: bottom;
+    }
+
+    .title {
+       font-size: 140%;
+       font-weight: bold;
+       margin-left: 0.3em;
+       margin-right: 1em;
+    }
+
+    .backLink {
+       text-decoration: underline;
+    }
+   </ui:style>
+
+
+   <g:HTMLPanel>
+      <g:FlowPanel ui:field="navigationHeaderSlot"/>
+         <div class="{style.content}">
+            <table class="{style.header}">
+               <tbody>
+                  <tr>
+                     <td>
+                        <g:Label addStyleNames="{style.title}">
+                           Settings
+                        </g:Label>
+                     </td>
+                     <td>
+                        <g:Hyperlink ui:field="backHyperlink" addStyleNames="{style.backLink}">
+                           &#171; Back to Explorer
+                        </g:Hyperlink>
+                     </td>
+                  </tr>
+               </tbody>
+            </table>
+            <g:DecoratedTabPanel ui:field="tabPanel" addStyleDependentNames="settings">
+               <g:Tab text="Endpoints">
+                  <g:HTMLPanel>
+                     <g:Button ui:field="addSubscriptionButton">
                         Add endpoint
-                    </g:Button>
-                </div>
-            </g:HTMLPanel>
-        </g:north>
-
-        <g:center>
-            <g:ScrollPanel>
-                <g:HTMLPanel>
-                    <div class="{res.css.settingsTabContent}">
-                        <g:FlexTable ui:field="subscriptionsTable"
-                                     addStyleNames="{res.css.settingsTabFeedList}"/>
-                    </div>
-                </g:HTMLPanel>
-            </g:ScrollPanel>
-        </g:center>
-    </g:DockLayoutPanel>
+                     </g:Button>
 
+                     <g:FlexTable ui:field="subscriptionsTable"/>
+                  </g:HTMLPanel>
+               </g:Tab>
+            </g:DecoratedTabPanel>
+         </div>
+
+   </g:HTMLPanel>
 </ui:UiBinder>

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsViewImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsViewImpl.java?rev=1072279&r1=1072278&r2=1072279&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsViewImpl.java (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsViewImpl.java Sat Feb 19 09:26:31 2011
@@ -32,6 +32,7 @@ import com.google.gwt.uibinder.client.Ui
 import com.google.gwt.uibinder.client.UiTemplate;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DecoratedTabPanel;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasWidgets;
@@ -51,6 +52,9 @@ public class SettingsViewImpl extends Co
     private static final SettingsViewUiBinder UI_BINDER = GWT.create(SettingsViewUiBinder.class);
 
     @UiField @Nonnull
+    DecoratedTabPanel tabPanel;
+
+    @UiField @Nonnull
     FlowPanel navigationHeaderSlot;
 
     @UiField @Nonnull
@@ -61,6 +65,7 @@ public class SettingsViewImpl extends Co
 
     public SettingsViewImpl() {
         initWidget(UI_BINDER.createAndBindUi(this));
+        tabPanel.selectTab(0);
     }
 
     public HasWidgets getNaviagationHeaderSlot() {

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/LogBrowser.html
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/LogBrowser.html?rev=1072279&r1=1072278&r2=1072279&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/LogBrowser.html (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/LogBrowser.html Sat Feb 19 09:26:31 2011
@@ -24,13 +24,6 @@
 
     <title>LogBrowser</title>
 
-     <!--TODO Move this to commons stylesheet-->
-     <style>
-        body table  {
-           width:100%;
-        }
-     </style>
-
     <script type="text/javascript" language="javascript" src="logbrowser.nocache.js"></script>
   </head>
 

Added: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/custom.css
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/custom.css?rev=1072279&view=auto
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/custom.css (added)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/resources/custom.css Sat Feb 19 09:26:31 2011
@@ -0,0 +1,12 @@
+body table {
+   width:100%;
+}
+
+.gwt-DecoratedTabPanel-settings .gwt-TabPanelBottom {
+   border-color: #FFF7D7;
+   background-color: #FFF7D7;
+}
+
+.gwt-DecoratedTabPanel-settings .tabMiddleLeft, .gwt-DecoratedTabPanel-settings .tabMiddleCenter, .gwt-DecoratedTabPanel-settings .tabMiddleRight, .gwt-DecoratedTabPanel-settings .tabTopLeft, .gwt-DecoratedTabPanel-settings .tabTopCenter, .gwt-DecoratedTabPanel-settings .tabTopRight {
+   background: none repeat scroll 0 0 #FFF7D7 !important;
+}
\ No newline at end of file