Author: dongxu Date: Thu Sep 12 03:51:49 2013 New Revision: 1522262 URL: http://svn.apache.org/r1522262 Log: dynamical style tool bar
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522262&r1=1522261&r2=1522262&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:51:49 2013 @@ -102,11 +102,11 @@ } @sprite .messageContent { - width: auto; - height: auto; + margin: 8px; gwt-image: 'originLogo'; background-position: center center; - margin: 8px; + width: auto; + height: auto; filter: grayscale(100%); -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); @@ -114,6 +114,14 @@ -o-filter: grayscale(100%); opacity: 0.7; } + + @sprite .messageContentWorkAround { + margin: 8px; + gwt-image: 'originLogo'; + background-position: center center; + width: auto; + height: auto; + } </ui:style> <g:LayoutPanel addStyleNames="{style.minWidth}"> <g:layer left='0' right='0' top='0' height='92px'> @@ -278,7 +286,7 @@ ui:field="messageContentBox"> <g:center> <g:ScrollPanel ui:field="messageContentContainer" - addStyleNames="{style.messageContent}" /> + addStyleNames="{style.messageContentWorkAround}" /> </g:center> <g:south size="25"> <g:SimplePanel ui:field="statusContainer" /> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522262&r1=1522261&r2=1522262&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 03:51:49 2013 @@ -30,6 +30,7 @@ import org.apache.hupa.shared.domain.Use import org.apache.hupa.shared.events.DeleteClickEvent; import com.google.gwt.core.client.GWT; +<<<<<<< HEAD import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; @@ -322,16 +323,28 @@ import org.apache.hupa.client.activity.T >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers import com.google.gwt.core.client.GWT; +======= +import com.google.gwt.resources.client.CssResource; +>>>>>>> dynamical style tool bar import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; public class ToolBarView extends Composite implements ToolBarActivity.Displayable { + @UiField Anchor reply; + @UiField Style style; + public ToolBarView() { initWidget(binder.createAndBindUi(this)); +<<<<<<< HEAD >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one +======= + reply.addStyleName(style.disabledButton()); +>>>>>>> dynamical style tool bar } interface ToolBarUiBinder extends UiBinder<FlowPanel, ToolBarView> { @@ -340,10 +353,17 @@ public class ToolBarView extends Composi private static ToolBarUiBinder binder = GWT.create(ToolBarUiBinder.class); <<<<<<< HEAD +<<<<<<< HEAD @Override public HasClickHandlers getRefresh() { return refresh; } ======= >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one +======= + interface Style extends CssResource { + String disabledButton(); + } + +>>>>>>> dynamical style tool bar } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522262&r1=1522261&r2=1522262&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Thu Sep 12 03:51:49 2013 @@ -12,6 +12,7 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> <<<<<<< HEAD +<<<<<<< HEAD <ui:image field="buttons" src="res/buttons.png" /> <ui:image field="listicons" src="res/listicons.png" /> <ui:style type="org.apache.hupa.client.ui.ToolBarView.Style"> @@ -22,6 +23,10 @@ ======= <ui:image field="buttons" src="res/buttons.png"/> <ui:style> +======= + <ui:image field="buttons" src="res/buttons.png" /> + <ui:style type="org.apache.hupa.client.ui.ToolBarView.Style"> +>>>>>>> dynamical style tool bar .bar { position: absolute; <<<<<<< HEAD @@ -262,6 +267,11 @@ background-position: center -850px; >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers } + + .disabledButton { + opacity: 0.4; + cursor: default; + } </ui:style> <g:FlowPanel addStyleNames="{style.bar}" ui:field="ToolBar"> @@ -293,18 +303,24 @@ <g:Anchor addStyleNames="{style.button} {style.checkMail}">Refresh</g:Anchor> <g:Anchor addStyleNames="{style.button} {style.compose}">Compose</g:Anchor> <g:HTMLPanel tag="span" addStyleNames="{style.spacer}"></g:HTMLPanel> - <g:Anchor addStyleNames="{style.button} {style.reply}">Reply</g:Anchor> - <g:HTMLPanel tag="span" addStyleNames="{style.dropButton}"> + <g:Anchor ui:field="reply" addStyleNames="{style.button} {style.reply} {style.disabledButton}">Reply</g:Anchor> + <g:HTMLPanel tag="span" addStyleNames="{style.dropButton} {style.disabledButton}"> <g:Anchor addStyleNames="{style.button} {style.replyAll}">Reply all</g:Anchor> <g:HTMLPanel tag="span" addStyleNames="{style.dropButtonTip}"></g:HTMLPanel> </g:HTMLPanel> - <g:HTMLPanel tag="span" addStyleNames="{style.dropButton}"> + <g:HTMLPanel tag="span" addStyleNames="{style.dropButton} {style.disabledButton}"> <g:Anchor addStyleNames="{style.button} {style.forward}">Forward</g:Anchor> <g:HTMLPanel tag="span" addStyleNames="{style.dropButtonTip}"></g:HTMLPanel> </g:HTMLPanel> +<<<<<<< HEAD <g:Anchor addStyleNames="{style.button} {style.delete}">Delete</g:Anchor> <g:Anchor addStyleNames="{style.button} {style.mark}">Mark</g:Anchor> <g:Anchor addStyleNames="{style.button} {style.more}">More</g:Anchor> >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one +======= + <g:Anchor addStyleNames="{style.button} {style.delete} {style.disabledButton}">Delete</g:Anchor> + <g:Anchor addStyleNames="{style.button} {style.mark} {style.disabledButton}">Mark</g:Anchor> + <g:Anchor addStyleNames="{style.button} {style.more} {style.disabledButton}">More</g:Anchor> +>>>>>>> dynamical style tool bar </g:FlowPanel> </ui:UiBinder> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org