Author: dongxu
Date: Thu Sep 12 05:02:39 2013
New Revision: 1522434
URL: http://svn.apache.org/r1522434
Log:
make a skeleton in the setting place, for more setting items
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
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/HupaLayoutable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/webapp/styles.css
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
Thu Sep 12 05:02:39 2013
@@ -45,6 +45,7 @@ public class SettingNavActivity extends
pc.goTo(new SettingPlace("labels"));
}
}));
+<<<<<<< HEAD
registerHandler(display.getEcsAchor().addClickHandler(new
ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -53,13 +54,18 @@ public class SettingNavActivity extends
}
}));
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
}
@Inject private Displayable display;
public interface Displayable extends IsWidget {
+<<<<<<< HEAD
HasClickHandlers getEcsAchor();
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
HasClickHandlers getLabelsAchor();
void singleSelect(int i);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 05:02:39 2013
@@ -765,7 +765,14 @@ public class AppGinModule extends Abstra
public ActivityManager
getLabelPropertiesActivityMapper(LabelPropertiesActivityMapper activityMapper,
EventBus eventBus) {
return new ActivityManager(activityMapper, eventBus);
}
+
+ @Provides
+ @Singleton
+ @Named("SettingNavRegion")
+ public ActivityManager
getSettingNavActivityMapper(SettingNavActivityMapper activityMapper, EventBus
eventBus) {
+ return new ActivityManager(activityMapper, eventBus);
+ }
@Provides
@Singleton
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
Thu Sep 12 05:02:39 2013
@@ -38,6 +38,7 @@ public class ActivityManagerInitializer
@Named("ContactsListRegion") ActivityManager
contactsListActivityManager,
@Named("ContactPropertiesRegion") ActivityManager
contactPropertiesActivityManager,
@Named("LabelListRegion") ActivityManager
labelListActivityManager,
+ @Named("SettingNavRegion") ActivityManager
settingNavActivityManager,
@Named("LabelPropertiesRegion") ActivityManager
labelPropertiesActivityManager,
@Named("LoginPage") ActivityManager
loginActivityManager,
@Named("TopBarRegion") ActivityManager
topBarActivityManager,
@@ -57,6 +58,7 @@ public class ActivityManagerInitializer
contactPropertiesActivityManager.setDisplay(hupaLayout.getContactPropertiesView());
labelPropertiesActivityManager.setDisplay(hupaLayout.getLabelPropertiesView());
labelListActivityManager.setDisplay(hupaLayout.getLabelListView());
+
settingNavActivityManager.setDisplay(hupaLayout.getSettingNavView());
loginActivityManager.setDisplay(loginLayout.getLoginView());
topBarActivityManager.setDisplay(hupaLayout.getTopBarView());
logoActivityManager.setDisplay(hupaLayout.getLogoView());
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=1522434&r1=1522433&r2=1522434&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 05:02:39 2013
@@ -135,7 +135,7 @@ public class HupaLayout implements HupaL
public AcceptsOneWidget getComposeToolBarView() {
return toolPanel.getComposeToolBarView();
}
-
+
@Override
public AcceptsOneWidget getSearchBoxView() {
return toolPanel.getSearchBoxView();
@@ -386,6 +386,11 @@ public class HupaLayout implements HupaL
}
@Override
+ public AcceptsOneWidget getSettingNavView() {
+ return settingPanel.getSettingNavView();
+ }
+
+ @Override
public AcceptsOneWidget getLabelPropertiesView() {
return settingPanel.getLabelPropertiesView();
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
Thu Sep 12 05:02:39 2013
@@ -65,6 +65,7 @@ public interface HupaLayoutable extends
AcceptsOneWidget getSearchBoxView();
AcceptsOneWidget getSettingNavView();
+<<<<<<< HEAD
void arrangeSettingLayout(SettingPlace sp);
=======
@@ -176,4 +177,6 @@ public interface HupaLayoutable extends
AcceptsOneWidget getSearchBoxView();
>>>>>>> prepare to add search feature
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
Thu Sep 12 05:02:39 2013
@@ -207,7 +207,7 @@ public class NavigationView extends Comp
settingOuter.addStyleName(style.selected());
setting.addStyleName(style.settingsInnerSelected());
- placeController.goTo(new SettingPlace("folders"));
+ placeController.goTo(new SettingPlace("labels"));
}
<<<<<<< HEAD
>>>>>>> try to make switch to setting work
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java
Thu Sep 12 05:02:39 2013
@@ -33,10 +33,14 @@ import com.google.gwt.user.client.ui.HTM
public class SettingNavView extends Composite implements
SettingNavActivity.Displayable {
@UiField Element navLabelsItem;
+<<<<<<< HEAD
@UiField Element navEcsItem;
@UiField Anchor labelsAnchor;
@UiField Anchor ecsAnchor;
+=======
+ @UiField Anchor labelsAnchor;
+>>>>>>> make a skeleton in the setting place, for more setting items
public SettingNavView() {
initWidget(binder.createAndBindUi(this));
@@ -53,6 +57,7 @@ public class SettingNavView extends Comp
}
@Override
+<<<<<<< HEAD
public HasClickHandlers getEcsAchor() {
return ecsAnchor;
}
@@ -62,10 +67,15 @@ public class SettingNavView extends Comp
public void singleSelect(int i) {
switch(i){
case 2:selectEcsItem();break;
+=======
+ public void singleSelect(int i) {
+ switch(i){
+>>>>>>> make a skeleton in the setting place, for more setting items
default:selectNavLabelItem();
}
}
+<<<<<<< HEAD
private void selectEcsItem() {
String labelClass = navLabelsItem.getAttribute("class");
navLabelsItem.setAttribute("class",
labelClass.replace("selected", ""));
@@ -80,4 +90,11 @@ public class SettingNavView extends Comp
String labelClass = navLabelsItem.getAttribute("class");
navLabelsItem.setAttribute("class", labelClass + " selected");
}
+=======
+ private void selectNavLabelItem() {
+ String clazz = navLabelsItem.getAttribute("class");
+ navLabelsItem.setAttribute("class", clazz + " selected");
+ }
+
+>>>>>>> make a skeleton in the setting place, for more setting items
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml
Thu Sep 12 05:02:39 2013
@@ -11,11 +11,20 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
+=======
+ <ui:style>
+ .selected {
+ font-weight: bold;
+ }
+ </ui:style>
+>>>>>>> make a skeleton in the setting place, for more setting items
<g:HTMLPanel ui:field="thisPanel">
<div id="settings-sections" class="uibox listbox">
<h2 class="boxtitle">Settings</h2>
<div id="settings-tabs" class="scroller">
<span class="listitem folders selected"
ui:field="navLabelsItem">
+<<<<<<< HEAD
<g:Anchor
ui:field="labelsAnchor">Labels</g:Anchor>
</span>
<span class="listitem preferences"
ui:field="navEcsItem">
@@ -26,5 +35,19 @@
</span> -->
</div>
</div>
+=======
+ <g:Anchor ui:field="labelsAnchor">Labels
+ </g:Anchor>
+ </span>
+ <!-- <span id="settingstabfolders"
class="listitem preferences selected">
+ <a title="Manage folders"
id="rcmbtn106" >Folders</a> </span> -->
+ <!-- <span id="settingstabidentities"
class="listitem identities"> <a
+ title="Manage identities for this
account" id="rcmbtn107" >Identities</a>
+ </span> -->
+
+ </div>
+ </div>
+
+>>>>>>> make a skeleton in the setting place, for more setting items
</g:HTMLPanel>
</ui:UiBinder>
\ No newline at end of file
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
Thu Sep 12 05:02:39 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.core.client.GWT;
@@ -104,13 +105,13 @@ import org.apache.hupa.client.ui.FolderL
>>>>>>> fixed issue#66 and remove one useless class, make
>>>>>>> MessageListFooterActivityMapper do not map anything when it comes to
>>>>>>> setting place
import com.google.gwt.cell.client.AbstractCell;
>>>>>>> try to rearrange the places and history managment.
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle.Source;
-import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.cellview.client.CellList;
-import
com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.IsWidget;
@@ -118,26 +119,28 @@ import com.google.gwt.user.client.ui.Sim
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.SplitLayoutPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.view.client.SelectionChangeEvent;
-import com.google.gwt.view.client.SingleSelectionModel;
public class _CenterSettingPanel extends Composite {
+
@UiField SplitLayoutPanel thisPanel;
- @UiField SimpleLayoutPanel settingsTab;
+ @UiField SimpleLayoutPanel settingNavContainer;
@UiField SimpleLayoutPanel labelListContainer;
@UiField SimplePanel labelPropertiesContainer;
+
+ @UiField protected Style style;
+ interface Style extends CssResource {
+
+ }
+
public _CenterSettingPanel() {
initWidget(binder.createAndBindUi(this));
- settingsTab.setWidget(createTabList());
}
- private static final List<String> TABS = Arrays.asList("Folders");
-
public interface Resources extends CellList.Resources {
Resources INSTANCE = GWT.create(Resources.class);
@@ -145,6 +148,7 @@ public class _CenterSettingPanel extends
@Source("res/CssLabelListView.css")
public CellList.Style cellListStyle();
}
+<<<<<<< HEAD
private CellList<String> createTabList() {
CellList<String> cellList = new CellList<String>(new
SpanCell(), Resources.INSTANCE);
cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED);
@@ -186,6 +190,8 @@ public class _CenterSettingPanel extends
sb.appendHtmlConstant("</span>");
}
}
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
>>>>>>> try to rearrange the places and history managment.
interface _CeterSettingPanelUiBinder extends UiBinder<SplitLayoutPanel,
_CenterSettingPanel> {
@@ -246,5 +252,17 @@ public class _CenterSettingPanel extends
}
};
}
+<<<<<<< HEAD
>>>>>>> add rename RF to label setting feature
+=======
+
+ public AcceptsOneWidget getSettingNavView() {
+ return new AcceptsOneWidget() {
+ @Override
+ public void setWidget(IsWidget w) {
+
settingNavContainer.setWidget(Widget.asWidgetOrNull(w));
+ }
+ };
+ }
+>>>>>>> make a skeleton in the setting place, for more setting items
}
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=1522434&r1=1522433&r2=1522434&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
Thu Sep 12 05:02:39 2013
@@ -138,108 +138,110 @@
<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">
- .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>
+ <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="34">
+ <g:north size="0">
<g:HTML>
<h2
class="{style.boxtitle}">Settings</h2>
</g:HTML>
</g:north>
<g:center>
- <g:SimpleLayoutPanel
ui:field="settingsTab"
-
addStyleNames="{style.scroller}" />
+ <g:SimpleLayoutPanel
ui:field="settingNavContainer"
+
addStyleNames="{style.scroller}">
+ </g:SimpleLayoutPanel>
</g:center>
</g:DockLayoutPanel>
</g:west>
Modified: james/hupa/trunk/client/src/main/webapp/styles.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/styles.css?rev=1522434&r1=1522433&r2=1522434&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/styles.css (original)
+++ james/hupa/trunk/client/src/main/webapp/styles.css Thu Sep 12 05:02:39 2013
@@ -2274,6 +2274,9 @@ fieldset.tab {
height: 0px;
overflow: hidden;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> make a skeleton in the setting place, for more setting items
}
@@ -2500,6 +2503,7 @@ fieldset.tab {
.webkit #pluginlist td.license,
.webkit #pluginlist td.source {
width: 9em;
+<<<<<<< HEAD
=======
=======
@@ -4670,3 +4674,6 @@ fieldset.tab {
=======
}
>>>>>>> fixed issue#73, using LinkedHashSet in memory to store the contacts
>>>>>>> list like 'Echo Wang <echo...@gmail.com>'
+=======
+}
+>>>>>>> make a skeleton in the setting place, for more setting items
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
