Author: dongxu
Date: Thu Sep 12 02:48:05 2013
New Revision: 1522142
URL: http://svn.apache.org/r1522142
Log:
decorate the theme
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/maincontent.png
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/mainmenu.png
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/masterv.png
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
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
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522142&r1=1522141&r2=1522142&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
Thu Sep 12 02:48:05 2013
@@ -39,6 +39,7 @@ package org.apache.hupa.client.activity;
import net.customware.gwt.dispatch.client.DispatchAsync;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.HupaConstants;
<<<<<<< HEAD
import org.apache.hupa.client.evo.HupaEvoCallback;
@@ -56,6 +57,15 @@ import org.apache.hupa.client.HupaEvoCal
import org.apache.hupa.client.mvp.WidgetDisplayable;
import org.apache.hupa.client.place.MailInboxPlace;
>>>>>>> Change to new mvp framework - first step
+=======
+import org.apache.hupa.client.HupaConstants;
+import org.apache.hupa.client.HupaEvoCallback;
+import org.apache.hupa.client.mvp.WidgetDisplayable;
+import org.apache.hupa.client.place.MailInboxPlace;
+import org.apache.hupa.shared.events.FlashEvent;
+import org.apache.hupa.shared.events.SessionExpireEvent;
+import org.apache.hupa.shared.events.SessionExpireEventHandler;
+>>>>>>> decorate the theme
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
@@ -64,6 +74,7 @@ import com.google.gwt.activity.shared.Ab
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.core.client.GWT;
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
@@ -76,6 +87,9 @@ import com.google.gwt.core.client.GWT;
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
>>>>>>> Change to new mvp framework - first step
+=======
+import com.google.gwt.core.client.GWT;
+>>>>>>> decorate the theme
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
@@ -136,6 +150,7 @@ public class LoginActivity extends Abstr
private final PlaceController placeController;
private final Provider<MailInboxPlace> mailInboxPlaceProvider;
private DispatchAsync dispatcher;
+ private HupaConstants constants = GWT.create(HupaConstants.class);
@Inject
<<<<<<< HEAD
@@ -201,6 +216,7 @@ public class LoginActivity extends Abstr
}
});
<<<<<<< HEAD
+<<<<<<< HEAD
display.getResetClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
@@ -213,6 +229,22 @@ public class LoginActivity extends Abstr
public void onSessionExpireEvent(SessionExpireEvent
event) {
eventBus.fireEvent(new
FlashEvent(constants.sessionTimedOut(), 4000));
}
+=======
+ display.getResetClick().addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ doReset();
+ }
+
+ });
+ eventBus.addHandler(SessionExpireEvent.TYPE, new
SessionExpireEventHandler() {
+
+ public void onSessionExpireEvent(SessionExpireEvent event) {
+ eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(),
4000));
+ }
+
+ });
+>>>>>>> decorate the theme
});
@@ -302,6 +334,7 @@ public class LoginActivity extends Abstr
<<<<<<< HEAD
Window.alert("error");
<<<<<<< HEAD
+<<<<<<< HEAD
LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get());
// eventBus.fireEvent(new
FlashEvent(constants.loginInvalid(),
// 4000));
@@ -312,6 +345,9 @@ public class LoginActivity extends Abstr
=======
eventBus.fireEvent(new
FlashEvent(constants.loginInvalid(), 4000));
>>>>>>> introduce the top activity
+=======
+ // eventBus.fireEvent(new
FlashEvent(constants.loginInvalid(),4000));
+>>>>>>> decorate the theme
doReset();
}
});
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=1522142&r1=1522141&r2=1522142&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 02:48:05 2013
@@ -40,6 +40,7 @@ import com.google.gwt.user.client.ui.Acc
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
=======
@@ -49,6 +50,9 @@ import com.google.gwt.user.client.ui.Flo
>>>>>>> decorate the theme
=======
>>>>>>> Change to new mvp framework - first step
+=======
+import com.google.gwt.user.client.ui.FlowPanel;
+>>>>>>> decorate the theme
import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
@@ -60,22 +64,29 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private final DockLayoutPanel appLayoutPanel;
interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
=======
+=======
+>>>>>>> decorate the theme
private static final int MAINMENU_HEIGHT = 10;
private static final int VMASTER_WIDTH = 15;
private final LayoutPanel mainLayoutPanel;
interface AppLayoutUiBinder extends UiBinder<LayoutPanel,
AppLayoutImpl> {
+<<<<<<< HEAD
+>>>>>>> decorate the theme
+=======
>>>>>>> decorate the theme
}
private static AppLayoutUiBinder binder =
GWT.create(AppLayoutUiBinder.class);
<<<<<<< HEAD
+<<<<<<< HEAD
@UiField LayoutPanel northPanel;
@UiField HTMLPanel southPanel;
@UiField SimplePanel westPanel;
@@ -91,6 +102,10 @@ public class AppLayoutImpl implements Ap
=======
@UiField
SimplePanel topPanel;
+=======
+ @UiField
+ FlowPanel topPanel;
+>>>>>>> decorate the theme
@UiField
SimplePanel westPanel;
@@ -101,12 +116,16 @@ public class AppLayoutImpl implements Ap
@Inject
public AppLayoutImpl() {
mainLayoutPanel = binder.createAndBindUi(this);
+<<<<<<< HEAD
+>>>>>>> decorate the theme
+=======
>>>>>>> decorate the theme
setLoginLayout();
}
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
public DockLayoutPanel getAppLayoutPanel() {
return appLayoutPanel;
}
@@ -125,10 +144,13 @@ public class AppLayoutImpl implements Ap
}
@Override
=======
+=======
+>>>>>>> decorate the theme
public LayoutPanel getMainLayoutPanel() {
return mainLayoutPanel;
}
+<<<<<<< HEAD
@Override
public AcceptsOneWidget getTopContainer() {
@@ -142,6 +164,9 @@ public class AppLayoutImpl implements Ap
}
@Override
>>>>>>> decorate the theme
+=======
+ @Override
+>>>>>>> decorate the theme
public AcceptsOneWidget getWestContainer() {
return new AcceptsOneWidget() {
@Override
@@ -154,15 +179,20 @@ public class AppLayoutImpl implements Ap
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
public AcceptsOneWidget getCenterContainer() {
=======
public AcceptsOneWidget getMainContainer() {
>>>>>>> decorate the theme
+=======
+ public AcceptsOneWidget getMainContainer() {
+>>>>>>> decorate the theme
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
Widget widget = Widget.asWidgetOrNull(w);
<<<<<<< HEAD
+<<<<<<< HEAD
if(centerPanel.getWidgetCount() > 0){
centerPanel.remove(0);
}
@@ -172,12 +202,16 @@ public class AppLayoutImpl implements Ap
=======
mainPanel.setWidget(widget);
>>>>>>> decorate the theme
+=======
+ mainPanel.setWidget(widget);
+>>>>>>> decorate the theme
}
};
}
public void setDefaultLayout() {
<<<<<<< HEAD
+<<<<<<< HEAD
arrangeLayoutSize(8, 2, 15, 0);
}
@@ -267,6 +301,8 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
+=======
+>>>>>>> decorate the theme
int height = 100 - MAINMENU_HEIGHT;
mainLayoutPanel.setWidgetTopHeight(westPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
mainLayoutPanel.setWidgetLeftWidth(westPanel, 0, PCT,
VMASTER_WIDTH, PCT);
@@ -283,7 +319,10 @@ public class AppLayoutImpl implements Ap
mainLayoutPanel.setWidgetLeftWidth(mainPanel, 0, PCT, 100, PCT);
// mainLayoutPanel.animate(500);
}
+<<<<<<< HEAD
>>>>>>> decorate the theme
=======
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> decorate the theme
}
\ No newline at end of file
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=1522142&r1=1522141&r2=1522142&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 02:48:05 2013
@@ -43,6 +43,7 @@
<<<<<<< HEAD
=======
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:my='urn:import:org.apache.hupa.client.ui'>
@@ -89,6 +90,8 @@
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
+=======
+>>>>>>> decorate the theme
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:my='urn:import:org.apache.hupa.client.ui'>
<ui:style>
.Hupa {
@@ -112,9 +115,15 @@
.topView {
height: 64px;
background-color: #C5D9FF;
+<<<<<<< HEAD
background: literal("-moz-linear-gradient(#FFFFFF,
#C5D9FF)");
background: literal("-webkit-linear-gradient(#FFFFFF,
#C5D9FF)");
background: literal("-o-linear-gradient(#FFFFFF,
#C5D9FF)");
+=======
+ background: -moz-linear-gradient(#FFFFFF, #C5D9FF);
+ background: -webkit-linear-gradient(#FFFFFF, #C5D9FF);
+ background: -o-linear-gradient(#FFFFFF, #C5D9FF);
+>>>>>>> decorate the theme
}
.hupa-logo {
@@ -128,9 +137,15 @@
clear: both;
margin: 8px 8px 8px 8px;
min-height: 500px;
+<<<<<<< HEAD
background: literal("-moz-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-webkit-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-o-linear-gradient(#eaeaea,
#fafafa)");
+=======
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+>>>>>>> decorate the theme
}
.westPanel {
@@ -138,9 +153,15 @@
box-shadow: 0 1px 4px grey;
border-radius: 5px;
overflow: hidden;
+<<<<<<< HEAD
background: literal("-moz-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-webkit-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-o-linear-gradient(#eaeaea,
#fafafa)");
+=======
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+>>>>>>> decorate the theme
clear: both;
margin: 8px 8px 8px 8px;
}
@@ -150,9 +171,15 @@
box-shadow: 0 1px 4px grey;
border-radius: 5px;
overflow: hidden;
+<<<<<<< HEAD
background: literal("-moz-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-webkit-linear-gradient(#eaeaea,
#fafafa)");
background: literal("-o-linear-gradient(#eaeaea,
#fafafa)");
+=======
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+>>>>>>> decorate the theme
clear: both;
margin: 8px 8px 8px 8px;
min-height: 500px;
@@ -160,8 +187,15 @@
</ui:style>
<g:LayoutPanel addStyleNames="{style.Hupa}">
<g:layer>
+<<<<<<< HEAD
<g:SimplePanel ui:field="topPanel"
addStyleNames="{style.topPanel}">
</g:SimplePanel>
+=======
+ <g:FlowPanel ui:field="topPanel"
addStyleNames="{style.topPanel}">
+ <g:HTMLPanel addStyleNames="{style.hupa-logo}"
/>
+ <my:TopView ui:field="topView"
addStyleNames="{style.topView}" />
+ </g:FlowPanel>
+>>>>>>> decorate the theme
</g:layer>
<g:layer>
<g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}" />
@@ -170,7 +204,10 @@
<g:SimplePanel ui:field="mainPanel"
addStyleNames="{style.mainPanel}" />
</g:layer>
</g:LayoutPanel>
+<<<<<<< HEAD
>>>>>>> decorate the theme
=======
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> decorate the theme
</ui:UiBinder>
\ No newline at end of file
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=1522142&r1=1522141&r2=1522142&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 02:48:05 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -159,6 +160,17 @@ public class TopView extends Composite i
=======
public class TopView extends Composite implements TopActivity.Displayable {
>>>>>>> introduce the top activity
+=======
+package org.apache.hupa.client.ui;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.IsWidget;
+
+public class TopView extends Composite implements IsWidget {
+>>>>>>> decorate the theme
interface TopViewUiBinder extends UiBinder<FlowPanel, TopView> {
}
@@ -167,6 +179,7 @@ public class TopView extends Composite i
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
public TopView() {
FlowPanel panel = binder.createAndBindUi(this);
@@ -294,4 +307,11 @@ public class TopView extends Composite i
};
>>>>>>> introduce the top activity
+=======
+ public TopView() {
+ FlowPanel panel = binder.createAndBindUi(this);
+ initWidget(panel);
+ }
+
+>>>>>>> decorate the theme
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml?rev=1522142&r1=1522141&r2=1522142&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml
Thu Sep 12 02:48:05 2013
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -32,6 +33,8 @@
<g:Label ui:field="extraLabel"></g:Label>
</g:HorizontalPanel>
=======
+=======
+>>>>>>> decorate the theme
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:style>
@@ -43,10 +46,14 @@
}
</ui:style>
<<<<<<< HEAD
+<<<<<<< HEAD
<g:FlowPanel addStyleNames="{style.round-corner-panel}">
>>>>>>> decorate the theme
=======
<g:FlowPanel ui:field="topWrapper"
addStyleNames="{style.round-corner-panel}">
>>>>>>> introduce the top activity
+=======
+ <g:FlowPanel addStyleNames="{style.round-corner-panel}">
+>>>>>>> decorate the theme
</g:FlowPanel>
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522142&r1=1522141&r2=1522142&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
Thu Sep 12 02:48:05 2013
@@ -141,10 +141,14 @@ public class WestView extends Composite
private VerticalPanel north;
private HupaConstants constants;
<<<<<<< HEAD
+<<<<<<< HEAD
private VerticalPanel west;
=======
private RndPanel west;
>>>>>>> Change to new mvp framework - first step
+=======
+ private VerticalPanel west;
+>>>>>>> decorate the theme
private IMAPTreeImages tImages = GWT.create(IMAPTreeImages.class);
private Tree folderTree = new Tree(tImages, true);
@@ -203,18 +207,26 @@ public class WestView extends Composite
dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT);
<<<<<<< HEAD
+<<<<<<< HEAD
west.setWidth("100%");
=======
>>>>>>> Change to new mvp framework - first step
+=======
+ west.setWidth("100%");
+>>>>>>> decorate the theme
initWidget(west);
}
private void createWest() {
<<<<<<< HEAD
+<<<<<<< HEAD
west = new VerticalPanel();
=======
west = new RndPanel();
>>>>>>> Change to new mvp framework - first step
+=======
+ west = new VerticalPanel();
+>>>>>>> decorate the theme
west.add(folderTree);
west.addStyleName(HupaCSS.C_tree_container);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
