Author: dongxu
Date: Thu Sep 12 03:24:37 2013
New Revision: 1522198
URL: http://svn.apache.org/r1522198
Log:
make it look more beautiful
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java?rev=1522198&r1=1522197&r2=1522198&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
Thu Sep 12 03:24:37 2013
@@ -57,6 +57,7 @@ import com.google.gwt.user.client.ui.Acc
<<<<<<< HEAD
import com.google.gwt.user.client.ui.DockLayoutPanel;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.HTMLPanel;
=======
>>>>>>> Change to new mvp framework - first step
@@ -74,6 +75,9 @@ import com.google.gwt.user.client.ui.Doc
=======
import com.google.gwt.user.client.ui.HorizontalPanel;
>>>>>>> make it look more beautiful
+=======
+import com.google.gwt.user.client.ui.HTMLPanel;
+>>>>>>> make it look more beautiful
import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
@@ -120,6 +124,7 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@UiField LayoutPanel northPanel;
@UiField HTMLPanel southPanel;
@UiField SimplePanel westPanel;
@@ -152,6 +157,10 @@ public class AppLayoutImpl implements Ap
@UiField HorizontalPanel northPanel;
@UiField SimplePanel southPanel;
>>>>>>> make it look more beautiful
+=======
+ @UiField LayoutPanel northPanel;
+ @UiField HTMLPanel southPanel;
+>>>>>>> make it look more beautiful
@UiField SimplePanel westPanel;
@UiField SimplePanel eastPanel;
@UiField LayoutPanel centerPanel;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml?rev=1522198&r1=1522197&r2=1522198&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
Thu Sep 12 03:24:37 2013
@@ -139,6 +139,7 @@
border: 1px solid #7FAAFF;
box-shadow: 0 1px 4px grey;
border-radius: 5px;
+ overflow: hidden;
background: literal("-moz-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-webkit-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-o-linear-gradient(#eaeaea,
#fafafa)");
@@ -232,8 +233,15 @@
min-height: 500px;
=======
margin: 0px 8px 8px 8px;
+<<<<<<< HEAD
min-height: 400px;
>>>>>>> make it look more beautiful
+=======
+ min-height: 300px;
+ }
+ .southPanel{
+ text-align: center;
+>>>>>>> make it look more beautiful
}
</ui:style>
<<<<<<< HEAD
@@ -270,13 +278,16 @@
=======
<g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}">
<g:north size='8'>
- <g:HorizontalPanel ui:field="northPanel"
addStyleNames="{style.northPanel}">
- <g:SimplePanel ui:field="logoContainer"/>
- <g:SimplePanel ui:field="topContainer" />
- </g:HorizontalPanel>
+ <g:LayoutPanel ui:field="northPanel"
addStyleNames="{style.northPanel}">
+ <g:layer left="0px" width="84px" top="0px" height="64">
+ <g:SimplePanel
ui:field="logoContainer"/></g:layer>
+ <g:layer right="12px" width="37%" >
+ <g:SimplePanel ui:field="topContainer"
/></g:layer>
+ </g:LayoutPanel>
</g:north>
<g:south size='2'>
- <g:SimplePanel ui:field="southPanel" />
+ <g:HTMLPanel ui:field="southPanel"
addStyleNames="{style.southPanel}"><g:HTML>You're using <b>Hupa</b> Webmail
which is part of the <a target='_blank'
href='http://james.apache.org'>Apache-James</a> project.</g:HTML>
+ </g:HTMLPanel>
</g:south>
<g:west size='12'>
<g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}"/>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java?rev=1522198&r1=1522197&r2=1522198&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java
Thu Sep 12 03:24:37 2013
@@ -251,8 +251,9 @@ public class TopView extends Composite i
// Layout containers and panels
buttonContainer.add(loginInfoPanel);
- loginInfoPanel.add(loginLabel);
- loginInfoPanel.add(loginUserLabel);
+// loginInfoPanel.add(loginLabel);
+// loginInfoPanel.add(loginUserLabel);
+ buttonContainer.add(loginUserLabel);
buttonContainer.add(contactsButton);
buttonContainer.add(mainButton);
buttonContainer.add(logoutButton);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
