Author: manolo
Date: Sat Jul 14 07:39:51 2012
New Revision: 1361484
URL: http://svn.apache.org/viewvc?rev=1361484&view=rev
Log:
Remove dependency of org.cobogw.gwt for Round panels. Use css3 in modern
browsers and gwt decorators for old ones
Added:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java
Removed:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImpl.java
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Sat Jul 14 07:39:51 2012
@@ -93,6 +93,11 @@
<artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <classifier>sources</classifier>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Sat Jul
14 07:39:51 2012
@@ -38,9 +38,10 @@
<!-- <inherits name="com.google.gwt.junit.JUnit"/> -->
<!-- Inherit the default GWT style sheet. -->
- <inherits name='com.google.gwt.user.theme.standard.Standard'/>
- <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
+ <inherits name='com.google.gwt.user.theme.clean.Clean'/>
<!-- CSS loaded asynchronously -->
<stylesheet src="../Hupa.css"/>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
Sat Jul 14 07:39:51 2012
@@ -42,12 +42,14 @@ public class HupaCSS extends WidgetsCSS
public static final String C_flash ="hupa-flash";
public static final String C_top_container ="hupa-top";
+ public static final String C_central_container ="hupa-central";
public static final String C_main_container ="hupa-main";
public static final String C_bottom_container ="hupa-bottom";
public static final String C_login_container = "hupa-login";
+ public static final String C_login_box = "hupa-login-box";
public static final String C_login_form = "hupa-login-form";
- public static final String C_login_box = "hupa-login-textbox";
+ public static final String C_login_textbox = "hupa-login-textbox";
public static final String C_contacts_container = "hupa-contacts";
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
Sat Jul 14 07:39:51 2012
@@ -77,7 +77,7 @@ public class AppView extends Composite i
appContainer.addStyleName(HupaCSS.C_app_container);
logoContainer.addStyleName(HupaCSS.C_logo_container);
topContainer.addStyleName(HupaCSS.C_top_container);
- centralContainer.addStyleName(HupaCSS.C_main_container);
+ centralContainer.addStyleName(HupaCSS.C_central_container);
bottomContainer.addStyleName(HupaCSS.C_bottom_container);
topWrapper.addStyleName(HupaCSS.C_top_container + "-wrap");
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Sat Jul 14 07:39:51 2012
@@ -79,9 +79,10 @@ public class LoginView extends Composite
loading = new Loading(constants.loading());
mainContainer.setStyleName(HupaCSS.C_login_container);
+ rPanel.addStyleName(HupaCSS.C_login_box);
flexTable.addStyleName(HupaCSS.C_login_form);
- usernameTextBox.addStyleName(HupaCSS.C_login_box);
- passwordTextBox.addStyleName(HupaCSS.C_login_box);
+ usernameTextBox.addStyleName(HupaCSS.C_login_textbox);
+ passwordTextBox.addStyleName(HupaCSS.C_login_textbox);
buttonBar.add(submitButton);
buttonBar.add(resetButton);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Sat Jul 14 07:39:51 2012
@@ -112,7 +112,7 @@ public class MainView extends Composite
dockPanel = new DockPanel();
- dockPanel.setSpacing(10);
+ dockPanel.setSpacing(5);
dockPanel.setWidth("100%");
// Not used so far
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Sat Jul 14 07:39:51 2012
@@ -88,8 +88,8 @@ div.hupa-logo {
}
div.hupa-top {
- padding-left: 80px;
- padding-right: 8px;
+ padding-left: 90px;
+ margin-right: 8px;
}
* html div.hupa-top {
padding-left: 0px;
@@ -121,12 +121,12 @@ div.hupa-loginfo-label, div.hupa-loginfo
margin-right: 15px;
}
div.hupa-header {
- color: transparent;
+ display: none;
padding-left: 10px;
height: 32px;
}
-div.hupa-main {
+.hupa-central {
clear: both;
margin: 8px 8px 8px 8px;
min-height: 500px;
@@ -137,8 +137,7 @@ div.hupa-main {
text-align: center;
}
-div.hupa-flash {
- border: 1px solid #FAD163;
+.hupa-flash {
background-color: #fae5b0;
text-align: center;
margin: auto auto 2px auto;
@@ -165,14 +164,14 @@ div.hupa-bottom {
/************[ view: LoginView ]*******************/
table.hupa-login {
text-align: right;
- margin-left: auto;
- margin-right: auto;
- padding: 40px;
+ margin-left: -125px;
+ position: absolute;
+ left: 50%;
+ padding: 40px;
}
table.hupa-login td {
text-align: center;
- padding-top: 6px;
}
table.hupa-login-form {
padding: 10px;
@@ -357,7 +356,7 @@ body {
.hupa-rounded {
box-shadow: 0 1px 4px grey;
}
-.hupa-top-wrap, .hupa-login-form, .hupa-msg-top-bar {
+.hupa-top-wrap, .hupa-login-box, .hupa-msg-top-bar {
background: -moz-linear-gradient(#FFFFFF, #C5D9FF);
background: -webkit-linear-gradient(#FFFFFF, #C5D9FF);
background: -o-linear-gradient(#FFFFFF, #C5D9FF);
@@ -422,6 +421,15 @@ div.hupa-main {
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FFFFFF', endColorstr='#dcdcdc',GradientType=0 );
}
+.gwt-DecoratorPanel .middleCenter {
+ height: 100%;
+ width: 100%;
+}
+.gwt-SuggestBox {
+ border-radius: 50px;
+ max-height: 8px;
+}
+
Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
--- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
(original)
+++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Sat
Jul 14 07:39:51 2012
@@ -25,11 +25,11 @@
<source path="widgets"/>
- <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl">
+ <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3">
<when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/>
</replace-with>
- <replace-with
class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImplIE">
+ <replace-with
class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorDecorator">
<when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/>
<any>
<when-property-is name="user.agent" value="ie6"/>
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java?rev=1361484&r1=1361483&r2=1361484&view=diff
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Sat Jul 14 07:39:51 2012
@@ -25,7 +25,6 @@ import com.google.gwt.user.client.ui.Flo
import com.google.gwt.user.client.ui.Widget;
import org.apache.hupa.widgets.ui.impl.RndPanelGenerator;
-import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl;
/**
* Widget which renders a rounded panel.
Added:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java?rev=1361484&view=auto
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java
(added)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorCss3.java
Sat Jul 14 07:39:51 2012
@@ -0,0 +1,56 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you 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. *
+ ****************************************************************/
+
+package org.apache.hupa.widgets.ui.impl;
+
+import org.apache.hupa.widgets.WidgetsCSS;
+
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.Panel;
+
+/**
+ * Simple generator of rounded panels using css.
+ * It works in FF, safari, chrome and opera.
+ *
+ * It is needed to define this in your css.
+ * <pre>
+ * div.hupa-rounded {
+ * border: 1px solid #7FAAFF;
+ * border-radius: 8px;
+ * }
+ * </pre>
+ *
+ */
+public class RndPanelGeneratorCss3 implements RndPanelGenerator {
+
+ public Panel roundPanel(Panel panel) {
+ panel.addStyleName(WidgetsCSS.C_hupa_rnd_container);
+ return panel;
+ }
+
+ public FlowPanel createPanel() {
+ return new FlowPanel() {
+ @Override
+ public void setStyleName(String style) {
+ super.setStyleName(style);
+ super.addStyleName(WidgetsCSS.C_hupa_rnd_container);
+ }
+ };
+ }
+}
Added:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java?rev=1361484&view=auto
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java
(added)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorDecorator.java
Sat Jul 14 07:39:51 2012
@@ -0,0 +1,40 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you 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. *
+ ****************************************************************/
+
+package org.apache.hupa.widgets.ui.impl;
+
+import com.google.gwt.user.client.ui.DecoratorPanel;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.Panel;
+
+/**
+ * Simple generator of rounded panels using DecoratedPanels in GWT 2.0.
+ * It works in all browsers
+ */
+public class RndPanelGeneratorDecorator implements RndPanelGenerator {
+ public Panel roundPanel(Panel panel) {
+ DecoratorPanel ret = new DecoratorPanel();
+ ret.setWidget(panel);
+ return ret;
+ }
+
+ public FlowPanel createPanel() {
+ return new FlowPanel();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
