Author: dongxu
Date: Thu Sep 12 02:57:07 2013
New Revision: 1522156
URL: http://svn.apache.org/r1522156
Log:
merged with main trunk in apache: replacing rounded borders with gwt decorator
boxes, fix Hupa-93 Hupa-94, fix IE issue
Removed:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImpl.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/impl/RndPanelGeneratorImplIE.java
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
james/hupa/trunk/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:57:07 2013
@@ -138,6 +138,11 @@
<artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <classifier>sources</classifier>
+ </dependency>
<dependency>
<<<<<<< HEAD
<<<<<<< HEAD
@@ -221,6 +226,7 @@
<disableClassMetadata>${gwt.disableClassMetadata}</disableClassMetadata>
<disableCastChecking>${gwt.disableCastChecking}</disableCastChecking>
<logLevel>${gwt.logLevel}</logLevel>
+ <style>${gwt.style}</style>
<modules>
<module>org.apache.hupa.Hupa${gwt.moduleSuffix}</module>
</modules>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Sep
12 02:57:07 2013
@@ -79,9 +79,10 @@
<!-- <inherits name="com.google.gwt.junit.JUnit"/> -->
<!-- Inherit the default GWT style sheet. -->
- <inherits name='com.google.gwt.user.theme.standard.Standard'/>
- <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
+<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
+ <inherits name='com.google.gwt.user.theme.clean.Clean'/>
<!-- CSS loaded asynchronously -->
<stylesheet src="../Hupa.css"/>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
Thu Sep 12 02:57:07 2013
@@ -42,12 +42,14 @@ public class HupaCSS extends WidgetsCSS
public static final String C_flash ="hupa-flash";
public static final String C_top_container ="hupa-top";
+ public static final String C_central_container ="hupa-central";
public static final String C_main_container ="hupa-main";
public static final String C_bottom_container ="hupa-bottom";
public static final String C_login_container = "hupa-login";
+ public static final String C_login_box = "hupa-login-box";
public static final String C_login_form = "hupa-login-form";
- public static final String C_login_box = "hupa-login-textbox";
+ public static final String C_login_textbox = "hupa-login-textbox";
public static final String C_contacts_container = "hupa-contacts";
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
Thu Sep 12 02:57:07 2013
@@ -77,7 +77,7 @@ public class AppView extends Composite i
appContainer.addStyleName(HupaCSS.C_app_container);
logoContainer.addStyleName(HupaCSS.C_logo_container);
topContainer.addStyleName(HupaCSS.C_top_container);
- centralContainer.addStyleName(HupaCSS.C_main_container);
+ centralContainer.addStyleName(HupaCSS.C_central_container);
bottomContainer.addStyleName(HupaCSS.C_bottom_container);
topWrapper.addStyleName(HupaCSS.C_top_container + "-wrap");
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
Thu Sep 12 02:57:07 2013
@@ -41,6 +41,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
@@ -147,10 +148,7 @@ public class IMAPMessageView extends Com
link.setStyleName(HupaCSS.C_hyperlink);
link.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- String url = GWT.getModuleBaseURL() +
SConsts.SERVLET_DOWNLOAD
- + "?" + SConsts.PARAM_NAME + "=" +
messageAttachment.getName()
- + "&" + SConsts.PARAM_FOLDER + "=" + folder
- + "&" + SConsts.PARAM_UID + "=" + uid;
+ String url = getUrl(messageAttachment, folder, uid,
false);
if (downloadIframe == null)
Window.open(url,"_blank", "");
else
@@ -161,10 +159,23 @@ public class IMAPMessageView extends Com
aPanel.addStyleName(HupaCSS.C_attachment);
aPanel.add(new Image(imageBundle.attachmentIcon()));
aPanel.add(link);
+ if (messageAttachment.isImage()) {
+ Anchor viewImageLink = new
Anchor("View",getUrl(messageAttachment, folder, uid, true), "_blank");
+ viewImageLink.setStyleName(HupaCSS.C_attachment_view);
+ aPanel.add(viewImageLink);
+ }
attachments.add(aPanel);
}
}
}
+
+ private String getUrl(MessageAttachment messageAttachment, String folder,
long uid, boolean inline) {
+ return GWT.getModuleBaseURL() + SConsts.SERVLET_DOWNLOAD
+ + "?" + SConsts.PARAM_NAME + "=" + messageAttachment.getName()
+ + "&" + SConsts.PARAM_FOLDER + "=" + folder
+ + "&" + SConsts.PARAM_UID + "=" + uid
+ + (inline ? "&" + SConsts.PARAM_MODE + "=inline" : "");
+ }
public HasClickHandlers getForwardButtonClick() {
return forwardMsgButton;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Thu Sep 12 02:57:07 2013
@@ -153,12 +153,13 @@ public class LoginView extends Composite
=======
>>>>>>> constantly changed by manolo
loading = new Loading(constants.loading());
-
+
mainContainer.setStyleName(HupaCSS.C_login_container);
+ rPanel.addStyleName(HupaCSS.C_login_box);
flexTable.addStyleName(HupaCSS.C_login_form);
- usernameTextBox.addStyleName(HupaCSS.C_login_box);
- passwordTextBox.addStyleName(HupaCSS.C_login_box);
-
+ usernameTextBox.addStyleName(HupaCSS.C_login_textbox);
+ passwordTextBox.addStyleName(HupaCSS.C_login_textbox);
+
buttonBar.add(submitButton);
buttonBar.add(resetButton);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
Thu Sep 12 02:57:07 2013
@@ -152,7 +152,7 @@ public class MainView extends Composite
dockPanel = new DockPanel();
- dockPanel.setSpacing(10);
+ dockPanel.setSpacing(5);
dockPanel.setWidth("100%");
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
Thu Sep 12 02:57:07 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.validation;
+import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.user.client.ui.HasText;
import eu.maydu.gwt.validation.client.ValidationAction;
@@ -35,6 +36,7 @@ import eu.maydu.gwt.validation.client.i1
public class EmailListValidator extends Validator<EmailListValidator>{
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%'*/=+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
=======
private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
@@ -42,6 +44,9 @@ public class EmailListValidator extends
=======
private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
>>>>>>> first commit
+=======
+ private static final String emailRegex =
"^(.*<)?[A-Za-z0-9._%'*/=+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
private HasText text;
public EmailListValidator(HasText text) {
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=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 02:57:07 2013
@@ -199,8 +199,8 @@ div.hupa-logo {
}
div.hupa-top {
- padding-left: 80px;
- padding-right: 8px;
+ padding-left: 90px;
+ margin-right: 8px;
}
* html div.hupa-top {
padding-left: 0px;
@@ -282,17 +282,22 @@ div.hupa-header {
margin-right: 15px;
}
div.hupa-header {
+<<<<<<< HEAD
color: transparent;
<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+ display: none;
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
padding-left: 10px;
height: 32px;
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-central {
clear: both;
margin: 8px 8px 8px 8px;
@@ -301,6 +306,9 @@ div.hupa-header {
=======
>>>>>>> first commit
div.hupa-main {
+=======
+.hupa-central {
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
clear: both;
margin: 8px 8px 8px 8px;
min-height: 500px;
@@ -333,8 +341,7 @@ div.hupa-main {
text-align: center;
}
-div.hupa-flash {
- border: 1px solid #FAD163;
+.hupa-flash {
background-color: #fae5b0;
text-align: center;
margin: auto auto 2px auto;
@@ -398,14 +405,14 @@ div.hupa-bottom {
>>>>>>> first commit
table.hupa-login {
text-align: right;
- margin-left: auto;
- margin-right: auto;
- padding: 40px;
+ margin-left: -220px;
+ position: relative;
+ left: 50%;
+ padding: 40px;
}
table.hupa-login td {
text-align: center;
- padding-top: 6px;
}
table.hupa-login-form {
<<<<<<< HEAD
@@ -648,6 +655,7 @@ div.hupa-msgview-content {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
.hupa-attachment-view {
margin-left: 10px;
}
@@ -656,6 +664,12 @@ div.hupa-msgview-content {
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+.hupa-attachment-view {
+ margin-left: 10px;
+}
+
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
/************[ view: MessageSendView ]*******************/
table.hupa-msgsend {
width: 100%;
@@ -887,7 +901,7 @@ body {
.hupa-rounded {
box-shadow: 0 1px 4px grey;
}
-.hupa-top-wrap, .hupa-login-form, .hupa-msg-top-bar {
+.hupa-top-wrap, .hupa-login-box, .hupa-msg-top-bar {
background: -moz-linear-gradient(#FFFFFF, #C5D9FF);
background: -webkit-linear-gradient(#FFFFFF, #C5D9FF);
background: -o-linear-gradient(#FFFFFF, #C5D9FF);
@@ -959,6 +973,15 @@ div.hupa-main {
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#FFFFFF', endColorstr='#dcdcdc',GradientType=0 );
}
+.gwt-DecoratorPanel .middleCenter {
+ height: 100%;
+ width: 100%;
+}
+.gwt-SuggestBox {
+ border-radius: 50px;
+ max-height: 8px;
+}
+
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=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 02:57:07 2013
@@ -20,6 +20,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
@@ -27,6 +28,11 @@
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+ <!--[if lt IE 9]>
+ <meta http-equiv="X-UA-Compatible" content="chrome=1">
+ <![endif]-->
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
<link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon"/>
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
Thu Sep 12 02:57:07 2013
@@ -33,11 +33,15 @@ public class EmailListValidatorTest exte
assertTrue(EmailListValidator.isValidAddressList("a...@abc.def\nMMM
<m...@aa.co>;;;"));
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail....@james.apache.org"));
=======
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail....@james.apache.org"));
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
}
}
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 02:57:07 2013
@@ -193,12 +193,21 @@
</properties>
</profile>
<profile>
- <!-- Deliver Hupa with Demo stuff -->
<id>demo</id>
<properties>
<mock.scope />
</properties>
</profile>
+ <profile>
+ <!-- Deliver Hupa with Demo stuff -->
+ <id>pretty</id>
+ <properties>
+ <gwt.moduleSuffix>Prod</gwt.moduleSuffix>
+ <gwt.style>PRETTY</gwt.style>
+ <mock.scope />
+ <gwt.logLevel>TRACE</gwt.logLevel>
+ </properties>
+ </profile>
</profiles>
=======
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
Thu Sep 12 02:57:07 2013
@@ -89,6 +89,7 @@ public class DownloadAttachmentServlet e
String folderName = request.getParameter(SConsts.PARAM_FOLDER);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
String mode = request.getParameter(SConsts.PARAM_MODE);
boolean inline = "inline".equals(mode);
if (!inline) {
@@ -103,6 +104,13 @@ public class DownloadAttachmentServlet e
response.setHeader("Content-disposition", "attachment; filename="
+ attachmentName + "");
>>>>>>> first commit
+=======
+ String mode = request.getParameter(SConsts.PARAM_MODE);
+ if (!"inline".equals(mode)) {
+ response.setHeader("Content-disposition", "attachment;
filename="
+ + attachmentName + "");
+ }
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
InputStream in = null;
OutputStream out = response.getOutputStream();
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
(original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
Thu Sep 12 02:57:07 2013
@@ -39,6 +39,7 @@ public class SConsts {
public static final String PARAM_UID = "uid";
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public static final String PARAM_MODE = "mode";
public static final String USER_SESS_ATTR = "user";
@@ -55,6 +56,9 @@ public class SConsts {
public static final String CONTACTS_SESS_ATTR = "contacts";
>>>>>>> first commit
=======
+=======
+ public static final String PARAM_MODE = "mode";
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
public static final String USER_SESS_ATTR = "user";
public static final String CONTACTS_SESS_ATTR = "contacts";
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
Thu Sep 12 02:57:07 2013
@@ -74,6 +74,15 @@ public class MessageAttachment implement
}
/**
+ * Return whether the attachment is an image
+ *
+ * @return cType
+ */
+ public boolean isImage() {
+ return cType != null && cType.toLowerCase().startsWith("image/");
+ }
+
+ /**
* Set the content size in bytes
*
* @param size
Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
--- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
(original)
+++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Thu
Sep 12 02:57:07 2013
@@ -36,6 +36,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3">
<when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/>
</replace-with>
@@ -53,6 +54,13 @@
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+ <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3">
+ <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/>
+ </replace-with>
+
+ <replace-with
class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorDecorator">
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
<when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/>
<any>
<when-property-is name="user.agent" value="ie6"/>
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
Thu Sep 12 02:57:07 2013
@@ -27,6 +27,7 @@ public class WidgetsCSS {
public static final String C_attachment = "hupa-attachment";
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public static final String C_attachment_view = "hupa-attachment-view";
=======
@@ -34,4 +35,7 @@ public class WidgetsCSS {
=======
>>>>>>> first commit
+=======
+ public static final String C_attachment_view = "hupa-attachment-view";
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
}
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java?rev=1522156&r1=1522155&r2=1522156&view=diff
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Thu Sep 12 02:57:07 2013
@@ -27,12 +27,15 @@ import com.google.gwt.user.client.ui.Wid
import org.apache.hupa.widgets.ui.impl.RndPanelGenerator;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl;
>>>>>>> first commit
=======
import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl;
>>>>>>> first commit
+=======
+>>>>>>> merged with main trunk in apache: replacing rounded borders with gwt
decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
/**
* Widget which renders a rounded panel.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
