Author: dongxu
Date: Thu Sep 12 03:41:09 2013
New Revision: 1522234
URL: http://svn.apache.org/r1522234
Log:
make login page as one part of the overall layout & splite layout to little one
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
- copied, changed from r1522233,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
(from r1522233,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java&r1=1522233&r2=1522234&rev=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
Thu Sep 12 03:41:09 2013
@@ -17,24 +17,24 @@
* under the License. *
****************************************************************/
-package org.apache.hupa.client.ui;
+package org.apache.hupa.client;
-import org.apache.hupa.client.activity.LogoActivity;
+import org.apache.hupa.client.ui.HupaLayoutable;
-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.SimplePanel;
-
-public class LogoView extends Composite implements LogoActivity.Displayable {
-
- public LogoView() {
- initWidget(binder.createAndBindUi(this));
+import com.google.gwt.activity.shared.ActivityManager;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
+/**
+ * This class is responsible for ActivityManager instantiations through GIN, it
+ * also associate every ActivityManager with the corresponding display region
+ */
+public class HupaActivityManagerInitializer {
+
+ @Inject
+ public HupaActivityManagerInitializer(HupaLayoutable layout,
+ @Named("LoginPage") ActivityManager
loginActivityManager) {
+ loginActivityManager.setDisplay(layout.getLoginView());
}
- interface LogoUiBinder extends UiBinder<SimplePanel, LogoView> {
- }
-
- private static LogoUiBinder binder = GWT.create(LogoUiBinder.class);
-
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
Thu Sep 12 03:41:09 2013
@@ -46,12 +46,10 @@ import com.google.gwt.core.client.Schedu
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
=======
import org.apache.hupa.client.bundles.HupaResources;
-import org.apache.hupa.client.evo.ActivityManagerInitializer;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.ui.AppLayout;
import org.apache.hupa.client.ui.HupaLayoutable;
>>>>>>> move new theme ui from experiment to hupa evo
@@ -103,8 +101,13 @@ public class HupaController {
private Place currentPlace;
@Inject
+<<<<<<< HEAD
public HupaController(EventBus eventBus) {
>>>>>>> move new theme ui from experiment to hupa evo
+=======
+ public HupaController(EventBus eventBus,
+ HupaActivityManagerInitializer
initializeActivityManagerByGin) {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
eventBus.addHandler(PlaceChangeEvent.TYPE, new
PlaceChangHandler());
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 03:41:09 2013
@@ -37,6 +37,10 @@ import java.util.logging.Logger;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+import org.apache.hupa.client.HupaConstants;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.activity.ComposeActivity;
import org.apache.hupa.client.activity.ComposeToolBarActivity;
@@ -125,10 +129,13 @@ import org.apache.hupa.client.activity.L
import org.apache.hupa.client.activity.MessageSendActivity;
import org.apache.hupa.client.activity.TopActivity;
import org.apache.hupa.client.activity.WestActivity;
-import org.apache.hupa.client.evo.AppController;
import org.apache.hupa.client.mapper.AppPlaceHistoryMapper;
import org.apache.hupa.client.mapper.CachingTopActivityMapper;
+<<<<<<< HEAD
import org.apache.hupa.client.mapper.CachingWestActivityMapper;
+=======
+import org.apache.hupa.client.mapper.LoginActivityMapper;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
import org.apache.hupa.client.mapper.MainContentActivityMapper;
=======
import org.apache.hupa.client.AppController;
@@ -166,11 +173,9 @@ import org.apache.hupa.client.mapper.Wes
>>>>>>> delete messages, make WestActivity Singleton
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.ui.AppLayout;
-import org.apache.hupa.client.ui.AppLayoutImpl;
import org.apache.hupa.client.ui.FoldersTreeViewModel;
+import org.apache.hupa.client.ui.HupaLayout;
import org.apache.hupa.client.ui.HupaLayoutable;
-import org.apache.hupa.client.ui.HupaOverallLayout;
import org.apache.hupa.client.ui.IMAPMessageListView;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -238,6 +243,7 @@ public class AppGinModule extends Abstra
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class);
bind(LoginLayoutable.class).to(LoginLayout.class).in(Singleton.class);
@@ -403,6 +409,9 @@ public class AppGinModule extends Abstra
=======
bind(HupaLayoutable.class).to(HupaOverallLayout.class).in(Singleton.class);
>>>>>>> refactoring
+=======
+
bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class);
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
// Activities
bind(LoginActivity.Displayable.class).to(LoginView.class);
@@ -478,6 +487,7 @@ public class AppGinModule extends Abstra
//
bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
}
+<<<<<<< HEAD
<<<<<<< HEAD
=======
@@ -490,6 +500,16 @@ public class AppGinModule extends Abstra
}
>>>>>>> introduce the top activity
+=======
+
+ @Provides
+ @Singleton
+ @Named("LoginPage")
+ public ActivityManager getLoginActivityMapper(LoginActivityMapper
activityMapper, EventBus eventBus) {
+ return new ActivityManager(activityMapper, eventBus);
+ }
+
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
@Provides
@Singleton
@Named("TopRegion")
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java
Thu Sep 12 03:41:09 2013
@@ -23,8 +23,11 @@ import org.apache.hupa.client.activity.L
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.activity.shared.ActivityMapper;
+<<<<<<< HEAD
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
import com.google.gwt.place.shared.Place;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -39,6 +42,7 @@ public class LoginActivityMapper impleme
@Override
public Activity getActivity(Place place) {
+<<<<<<< HEAD
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
@@ -50,5 +54,8 @@ public class LoginActivityMapper impleme
return loginActivityProvider.get();
}
};
+=======
+ return loginActivityProvider.get();
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
@@ -205,6 +206,17 @@ public class FolderListView extends Comp
public void refresh() {
this.onRangeChanged(display);
}
+=======
+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.SimplePanel;
+
+public class FolderListView extends Composite {
+
+ public FolderListView() {
+ initWidget(binder.createAndBindUi(this));
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
interface FolderListUiBinder extends UiBinder<SimplePanel,
FolderListView> {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -11,5 +11,11 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<g:SimplePanel ui:field="thisView" />
+=======
+ <g:SimplePanel ui:field="FolderListView">
+ <g:HTMLPanel></g:HTMLPanel>
+ </g:SimplePanel>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
Thu Sep 12 03:41:09 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.ui;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.core.client.GWT;
@@ -224,9 +225,38 @@ public class HupaLayout implements HupaL
=======
+=======
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
import com.google.gwt.user.client.ui.LayoutPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+
+public class HupaLayout implements HupaLayoutable {
+
+ @UiField SimplePanel loginView;
+
+ @Override
+ public LayoutPanel get() {
+ return binder.createAndBindUi(this);
+ }
+
+ interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> {
+ }
+ private static HupaLayoutUiBinder binder = GWT
+ .create(HupaLayoutUiBinder.class);
+
+ @Override
+ public SimplePanel getLoginView(){
+ return loginView;
+ }
+
+<<<<<<< HEAD
public interface HupaLayout {
LayoutPanel get();
>>>>>>> move new theme ui from experiment to hupa evo
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 03:41:09 2013
@@ -1,10 +1,16 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
<ui:image field="buttons" src="res/buttons.png" />
+<<<<<<< HEAD
<ui:image field="originLogo"
src="res/hupa-logo-original-transparent.png" />
<ui:style>
.minWidth {
min-width: 700px;
+=======
+ <ui:style>
+ .minWidth {
+ min-width: 1150px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
.feature {
@@ -18,16 +24,76 @@
background: -ms-linear-gradient(top, #404040 0%,
#060606 100%);
background: linear-gradient(top, #404040 0%, #060606
100%);
}
+<<<<<<< HEAD
</ui:style>
<g:LayoutPanel addStyleNames="{style.minWidth}">
<g:layer left='0' right='0' top='0' height='92px'>
<g:DockLayoutPanel unit="PX" ui:field="Header">
<g:north size="23">
<g:SimplePanel
ui:field="topBarContainer" />
+=======
+
+ .folderList {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ bottom: 0;
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
+
+ .box {
+ border: 1px solid #A3A3A3;
+ border-radius: 4px;
+ overflow: hidden;
+ box-shadow: 0 0 2px #999;
+ -o-box-shadow: 0 0 2px #999;
+ -webkit-box-shadow: 0 0 2px #999;
+ -moz-box-shadow: 0 0 2px #999;
+ background: white;
+ }
+
+ .listBox {
+ background: #D9ECF4;
+ overflow: hidden;
+ }
+
+ .box .boxFooter {
+ border-radius: 0 0 4px 4px;
+ }
+
+ .listBox .boxFooter {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 42px;
+ border-top: 1px solid #CCDDE4;
+ background: #D9ECF4;
+ -webkit-box-shadow: inset 0 1px 0 0 white;
+ -moz-box-shadow: inset 0 1px 0 0 #fff;
+ box-shadow: inset 0 1px 0 0 white;
+ white-space: nowrap;
+ overflow: hidden;
+ }
+ </ui:style>
+ <g:LayoutPanel addStyleNames="{style.minWidth}">
+ <g:layer>
+ <g:SimplePanel ui:field="loginView">
+ <hupa:LoginView/>
+ </g:SimplePanel>
+ </g:layer> <!--
+ <g:layer left='0' right='0' top='0' height='92px'>
+ <g:DockLayoutPanel unit="PX" ui:field="Header">
+ <g:north size="23">
+ <hupa:TopBarView />
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:north>
<g:center>
<g:LayoutPanel
addStyleNames="{style.feature}"
ui:field="HupaFeature">
+<<<<<<< HEAD
<g:layer width="177px"
left="10px">
<g:SimplePanel
ui:field="logoContainer" />
@@ -37,11 +103,19 @@
</g:layer>
<g:layer width="287px"
right="0">
<g:SimpleLayoutPanel
ui:field="navigationContainer" />
+=======
+ <g:layer width="177px"
left="10px">
+ <hupa:LogoView />
+ </g:layer>
+ <g:layer width="301px"
right="0">
+ <hupa:NavigationView />
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:layer>
</g:LayoutPanel>
</g:center>
</g:DockLayoutPanel>
</g:layer>
+<<<<<<< HEAD
<g:layer left='10px' right='10px' top='84px' bottom="20px">
<g:DockLayoutPanel>
<g:north size="44">
@@ -65,5 +139,80 @@
</g:center>
</g:DockLayoutPanel>
</g:layer>
+=======
+ <g:layer left='10px' right='10px' top='88px' bottom="20px">
+ <g:DockLayoutPanel ui:field="MainBox">
+ <g:north size="40">
+ <hupa:ToolBarView />
+ </g:north>
+ <g:center>
+ <g:SplitLayoutPanel
ui:field="MessageSpace">
+ <g:west size="373">
+ <g:LayoutPanel
ui:field="LeftBox"
+
addStyleNames="{style.folderList} {style.box} {style.listBox}">
+ <g:layer
top="0" height="100%">
+
<hupa:FolderListView />
+ </g:layer>
+ <g:layer
bottom="0" height="41px">
+
<g:SimplePanel styleName="{style.boxFooter}">
+
<g:HTMLPanel tag="span"></g:HTMLPanel>
+
</g:SimplePanel>
+ </g:layer>
+ </g:LayoutPanel>
+
+ </g:west>
+ <g:center>
+ <g:DockLayoutPanel
unit="PCT" ui:field="RightBox">
+ <g:west
size="100">
+
<g:SplitLayoutPanel ui:field="MessageBox">
+
<g:north size="200">
+
<g:LayoutPanel addStyleNames="{style.box}"
+
ui:field="MessageListBox">
+
<g:layer>
+
<hupa:MessageListView />
+
</g:layer>
+
<g:layer bottom="0" height="25px">
+
<hupa:MessageListFooterView />
+
</g:layer>
+
</g:LayoutPanel>
+
</g:north>
+
<g:center>
+
<g:LayoutPanel addStyleNames="{style.box}"
+
ui:field="MessageContentBox">
+
<g:layer>
+
<hupa:MessageContentView />
+
</g:layer>
+
<g:layer bottom="0" height="25px">
+
<hupa:StatusView />
+
</g:layer>
+
</g:LayoutPanel>
+
</g:center>
+
</g:SplitLayoutPanel>
+ </g:west>
+ <g:center
size="0">
+
<g:SplitLayoutPanel ui:field="ContactBox">
+
<g:west size="150">
+
<g:HTMLPanel addStyleNames="{style.box}">Address</g:HTMLPanel>
+
</g:west>
+
<g:center size="100">
+
<g:LayoutPanel addStyleNames="{style.box}">
+
<g:layer>
+
<g:HTMLPanel>MessageContent
+
</g:HTMLPanel>
+
</g:layer>
+
<g:layer bottom="0" height="25px">
+
<hupa:StatusView />
+
</g:layer>
+
</g:LayoutPanel>
+
</g:center>
+
</g:SplitLayoutPanel>
+ </g:center>
+ </g:DockLayoutPanel>
+ </g:center>
+ </g:SplitLayoutPanel>
+ </g:center>
+ </g:DockLayoutPanel>
+ </g:layer> -->
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:LayoutPanel>
</ui:UiBinder>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
Thu Sep 12 03:41:09 2013
@@ -67,8 +67,14 @@ public interface HupaLayoutable extends
void arrangeSettingLayout(SettingPlace sp);
=======
import com.google.gwt.user.client.ui.LayoutPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
public interface HupaLayoutable {
LayoutPanel get();
+<<<<<<< HEAD
>>>>>>> refactoring
+=======
+
+ SimplePanel getLoginView();
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
Thu Sep 12 03:41:09 2013
@@ -26,6 +26,7 @@
package org.apache.hupa.client.ui;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.activity.LoginActivity;
import com.google.gwt.core.client.GWT;
@@ -45,6 +46,8 @@ import org.apache.hupa.client.HupaCSS;
=======
>>>>>>> refactoring theme 1 - login page
import org.apache.hupa.client.HupaConstants;
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
import org.apache.hupa.client.activity.LoginActivity;
import org.apache.hupa.client.bundles.HupaResources;
import org.apache.hupa.client.bundles.HupaResources.Css;
@@ -255,19 +258,17 @@ public class LoginView extends Composite
>>>>>>> refactoring theme 1 - login page
@Inject
- public LoginView(HupaConstants constants) {
+ public LoginView() {
initWidget(binder.createAndBindUi(this));
mainContainer.addStyleName(css.loginForm());
innerBox.addStyleName(css.boxInner());
formPanel = FormPanel.wrap(DOM.getElementById("loginForm"),
true);
- submitButton = new SubmitButton(constants.loginButton());
+ submitButton = new SubmitButton("Login");
submitButton.setStyleName(css.submitButton());
- boxBottom.addStyleName(css.boxBottom());
- messageBox.addStyleName(css.messageBox());
bottomLine.addStyleName(css.bottomLine());
buttonBar.add(submitButton);
buttonBar.addStyleName(css.pFormbuttons());
- createLoginPrompt(constants);
+ createLoginPrompt();
flexTable.getFlexCellFormatter().setColSpan(2, 0, 2);
flexTable.setWidget(2, 0, buttonBar);
@@ -376,9 +377,9 @@ public class LoginView extends Composite
>>>>>>> replace with uibinder
}
- private void createLoginPrompt(HupaConstants constants) {
- Label userNameLabel = new Label(constants.usernameLabel());
- Label passWordLabel = new Label(constants.passwordLabel());
+ private void createLoginPrompt() {
+ Label userNameLabel = new Label("username");
+ Label passWordLabel = new Label("password");
userNameLabel.addStyleName(css.tdTitle());
passWordLabel.addStyleName(css.tdTitle());
flexTable.setWidget(0, 0, userNameLabel);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -1,4 +1,7 @@
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
<!-- 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
@@ -9,6 +12,7 @@
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. -->
+<<<<<<< HEAD
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
@@ -114,16 +118,70 @@
=======
<ui:with field='res'
type='org.apache.hupa.client.bundles.HupaResources'/>
+=======
+
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+ <ui:image field='logo' src='res/hupa-logo-64-transparent.png' />
+ <ui:image field="shadow" src="res/login_shadow.png" />
+ <ui:image field="messages" src="res/messages.png" />
+ <ui:style>
+ @sprite .boxBottom {
+ gwt-image: 'shadow';
+ background-position: top center;
+ width: auto;
+ height: auto;
+ margin-top: -3px;
+ padding-top: 10px;
+ }
+
+ .message {
+ min-height: 40px;
+ padding: 5px 25px;
+ text-align: center;
+ }
+
+ @sprite .notice {
+ gwt-image: 'messages';
+ background-position: 0 5px;
+ width: auto;
+ height: auto;
+ color: #555;
+ font-weight: bold;
+ padding: 6px 30px 6px 25px;
+ display: inline-block;
+ white-space: nowrap;
+ text-align: center;
+ cursor: default;
+ display: none;
+ }
+ </ui:style>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
<g:FlowPanel ui:field="mainContainer">
<g:FlowPanel ui:field="innerBox">
- <g:Image resource='{res.logo64PNG}'></g:Image>
+ <g:Image resource='{logo}'></g:Image>
<g:FormPanel ui:field="formPanel">
<g:FlexTable ui:field="flexTable"></g:FlexTable>
</g:FormPanel>
<g:Button ui:field="loginButton"></g:Button>
</g:FlowPanel>
- <g:FlowPanel ui:field="boxBottom"><g:FlowPanel
ui:field="messageBox"></g:FlowPanel></g:FlowPanel>
- <g:FlowPanel ui:field="bottomLine"><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:FlowPanel>
+ <g:FlowPanel ui:field="boxBottom" styleName="{style.boxBottom}">
+ <g:FlowPanel ui:field="messageBox"
addStyleNames="{style.message}">
+ <g:HTMLPanel addStyleNames="{style.notice}">You
have successfully
+ terminated the
+ session. Good bye!
+ </g:HTMLPanel>
+ </g:FlowPanel>
+ </g:FlowPanel>
+ <g:FlowPanel ui:field="bottomLine">
+ <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:FlowPanel>
</g:FlowPanel>
>>>>>>> refactoring theme 1 - login page
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
Thu Sep 12 03:41:09 2013
@@ -19,14 +19,21 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.activity.LogoActivity;
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
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.SimplePanel;
+<<<<<<< HEAD
public class LogoView extends Composite implements LogoActivity.Displayable {
+=======
+public class LogoView extends Composite {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
public LogoView() {
initWidget(binder.createAndBindUi(this));
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import java.util.List;
import org.apache.hupa.client.HupaCSS;
@@ -59,10 +60,20 @@ public class MessageContentView extends
@UiField SimplePanel rawPanel;
@Inject
+=======
+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.HTMLPanel;
+
+public class MessageContentView extends Composite {
+
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
public MessageContentView() {
initWidget(binder.createAndBindUi(this));
}
+<<<<<<< HEAD
@Override
public void fillMessageContent(String messageDetail) {
messageContentHTML.setHTML(messageDetail);
@@ -135,4 +146,11 @@ public class MessageContentView extends
public HasVisibility getRawPanel() {
return rawPanel;
}
+=======
+ interface MessageContentUiBinder extends UiBinder<HTMLPanel,
MessageContentView> {
+ }
+
+ private static MessageContentUiBinder binder =
GWT.create(MessageContentUiBinder.class);
+
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -11,6 +11,7 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<ui:image field="buttons" src="res/buttons.png" />
<ui:style>
.messageContent {
@@ -92,4 +93,8 @@
</g:DockLayoutPanel>
</g:center>
</g:DockLayoutPanel>
+=======
+ <g:HTMLPanel>MessageContent
+ </g:HTMLPanel>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
@@ -116,10 +117,25 @@ public class MessageListFooterView exten
}
interface MessageListFooterUiBinder extends UiBinder<HorizontalPanel,
MessageListFooterView> {
+=======
+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.HTMLPanel;
+
+public class MessageListFooterView extends Composite {
+
+ public MessageListFooterView() {
+ initWidget(binder.createAndBindUi(this));
+ }
+
+ interface MessageListFooterUiBinder extends UiBinder<HTMLPanel,
MessageListFooterView> {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
private static MessageListFooterUiBinder binder =
GWT.create(MessageListFooterUiBinder.class);
+<<<<<<< HEAD
@Override
public SimplePager getPager() {
return simplePager;
@@ -135,4 +151,6 @@ public class MessageListFooterView exten
return labels;
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -10,6 +10,7 @@
language governing permissions and limitations under the License. -->
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+<<<<<<< HEAD
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
<ui:style>
@@ -24,4 +25,9 @@
<g:ListBox ui:field="labels"></g:ListBox>
</g:SimplePanel>
</g:HorizontalPanel>
+=======
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+ <g:HTMLPanel>MessageListFooter
+ </g:HTMLPanel>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -49,10 +50,25 @@ public class MessageListView extends Com
}
interface MessageListUiBinder extends UiBinder<SimpleLayoutPanel,
MessageListView> {
+=======
+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.HTMLPanel;
+
+public class MessageListView extends Composite {
+
+ public MessageListView() {
+ initWidget(binder.createAndBindUi(this));
+ }
+
+ interface MessageListUiBinder extends UiBinder<HTMLPanel,
MessageListView> {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
private static MessageListUiBinder binder =
GWT.create(MessageListUiBinder.class);
+<<<<<<< HEAD
@Override
public MessagesCellTable getGrid() {
return grid;
@@ -94,4 +110,6 @@ public class MessageListView extends Com
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -10,6 +10,12 @@
language governing permissions and limitations under the License. -->
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+<<<<<<< HEAD
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<g:SimpleLayoutPanel ui:field="thisView" />
+=======
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+ <g:HTMLPanel>MessageList
+ </g:HTMLPanel>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.activity.NavigationActivity;
import org.apache.hupa.client.place.ContactPlace;
import org.apache.hupa.client.place.FolderPlace;
@@ -57,10 +58,19 @@ public class NavigationView extends Comp
String mailInnerSelected();
String contactInnerSelected();
}
+=======
+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.DockLayoutPanel;
+
+public class NavigationView extends Composite {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
public NavigationView() {
initWidget(binder.createAndBindUi(this));
}
+<<<<<<< HEAD
@UiHandler("mail")
public void onMailClick(ClickEvent e){
@@ -109,6 +119,8 @@ public class NavigationView extends Comp
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
interface NavigationUiBinder extends UiBinder<DockLayoutPanel,
NavigationView> {
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -12,7 +12,11 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:image field="buttons" src="res/buttons.png"/>
+<<<<<<< HEAD
<ui:style type="org.apache.hupa.client.ui.NavigationView.Style">
+=======
+ <ui:style>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
@sprite .navigation .inner {
gwt-image: 'buttons';
display: inline-block;
@@ -36,6 +40,7 @@
}
.navigation .mailInner {
+<<<<<<< HEAD
background-position: 0 2px;
}
@@ -44,6 +49,12 @@
color: #3cf;
}
+=======
+ background-position: 0 -22px;
+ color: #3cf;
+ /*background-position: 0 2px;*/
+ }
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
.navigation mailInner:hover,.navigation .mailInner.selected {
background-position: 0 -22px;
@@ -52,9 +63,12 @@
.navigation .contactInner {
background-position: 0 -48px;
}
+<<<<<<< HEAD
.navigation .contactInnerSelected {
background-position: 0 -72px;
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
.navigation a.contact:hover span.inner,.navigation
a.contact.selected span.inner
{
@@ -65,9 +79,12 @@
background-position: 0 -96px;
}
+<<<<<<< HEAD
.navigation .settingsInnerSelected {
background-position: 0 -120px;
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
.navigation a.settings:hover span.inner,.navigation
a.settings.selected span.inner
{
background-position: 0 -120px;
@@ -84,17 +101,29 @@
</ui:style>
<g:DockLayoutPanel unit="PX" ui:field="Navigation">
<g:west size="74">
+<<<<<<< HEAD
<g:SimplePanel ui:field="mailOuter"
addStyleNames="{style.navigation} {style.selected}">
<g:Anchor ui:field="mail"
addStyleNames="
{style.mailInnerSelected} {style.inner}">
+=======
+ <g:SimplePanel addStyleNames="{style.navigation}
{style.selected}">
+ <g:Anchor
+ addStyleNames="
+ {style.mailInner} {style.inner}">
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
Mail
</g:Anchor>
</g:SimplePanel>
</g:west>
<g:center>
+<<<<<<< HEAD
<g:SimplePanel ui:field="contactOuter"
addStyleNames="{style.navigation}">
<g:Anchor ui:field="contact"
+=======
+ <g:SimplePanel addStyleNames="{style.navigation}">
+ <g:Anchor
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
addStyleNames="
{style.contactInner} {style.inner}">
Contacts
@@ -102,8 +131,13 @@
</g:SimplePanel>
</g:center>
<g:east size="97">
+<<<<<<< HEAD
<g:SimplePanel ui:field="settingOuter"
addStyleNames="{style.navigation}">
<g:Anchor ui:field="setting"
+=======
+ <g:SimplePanel addStyleNames="{style.navigation}">
+ <g:Anchor
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
addStyleNames="
{style.settingsInner} {style.inner}">
Settings
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java
Thu Sep 12 03:41:09 2013
@@ -19,14 +19,21 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.activity.StatusActivity;
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
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.HTMLPanel;
+<<<<<<< HEAD
public class StatusView extends Composite implements
StatusActivity.Displayable {
+=======
+public class StatusView extends Composite {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
public StatusView() {
initWidget(binder.createAndBindUi(this));
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -11,6 +11,10 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<g:HTMLPanel>
+=======
+ <g:HTMLPanel>Status
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:HTMLPanel>
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.activity.ToolBarActivity;
import org.apache.hupa.client.place.ComposePlace;
import org.apache.hupa.client.rf.HupaRequestFactory;
@@ -314,6 +315,17 @@ public class ToolBarView extends Composi
private void removeDealingDisableds() {
delete.removeStyleName(style.disabledButton());
mark.removeStyleName(style.disabledButton());
+=======
+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;
+
+public class ToolBarView extends Composite {
+
+ public ToolBarView() {
+ initWidget(binder.createAndBindUi(this));
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
interface ToolBarUiBinder extends UiBinder<FlowPanel, ToolBarView> {
@@ -321,8 +333,11 @@ public class ToolBarView extends Composi
private static ToolBarUiBinder binder =
GWT.create(ToolBarUiBinder.class);
+<<<<<<< HEAD
@Override
public HasClickHandlers getRefresh() {
return refresh;
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -11,6 +11,7 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<ui:image field="buttons" src="res/buttons.png" />
<ui:image field="listicons" src="res/listicons.png" />
<ui:style type="org.apache.hupa.client.ui.ToolBarView.Style">
@@ -18,6 +19,13 @@
position: absolute;
display: block;
top: -2px;
+=======
+ <ui:image field="buttons" src="res/buttons.png"/>
+ <ui:style>
+ .bar {
+ position: absolute;
+ top: -6px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
right: 390px;
left: 0;
height: 40px;
@@ -25,6 +33,7 @@
z-index: 10;
}
+<<<<<<< HEAD
@sprite .listicon {
gwt-image: 'listicons';
display: block;
@@ -35,6 +44,8 @@
opacity: 0.99;
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
@sprite .button {
gwt-image: 'buttons';
text-align: center;
@@ -46,7 +57,11 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+<<<<<<< HEAD
padding: 28px 2px 0 2px;
+=======
+ padding: 24px 2px 0 2px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
text-shadow: 0px 1px 1px #EEE;
box-shadow: none;
-webkit-box-shadow: none;
@@ -56,6 +71,7 @@
margin: 0 2px;
border-radius: 4px;
text-decoration: none;
+<<<<<<< HEAD
}
.checkMail {
@@ -64,6 +80,17 @@
.compose {
background-position: center -530px;
+=======
+ cursor: pointer;
+ }
+
+ .checkMail {
+ background-position: center -1180px;
+ }
+
+ .compose {
+ background-position: center -534px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
.spacer {
@@ -74,7 +101,11 @@
}
.reply {
+<<<<<<< HEAD
background-position: center -570px;
+=======
+ background-position: center -574px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
.dropButton {
@@ -91,7 +122,11 @@
.replyAll {
min-width: 64px;
+<<<<<<< HEAD
background-position: left -610px;
+=======
+ background-position: left -614px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
@sprite .dropButton .dropButtonTip {
@@ -102,6 +137,7 @@
top: 0;
height: 42px;
width: 18px;
+<<<<<<< HEAD
background-position: 0 -1255px;
}
@@ -176,10 +212,32 @@
.unread {
background-position: 0 -1198px;
+=======
+ background-position: 0 -1259px;
+ cursor: pointer;
+ }
+
+ .forward {
+ min-width: 64px;
+ background-position: left -654px;
+ }
+
+ .delete {
+ background-position: center -694px;
+ }
+
+ .mark {
+ background-position: center -1098px;
+ }
+
+ .more {
+ background-position: center -854px;
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
}
</ui:style>
<g:FlowPanel addStyleNames="{style.bar}" ui:field="ToolBar">
+<<<<<<< HEAD
<g:Anchor ui:field="refresh" addStyleNames="{style.button}
{style.checkMail} {style.handCursor}">Refresh</g:Anchor>
<g:Anchor ui:field="compose" addStyleNames="{style.button}
{style.compose} {style.handCursor}">Compose</g:Anchor>
<g:HTMLPanel tag="span"
addStyleNames="{style.spacer}"></g:HTMLPanel>
@@ -203,5 +261,22 @@
addStyleNames="{style.button} {style.mark}
{style.handCursor}">Mark</g:Anchor>
<g:Anchor ui:field="more"
addStyleNames="{style.button} {style.more}
{style.handCursor}">More</g:Anchor>
+=======
+ <g:Anchor addStyleNames="{style.button}
{style.checkMail}">Refresh</g:Anchor>
+ <g:Anchor addStyleNames="{style.button}
{style.compose}">Compose</g:Anchor>
+ <g:HTMLPanel tag="span"
addStyleNames="{style.spacer}"></g:HTMLPanel>
+ <g:Anchor addStyleNames="{style.button}
{style.reply}">Reply</g:Anchor>
+ <g:HTMLPanel tag="span" addStyleNames="{style.dropButton}">
+ <g:Anchor addStyleNames="{style.button}
{style.replyAll}">Reply all</g:Anchor>
+ <g:HTMLPanel tag="span"
addStyleNames="{style.dropButtonTip}"></g:HTMLPanel>
+ </g:HTMLPanel>
+ <g:HTMLPanel tag="span" addStyleNames="{style.dropButton}">
+ <g:Anchor addStyleNames="{style.button}
{style.forward}">Forward</g:Anchor>
+ <g:HTMLPanel tag="span"
addStyleNames="{style.dropButtonTip}"></g:HTMLPanel>
+ </g:HTMLPanel>
+ <g:Anchor addStyleNames="{style.button}
{style.delete}">Delete</g:Anchor>
+ <g:Anchor addStyleNames="{style.button}
{style.mark}">Mark</g:Anchor>
+ <g:Anchor addStyleNames="{style.button}
{style.more}">More</g:Anchor>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:FlowPanel>
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java
Thu Sep 12 03:41:09 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.activity.TopBarActivity;
import com.google.gwt.core.client.GWT;
@@ -49,10 +50,19 @@ public class TopBarView extends Composit
interface Style extends CssResource {
String hideLoading();
}
+=======
+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.DockLayoutPanel;
+
+public class TopBarView extends Composite {
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
public TopBarView() {
initWidget(binder.createAndBindUi(this));
}
+<<<<<<< HEAD
@UiHandler("about")
void handleAboutClick(ClickEvent e){
@@ -86,6 +96,8 @@ public class TopBarView extends Composit
userLabel.clear();
userLabel.add(new HTML(userName));
}
+=======
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
interface TopBarUiBinder extends UiBinder<DockLayoutPanel, TopBarView> {
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml?rev=1522234&r1=1522233&r2=1522234&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
Thu Sep 12 03:41:09 2013
@@ -11,9 +11,15 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<ui:image field="topBarBackgroundImg" src="res/linen_header.jpg" />
<ui:image field="buttons" src="res/buttons.png" />
<ui:style type="org.apache.hupa.client.ui.TopBarView.Style">
+=======
+ <ui:image field="topBarBackgroundImg" src="res/linen_header.jpg"/>
+ <ui:image field="buttons" src="res/buttons.png"/>
+ <ui:style>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
@sprite .self {
gwt-image: 'topBarBackgroundImg';
width: 100%;
@@ -55,6 +61,7 @@
.right {
float: right;
}
+<<<<<<< HEAD
.textCenter {
text-align: center;
@@ -106,5 +113,22 @@
addStyleNames="{style.right}
{style.username}" />
</g:FlowPanel>
</g:east>
+=======
+ </ui:style>
+ <g:DockLayoutPanel ui:field="TopBar" unit="PX"
+ addStyleNames="{style.self}">
+ <g:west size="60">
+ <g:SimplePanel addStyleNames="{style.left}">
+ <g:Anchor
styleName="{style.about}">About</g:Anchor>
+ </g:SimplePanel>
+ </g:west>
+ <g:center>
+ <g:FlowPanel>
+ <g:Anchor addStyleNames="{style.right}
{style.logout}">Logout</g:Anchor>
+ <g:HTMLPanel tag="span"
addStyleNames="{style.right} {style.username}">[email protected]
+ </g:HTMLPanel>
+ </g:FlowPanel>
+ </g:center>
+>>>>>>> make login page as one part of the overall layout & splite layout to
little one
</g:DockLayoutPanel>
</ui:UiBinder>
\ No newline at end of file
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png?rev=1522234&view=auto
==============================================================================
Files
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png
(added) and
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png
Thu Sep 12 03:41:09 2013 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
