Author: dongxu
Date: Thu Sep 12 03:51:32 2013
New Revision: 1522261
URL: http://svn.apache.org/r1522261
Log:
beautify message list and content
Modified:
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/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/MessagesCellTable.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/res/DataGrid.css
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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -279,6 +279,7 @@ public class HupaLayout implements HupaL
messageSpace.setWidgetMinSize(folderArea, 144);
messageArea.setWidgetMinSize(messageListBox, 72);
messageArea.setWidgetHidden(contactBox, true);
+ messageArea.setWidgetMinSize(messageListBox, 130);
}
@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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -2,11 +2,15 @@
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
+<<<<<<< HEAD
<ui:image field="originLogo"
src="res/hupa-logo-original-transparent.png" />
<ui:style>
.minWidth {
min-width: 700px;
=======
+=======
+ <ui:image field="originLogo"
src="res/hupa-logo-original-transparent.png" />
+>>>>>>> beautify message list and content
<ui:style>
.minWidth {
min-width: 1150px;
@@ -96,6 +100,20 @@
background: linear-gradient(top, #ebebeb 0%, #c6c6c6
100%);
border-radius: 0 0 4px 4px;
}
+
+ @sprite .messageContent {
+ width: auto;
+ height: auto;
+ gwt-image: 'originLogo';
+ background-position: center center;
+ margin: 8px;
+ filter: grayscale(100%);
+ -webkit-filter: grayscale(100%);
+ -moz-filter: grayscale(100%);
+ -ms-filter: grayscale(100%);
+ -o-filter: grayscale(100%);
+ opacity: 0.7;
+ }
</ui:style>
<g:LayoutPanel addStyleNames="{style.minWidth}">
<g:layer left='0' right='0' top='0' height='92px'>
@@ -224,7 +242,7 @@
<g:center>
<g:SplitLayoutPanel
ui:field="messageSpace">
<g:west size="373">
- <g:DockLayoutPanel
ui:field="folderArea"
+ <g:DockLayoutPanel
unit="PX" ui:field="folderArea"
addStyleNames="{style.folderList} {style.box} {style.listBox}">
<g:center>
<g:ScrollPanel ui:field="folderListContainer" />
@@ -257,9 +275,10 @@
</g:west>
<g:center>
<g:DockLayoutPanel unit="PX" addStyleNames="{style.box}"
-
ui:field="MessageContentBox">
+
ui:field="messageContentBox">
<g:center>
-
<g:ScrollPanel ui:field="messageContentContainer" />
+
<g:ScrollPanel ui:field="messageContentContainer"
+
addStyleNames="{style.messageContent}" />
</g:center>
<g:south size="25">
<g:SimplePanel ui:field="statusContainer" />
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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -90,7 +90,7 @@ import com.google.gwt.uibinder.client.Ui
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
import com.google.inject.Inject;
<<<<<<< HEAD
@@ -262,6 +262,7 @@ public class MessageContentView extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Override
public void fillMessageContent(String messageDetail) {
messageContentHTML.setHTML(messageDetail);
@@ -347,6 +348,9 @@ public class MessageContentView extends
=======
interface MessageContentUiBinder extends UiBinder<ScrollPanel,
MessageContentView> {
>>>>>>> make message content work as expected partly
+=======
+ interface MessageContentUiBinder extends UiBinder<SimplePanel,
MessageContentView> {
+>>>>>>> beautify message list and content
}
private static MessageContentUiBinder binder =
GWT.create(MessageContentUiBinder.class);
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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -14,11 +14,15 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<ui:image field="buttons" src="res/buttons.png" />
+=======
+>>>>>>> beautify message list and content
<ui:style>
.messageContent {
display: block;
background-color: white;
+<<<<<<< HEAD
width: 100%;
height: 100%;
}
@@ -107,4 +111,13 @@
<g:HTML ui:field="messageContent" />
</g:ScrollPanel>
>>>>>>> make message content work as expected partly
+=======
+ width:100%;
+ height:100%;
+ }
+ </ui:style>
+ <g:SimplePanel addStyleNames="{style.messageContent}">
+ <g:HTML ui:field="messageContent" />
+ </g:SimplePanel>
+>>>>>>> beautify message list and content
</ui:UiBinder>
\ No newline at end of file
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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -517,11 +517,9 @@ import com.google.gwt.core.client.GWT;
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.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.cellview.client.DataGrid;
import com.google.gwt.user.cellview.client.Header;
-import com.google.gwt.user.cellview.client.SafeHtmlHeader;
import com.google.gwt.view.client.DefaultSelectionEventManager;
import com.google.gwt.view.client.MultiSelectionModel;
import com.google.gwt.view.client.ProvidesKey;
@@ -561,12 +559,19 @@ public class MessagesCellTable extends D
this.imageBundle = imageBundle;
CheckboxCell headerCheckbox = new CheckboxCell();
+ ImageResourceCell headerAttached = new ImageResourceCell();
Header<Boolean> header = new Header<Boolean>(headerCheckbox) {
@Override
public Boolean getValue() {
return false;
}
};
+ Header<ImageResource> attachedPin = new
Header<ImageResource>(headerAttached) {
+ @Override
+ public ImageResource getValue() {
+ return imageBundle.attachmentIcon();
+ }
+ };
header.setUpdater(new ValueUpdater<Boolean>() {
@Override
public void update(Boolean value) {
@@ -585,8 +590,8 @@ public class MessagesCellTable extends D
setColumnWidth(fromCol, 40, Unit.PCT);
addColumn(subjectCol, constants.mailTableSubject());
setColumnWidth(subjectCol, 60, Unit.PCT);
- addColumn(attachedCol, "Attached");// TODO i18n
- setColumnWidth(attachedCol, 7, Unit.EM);
+ addColumn(attachedCol, attachedPin);
+ setColumnWidth(attachedCol, 33, Unit.PX);
addColumn(dateCol, constants.mailTableDate());
setColumnWidth(dateCol, 10, Unit.EM);
setRowCount(PAGE_SIZE, false);
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=1522261&r1=1522260&r2=1522261&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:51:32 2013
@@ -24,11 +24,15 @@
<ui:style>
.bar {
position: absolute;
+<<<<<<< HEAD
top: -6px;
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ top: -2px;
+>>>>>>> beautify message list and content
right: 390px;
left: 0;
- height: 40px;
+ height: 36px;
white-space: nowrap;
z-index: 10;
}
@@ -58,10 +62,14 @@
text-overflow: ellipsis;
white-space: nowrap;
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ padding: 28px 2px 0 2px;
+>>>>>>> beautify message list and content
text-shadow: 0px 1px 1px #EEE;
box-shadow: none;
-webkit-box-shadow: none;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css?rev=1522261&r1=1522260&r2=1522261&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css
Thu Sep 12 03:51:32 2013
@@ -1,6 +1,6 @@
@def selectionBorderWidth 2px;
.dataGridWidget {
-
+ table-layout: fixed;
}
.dataGridFirstColumn {
@@ -22,24 +22,34 @@
}
.dataGridHeader {
- color: #69939e;
- font-size: 11px;
- font-weight: bold;
- background: #d6eaf3;
- background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
- background: -webkit-gradient(linear, left top, right top,
color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
- background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
- background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3
100%);
- background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
- border-left: 1px solid #bbd3da;
- overflow: hidden;
- text-overflow: ellipsis;
- height:23px;
- padding: 2px 3px;
+ color: #69939e;
+ font-size: 11px;
+ font-weight: bold;
+ background: #d6eaf3;
+ background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
+ background: -webkit-gradient(linear, left top, right top, color-stop(0,
#e3f2f6),
+ color-stop(8%, #d6eaf3), color-stop(100%, #d6eaf3) );
+ background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
+ background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
+ background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3
100%);
+ border-left: 1px solid #bbd3da;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 23px;
+ padding: 2px 7px;
+ text-align: left;
}
.dataGridCell {
- cursor:default;
+ cursor: pointer;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: table-cell;
+ vertical-align: inherit;
+ padding: 2px 7px;
+ border-left: 1px dotted #bbd3da;
+ border-bottom: 1px solid #111;
}
.dataGridFirstColumnFooter {
@@ -80,7 +90,8 @@
}
.dataGridEvenRowCell {
- border: selectionBorderWidth solid #ffffff;
+ border-left: 1px dotted #bbd3da;
+ border-bottom: 0px solid #bbd3da;
}
.dataGridOddRow {
@@ -88,7 +99,8 @@
}
.dataGridOddRowCell {
- border: selectionBorderWidth solid #f3f7fb;
+ border-left: 1px dotted #bbd3da;
+ border-bottom: 0px solid #bbd3da;
}
.dataGridHoveredRow {
@@ -96,7 +108,8 @@
}
.dataGridHoveredRowCell {
- border: selectionBorderWidth solid #eee;
+ border-left: 1px dotted #eee;
+ border-bottom: 0px solid #eee;
}
.dataGridKeyboardSelectedRow {
@@ -104,18 +117,25 @@
}
.dataGridKeyboardSelectedRowCell {
- border: selectionBorderWidth solid #ffc;
+
}
.dataGridSelectedRow {
- background: #628cd5;
color: white;
height: auto;
overflow: auto;
+ background: #059ec6;
+ background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #019bc6),
+ color-stop(100%, #017cb4) );
+ background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
}
.dataGridSelectedRowCell {
- border: selectionBorderWidth solid #628cd5;
+ border-left: 1px dotted #628cd5;
+ border-bottom: 0px solid #628cd5;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
