Author: dongxu
Date: Thu Sep 12 04:24:50 2013
New Revision: 1522343
URL: http://svn.apache.org/r1522343
Log:
add loading and notification bar(finishing the folder list click event),
related to the issue#18
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.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/ActivityManagerInitializer.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
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/NotificationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.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
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Thu Sep 12 04:24:50 2013
@@ -299,7 +299,8 @@ public class MessageListActivity extends
@Inject private Displayable display;
@Inject private HupaRequestFactory requestFactory;
@Inject private PlaceController placeController;
- @Inject private ToolBarActivity.Displayable toolBarDisplay;
+ @Inject private ToolBarActivity.Displayable toolBar;
+ @Inject private TopBarActivity.Displayable topBar;
private ImapFolder folder;
private String searchValue;
private User user;
@@ -379,6 +380,12 @@ public class MessageListActivity extends
assert result != null;
display.getGrid().setRowCount(result.getRealCount());
display.getGrid().setRowData(start,
result.getMessages());
+// Scheduler.get().scheduleDeferred(new
ScheduledCommand() {
+// @Override
+// public void execute() {
+// topBar.hideLoading();
+// }
+// });
}
@Override
@@ -443,7 +450,7 @@ public class MessageListActivity extends
private void antiSelectMessages(Collection<Message> c) {
for (Message msg : c) {
display.getGrid().getSelectionModel().setSelected(msg,
false);
- toolBarDisplay.enableAllTools(false);
+ toolBar.enableAllTools(false);
}
}
public void deleteSelectedMessages() {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
Thu Sep 12 04:24:50 2013
@@ -19,9 +19,17 @@
package org.apache.hupa.client.activity;
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
+=======
+import org.apache.hupa.client.ui.WidgetDisplayable;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
import com.google.inject.Inject;
public class NotificationActivity extends AppBaseActivity {
@@ -33,8 +41,14 @@ public class NotificationActivity extend
@Inject private Displayable display;
+<<<<<<< HEAD
public interface Displayable extends IsWidget {
void hideNotification();
void notice(String html);
+=======
+ public interface Displayable extends WidgetDisplayable {
+ void hideNotification();
+ void notice(SafeHtml html);
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
Thu Sep 12 04:24:50 2013
@@ -244,6 +244,8 @@ public class TopBarActivity extends AppB
HasClickHandlers getLogoutClick();
void showUserName(String userName);
HTMLPanel getUserLabel();
+ void showLoading();
+ void hideLoading();
}
>>>>>>> add logout support
}
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -153,6 +153,7 @@ import org.apache.hupa.client.activity.M
import org.apache.hupa.client.activity.MessageListFooterActivity;
import org.apache.hupa.client.activity.MessageSendActivity;
import org.apache.hupa.client.activity.NavigationActivity;
+import org.apache.hupa.client.activity.NotificationActivity;
import org.apache.hupa.client.activity.StatusActivity;
import org.apache.hupa.client.activity.ToolBarActivity;
import org.apache.hupa.client.activity.TopActivity;
@@ -228,6 +229,7 @@ import org.apache.hupa.client.mapper.Mes
import org.apache.hupa.client.mapper.MessageListActivityMapper;
import org.apache.hupa.client.mapper.MessageListFooterActivityMapper;
import org.apache.hupa.client.mapper.NavigationActivityMapper;
+import org.apache.hupa.client.mapper.NotificationActivityMapper;
import org.apache.hupa.client.mapper.StatusActivityMapper;
import org.apache.hupa.client.mapper.ToolBarActivityMapper;
<<<<<<< HEAD
@@ -264,6 +266,7 @@ import org.apache.hupa.client.ui.Message
import org.apache.hupa.client.ui.MessageSendView;
import org.apache.hupa.client.ui.MessagesCellTable;
import org.apache.hupa.client.ui.NavigationView;
+import org.apache.hupa.client.ui.NotificationView;
import org.apache.hupa.client.ui.StatusView;
import org.apache.hupa.client.ui.ToolBarView;
import org.apache.hupa.client.ui.TopBarView;
@@ -673,6 +676,12 @@ public class AppGinModule extends Abstra
@Provides
@Singleton
+ @Named("NotificationRegion")
+ public ActivityManager
getNotificationActivityMapper(NotificationActivityMapper activityMapper,
EventBus eventBus) {
+ return new ActivityManager(activityMapper, eventBus);
+ }
+ @Provides
+ @Singleton
@Named("NavigationRegion")
public ActivityManager
getNavigationActivityMapper(NavigationActivityMapper activityMapper, EventBus
eventBus) {
return new ActivityManager(activityMapper, eventBus);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
Thu Sep 12 04:24:50 2013
@@ -37,6 +37,7 @@ public class ActivityManagerInitializer
@Named("LoginPage") ActivityManager
loginActivityManager,
@Named("TopBarRegion") ActivityManager
topBarActivityManager,
@Named("LogoRegion") ActivityManager
logoActivityManager,
+ @Named("NotificationRegion") ActivityManager
notificationActivityManager,
@Named("NavigationRegion") ActivityManager
navigationActivityManager,
@Named("ToolBarRegion") ActivityManager
toolBarActivityManager,
@Named("FolderListRegion") ActivityManager
folderListActivityManager,
@@ -49,6 +50,7 @@ public class ActivityManagerInitializer
loginActivityManager.setDisplay(loginLayout.getLoginView());
topBarActivityManager.setDisplay(hupaLayout.getTopBarView());
logoActivityManager.setDisplay(hupaLayout.getLogoView());
+
notificationActivityManager.setDisplay(hupaLayout.getNotificationView());
navigationActivityManager.setDisplay(hupaLayout.getNavigationView());
toolBarActivityManager.setDisplay(hupaLayout.getToolBarView());
folderListActivityManager.setDisplay(hupaLayout.getFolderListView());
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java
Thu Sep 12 04:24:50 2013
@@ -28,7 +28,11 @@ import com.google.gwt.place.shared.Place
import com.google.inject.Inject;
import com.google.inject.Provider;
+<<<<<<< HEAD
public class NotificationActivityMapper extends _HupaActivityMapper {
+=======
+public class NotificationActivityMapper extends MainActivityMapper {
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
private final Provider<NotificationActivity>
notificationActivityProvider;
@Inject
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
Thu Sep 12 04:24:50 2013
@@ -21,6 +21,8 @@ package org.apache.hupa.client.ui;
import java.util.List;
+import org.apache.hupa.client.activity.NotificationActivity;
+import org.apache.hupa.client.activity.TopBarActivity;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -38,6 +40,7 @@ import com.google.gwt.event.dom.client.C
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.view.client.AsyncDataProvider;
import com.google.gwt.view.client.HasData;
import com.google.gwt.view.client.ProvidesKey;
@@ -52,7 +55,8 @@ public class FoldersTreeViewModel implem
@Inject private HupaRequestFactory rf;
@Inject private PlaceController placeController;
- // @Inject private Provider<MailFolderPlace> folderPlaceProvider;
+ @Inject private TopBarActivity.Displayable topBar;
+ @Inject private NotificationActivity.Displayable notice;
private User user;
private ImapFolder currentFolder;
private EventBus eventBus;
@@ -64,6 +68,8 @@ public class FoldersTreeViewModel implem
@SuppressWarnings("unchecked")
@Override
public void onSelectionChange(SelectionChangeEvent
event) {
+ topBar.showLoading();//FIXME delay to show, why
+ notice.notice(SafeHtmlUtils.fromString("Hi,
this is the notification test."));
SingleSelectionModel<ImapFolder> selectionModel
= (SingleSelectionModel<ImapFolder>) event.getSource();
currentFolder =
selectionModel.getSelectedObject();
eventBus.fireEvent(new LoadMessagesEvent(user,
selectionModel.getSelectedObject()));
@@ -107,10 +113,20 @@ public class FoldersTreeViewModel implem
}
}
+// @Override
+// public Set<String> getConsumedEvents() {
+// HashSet<String> events = new HashSet<String>();
+// events.add("click");
+// return events;
+// }
// TODO is this a click event?
@Override
public void onBrowserEvent(Context context, Element parent,
ImapFolder value, NativeEvent event,
ValueUpdater<ImapFolder> valueUpdater) {
+ super.onBrowserEvent(context, parent, value, event,
valueUpdater);
+// if("click".equals(event.getType())){//FIXME why slow in
debug mode
+// topBar.showLoading();
+// }
if (clickSameFolder(value)) {
eventBus.fireEvent(new LoadMessagesEvent(user,
value));
placeController.goTo(new
MailFolderPlace(value.getFullName()));
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -22,11 +22,14 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
=======
import org.apache.hupa.client.evo.ActivityManagerInitializer;
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.uibinder.client.UiBinder;
@@ -249,13 +252,13 @@ import com.google.gwt.user.client.ui.Lay
>>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
public class HupaLayout implements HupaLayoutable {
@UiField SimplePanel topBarContainer;
@UiField SimplePanel logoContainer;
+ @UiField SimplePanel notificationContainer;
@UiField SimpleLayoutPanel navigationContainer;
@UiField _ToolPanel toolPanel;
@@ -333,6 +336,15 @@ public class HupaLayout implements HupaL
}
@Override
+ public AcceptsOneWidget getNotificationView() {
+ return new AcceptsOneWidget() {
+ @Override
+ public void setWidget(IsWidget w) {
+
notificationContainer.setWidget(Widget.asWidgetOrNull(w));
+ }
+ };
+ }
+ @Override
public AcceptsOneWidget getNavigationView() {
return new AcceptsOneWidget() {
@Override
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -7,6 +7,7 @@
<ui:style>
.minWidth {
min-width: 700px;
+<<<<<<< HEAD
=======
=======
<ui:image field="originLogo"
src="res/hupa-logo-original-transparent.png" />
@@ -15,6 +16,8 @@
.minWidth {
min-width: 1150px;
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
}
.feature {
@@ -156,11 +159,16 @@
<g:LayoutPanel
addStyleNames="{style.feature}"
ui:field="HupaFeature">
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
<g:layer width="177px"
left="10px">
<g:SimplePanel
ui:field="logoContainer" />
</g:layer>
<g:layer>
+<<<<<<< HEAD
<g:SimplePanel
ui:field="notificationContainer" />
</g:layer>
<g:layer width="287px"
right="0">
@@ -204,6 +212,10 @@
>>>>>>> remove some warnings and create the AbstractPlace that can give place
>>>>>>> infomation
=======
=======
+=======
+ <g:SimplePanel
ui:field="notificationContainer" />
+ </g:layer>
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
<g:layer width="287px"
right="0">
<<<<<<< HEAD
<<<<<<< HEAD
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -131,5 +131,10 @@ public interface HupaLayoutable extends
AcceptsOneWidget getComposeToolBarView();
AcceptsOneWidget getComposeView();
+<<<<<<< HEAD
>>>>>>> make send text mail work excellently
+=======
+
+ AcceptsOneWidget getNotificationView();
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
Thu Sep 12 04:24:50 2013
@@ -23,6 +23,10 @@ import org.apache.hupa.client.activity.N
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.CssResource;
+<<<<<<< HEAD
+=======
+import com.google.gwt.safehtml.shared.SafeHtml;
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
@@ -43,7 +47,11 @@ public class NotificationView extends Co
@Override
+<<<<<<< HEAD
public void notice(String html){
+=======
+ public void notice(SafeHtml html){
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
this.notificationContainer.removeStyleName(style.hideNotification());
this.notification.setHTML(html);
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml
Thu Sep 12 04:24:50 2013
@@ -21,7 +21,10 @@
}
.fontFeel {
+<<<<<<< HEAD
z-index: 9999;
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
position: relative;
display: inline-block;
border-color: #f0c36d;
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -48,13 +48,17 @@ public class TopBarView extends Composit
@UiField Anchor logout;
@UiField HTMLPanel userLabel;
@UiField SimplePanel loading;
+<<<<<<< HEAD
@UiField HTML loadingRegion;
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
@UiField Style style;
interface Style extends CssResource {
String hideLoading();
}
+<<<<<<< HEAD
=======
=======
import org.apache.hupa.client.activity.TopBarActivity;
@@ -85,6 +89,8 @@ public class TopBarView extends Composit
@UiField Anchor logout;
@UiField HTMLPanel userLabel;
>>>>>>> add logout support
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
public TopBarView() {
initWidget(binder.createAndBindUi(this));
@@ -133,6 +139,16 @@ public class TopBarView extends Composit
>>>>>>> fill the empty compose view with the old message when the composing
>>>>>>> type are reply, replyAll, forward and preparing for about & deleting
>>>>>>> operation
@Override
+ public void showLoading(){
+ loading.removeStyleName(style.hideLoading());
+ }
+
+ @Override
+ public void hideLoading(){
+ loading.addStyleName(style.hideLoading());
+ }
+
+ @Override
public HasClickHandlers getLogoutClick() {
return logout;
}
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=1522343&r1=1522342&r2=1522343&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 04:24:50 2013
@@ -12,6 +12,7 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<<<<<<< HEAD
+<<<<<<< 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">
@@ -20,6 +21,11 @@
<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
+=======
+ <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">
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
@sprite .self {
gwt-image: 'topBarBackgroundImg';
width: 100%;
@@ -62,6 +68,9 @@
float: right;
}
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
.textCenter {
text-align: center;
@@ -92,6 +101,7 @@
.hideLoading {
visibility: hidden;
}
+<<<<<<< HEAD
</ui:style>
<g:DockLayoutPanel ui:field="TopBar" unit="PX"
addStyleNames="{style.self} ">
@@ -114,20 +124,33 @@
</g:FlowPanel>
</g:east>
=======
+=======
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
</ui:style>
<g:DockLayoutPanel ui:field="TopBar" unit="PX"
- addStyleNames="{style.self}">
- <g:west size="60">
+ addStyleNames="{style.self} ">
+ <g:west size="300">
<g:SimplePanel addStyleNames="{style.left}">
<g:Anchor ui:field="about"
styleName="{style.about}">About</g:Anchor>
</g:SimplePanel>
</g:west>
<g:center>
+ <g:SimplePanel addStyleNames="{style.hideLoading}
{style.loadingPosition} {style.textCenter}" ui:field="loading">
+ <g:HTMLPanel
addStyleNames="{style.fontFeel}">Loading...
+ </g:HTMLPanel>
+ </g:SimplePanel>
+ </g:center>
+ <g:east size="300">
<g:FlowPanel>
<g:Anchor ui:field="logout"
addStyleNames="{style.right} {style.logout}">Logout</g:Anchor>
- <g:HTMLPanel ui:field="userLabel" tag="span"
addStyleNames="{style.right} {style.username}" />
+ <g:HTMLPanel ui:field="userLabel" tag="span"
+ addStyleNames="{style.right}
{style.username}" />
</g:FlowPanel>
+<<<<<<< HEAD
</g:center>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ </g:east>
+>>>>>>> add loading and notification bar(finishing the folder list click
event), related to the issue#18
</g:DockLayoutPanel>
</ui:UiBinder>
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522343&r1=1522342&r2=1522343&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 04:24:50 2013
@@ -176,6 +176,25 @@
>>>>>>> refactoring theme 1 - login page
<!-- load the application at the end when loading is being shown -->
<script type="text/javascript" language="javascript"
src="hupa/hupa.nocache.js"></script>
+ <div class="vY nq">
+ <div class="vX UC">
+ <div class="J-J5-Ji">
+ <div class="vh">
+ <div class="J-J5-Ji">
+ <div class="vZ"><span class="v1">Loading...</span></div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+ <div class="b8 UC" aria-live="polite" aria-atomic="true">
+ <div class="J-J5-Ji top">
+ <div class="vh">2 conversations have been moved to the
Inbox.
+ <a class="" target="_blank"
href="http://support.google.com/mail/bin/answer.py?hl=en&ctx=mail&answer=18522";>Learn
more</a>
+ <span class="" id="link_undo" tabindex="0" role="link"
idlink="">Undo</span>
+ </div>
+ </div>
+ </div>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
