Author: dongxu
Date: Thu Sep 12 02:05:26 2013
New Revision: 1522112
URL: http://svn.apache.org/r1522112
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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -35,18 +35,26 @@ package org.apache.hupa.client.activity;
import net.customware.gwt.dispatch.client.DispatchAsync;
+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;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
+<<<<<<< HEAD
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;
@@ -83,6 +91,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
public LoginActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
@@ -125,6 +134,20 @@ public class LoginActivity extends Abstr
doLogin();
}
});
+ 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));
+ }
+
+ });
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
}
@@ -168,10 +191,14 @@ public class LoginActivity extends Abstr
public void callbackError(Throwable caught) {
display.setLoading(false);
Window.alert("error");
+<<<<<<< HEAD
LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get());
// eventBus.fireEvent(new
FlashEvent(constants.loginInvalid(),
// 4000));
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+ // 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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -32,10 +32,14 @@ import com.google.gwt.uibinder.client.Ui
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
=======
>>>>>>> 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;
@@ -45,13 +49,23 @@ import com.google.inject.Inject;
public class AppLayoutImpl implements AppLayout {
<<<<<<< HEAD
+<<<<<<< HEAD
private final DockLayoutPanel appLayoutPanel;
interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
+=======
+ private static final int MAINMENU_HEIGHT = 10;
+ private static final int VMASTER_WIDTH = 15;
+
+ private final LayoutPanel mainLayoutPanel;
+
+ interface AppLayoutUiBinder extends UiBinder<LayoutPanel,
AppLayoutImpl> {
+>>>>>>> decorate the theme
}
private static AppLayoutUiBinder binder =
GWT.create(AppLayoutUiBinder.class);
+<<<<<<< HEAD
@UiField LayoutPanel northPanel;
@UiField HTMLPanel southPanel;
@UiField SimplePanel westPanel;
@@ -64,10 +78,25 @@ public class AppLayoutImpl implements Ap
public AppLayoutImpl() {
appLayoutPanel = binder.createAndBindUi(this);
logoContainer.addStyleName(HupaCSS.C_logo_container);
+=======
+ @UiField
+ FlowPanel topPanel;
+
+ @UiField
+ SimplePanel westPanel;
+
+ @UiField
+ SimplePanel mainPanel;
+
+ @Inject
+ public AppLayoutImpl() {
+ mainLayoutPanel = binder.createAndBindUi(this);
+>>>>>>> decorate the theme
setLoginLayout();
}
@Override
+<<<<<<< HEAD
public DockLayoutPanel getAppLayoutPanel() {
return appLayoutPanel;
}
@@ -85,6 +114,13 @@ public class AppLayoutImpl implements Ap
};
}
@Override
+=======
+ public LayoutPanel getMainLayoutPanel() {
+ return mainLayoutPanel;
+ }
+
+ @Override
+>>>>>>> decorate the theme
public AcceptsOneWidget getWestContainer() {
return new AcceptsOneWidget() {
@Override
@@ -96,22 +132,31 @@ public class AppLayoutImpl implements Ap
}
@Override
+<<<<<<< HEAD
public AcceptsOneWidget getCenterContainer() {
+=======
+ public AcceptsOneWidget getMainContainer() {
+>>>>>>> decorate the theme
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
Widget widget = Widget.asWidgetOrNull(w);
+<<<<<<< HEAD
if(centerPanel.getWidgetCount() > 0){
centerPanel.remove(0);
}
if(widget != null){
centerPanel.add(widget);
}
+=======
+ mainPanel.setWidget(widget);
+>>>>>>> decorate the theme
}
};
}
public void setDefaultLayout() {
+<<<<<<< HEAD
arrangeLayoutSize(8, 2, 15, 0);
}
@@ -197,4 +242,22 @@ public class AppLayoutImpl implements Ap
// mainLayoutPanel.animate(500);
}
>>>>>>> Change to new mvp framework - first step
+=======
+ int height = 100 - MAINMENU_HEIGHT;
+ mainLayoutPanel.setWidgetTopHeight(westPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
+ mainLayoutPanel.setWidgetLeftWidth(westPanel, 0, PCT,
VMASTER_WIDTH, PCT);
+ mainLayoutPanel.setWidgetTopHeight(mainPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
+ mainLayoutPanel.setWidgetLeftWidth(mainPanel, VMASTER_WIDTH,
PCT, 100 - VMASTER_WIDTH, PCT);
+ // mainLayoutPanel.animate(500);
+ }
+
+ public void setLoginLayout() {
+ int height = 100 - MAINMENU_HEIGHT;
+ mainLayoutPanel.setWidgetTopHeight(topPanel, 0, PCT,
MAINMENU_HEIGHT, PCT);
+ mainLayoutPanel.setWidgetTopHeight(westPanel, 0, PCT, 0, PCT);
+ mainLayoutPanel.setWidgetTopHeight(mainPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
+ mainLayoutPanel.setWidgetLeftWidth(mainPanel, 0, PCT, 100, PCT);
+ // mainLayoutPanel.animate(500);
+ }
+>>>>>>> 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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -39,6 +39,7 @@
</g:DockLayoutPanel>
=======
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+<<<<<<< HEAD
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:my='urn:import:org.apache.hupa.client.ui'>
<ui:image field="maincontent"/>
@@ -82,4 +83,89 @@
</g:layer>
</g:LayoutPanel>
>>>>>>> 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'>
+ <ui:style>
+ .Hupa {
+ text-align: left;
+ margin-top: 0px;
+ padding: 0px;
+ width: 100%;
+ min-width: 920px;
+ margin-top: 15px;
+ }
+
+ * html div.Hupa {
+ margin-top: 15px;
+ }
+
+ .topPanel {
+ padding-left: 80px;
+ padding-right: 8px;
+ }
+
+ .topView {
+ height: 64px;
+ background-color: #C5D9FF;
+ background: -moz-linear-gradient(#FFFFFF, #C5D9FF);
+ background: -webkit-linear-gradient(#FFFFFF, #C5D9FF);
+ background: -o-linear-gradient(#FFFFFF, #C5D9FF);
+ }
+
+ .hupa-logo {
+ width: 90px;
+ height: 64px;
+ float: left;
+ background: url(images/hupa-logo-64-transparent.png)
no-repeat;
+ }
+
+ .hupa-main {
+ clear: both;
+ margin: 8px 8px 8px 8px;
+ min-height: 500px;
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+ }
+
+ .westPanel {
+ border: 1px solid #7FAAFF;
+ box-shadow: 0 1px 4px grey;
+ border-radius: 5px;
+ overflow: hidden;
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+ clear: both;
+ margin: 8px 8px 8px 8px;
+ }
+
+ .mainPanel {
+ border: 1px solid #7FAAFF;
+ box-shadow: 0 1px 4px grey;
+ border-radius: 5px;
+ overflow: hidden;
+ background: -moz-linear-gradient(#eaeaea, #fafafa);
+ background: -webkit-linear-gradient(#eaeaea, #fafafa);
+ background: -o-linear-gradient(#eaeaea, #fafafa);
+ clear: both;
+ margin: 8px 8px 8px 8px;
+ min-height: 500px;
+ }
+ </ui:style>
+ <g:LayoutPanel addStyleNames="{style.Hupa}">
+ <g:layer>
+ <g:FlowPanel ui:field="topPanel"
addStyleNames="{style.topPanel}">
+ <g:HTMLPanel addStyleNames="{style.hupa-logo}"
/>
+ <my:TopView ui:field="topView"
addStyleNames="{style.topView}" />
+ </g:FlowPanel>
+ </g:layer>
+ <g:layer>
+ <g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}" />
+ </g:layer>
+ <g:layer>
+ <g:SimplePanel ui:field="mainPanel"
addStyleNames="{style.mainPanel}" />
+ </g:layer>
+ </g:LayoutPanel>
+>>>>>>> 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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -130,10 +131,29 @@ public class TopView extends Composite i
flashLabel.setText("");
}
};
+=======
+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> {
}
private static TopViewUiBinder binder =
GWT.create(TopViewUiBinder.class);
+<<<<<<< HEAD
+=======
+ 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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -30,5 +31,18 @@
<g:Label ui:field="appnameLabel"></g:Label>
<g:Label ui:field="extraLabel"></g:Label>
</g:HorizontalPanel>
+=======
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+ <ui:style>
+ .round-corner-panel {
+ border: 1px solid #7FAAFF;
+ box-shadow: 0 1px 4px grey;
+ border-radius: 5px;
+ overflow: hidden;
+ }
+ </ui:style>
+ <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=1522112&r1=1522111&r2=1522112&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:05:26 2013
@@ -133,7 +133,7 @@ public class WestView extends Composite
private DockPanel dockPanel;
private VerticalPanel north;
private HupaConstants constants;
- private RndPanel west;
+ private VerticalPanel west;
private IMAPTreeImages tImages = GWT.create(IMAPTreeImages.class);
private Tree folderTree = new Tree(tImages, true);
@@ -185,11 +185,12 @@ public class WestView extends Composite
dockPanel.add(center, DockPanel.CENTER);
dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT);
+ west.setWidth("100%");
initWidget(west);
}
private void createWest() {
- west = new RndPanel();
+ west = new VerticalPanel();
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
