Author: dongxu Date: Thu Sep 12 05:00:10 2013 New Revision: 1522428 URL: http://svn.apache.org/r1522428 Log: fixed issue#86, use opening a new window button to show the raw message in a new window
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.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 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522428&r1=1522427&r2=1522428&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java Thu Sep 12 05:00:10 2013 @@ -124,6 +124,7 @@ public class MessageContentActivity exte } })); +<<<<<<< HEAD } private boolean isUidSet() { @@ -276,6 +277,8 @@ public class MessageContentActivity exte display.clearContent(); } }); +======= +>>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window } >>>>>>> fixed issue#76 with adding delete handler event @@ -294,6 +297,7 @@ public class MessageContentActivity exte void clearContent(); void setAttachments(List<MessageAttachment> attachements, String folder, long uid); void showAttachmentPanel(boolean is); + HasClickHandlers getRaw(); } public Activity with(TokenWrapper tokenWrapper) { 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=1522428&r1=1522427&r2=1522428&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 05:00:10 2013 @@ -65,10 +65,14 @@ public class MessageContentView extends @UiField FlowPanel attachments; @UiField DockLayoutPanel thisPanel; <<<<<<< HEAD +<<<<<<< HEAD @UiField Anchor rawButton; @UiField SimplePanel rawPanel; ======= >>>>>>> show/hide attachment's panel according to the attachments size +======= + @UiField Anchor rawButton; +>>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window @Inject ======= @@ -462,5 +466,13 @@ public class MessageContentView extends } private static Binder binder = GWT.create(Binder.class); +<<<<<<< HEAD >>>>>>> show/hide attachment's panel according to the attachments size +======= + + @Override + public HasClickHandlers getRaw() { + return rawButton; + } +>>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window } 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=1522428&r1=1522427&r2=1522428&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 05:00:10 2013 @@ -15,9 +15,13 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <ui:image field="buttons" src="res/buttons.png" /> ======= >>>>>>> beautify message list and content +======= + <ui:image field="buttons" src="res/buttons.png" /> +>>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window <ui:style> .messageContent { display: block; @@ -126,16 +130,42 @@ >>>>>>> beautify message list and content ======= } + + .moreHeaders { + position: absolute; + top: 8px; + cursor: pointer; + right: 18px; + width: 18em; + text-align: right; + white-space: nowrap; + } + + @sprite .inner { + gwt-image: 'buttons'; + background-position: -29px -271px; + display: inline-block; + width: 16px; + height: 13px; + text-indent: 1000px; + overflow: hidden; + } </ui:style> <g:DockLayoutPanel unit="PX"> - <g:north size="0"> - <g:HTMLPanel addStyleNames="{style.previewheader} {style.messageheader}"> - </g:HTMLPanel> - </g:north> <g:center> <g:DockLayoutPanel unit="PX" ui:field="thisPanel"> + <g:north size="30"> + <g:FlowPanel addStyleNames="{style.previewheader} {style.messageheader}"> + <g:SimplePanel addStyleNames="{style.moreHeaders}"> + + <g:Anchor ui:field="rawButton" addStyleNames="{style.inner}">Raw + </g:Anchor> + </g:SimplePanel> + </g:FlowPanel> + </g:north> <g:center> - <g:ScrollPanel ui:field="messageContent" addStyleNames="{style.messageContent}" /> + <g:ScrollPanel ui:field="messageContent" + addStyleNames="{style.messageContent}" /> </g:center> <g:east size="0"> <g:FlowPanel ui:field="attachments" addStyleNames="{style.attachBox}"> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org