Author: dongxu Date: Thu Sep 12 03:24:17 2013 New Revision: 1522197 URL: http://svn.apache.org/r1522197 Log: make it look more beautiful
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java?rev=1522197&r1=1522196&r2=1522197&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java Thu Sep 12 03:24:17 2013 @@ -26,6 +26,7 @@ package org.apache.hupa.client.ui; import org.apache.hupa.client.HupaCSS; +<<<<<<< HEAD ======= ======= >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add >>>>>>> license headers to all new files @@ -42,6 +43,9 @@ import static com.google.gwt.dom.client. ======= >>>>>>> use DockLayoutPanel as the App Layout +======= + +>>>>>>> make it look more beautiful import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -52,6 +56,7 @@ import com.google.gwt.user.client.ui.Acc <<<<<<< HEAD <<<<<<< HEAD import com.google.gwt.user.client.ui.DockLayoutPanel; +<<<<<<< HEAD import com.google.gwt.user.client.ui.HTMLPanel; ======= >>>>>>> Change to new mvp framework - first step @@ -66,6 +71,9 @@ import com.google.gwt.user.client.ui.Flo ======= import com.google.gwt.user.client.ui.DockLayoutPanel; >>>>>>> use DockLayoutPanel as the App Layout +======= +import com.google.gwt.user.client.ui.HorizontalPanel; +>>>>>>> make it look more beautiful import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.LayoutPanel; import com.google.gwt.user.client.ui.SimplePanel; @@ -111,6 +119,7 @@ public class AppLayoutImpl implements Ap <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD @UiField LayoutPanel northPanel; @UiField HTMLPanel southPanel; @UiField SimplePanel westPanel; @@ -139,10 +148,15 @@ public class AppLayoutImpl implements Ap @UiField SimplePanel southPanel; >>>>>>> use DockLayoutPanel as the App Layout +======= + @UiField HorizontalPanel northPanel; + @UiField SimplePanel southPanel; +>>>>>>> make it look more beautiful @UiField SimplePanel westPanel; @UiField SimplePanel eastPanel; - @UiField LayoutPanel centerPanel; + @UiField SimplePanel logoContainer; + @UiField SimplePanel topContainer; @Inject public AppLayoutImpl() { @@ -154,7 +168,11 @@ public class AppLayoutImpl implements Ap >>>>>>> decorate the theme ======= appLayoutPanel = binder.createAndBindUi(this); +<<<<<<< HEAD >>>>>>> use DataGrid instead of CellTable to list messages. +======= + logoContainer.addStyleName(HupaCSS.C_logo_container); +>>>>>>> make it look more beautiful setLoginLayout(); } @@ -208,7 +226,9 @@ public class AppLayoutImpl implements Ap @Override public void setWidget(IsWidget w) { Widget widget = Widget.asWidgetOrNull(w); - northPanel.setWidget(widget); + if(widget != null){ + topContainer.add(widget); + } } }; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml?rev=1522197&r1=1522196&r2=1522197&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml Thu Sep 12 03:24:17 2013 @@ -130,17 +130,19 @@ margin-top: 0px; padding: 0px; width: 100%; - min-width: 920px; - margin-top: 15px; - } - - * html div.Hupa { + min-width: 800px; margin-top: 15px; } .northPanel { - padding-left: 80px; - padding-right: 8px; + clear: both; + border: 1px solid #7FAAFF; + box-shadow: 0 1px 4px grey; + border-radius: 5px; + background: literal("-moz-linear-gradient(#eaeaea, #fafafa)"); + background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)"); + background: literal("-o-linear-gradient(#eaeaea, #fafafa)"); + margin: 0px 8px 8px 8px; } .topView { @@ -154,17 +156,22 @@ >>>>>>> use DockLayoutPanel as the App Layout background: literal("-webkit-linear-gradient(#FFFFFF, #C5D9FF)"); background: literal("-o-linear-gradient(#FFFFFF, #C5D9FF)"); +<<<<<<< HEAD ======= background: -moz-linear-gradient(#FFFFFF, #C5D9FF); background: -webkit-linear-gradient(#FFFFFF, #C5D9FF); background: -o-linear-gradient(#FFFFFF, #C5D9FF); >>>>>>> decorate the theme +======= + width : 98% +>>>>>>> make it look more beautiful } .hupa-logo { width: 90px; height: 64px; float: left; +<<<<<<< HEAD background: url(images/hupa-logo-64-transparent.png) no-repeat; } @@ -181,6 +188,9 @@ background: -webkit-linear-gradient(#eaeaea, #fafafa); background: -o-linear-gradient(#eaeaea, #fafafa); >>>>>>> decorate the theme +======= + background: url(hupa-logo-64-transparent.png) no-repeat; +>>>>>>> make it look more beautiful } .westPanel { @@ -202,6 +212,7 @@ } .centerPanel { + clear: both; border: 1px solid #7FAAFF; box-shadow: 0 1px 4px grey; border-radius: 5px; @@ -210,6 +221,7 @@ background: literal("-moz-linear-gradient(#eaeaea, #fafafa)"); background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)"); background: literal("-o-linear-gradient(#eaeaea, #fafafa)"); +<<<<<<< HEAD ======= background: -moz-linear-gradient(#eaeaea, #fafafa); background: -webkit-linear-gradient(#eaeaea, #fafafa); @@ -218,6 +230,10 @@ clear: both; margin: 8px 8px 8px 8px; min-height: 500px; +======= + margin: 0px 8px 8px 8px; + min-height: 400px; +>>>>>>> make it look more beautiful } </ui:style> <<<<<<< HEAD @@ -254,7 +270,10 @@ ======= <g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}"> <g:north size='8'> - <g:SimplePanel ui:field="northPanel" addStyleNames="{style.northPanel}"/> + <g:HorizontalPanel ui:field="northPanel" addStyleNames="{style.northPanel}"> + <g:SimplePanel ui:field="logoContainer"/> + <g:SimplePanel ui:field="topContainer" /> + </g:HorizontalPanel> </g:north> <g:south size='2'> <g:SimplePanel ui:field="southPanel" /> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522197&r1=1522196&r2=1522197&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java Thu Sep 12 03:24:17 2013 @@ -240,7 +240,7 @@ public class LoginView extends Composite submitButton.getElement().setClassName(resetButton.getElement().getClassName()); loading = new Loading(constants.loading()); -// mainContainer.setStyleName(HupaCSS.C_login_container); + mainContainer.setStyleName(HupaCSS.C_login_container); flexTable.addStyleName(HupaCSS.C_login_form); usernameTextBox.addStyleName(HupaCSS.C_login_box); passwordTextBox.addStyleName(HupaCSS.C_login_box); @@ -257,7 +257,7 @@ public class LoginView extends Composite rPanel.add(formPanel); formPanel.add(flexTable); - mainContainer.add(rPanel); + mainContainer.add(formPanel); mainContainer.add(loading); <<<<<<< HEAD initWidget(mainContainer); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java?rev=1522197&r1=1522196&r2=1522197&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java Thu Sep 12 03:24:17 2013 @@ -230,7 +230,7 @@ public class TopView extends Composite i @Inject @UiConstructor public TopView(HupaConstants constants) { - panel.addStyleName(HupaCSS.C_top_container + "-wrap"); +// panel.addStyleName(HupaCSS.C_top_container + "-wrap"); buttonContainer.addStyleName(HupaCSS.C_button_container); infoContainer.addStyleName(HupaCSS.C_info_container); loginInfoPanel.addStyleName(HupaCSS.C_login_info_container); @@ -261,8 +261,8 @@ public class TopView extends Composite i infoContainer.add(appnameLabel); infoContainer.add(extraLabel); panel.add(buttonContainer); - panel.add(infoContainer); - panel.add(flashContainer); +// panel.add(infoContainer); +// panel.add(flashContainer); flashContainer.add(flashLabel); <<<<<<< HEAD >>>>>>> introduce the top activity Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml?rev=1522197&r1=1522196&r2=1522197&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.ui.xml Thu Sep 12 03:24:17 2013 @@ -43,6 +43,7 @@ >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add >>>>>>> license headers to all new files <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> +<<<<<<< HEAD <ui:style> .round-corner-panel { border: 1px solid #7FAAFF; @@ -65,5 +66,8 @@ ======= <g:FlowPanel ui:field="topWrapper" addStyleNames="{style.round-corner-panel}"> >>>>>>> introduce the top activity +======= + <g:FlowPanel ui:field="topWrapper"> +>>>>>>> make it look more beautiful </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