Author: dongxu
Date: Thu Sep 12 04:36:08 2013
New Revision: 1522368
URL: http://svn.apache.org/r1522368
Log:
make navigation styles shufflling be working as expected
Modified:
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/NavigationView.ui.xml
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=1522368&r1=1522367&r2=1522368&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 04:36:08 2013
@@ -34,6 +34,9 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.place.shared.PlaceController;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> make navigation styles shufflling be working as expected
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -43,6 +46,7 @@ import com.google.gwt.user.client.ui.Anc
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
+<<<<<<< HEAD
=======
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -51,6 +55,8 @@ import com.google.gwt.user.client.ui.Anc
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
>>>>>>> try to make switch to setting work
+=======
+>>>>>>> make navigation styles shufflling be working as expected
import com.google.inject.Inject;
public class NavigationView extends Composite implements
NavigationActivity.Displayable{
@@ -59,8 +65,12 @@ public class NavigationView extends Comp
@UiField Anchor mail;
@UiField Anchor setting;
<<<<<<< HEAD
+<<<<<<< HEAD
@UiField Anchor contact;
@UiField SimplePanel contactOuter;
+=======
+ @UiField Anchor contact;
+>>>>>>> make navigation styles shufflling be working as expected
@UiField SimplePanel mailOuter;
@UiField SimplePanel settingOuter;
@@ -71,6 +81,7 @@ public class NavigationView extends Comp
String selected();
String settingsInnerSelected();
String mailInnerSelected();
+<<<<<<< HEAD
String contactInnerSelected();
}
=======
@@ -91,6 +102,9 @@ public class NavigationView extends Comp
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
=======
>>>>>>> try to make switch to setting work
+=======
+ }
+>>>>>>> make navigation styles shufflling be working as expected
public NavigationView() {
initWidget(binder.createAndBindUi(this));
@@ -151,11 +165,19 @@ public class NavigationView extends Comp
@UiHandler("mail")
public void onMailClick(ClickEvent e){
+ mailOuter.addStyleName(style.selected());
+ settingOuter.removeStyleName(style.selected());
+ mail.addStyleName(style.mailInnerSelected());
+ setting.removeStyleName(style.settingsInnerSelected());
placeController.goTo(new MailFolderPlace("Mock-Inbox"));
}
@UiHandler("setting")
public void onSettingClick(ClickEvent e){
+ mailOuter.removeStyleName(style.selected());
+ settingOuter.addStyleName(style.selected());
+ mail.removeStyleName(style.mailInnerSelected());
+ setting.addStyleName(style.settingsInnerSelected());
placeController.goTo(new SettingPlace("folders"));
}
>>>>>>> try to make switch to setting work
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml?rev=1522368&r1=1522367&r2=1522368&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
Thu Sep 12 04:36:08 2013
@@ -13,10 +13,14 @@
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:image field="buttons" src="res/buttons.png"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<ui:style type="org.apache.hupa.client.ui.NavigationView.Style">
=======
<ui:style>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <ui:style type="org.apache.hupa.client.ui.NavigationView.Style">
+>>>>>>> make navigation styles shufflling be working as expected
@sprite .navigation .inner {
gwt-image: 'buttons';
display: inline-block;
@@ -41,6 +45,7 @@
.navigation .mailInner {
<<<<<<< HEAD
+<<<<<<< HEAD
background-position: 0 2px;
}
@@ -55,6 +60,16 @@
/*background-position: 0 2px;*/
}
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ background-position: 0 2px;
+ }
+
+ .navigation .mailInnerSelected {
+ background-position: 0 -22px;
+ color: #3cf;
+ }
+
+>>>>>>> make navigation styles shufflling be working as expected
.navigation mailInner:hover,.navigation .mailInner.selected {
background-position: 0 -22px;
@@ -80,11 +95,17 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
.navigation .settingsInnerSelected {
background-position: 0 -120px;
}
=======
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ .navigation .settingsInnerSelected {
+ background-position: 0 -120px;
+ }
+>>>>>>> make navigation styles shufflling be working as expected
.navigation a.settings:hover span.inner,.navigation
a.settings.selected span.inner
{
background-position: 0 -120px;
@@ -102,6 +123,7 @@
<g:DockLayoutPanel unit="PX" ui:field="Navigation">
<g:west size="74">
<<<<<<< HEAD
+<<<<<<< HEAD
<g:SimplePanel ui:field="mailOuter"
addStyleNames="{style.navigation} {style.selected}">
<g:Anchor ui:field="mail"
addStyleNames="
@@ -112,6 +134,12 @@
addStyleNames="
{style.mailInner} {style.inner}">
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <g:SimplePanel ui:field="mailOuter"
addStyleNames="{style.navigation} {style.selected}">
+ <g:Anchor ui:field="mail"
+ addStyleNames="
+ {style.mailInnerSelected} {style.inner}">
+>>>>>>> make navigation styles shufflling be working as expected
Mail
</g:Anchor>
</g:SimplePanel>
@@ -122,8 +150,12 @@
<g:Anchor ui:field="contact"
=======
<g:SimplePanel addStyleNames="{style.navigation}">
+<<<<<<< HEAD
<g:Anchor
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <g:Anchor ui:field="contact"
+>>>>>>> make navigation styles shufflling be working as expected
addStyleNames="
{style.contactInner} {style.inner}">
Contacts
@@ -132,6 +164,7 @@
</g:center>
<g:east size="97">
<<<<<<< HEAD
+<<<<<<< HEAD
<g:SimplePanel ui:field="settingOuter"
addStyleNames="{style.navigation}">
<g:Anchor ui:field="setting"
=======
@@ -140,6 +173,9 @@
<g:Anchor
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
=======
+=======
+ <g:SimplePanel ui:field="settingOuter"
addStyleNames="{style.navigation}">
+>>>>>>> make navigation styles shufflling be working as expected
<g:Anchor ui:field="setting"
>>>>>>> try to make switch to setting work
addStyleNames="
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
