james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1525515 [7/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ cli...
Date Mon, 23 Sep 2013 07:04:13 GMT
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml Mon Sep 23 07:04:08 2013
@@ -8,133 +8,6 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
 	OF ANY KIND, either express or implied. See the License for the specific 
 	language governing permissions and limitations under the License. -->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
-
-	<ui:style src="res/CssSplitLayoutPanel.css"
-		type="org.apache.hupa.client.ui._CenterSettingPanel.Style">
-			.scroller {
-				overflow: auto;
-			}
-			
-			.uibox {
-				border: 1px solid #a3a3a3;
-				border-radius: 4px;
-				overflow: hidden;
-				box-shadow: 0 0 2px #999;
-				-o-box-shadow: 0 0 2px #999;
-				-webkit-box-shadow: 0 0 2px #999;
-				-moz-box-shadow: 0 0 2px #999;
-				background: #fff;
-			}
-			
-			.listbox {
-				background: #d9ecf4;
-				overflow: hidden;
-			}
-			
-			.listbox .scroller {
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 100%;
-				bottom: 0;
-				overflow-x: hidden;
-				overflow-y: auto;
-			}
-			
-			.listbox .scroller.withfooter {
-				bottom: 42px;
-			}
-			
-			.listbox .boxtitle+.scroller {
-				top: 34px;
-			}
-			
-			.boxtitle,.uibox .listing thead td {
-				font-size: 12px;
-				font-weight: bold;
-				padding: 10px 8px 3px 8px;
-				height: 20px; /* doesn't affect table-cells in FF */
-				margin: 0;
-				text-shadow: 0px 1px 1px #fff;
-				border-bottom: 1px solid #bbd3da;
-				white-space: nowrap;
-			}
-			
-			.uibox .boxtitle,.uibox .listing thead td {
-				background: #b0ccd7;
-				color: #004458;
-				border-radius: 4px 4px 0 0;
-			}
-			
-			.contentbox .boxtitle {
-				color: #777;
-				background: #eee;
-				background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee),
-					color-stop(100%, #dfdfdf) );
-				background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-				background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-				background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
-				border-bottom: 1px solid #ccc;
-			}
-			
-			.contentbox .scroller {
-				position: absolute;
-				top: 34px;
-				left: 0;
-				right: 0;
-				bottom: 28px;
-				overflow: auto;
-			}
-			
-			body.iframe .boxtitle {
-				position: fixed;
-				top: 0;
-				left: 0;
-				width: 100%;
-				z-index: 100;
-			}
-			
-			.boxcontent {
-				padding: 10px;
-			}
-		</ui:style>
-
-	<g:SplitLayoutPanel ui:field="thisPanel"
-		addStyleNames="{style.splitLayoutPanel}">
-		<g:west size="220">
-			<g:DockLayoutPanel addStyleNames="{style.listbox} {style.uibox}">
-				<g:north size="0">
-					<g:HTML>
-						<h2 class="{style.boxtitle}">Settings</h2>
-					</g:HTML>
-				</g:north>
-				<g:center>
-					<g:SimpleLayoutPanel ui:field="settingNavContainer"
-						addStyleNames="{style.scroller}">
-					</g:SimpleLayoutPanel>
-				</g:center>
-			</g:DockLayoutPanel>
-		</g:west>
-		<g:center>
-			<g:LayoutPanel ui:field="settingBox">
-				<g:layer left="0%" width="100%" top="0%" height="100%">
-					<hupa:SettingLabelPanel ui:field="settingLabelPanel" />
-				</g:layer>
-				<g:layer left="0%" width="0" top="0%" height="0">
-					<hupa:SettingEcsPanel ui:field="settingEcsPanel" />
-				</g:layer>
-			</g:LayoutPanel>
-		</g:center>
-	</g:SplitLayoutPanel>
-=======
-
-=======
->>>>>>> layout the label setting view
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
 
@@ -272,10 +145,5 @@
 				</g:center>
 			</g:SplitLayoutPanel>
 		</g:center>
-<<<<<<< HEAD
-	</g:DockLayoutPanel>
->>>>>>> attempt to add label setting feature
-=======
 	</g:SplitLayoutPanel>
->>>>>>> add layout styles to three part
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java Mon Sep 23 07:04:08 2013
@@ -19,14 +19,6 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.client.activity.StatusActivity;
-
->>>>>>> split the layout panel to more small ones
-=======
->>>>>>> scrub code
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -37,19 +29,8 @@ import com.google.gwt.user.client.ui.IsW
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class __OutlinePanel extends Composite {
 
-=======
-public class __OutlinePanel extends Composite implements
-		StatusActivity.Displayable {
-	
->>>>>>> split the layout panel to more small ones
-=======
-public class __OutlinePanel extends Composite {
-
->>>>>>> scrub code
 	@UiField ScrollPanel folderListContainer;
 
 	public __OutlinePanel() {
@@ -64,14 +45,7 @@ public class __OutlinePanel extends Comp
 			}
 		};
 	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> split the layout panel to more small ones
-=======
 
->>>>>>> scrub code
 	interface __OutlinePanelUiBinder extends
 			UiBinder<DockLayoutPanel, __OutlinePanel> {
 	}

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml Mon Sep 23 07:04:08 2013
@@ -12,8 +12,6 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 	<ui:style>
-<<<<<<< HEAD
-<<<<<<< HEAD
 		.box {
 			border: 1px solid #A3A3A3;
 			border-radius: 4px;
@@ -25,8 +23,6 @@
 			background: white;
 		}
 		
-=======
->>>>>>> split the layout panel to more small ones
 		.folderList {
 			position: absolute;
 			top: 0;
@@ -38,36 +34,6 @@
 			overflow-y: auto;
 		}
 		
-<<<<<<< HEAD
-=======
-=======
->>>>>>> fine tuning on folder list footer panel's border
-		.box {
-			border: 1px solid #A3A3A3;
-			border-radius: 4px;
-			overflow: hidden;
-			box-shadow: 0 0 2px #999;
-			-o-box-shadow: 0 0 2px #999;
-			-webkit-box-shadow: 0 0 2px #999;
-			-moz-box-shadow: 0 0 2px #999;
-			background: white;
-		}
-		
-<<<<<<< HEAD
->>>>>>> split the layout panel to more small ones
-=======
-		.folderList {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			min-width: 144px;
-			bottom: 0;
-			overflow-x: hidden;
-			overflow-y: auto;
-		}
-		
->>>>>>> fine tuning on folder list footer panel's border
 		.listBox {
 			background: #D9ECF4;
 			overflow: hidden;
@@ -75,20 +41,11 @@
 		
 		.box .boxFooter {
 			border-radius: 0 0 4px 4px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fine tuning on folder list footer panel's border
 			border-top: 1px solid #ccdde4;
 			-webkit-box-shadow: inset 0 1px 0 0 #fff;
 			-moz-box-shadow: inset 0 1px 0 0 #fff;
 			box-shadow: inset 0 1px 0 0 #fff;
 			background: #d9ecf4;
-<<<<<<< HEAD
-=======
->>>>>>> split the layout panel to more small ones
-=======
->>>>>>> fine tuning on folder list footer panel's border
 		}
 	</ui:style>
 	<g:DockLayoutPanel unit="PX" ui:field="thisPanel"

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css Mon Sep 23 07:04:08 2013
@@ -15,16 +15,8 @@
  */
 .cellListWidget {
 	
-<<<<<<< HEAD
-<<<<<<< HEAD
 	cursor:default;
 	
-=======
->>>>>>> add adjusted style to labels list in setting palce
-=======
-	cursor:default;
-	
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
 }
 
 .cellListEvenItem {
@@ -60,26 +52,11 @@
 }
 
 .cellListKeyboardSelectedItem {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    background:  #c7e3ef;
-}
-
-.cellListSelectedItem {
-	background:  #c7e3ef;
-=======
-	background: #ffc;
-}
-
-.cellListSelectedItem {
->>>>>>> add adjusted style to labels list in setting palce
-=======
     background:  #c7e3ef;
 }
 
 .cellListSelectedItem {
 	background:  #c7e3ef;
->>>>>>> fixed issue#71, use an unique background
     background-color: #c7e3ef;
     color: #004458;
     height: auto;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css Mon Sep 23 07:04:08 2013
@@ -27,8 +27,6 @@
 	cursor: row-resize;
 	background-position: center 0;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 @external .gwt-SplitLayoutPanel-HDragger;
 @external .gwt-SplitLayoutPanel-VDragger;
@@ -51,33 +49,4 @@
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-}
-=======
-@external .gwt-SplitLayoutPanel-HDragger;
-@external .gwt-SplitLayoutPanel-VDragger;
->>>>>>> add splitter
-=======
-
-@external .gwt-SplitLayoutPanel-HDragger;
-@external .gwt-SplitLayoutPanel-VDragger;
-.statusbar {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	height: 27px;
-	padding-left: 8px;
-	border-top: 1px solid #ddd;
-	border-radius: 0 0 4px 4px;
-	background: #eaeaea;
-	background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eaeaea),
-		color-stop(100%, #c8c8c8) );
-	background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
-	background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
-	background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
->>>>>>> layout the label setting view
+}
\ No newline at end of file

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -33,19 +33,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*$";
->>>>>>> first commit
-=======
-    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/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java Mon Sep 23 07:04:08 2013
@@ -19,10 +19,6 @@
 
 package org.apache.hupa.client.widgets;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.widgets.event.EditEvent;
 import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -174,425 +170,4 @@ public class IMAPTreeItem extends Editab
 		}
 
 	}
-=======
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
-=======
-import org.apache.hupa.shared.data.IMAPFolder;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-import org.apache.hupa.shared.data.ImapFolderImpl;
-<<<<<<< HEAD
-import org.apache.hupa.shared.proxy.ImapFolder;
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
-=======
-=======
->>>>>>> forward and reply message to use RF
-import org.apache.hupa.shared.domain.ImapFolder;
->>>>>>> Allow client can use the domain entity interface.
-import org.apache.hupa.widgets.event.EditEvent;
-import org.apache.hupa.widgets.ui.EditableTreeItem;
-
-<<<<<<< HEAD
-public class IMAPTreeItem extends EditableTreeItem {    
-    protected String oldFullName;
-    protected String oldName;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public IMAPTreeItem(IMAPFolderProxy folder) {
-=======
-    public IMAPTreeItem(IMAPFolder folder) {
->>>>>>> first commit
-=======
-    public IMAPTreeItem(IMAPFolderProxy folder) {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        setUserObject(folder);
-        setFolderText(folder);    
-    }
-
-    @Override
-    public void setSelected(boolean selected) {
-        super.setSelected(selected);
-        if (isSelected()) {
-            getWidget().addStyleName("hupa-IMAPFolder-selected");
-        } else {
-            getWidget().removeStyleName("hupa-IMAPFolder-selected");
-        }
-    }
-    
-    /**
-     * Decrease the unseen messagecount of this folder
-     */
-    public void decreaseUnseenMessageCount() {
-        descreaseUnseenMessageCount(1);
-    }
-    
-    public void setUnseenMessageCount(int cound) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
-=======
-        IMAPFolder folder = (IMAPFolder) getUserObject();
->>>>>>> first commit
-=======
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        int count = folder.getUnseeMessageCount();
-        folder.setUnseenMessageCount(count);
-        setFolderText(folder);
-        
-    }
-    
-    
-    /**
-     * Decrease the unseen messagecount of this folder
-     */
-    public void descreaseUnseenMessageCount(int decreaseCount) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
-=======
-        IMAPFolder folder = (IMAPFolder) getUserObject();
->>>>>>> first commit
-=======
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        int count = folder.getUnseeMessageCount();
-        if (count > 0) { 
-            count = count - decreaseCount;
-            if (count < 0) {
-                count = 0;
-            }
-            folder.setUnseenMessageCount(count);
-            setFolderText(folder);
-        } 
-    }
-    /**
-     * Increase the unseen messagecount of this folder
-     */
-    public void increaseUnseenMessageCount() {
-        increaseUnseenMessageCount(1);
-    }
-    
-    /**
-     * Increase the unseen messagecount of this folder
-     */
-    public void increaseUnseenMessageCount( int increaseCount) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
-=======
-        IMAPFolder folder = (IMAPFolder) getUserObject();
->>>>>>> first commit
-=======
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        int count = folder.getUnseeMessageCount(); 
-        count = count+ increaseCount;
-        folder.setUnseenMessageCount(count);
-        setFolderText(folder);
-    }
-    
-<<<<<<< HEAD
-<<<<<<< HEAD
-    private void setFolderText(IMAPFolderProxy folder) {
-=======
-    private void setFolderText(IMAPFolder folder) {
->>>>>>> first commit
-=======
-    private void setFolderText(IMAPFolderProxy folder) {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        setText(getFolderName(folder));
-        setUnseenMessageCountStyle(folder);
-    }
-    
-<<<<<<< HEAD
-<<<<<<< HEAD
-    private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
-        boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
-        for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
-=======
-    private void setUnseenMessageCountStyle(IMAPFolder folder) {
-        boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
-        for (IMAPFolder fold : folder.getChildIMAPFolders()) {
->>>>>>> first commit
-=======
-    private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
-        boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
-        for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-            if (fold.getUnseeMessageCount() > 0) {
-                containsUnseen = true;
-                break;
-            }
-        }
-        if (containsUnseen) {
-            getWidget().addStyleName("hupa-IMAPFolder-unseen");
-        } else {
-            getWidget().removeStyleName("hupa-IMAPFolder-unseen");
-        }
-    }
-    
-    /**
-     * Return the folder name to display in the TreeItem for the given IMAPFolder
-     * 
-     * @param folder
-     * @return name
-     */
-<<<<<<< HEAD
-<<<<<<< HEAD
-    private String getFolderName(IMAPFolderProxy folder) {
-=======
-    private String getFolderName(IMAPFolder folder) {
->>>>>>> first commit
-=======
-    private String getFolderName(IMAPFolderProxy folder) {
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        if (folder.getUnseeMessageCount() > 0) {
-            return folder.getName() + " ("+folder.getUnseeMessageCount()+")";
-        }
-        return folder.getName();
-    }
-    
-    @Override
-    public void setUserObject(Object obj) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-        if ((obj instanceof IMAPFolderProxy) == false) {
-            throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
-        }        
-        setFolderText((IMAPFolderProxy)obj);
-=======
-        if ((obj instanceof IMAPFolder) == false) {
-            throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
-        }        
-        setFolderText((IMAPFolder)obj);
->>>>>>> first commit
-=======
-        if ((obj instanceof IMAPFolderProxy) == false) {
-            throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
-        }        
-        setFolderText((IMAPFolderProxy)obj);
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-
-        super.setUserObject(obj);
-    }
-
-    @Override
-    public void startEdit() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
-=======
-        IMAPFolder folder = (IMAPFolder) getUserObject();
->>>>>>> first commit
-=======
-    	IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        oldFullName = folder.getFullName();
-        oldName = folder.getName();
-        showEditBox(oldName);
-        manager.fireEvent(new EditEvent(EditEvent.EventType.Start,oldFullName,null));
-    }
-    
-    @Override
-    public void cancelEdit() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    	IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
-=======
-        IMAPFolder folder = ((IMAPFolder) getUserObject());
->>>>>>> first commit
-=======
-    	IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-        folder.setFullName(oldFullName);
-        showItem(getFolderName(folder));
-
-        manager.fireEvent(new EditEvent(EditEvent.EventType.Cancel,oldFullName,null));
-
-    }
-    
-    @Override
-    public void stopEdit() {
-        if (editBox.getText().length() < 1) {
-            // Empty folder name is not allowed!
-            cancelEdit();
-        } else {
-            String newFolderName = editBox.getText();
-            String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length())  + newFolderName; 
-<<<<<<< HEAD
-<<<<<<< HEAD
-            IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
-=======
-            IMAPFolder folder = ((IMAPFolder) getUserObject());
->>>>>>> first commit
-=======
-            IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-            folder.setFullName(newFullFolderName);
-            showItem(getFolderName(folder));
-
-            manager.fireEvent(new EditEvent(EditEvent.EventType.Stop,oldFullName,newFullFolderName));
-        }
-
-    }
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-public class IMAPTreeItem extends EditableTreeItem {
-	protected String oldFullName;
-	protected String oldName;
-
-	public IMAPTreeItem(ImapFolder folder) {
-		setUserObject(folder);
-		setFolderText(folder);
-	}
-
-	@Override
-	public void setSelected(boolean selected) {
-		super.setSelected(selected);
-		if (isSelected()) {
-			getWidget().addStyleName("hupa-IMAPFolder-selected");
-		} else {
-			getWidget().removeStyleName("hupa-IMAPFolder-selected");
-		}
-	}
-
-	/**
-	 * Decrease the unseen messagecount of this folder
-	 */
-	public void decreaseUnseenMessageCount() {
-		descreaseUnseenMessageCount(1);
-	}
-
-	public void setUnseenMessageCount(int cound) {
-		ImapFolder folder = (ImapFolder) getUserObject();
-		int count = folder.getUnseenMessageCount();
-		folder.setUnseenMessageCount(count);
-		setFolderText(folder);
-
-	}
-
-	/**
-	 * Decrease the unseen messagecount of this folder
-	 */
-	public void descreaseUnseenMessageCount(int decreaseCount) {
-		ImapFolder folder = (ImapFolder) getUserObject();
-		int count = folder.getUnseenMessageCount();
-		if (count > 0) {
-			count = count - decreaseCount;
-			if (count < 0) {
-				count = 0;
-			}
-			folder.setUnseenMessageCount(count);
-			setFolderText(folder);
-		}
-	}
-	/**
-	 * Increase the unseen messagecount of this folder
-	 */
-	public void increaseUnseenMessageCount() {
-		increaseUnseenMessageCount(1);
-	}
-
-	/**
-	 * Increase the unseen messagecount of this folder
-	 */
-	public void increaseUnseenMessageCount(int increaseCount) {
-		ImapFolder folder = (ImapFolder) getUserObject();
-		int count = folder.getUnseenMessageCount();
-		count = count + increaseCount;
-		folder.setUnseenMessageCount(count);
-		setFolderText(folder);
-	}
-
-	private void setFolderText(ImapFolder folder) {
-		setText(getFolderName(folder));
-		setUnseenMessageCountStyle(folder);
-	}
-
-	private void setUnseenMessageCountStyle(ImapFolder folder) {
-		boolean containsUnseen = (folder.getUnseenMessageCount() > 0);
-		for (ImapFolder fold : folder.getChildren()) {
-			if (fold.getUnseenMessageCount() > 0) {
-				containsUnseen = true;
-				break;
-			}
-		}
-		if (containsUnseen) {
-			getWidget().addStyleName("hupa-IMAPFolder-unseen");
-		} else {
-			getWidget().removeStyleName("hupa-IMAPFolder-unseen");
-		}
-	}
-
-	/**
-	 * Return the folder name to display in the TreeItem for the given
-	 * IMAPFolder
-	 * 
-	 * @param folder
-	 * @return name
-	 */
-	private String getFolderName(ImapFolder folder) {
-		if (folder.getUnseenMessageCount() > 0) {
-			return folder.getName() + " (" + folder.getUnseenMessageCount() + ")";
-		}
-		return folder.getName();
-	}
-
-	@Override
-	public void setUserObject(Object obj) {
-		if ((obj instanceof ImapFolder) == false) {
-			throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
-		}
-		setFolderText((ImapFolder) obj);
-
-		super.setUserObject(obj);
-	}
-
-	@Override
-	public void startEdit() {
-		ImapFolder folder = (ImapFolder) getUserObject();
-		oldFullName = folder.getFullName();
-		oldName = folder.getName();
-		showEditBox(oldName);
-		manager.fireEvent(new EditEvent(EditEvent.EventType.Start, oldFullName, null));
-	}
-
-	@Override
-	public void cancelEdit() {
-		ImapFolder folder = ((ImapFolder) getUserObject());
-		folder.setFullName(oldFullName);
-		showItem(getFolderName(folder));
-
-		manager.fireEvent(new EditEvent(EditEvent.EventType.Cancel, oldFullName, null));
-
-	}
-
-	@Override
-	public void stopEdit() {
-		if (editBox.getText().length() < 1) {
-			// Empty folder name is not allowed!
-			cancelEdit();
-		} else {
-			String newFolderName = editBox.getText();
-			String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length())
-					+ newFolderName;
-			ImapFolder folder = ((ImapFolder) getUserObject());
-			folder.setFullName(newFullFolderName);
-			showItem(getFolderName(folder));
-
-			manager.fireEvent(new EditEvent(EditEvent.EventType.Stop, oldFullName, newFullFolderName));
-		}
-
-	}
->>>>>>> 
 }

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=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Mon Sep 23 07:04:08 2013
@@ -16,9 +16,6 @@
   specific language governing permissions and limitations
   under the License.
 */
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 /************[ Fonts ]***************************/
 body,table td,select,* {
 	font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana;
@@ -42,90 +39,20 @@ body.noscroll { /* also avoids bounce ef
 	background: #fae5b0;
 }
 
-=======
-=======
->>>>>>> first commit
-
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
-/************[ Fonts ]***************************/
-body,table td,select,* {
-	font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana;
-	font-size: 12px;
-}
-
-body {
-	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #333;
-	background: url(images/linen.jpg) repeat #d1d5d8;
-	margin: 0;
-}
-
-body.noscroll { /* also avoids bounce effect in Chrome and Safari */
-	overflow: hidden;
-}
-
-/************[ widget: MyDialogBox ]****************/
-.hupa-dialog-box td.dialogMiddleCenter {
-	background: #fae5b0;
-}
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-dialog-box .dialogContent .gwt-Label {
 	font-weight: bold;
 	margin: 15px;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-.hupa-dialog-box .Caption {
-	font-size: 14px;
-=======
-.hupa-dialog-box .Caption {
-    font-size: 14px;
->>>>>>> first commit
-=======
-.hupa-dialog-box .Caption {
-    font-size: 14px;
->>>>>>> first commit
-=======
 
 .hupa-dialog-box .Caption {
 	font-size: 14px;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 /************[ widget: RndPanel ]****************/
 .hupa-rounded {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	border: 1px solid #7FAAFF;
-	border-radius: 5px;
-	overflow: hidden;
-=======
-   border: 1px solid #7FAAFF; 
-   border-radius: 5px;
-   overflow: hidden;
->>>>>>> first commit
-=======
-   border: 1px solid #7FAAFF; 
-   border-radius: 5px;
-   overflow: hidden;
->>>>>>> first commit
-=======
 	border: 1px solid #7FAAFF;
 	border-radius: 5px;
 	overflow: hidden;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 /************[ widget: Loading ]*************************************/
@@ -134,33 +61,12 @@ div.hupa-loading {
 	padding-left: 25px;
 	width: 100px;
 	height: 14px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 	white-space: nowrap;
 	margin-top: 5px;
 	margin-left: auto;
 	margin-right: auto;
 	text-align: left;
 	vertical-align: top;
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-    white-space: nowrap;
-    margin-top: 5px;
-    margin-left: auto;
-    margin-right: auto;
-    text-align: left;
-    vertical-align: top;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 /************[ widget: EnableHyperLink ]*********/
@@ -169,34 +75,12 @@ div.hupa-loading {
 	text-decoration: underline;
 	cursor: pointer;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-.hupa-hyperlink .gwt-Hyperlink-disabled {
-	color: #8d8d8d;
-}
-
-div.gwt-Hyperlink,div.gwt-Anchor {
-=======
-=======
->>>>>>> first commit
-.hupa-hyperlink .gwt-Hyperlink-disabled {
-	color: #8d8d8d;
-}
-div.gwt-Hyperlink, div.gwt-Anchor {
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
 .hupa-hyperlink .gwt-Hyperlink-disabled {
 	color: #8d8d8d;
 }
 
 div.gwt-Hyperlink,div.gwt-Anchor {
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 	padding-left: 4px;
 }
 
@@ -206,45 +90,9 @@ div.Hupa {
 	margin-top: 0px;
 	padding: 0px;
 	width: 100%;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	min-width: 400px;
 }
 
-<<<<<<< HEAD
-* html div.Hupa {
-	margin-top: 0px;
-}
-
-div.hupa-logo {
-	height: 64px;
-	background: url(images/hupa-logo-64-transparent.png) no-repeat;
-}
-
-div.hupa-top {
-	padding-left: 90px;
-	margin-right: 8px;
-}
-
-* html div.hupa-top {
-	padding-left: 0px;
-}
-
-=======
-=======
->>>>>>> first commit
-	min-width: 920px;
-=======
-	min-width: 800px;
->>>>>>> make it look more beautiful
-=======
-	min-width: 400px;
->>>>>>> decorate columns of messages list and related panels above and below.
-}
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 * html div.Hupa {
 	margin-top: 0px;
 }
@@ -258,188 +106,58 @@ div.hupa-top {
 	padding-left: 90px;
 	margin-right: 8px;
 }
-<<<<<<< HEAD
-* html div.hupa-top { 
-    padding-left: 0px;
-} 
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
 * html div.hupa-top {
 	padding-left: 0px;
 }
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 div.hupa-top-wrap {
 	height: 64px;
 	background-color: #C5D9FF;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 div.cgb-RPC-hupa-top-wrap {
 	height: 59px;
 }
 
 table.hupa-top {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	width: 100%;
-	margin-bottom: 0px;
-}
-
-=======
-    width: 100%;    
-    margin-bottom: 0px;
-}
->>>>>>> first commit
-=======
-    width: 100%;    
-    margin-bottom: 0px;
-}
->>>>>>> first commit
-=======
 	width: 100%;
 	margin-bottom: 0px;
 }
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 table.hupa-button-bar td div {
 	padding-top: 12px;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-div.hupa-loginfo-label,div.hupa-loginfo-user {
-	margin-left: 10px;
-	margin-right: 10px;
-}
-
-=======
-div.hupa-loginfo-label, div.hupa-loginfo-user {
-	margin-left: 10px;
-	margin-right: 10px;
-}
->>>>>>> first commit
-=======
-div.hupa-loginfo-label, div.hupa-loginfo-user {
-	margin-left: 10px;
-}
->>>>>>> first commit
-=======
 div.hupa-loginfo-label,div.hupa-loginfo-user {
 	margin-left: 10px;
 	margin-right: 10px;
 }
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-loginfo-user {
 	font-style: italic;
 	font-weight: bold;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-.hupa-menu-button {
-	margin-right: 15px;
-}
 
-div.hupa-header {
-	display: none;
-=======
-=======
->>>>>>> first commit
-=======
-
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-menu-button {
 	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;
-<<<<<<< HEAD
-<<<<<<< HEAD
-	min-height: 200px;
-=======
-=======
->>>>>>> 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;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-	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 {
 	height: 500px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	text-align: center;
-}
-
-.hupa-flash {
-	background-color: #fae5b0;
-	text-align: center;
-	margin: auto auto 2px auto;
-	width: 50%;
-	position: absolute;
-	top: 45px;
-	left: 25%;
-}
-
-=======
-=======
->>>>>>> first commit
-    text-align: center;
-=======
 	text-align: center;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .hupa-flash {
@@ -451,37 +169,14 @@ div.hupa-main {
 	top: 45px;
 	left: 25%;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 * html div.hupa-flash {
 	border: none;
 	background: none;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-* html .hupa-flash div {
-	background-color: #fae5b0;
-=======
-* html .hupa-flash div {
-    background-color: #fae5b0;
->>>>>>> first commit
-=======
-* html .hupa-flash div {
-    background-color: #fae5b0;
->>>>>>> first commit
-=======
 
 * html .hupa-flash div {
 	background-color: #fae5b0;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .hupa-flash div.gwt-Label {
@@ -492,9 +187,6 @@ div.hupa-bottom {
 	text-align: center;
 }
 /************[ view: LoginView ]*******************/
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 .hupa-login {
 	margin: 10pt auto;
 	width: 20%;
@@ -502,38 +194,6 @@ div.hupa-bottom {
 	position: relative;
 	left: 50%;
 	padding: 20px;
-<<<<<<< HEAD
-	border: 1px solid #7FAAFF;
-	box-shadow: 0 1px 4px grey;
-	border-radius: 5px;
-}
-
-.hupa-login td {
-	text-align: center;
-}
-
-.hupa-login-form {
-=======
-=======
->>>>>>> first commit
-table.hupa-login {
-=======
-.hupa-login {
-<<<<<<< HEAD
-	margin-top:10px;
-	margin-left:auto;
-	margin-right:auto;
->>>>>>> make it look more beautiful
-=======
-	margin: 10pt auto;
-	width: 20%;
->>>>>>> fix issue 5,6,8:
-    text-align: right;
-    position: relative;
-    left: 50%;
-    padding: 20px;
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 	border: 1px solid #7FAAFF;
 	box-shadow: 0 1px 4px grey;
 	border-radius: 5px;
@@ -542,37 +202,14 @@ table.hupa-login {
 .hupa-login td {
 	text-align: center;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-table.hupa-login-form {
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-login-form {
->>>>>>> make it look more beautiful
 	padding: 10px;
 }
 
 .hupa-login-textbox {
 	width: 230px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	background-color: #d8ecfd;
-=======
-	background-color:  #d8ecfd;
->>>>>>> first commit
-=======
-	background-color:  #d8ecfd;
->>>>>>> first commit
-=======
 	background-color: #d8ecfd;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 	border: 1px solid #7FAAFF;
 	margin-left: 5px;
 }
@@ -586,10 +223,6 @@ table.hupa-login-form {
 /************[ widget: CommandsBar ]*********/
 .hupa-commands-bar {
 	width: 100%;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	background-color: #deeeff;
 }
 
@@ -605,62 +238,11 @@ table.hupa-login-form {
 
 .hupa-msgtable-row {
 	text-align: left;
-=======
-=======
->>>>>>> first commit
-    padding: 5px 4px 5px 4px;
-=======
->>>>>>> decorate columns of messages list and related panels above and below.
-    background-color: #deeeff;  
-=======
-	background-color: #deeeff;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
-}
-
-/************[ view: IMAPMessageListView ]*******************/
-.hupa-msglist,.hupa-msg-top-bar,.hupa-msgtable {
-	width: 100%;
-}
-
-.hupa-msg-top-bar {
-	padding: 10px 4px 10px 4px;
-	background-color: #C3D9FF;
-}
-
-.hupa-msgtable-row {
-<<<<<<< HEAD
-    text-align: left;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-	text-align: left;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 	vertical-align: top;
 	padding: 0px 10px 0px 10px;
 	cursor: pointer;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-.hupa-msgtable-unseen {
-	font-weight: bold;
-}
-
-.hupa-msgtable-empty {
-	font-weight: bold;
-	text-align: center;
-	padding: 20px;
-}
 
-=======
-=======
->>>>>>> first commit
-=======
-
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-msgtable-unseen {
 	font-weight: bold;
 }
@@ -670,43 +252,14 @@ table.hupa-login-form {
 	text-align: center;
 	padding: 20px;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-search-box {
 	width: 150px;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-input[type=text],input[type=file],textarea {
-	background-color: #d8ecfd;
-	border: 1px solid #7FAAFF;
-}
-
-.dragdrop-dragable {
-	background: red;
-}
-
-.gwt-SuggestBoxPopup {
-	font-size: 10px;
-=======
-=======
->>>>>>> first commit
-input[type=text], input[type=file], textarea {
-    background-color:  #d8ecfd;
-    border: 1px solid #7FAAFF;
-=======
 input[type=text],input[type=file],textarea {
 	background-color: #d8ecfd;
 	border: 1px solid #7FAAFF;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .dragdrop-dragable {
@@ -714,112 +267,37 @@ input[type=text],input[type=file],textar
 }
 
 .gwt-SuggestBoxPopup {
-<<<<<<< HEAD
-    font-size: 10px;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 	font-size: 10px;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .hupa-buttons .gwt-ListBox {
 	margin-left: 5px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	padding-left: 3px;
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-  padding-left: 3px;
->>>>>>> decorate columns of messages list and related panels above and below.
-=======
 	padding-left: 3px;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 /*************[ buttonbars ]*********************/
 .hupa-buttons {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	white-space: nowrap;
-}
-
-.hupa-buttons td {
-	padding-left: 3px;
-=======
-=======
->>>>>>> first commit
-    white-space: nowrap;
-}
-
-.hupa-buttons td {
-  padding-left: 3px;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 	white-space: nowrap;
 }
 
 .hupa-buttons td {
 	padding-left: 3px;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .hupa-buttons div {
 	white-space: nowrap;
 	vertical-align: middle;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-buttons .gwt-Hyperlink {
 	padding-left: 6px;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-/************[ widget: MessageHeaders ]*******************/
-table.hupa-msg-headers {
-	background-color: #C3D9FF;
-}
-
-=======
-=======
->>>>>>> first commit
-
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 /************[ widget: MessageHeaders ]*******************/
 table.hupa-msg-headers {
 	background-color: #C3D9FF;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-msg-headers td.label {
 	width: 175px;
 	text-align: right;
@@ -831,17 +309,7 @@ table.hupa-msg-headers {
 table.hupa-msgview {
 	width: 100%;
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
 
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 div.hupa-msgview-content {
 	padding: 20px;
 }
@@ -854,46 +322,18 @@ div.hupa-msgview-content {
 	cursor: pointer;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-.hupa-attachment-view {
-	margin-left: 10px;
-}
-
-=======
->>>>>>> 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%;
 }
 
 .hupa-validate-error {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	border: 1pt solid red;
-	background-color: #fae5b0;
-=======
-	border:	1pt solid red;
-    background-color: #fae5b0;
->>>>>>> first commit
-=======
-	border:	1pt solid red;
-    background-color: #fae5b0;
->>>>>>> first commit
-=======
 	border: 1pt solid red;
 	background-color: #fae5b0;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 /************[ view: ContactsView ]*******************/
@@ -902,168 +342,14 @@ table.hupa-contacts {
 	margin-right: auto;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> first commit
-=======
-
->>>>>>> first commit
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 /************************************************************************/
 /*** Non re-factored stuff ***/
 .cbg-ButtonContent {
 	font-size: 80%;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-.hupa-ErrorLabel,.gwt-PagingOptions .errorMessage {
-	color: #FF0000;
-}
-
-.gwt-ScrollTable .dataTable td {
-	border-top: 1pt solid #EEEEEE;
-	white-space: nowrap;
-	padding: 0px 10px 0px 10px;
-	overflow: hidden;
-	font-size: 12px;
-	cursor: pointer;
-}
-
-.gwt-ScrollTable .dataTable tr.highlighted {
-	background: #FAD163;
-}
-
-.gwt-ScrollTable .dataTable tr.selected td {
-	background: #FFF7D7;
-}
-
-.hupa-IMAPFolder-unseen {
-	font-weight: bold;
-}
-
-.hupa-IMAPFolder-selected {
-	background: #f1e77b;
-	width: 100%;
-}
-
-.hupa-droptarget-invalid {
-	color: red;
-}
-
-.hupa-editor {
-	border-left: 1px solid #CCC;
-	border-right: 1px solid #CCC;
-}
-
-/**** HTML5 shadows and gradients ****/
-.hupa-rounded {
-	box-shadow: 0 1px 4px grey;
-}
-
-.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);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#FFFFFF',
-		endColorstr='#C5D9FF', GradientType=0 );
-}
-
-.hupa-commands-bar {
-	background: -moz-linear-gradient(#C5D9FF, #eaeaea);
-	background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
-	background: -o-linear-gradient(#C5D9FF, #eaeaea);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#C5D9FF',
-		endColorstr='#eaeaea', GradientType=0 );
-}
-
-.hupa-tree {
-	background: -moz-linear-gradient(#C5D9FF, #eaeaea);
-	background: -webkit-linear-gradient(#C5D9FF, #eaeaea);
-	background: -o-linear-gradient(#C5D9FF, #eaeaea);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#C5D9FF',
-		endColorstr='#eaeaea', GradientType=0 );
-}
-
-div.hupa-main {
-	background: -moz-linear-gradient(#eaeaea, #fafafa);
-	background: -webkit-linear-gradient(#eaeaea, #fafafa);
-	background: -o-linear-gradient(#eaeaea, #fafafa);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#eaeaea',
-		endColorstr='#fafafa', GradientType=0 );
-}
-
-.hupa-flash,.hupa-dialog-box td.dialogMiddleCenter {
-	background: -moz-linear-gradient(#fae5b0, #eaeaea);
-	background: -webkit-linear-gradient(#fae5b0, #eaeaea);
-	background: -o-linear-gradient(#fae5b0, #eaeaea);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#fae5b0',
-		endColorstr='#eaeaea', GradientType=0 );
-}
-
-.hupa-login-form,.hupa-bottom {
-	text-shadow: 1px 1px 3px #666666;
-}
-
-* html  .hupa-bottom {
-	filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666',
-		Direction=135, Strength=1 );
-}
-
-.hupa-button {
-	background: #FFFFFF;
-	background: -moz-linear-gradient(#FFFFFF, #EDEDED);
-	background: -webkit-linear-gradient(#FFFFFF, #EDEDED);
-	background: -o-linear-gradient(#FFFFFF, #EDEDED);
-	filter: progid:DXImageTransform.Microsoft.gradient(  startColorstr='#FFFFFF',
-		endColorstr='#EDEDED', GradientType=0 );
-	border: 1px solid #B7B7B7;
-	color: #606060;
-	border-radius: 2em 2em 2em 2em;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-	cursor: pointer;
-	display: inline-block;
-	font: 10px;
-	margin: 0 2px;
-	outline: medium none;
-	padding: 2px 10px;
-	text-align: center;
-	text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
-	vertical-align: baseline;
-}
-
-.hupa-button:hover {
-	background: #ededed;
-	background: -moz-linear-gradient(#FFFFFF, #dcdcdc);
-	background: -webkit-linear-gradient(#FFFFFF, #dcdcdc);
-	background: -o-linear-gradient(#FFFFFF, #dcdcdc);
-	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;
-}
-=======
-=======
->>>>>>> first commit
-.hupa-ErrorLabel, .gwt-PagingOptions .errorMessage {
-    color:           			   #FF0000;
-=======
 .hupa-ErrorLabel,.gwt-PagingOptions .errorMessage {
 	color: #FF0000;
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 }
 
 .gwt-ScrollTable .dataTable td {
@@ -1102,23 +388,6 @@ div.hupa-main {
 }
 
 /**** HTML5 shadows and gradients ****/
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-body {
-    background: #eaeaea;
-}
-=======
-
->>>>>>> refactoring theme 1 - login page
-=======
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
 .hupa-rounded {
 	box-shadow: 0 1px 4px grey;
 }
@@ -1171,13 +440,6 @@ div.hupa-main {
 	filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666',
 		Direction=135, Strength=1 );
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-=======
->>>>>>> constantly changed by manolo
 
 .hupa-button {
 	background: #FFFFFF;
@@ -1215,21 +477,7 @@ div.hupa-main {
 	width: 100%;
 }
 
-<<<<<<< HEAD
-
-
-
-
-
-<<<<<<< HEAD
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
 .gwt-SuggestBox {
 	border-radius: 50px;
 	max-height: 8px;
-}
->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
+}
\ 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=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Mon Sep 23 07:04:08 2013
@@ -18,36 +18,13 @@
 <html>
   <head>
     <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]-->    
-=======
->>>>>>> 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"/>
     
     <title>Hupa webmail</title>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    
->>>>>>> first commit
-=======
-    
->>>>>>> first commit
-=======
->>>>>>> refactoring theme 1 - login page
     <!-- define loading style early -->
     <style type="text/css">
 		div.loading {
@@ -57,92 +34,23 @@
 		}
 		.loading img {
 		    position: absolute;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 		    top: 37%;
 		    left: 50%;
 		}
 		#login {
 		    display: none;
 		}
-=======
-		    top: 50%;
-=======
-		    top: 37%;
->>>>>>> decorate the theme
-=======
-		    top: 37%;
->>>>>>> decorate the theme
-		    left: 50%;
-		}
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-		#login {
-		    display: none;
-		}
->>>>>>> constantly changed by manolo
-=======
-		    top: 50%;
-		    left: 50%;
-		}
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-		#login {
-		    display: none;
-		}
->>>>>>> constantly changed by manolo
     </style>
   </head>
 
   <!-- Add this to disable right menu in some browsers: -->
   <!--    oncontextmenu="return false;"                 -->
   <body>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  
->>>>>>> first commit
-=======
-  
->>>>>>> first commit
-=======
->>>>>>> refactoring theme 1 - login page
     <!-- An image is shown while the application is loaded -->
     <!-- It will be removed as soon as the app is ready    -->
     <div id="loading" class="loading">
      <img src="images/hupa-spinning.gif">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    </div>  
-    
-    <!-- We need this because passwords in forms rendered by js are not saved in browsers -->
-    <div id="login">
-	  <form id="loginForm" action="hupa/clear.cache.gif" method="post">
-	    <input autocomplete="on" autocapitalize="off" id="email" name="email" type="text">
-	    <input autocomplete="on" autocapitalize="off" id="password" name="password" type="password">
-	  </form>
-=======
->>>>>>> first commit
-    </div>
-    
-    <!-- We need this because passwords in forms rendered by js are not saved in browsers -->
-    <div id="login">
-	  <form id="loginForm" action="hupa/clear.cache.gif" method="post">
-	    <input id="email" name="email" type="text">
-	    <input id="password" name="password" type="password">
-	  </form>
-=======
->>>>>>> first commit
-    </div>
-=======
     </div>  
->>>>>>> refactoring theme 1 - login page
     
     <!-- We need this because passwords in forms rendered by js are not saved in browsers -->
     <div id="login">
@@ -157,23 +65,8 @@
     
     <!-- Download attachments needs this -->
     <iframe src="" id="__download" style="width:0;height:0;border:0"></iframe> 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-    
-=======
-  </body>
-
->>>>>>> first commit
-=======
-  </body>
-
->>>>>>> first commit
-=======
     
     
->>>>>>> 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>
     

Modified: james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Mon Sep 23 07:04:08 2013
@@ -14,31 +14,11 @@
     the specific language governing permissions and limitations under the
     License.
 -->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> integrate them as a whole one - first: make the default place work
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
               http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          version="2.5"
          xmlns="http://java.sun.com/xml/ns/javaee">
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> integrate them as a whole one - first: make the default place work
 
 	<!-- Max size of the upload request (10MB) -->
 	<context-param>
@@ -64,19 +44,7 @@
     </filter-mapping>
 
     <listener>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
-=======
-        <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
->>>>>>> first commit
-=======
-        <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
->>>>>>> first commit
-=======
         <listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
->>>>>>> config guice server module's listener
     </listener>
 
     <!-- Gwt remote logging -->
@@ -91,17 +59,7 @@
     
     <!-- Default page to serve -->
     <welcome-file-list>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <welcome-file>index.jsp</welcome-file>
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
         <welcome-file>index.jsp</welcome-file>
->>>>>>> integrate them as a whole one - first: make the default place work
         <welcome-file>Hupa.html</welcome-file>
     </welcome-file-list>
     



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


Mime
View raw message