You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:26:33 UTC

svn commit: r1522203 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/ui/IMAPMessageListView.java java/org/apache/hupa/client/ui/MessagesCellTable.java webapp/Hupa.css

Author: dongxu
Date: Thu Sep 12 03:26:32 2013
New Revision: 1522203

URL: http://svn.apache.org/r1522203
Log:
decorate columns of messages list and related panels above and below.

Modified:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
    james/hupa/trunk/client/src/main/webapp/Hupa.css

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java?rev=1522203&r1=1522202&r2=1522203&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java Thu Sep 12 03:26:32 2013
@@ -87,13 +87,11 @@ import org.apache.hupa.client.widgets.Co
 import org.apache.hupa.client.widgets.EnableButton;
 import org.apache.hupa.client.widgets.HasDialog;
 import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.MessageImpl;
 import org.apache.hupa.shared.domain.FetchMessagesAction;
 import org.apache.hupa.shared.domain.FetchMessagesResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
 import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.DecreaseUnseenEvent;
 import org.apache.hupa.shared.events.ExpandMessageEvent;
 import org.apache.hupa.shared.events.FolderSelectionEvent;
 import org.apache.hupa.shared.events.FolderSelectionEventHandler;
@@ -152,17 +150,23 @@ import com.google.gwt.event.dom.client.K
 import com.google.gwt.event.shared.EventBus;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
 >>>>>>> remove gwt-incubator dependency in Messages List Model; 
+=======
+>>>>>>> decorate columns of messages list and related panels above and below.
 import com.google.gwt.user.cellview.client.SimplePager;
 import com.google.gwt.user.cellview.client.SimplePager.TextLocation;
 import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
+<<<<<<< HEAD
+=======
+import com.google.gwt.user.client.ui.HTML;
+>>>>>>> decorate columns of messages list and related panels above and below.
 import com.google.gwt.user.client.ui.HasValue;
 import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.LayoutPanel;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.MultiWordSuggestOracle;
 import com.google.gwt.user.client.ui.SuggestBox;
@@ -174,10 +178,13 @@ import com.google.gwt.user.client.ui.Ver
 =======
 >>>>>>> use DataGrid instead of CellTable to list messages.
 import com.google.gwt.user.client.ui.Widget;
+<<<<<<< HEAD
 import com.google.gwt.view.client.CellPreviewEvent;
 import com.google.gwt.view.client.CellPreviewEvent.Handler;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.gwt.view.client.ProvidesKey;
+=======
+>>>>>>> decorate columns of messages list and related panels above and below.
 import com.google.gwt.view.client.RangeChangeEvent;
 import com.google.gwt.view.client.SelectionChangeEvent;
 import com.google.gwt.view.client.SelectionModel;
@@ -1820,7 +1827,7 @@ public class IMAPMessageListView extends
 		searchButton = new Button(constants.searchButton());
 		loading = new Loading(constants.loading());
 
-		LayoutPanel solidCenterPanel = new LayoutPanel();
+		DockLayoutPanel solidCenterPanel = new DockLayoutPanel(Unit.EM);
 //		solidCenterPanel.addStyleName(HupaCSS.C_msg_list_container);
 
 
@@ -1871,17 +1878,14 @@ public class IMAPMessageListView extends
 		commandsBar.addLeft(new HTML(constants.select() + ":"));
 		commandsBar.addLeft(allLink);
 		commandsBar.addLeft(noneLink);
-		commandsBar.add(loading);
+//		commandsBar.add(loading);
 		// commandsBar.addRight(pagingBar);
 
 		commandsBar.addRight(pager);
 
-		solidCenterPanel.add(hPanel);
-		solidCenterPanel.add(commandsBar);
+		solidCenterPanel.addNorth(hPanel, 3);
+		solidCenterPanel.addSouth(commandsBar, 2);
 		solidCenterPanel.add(table);
-		solidCenterPanel.setWidgetTopHeight(hPanel, 0, Unit.EM, 3, Unit.EM);
-		solidCenterPanel.setWidgetTopHeight(commandsBar, 3, Unit.EM, 3, Unit.EM);
-		solidCenterPanel.setWidgetTopHeight(table, 6, Unit.EM, 100, Unit.PCT);
 
 		// msgListContainer.add(mailTable);
 

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522203&r1=1522202&r2=1522203&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Thu Sep 12 03:26:32 2013
@@ -508,6 +508,7 @@ import com.google.gwt.cell.client.Checkb
 import com.google.gwt.cell.client.DateCell;
 import com.google.gwt.cell.client.ImageResourceCell;
 import com.google.gwt.cell.client.TextCell;
+import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.user.cellview.client.Column;
@@ -516,7 +517,7 @@ import com.google.inject.Inject;
 
 public class MessagesCellTable extends DataGrid<Message> {
 
-	private static final int PAGE_SIZE = 5;
+	private static final int PAGE_SIZE = 25;
 	
 	private HupaImageBundle imageBundle;
 
@@ -525,11 +526,23 @@ public class MessagesCellTable extends D
 	        final HupaImageBundle imageBundle) {
 		super(PAGE_SIZE);
 		this.imageBundle = imageBundle;
-		addColumn(new CheckboxColumn());
-		addColumn(new FromColumn());
-		addColumn(new SubjectColumn());
-		addColumn(new AttachmentColumn());
-		addColumn(new DateColumn());
+		
+		Column<Message, ?> checkboxCol = new CheckboxColumn();
+		Column<Message, ?> fromCol = new FromColumn();
+		Column<Message, ?> subjectCol = new SubjectColumn();
+		Column<Message, ?> attachedCol = new AttachmentColumn();
+		Column<Message, ?> dateCol = new DateColumn();
+		
+		addColumn(checkboxCol);
+		this.setColumnWidth(checkboxCol, 3, Unit.EM);
+		addColumn(fromCol);
+		this.setColumnWidth(fromCol, 40, Unit.PCT);
+		addColumn(subjectCol);
+		this.setColumnWidth(subjectCol, 60, Unit.PCT);
+		addColumn(attachedCol);
+		this.setColumnWidth(attachedCol, 3, Unit.EM);
+		addColumn(dateCol);
+		this.setColumnWidth(dateCol, 10, Unit.EM);
 		setRowCount(PAGE_SIZE, false);
 		setKeyboardSelectionPolicy(KeyboardSelectionPolicy.DISABLED);
 	}

Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1522203&r1=1522202&r2=1522203&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 03:26:32 2013
@@ -163,6 +163,7 @@ div.Hupa {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 	min-width: 400px;
 }
 
@@ -191,6 +192,9 @@ div.hupa-top {
 =======
 	min-width: 800px;
 >>>>>>> make it look more beautiful
+=======
+	min-width: 400px;
+>>>>>>> decorate columns of messages list and related panels above and below.
 }
 * html div.Hupa {
    margin-top: 0px;
@@ -305,6 +309,7 @@ div.hupa-header {
 	clear: both;
 	margin: 8px 8px 8px 8px;
 <<<<<<< HEAD
+<<<<<<< HEAD
 	min-height: 200px;
 =======
 =======
@@ -323,6 +328,9 @@ div.hupa-main {
 =======
 	min-height: 400px;
 >>>>>>> make it look more beautiful
+=======
+	min-height: 200px;
+>>>>>>> decorate columns of messages list and related panels above and below.
 }
 
 * html div.cgb-RPC-hupa-main {
@@ -468,6 +476,7 @@ table.hupa-login-form {
 	width: 100%;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 	background-color: #deeeff;
 }
 
@@ -487,6 +496,8 @@ table.hupa-login-form {
 =======
 >>>>>>> first commit
     padding: 5px 4px 5px 4px;
+=======
+>>>>>>> decorate columns of messages list and related panels above and below.
     background-color: #deeeff;  
 }
 
@@ -579,11 +590,15 @@ input[type=text], input[type=file], text
 	margin-left: 5px;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 	padding-left: 3px;
 =======
 >>>>>>> first commit
 =======
 >>>>>>> first commit
+=======
+  padding-left: 3px;
+>>>>>>> decorate columns of messages list and related panels above and below.
 }
 
 /*************[ buttonbars ]*********************/



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org