Author: dongxu Date: Thu Sep 12 03:57:26 2013 New Revision: 1522277 URL: http://svn.apache.org/r1522277 Log: scrub login view code, use css by a unique way
Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css~HEAD - copied, changed from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css~HEAD - copied, changed from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/hupa-logo-49-transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/hupa-logo-64-transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/login_shadow.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CellTree.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/TreeResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java 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/LoginView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:57:26 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -54,10 +55,13 @@ import java.util.logging.Logger; ======= >>>>>>> scrub code import org.apache.hupa.client.bundles.HupaResources; +======= +>>>>>>> scrub login view code, use css by a unique way import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.HupaLayoutable; import org.apache.hupa.client.ui.LoginLayoutable; +import org.apache.hupa.client.ui.LoginView; >>>>>>> move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; @@ -253,7 +257,7 @@ public class HupaController { private void bindCss() { // TODO:replace with a more gentle approach - StyleInjector.inject(HupaResources.INSTANCE.stylesheet().getText()); + StyleInjector.inject(LoginView.Resources.INSTANCE.stylesheet().getText()); } private final class PlaceChangHandler implements PlaceChangeEvent.Handler { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java Thu Sep 12 03:57:26 2013 @@ -19,14 +19,12 @@ package org.apache.hupa.client.evo; -import org.apache.hupa.client.bundles.HupaResources; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.AppLayout; -import com.google.gwt.dom.client.StyleInjector; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceChangeEvent; @@ -50,7 +48,6 @@ public class AppController { } public void start() { - StyleInjector.inject(HupaResources.INSTANCE.stylesheet().getText()); RootLayoutPanel.get().add(appPanelView.getAppLayoutPanel()); placeHistoryHandler.handleCurrentHistory(); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 03:57:26 2013 @@ -210,11 +210,11 @@ public class FolderListView extends Comp ======= ======= import org.apache.hupa.client.activity.FolderListActivity; -import org.apache.hupa.client.ui.res.TreeResources; >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.cellview.client.CellTree; @@ -222,23 +222,35 @@ import com.google.gwt.user.client.ui.Com import com.google.gwt.user.client.ui.SimplePanel; import com.google.inject.Inject; -public class FolderListView extends Composite implements FolderListActivity.Displayable { +public class FolderListView extends Composite implements + FolderListActivity.Displayable { - @UiField(provided = true) - CellTree cellTree; + @UiField(provided = true) CellTree cellTree; @Inject - public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus) { - CellTree.Resources res = GWT.create(TreeResources.class); - cellTree = new CellTree(viewModel, null, res); + public FolderListView(final FoldersTreeViewModel viewModel, + final EventBus eventBus) { + cellTree = new CellTree(viewModel, null, Resources.INSTANCE); cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one } + public interface Resources extends CellTree.Resources { + + Resources INSTANCE = GWT.create(Resources.class); + + @Source("res/CssFolderListView.css") + public CellTree.Style cellTreeStyle(); + + @Source("res/listicons.png") + public ImageResource listicons(); + } + interface FolderListUiBinder extends UiBinder<SimplePanel, FolderListView> { } - private static FolderListUiBinder binder = GWT.create(FolderListUiBinder.class); + private static FolderListUiBinder binder = GWT + .create(FolderListUiBinder.class); } 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=1522277&r1=1522276&r2=1522277&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:57:26 2013 @@ -49,8 +49,6 @@ import org.apache.hupa.client.HupaConsta ======= >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one import org.apache.hupa.client.activity.LoginActivity; -import org.apache.hupa.client.bundles.HupaResources; -import org.apache.hupa.client.bundles.HupaResources.Css; <<<<<<< HEAD <<<<<<< HEAD @@ -76,12 +74,18 @@ import com.google.gwt.event.dom.client.K <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.CssResource.NotStrict; ======= import com.google.gwt.resources.client.CssResource; >>>>>>> prepare for places and do something for loading related to issue #18 +======= +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.resources.client.CssResource.NotStrict; +>>>>>>> scrub login view code, use css by a unique way import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; ======= @@ -122,6 +126,7 @@ public class LoginView extends Composite * define by ourselves */ public interface Style extends CssResource { +<<<<<<< HEAD String loading(); String hidden(); @@ -268,11 +273,67 @@ public class LoginView extends Composite @UiField Style style; interface Style extends CssResource { +======= +>>>>>>> scrub login view code, use css by a unique way String loading(); + String hidden(); + String display(); } + @UiField Style style; + @UiField FlowPanel mainContainer; + @UiField FlowPanel innerBox; + @UiField Button loginButton; + @UiField FlexTable flexTable; + @UiField FlowPanel boxBottom; + @UiField FlowPanel messageBox; + @UiField FlowPanel bottomLine; + @UiField FormPanel formPanel; + @UiField HTMLPanel message; + Resources.Css css = Resources.INSTANCE.stylesheet(); + private SubmitButton submitButton; + PPanel buttonBar = new PPanel(); + + /* + * We wrap login/password boxes with a form which must be in the html + * document, in this way, the browser knows that we are sending a login form + * and offers the save password dialog to the user + */ + private TextBox usernameTextBox = TextBox.wrap(DOM.getElementById("email")); + private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM + .getElementById("password")); + + public interface Resources extends ClientBundle { + + Resources INSTANCE = GWT.create(Resources.class); + + @NotStrict + @Source("res/CssLoginView.css") + public Css stylesheet(); + + public interface Css extends CssResource { + String loginForm(); + + String boxInner(); + + String tdTitle(); + + String tdInput(); + + String pFormbuttons(); + + String submitButton(); + + String boxBottom(); + + String messageBox(); + + String bottomLine(); + } + } + @Inject public LoginView() { initWidget(binder.createAndBindUi(this)); @@ -311,11 +372,15 @@ public class LoginView extends Composite <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> scrub login view code, use css by a unique way /* * The user submits the form so as the browser detect it and displays * the save password dialog. Then we click on the hidden loginButton * which stores the presenter clickHandler. */ +<<<<<<< HEAD formPanel.addSubmitHandler(new FormPanel.SubmitHandler() { public void onSubmit(SubmitEvent event) { if (!usernameTextBox.getValue().trim().isEmpty() @@ -331,6 +396,8 @@ public class LoginView extends Composite // the save password dialog. Then we click on the hidden loginButton // which // stores the presenter clickHandler. +======= +>>>>>>> scrub login view code, use css by a unique way formPanel.addSubmitHandler(new FormPanel.SubmitHandler() { public void onSubmit(SubmitEvent event) { <<<<<<< HEAD @@ -350,6 +417,7 @@ public class LoginView extends Composite }); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD innerBox.add(loginButton); loginButton.setVisible(false); setLoading(false); @@ -383,6 +451,8 @@ public class LoginView extends Composite >>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter ======= // loginButton must be in the document to handle the click() method +======= +>>>>>>> scrub login view code, use css by a unique way innerBox.add(loginButton); loginButton.setVisible(false); <<<<<<< HEAD @@ -470,6 +540,9 @@ public class LoginView extends Composite <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> scrub login view code, use css by a unique way // FIXME the ajax loader will not hidden after normal logout @Override public void setLoading(boolean load) { @@ -539,6 +612,7 @@ public class LoginView extends Composite private static LoginViewUiBinder binder = GWT .create(LoginViewUiBinder.class); +<<<<<<< HEAD Css css = HupaResources.INSTANCE.stylesheet(); @UiField FlowPanel mainContainer; @UiField FlowPanel innerBox; @@ -561,4 +635,6 @@ public class LoginView extends Composite @UiField HTMLPanel message; >>>>>>> replace with uibinder +======= +>>>>>>> scrub login view code, use css by a unique way } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml Thu Sep 12 03:57:26 2013 @@ -123,7 +123,7 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> <ui:image field='logo' src='res/hupa-logo-64-transparent.png' /> - <ui:image field="shadow" src="res/login_shadow.png" /> + <ui:image field="shadow" src="res/loginShadow.png" /> <ui:image field="messages" src="res/messages.png" /> <ui:image field="loading" src="res/ajaxloader.gif" /> <ui:style type="org.apache.hupa.client.ui.LoginView.Style"> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Thu Sep 12 03:57:26 2013 @@ -504,7 +504,6 @@ import java.util.List; import org.apache.hupa.client.HupaConstants; import org.apache.hupa.client.bundles.HupaImageBundle; -import org.apache.hupa.client.ui.res.DataGridResources; import org.apache.hupa.shared.domain.Message; import com.google.gwt.cell.client.CheckboxCell; @@ -537,6 +536,14 @@ public class MessagesCellTable extends D Column<Message, ?> attachedCol = new AttachmentColumn(); Column<Message, ?> dateCol = new DateColumn(); + public interface Resources extends DataGrid.Resources { + + DataGrid.Resources INSTANCE = GWT.create(Resources.class); + + @Source("res/CssMessagesCellTable.css") + Style dataGridStyle(); + } + public CheckboxColumn getCheckboxCol() { return checkboxCol; } @@ -550,12 +557,10 @@ public class MessagesCellTable extends D private final SelectionModel<? super Message> selectionModel = new MultiSelectionModel<Message>( KEY_PROVIDER); - static DataGrid.Resources res = GWT.create(DataGridResources.class); - @Inject public MessagesCellTable(final HupaImageBundle imageBundle, final HupaConstants constants) { - super(PAGE_SIZE, res); + super(PAGE_SIZE, Resources.INSTANCE); this.imageBundle = imageBundle; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css Thu Sep 12 03:57:26 2013 @@ -82,13 +82,4 @@ div:focus { outline: none; } } .cellTreeShowMoreButton { -} - -.popup{ - border:1px solid black; - background-color:rgba(250, 250, 250, 0.5); -} - -.menuItem{ - cursor: pointer; } \ No newline at end of file Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css~HEAD (from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css&r1=1522276&r2=1522277&rev=1522277&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css?rev=1522277&r1=1522276&r2=1522277&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Thu Sep 12 03:57:26 2013 @@ -41,15 +41,15 @@ } .dataGridCell { - cursor: pointer; + cursor: pointer; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: table-cell; vertical-align: inherit; padding: 2px 7px; -/* border-left: 1px dotted #bbd3da; - border-bottom: 1px solid #111; */ + border-left: 1px dotted #bbd3da; + border-bottom: 1px solid #111; } .dataGridFirstColumnFooter { @@ -90,8 +90,8 @@ } .dataGridEvenRowCell { -/* border-left: 1px dotted #bbd3da; */ - border-bottom: 1px solid #E5E5E5; + border-left: 1px dotted #bbd3da; + border-bottom: 0px solid #bbd3da; } .dataGridOddRow { @@ -99,8 +99,8 @@ } .dataGridOddRowCell { -/* border-left: 1px dotted #bbd3da; */ - border-bottom: 1px solid #E5E5E5; + border-left: 1px dotted #bbd3da; + border-bottom: 0px solid #bbd3da; } .dataGridHoveredRow { @@ -108,8 +108,8 @@ } .dataGridHoveredRowCell { -/* border-left: 1px dotted #bbd3da; */ - border-bottom: 1px solid #E5E5E5; + border-left: 1px dotted #eee; + border-bottom: 0px solid #eee; } .dataGridKeyboardSelectedRow { @@ -121,27 +121,21 @@ } .dataGridSelectedRow { - color: #333333; + color: white; height: auto; overflow: auto; background: #059ec6; - background: -moz-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FFFCCE), - color-stop(100%, #FFFCCE) ); - background: -o-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%); - background: -ms-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%); - background: linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%); - /*background: linear-gradient(top, #019bc6 0%, #017cb4 100%);*/ -} - - -.dataGridSelectedRow td{ - border-bottom: 1px dotted #E5E5E5; + background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #019bc6), + color-stop(100%, #017cb4) ); + background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%); + background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%); + background: linear-gradient(top, #019bc6 0%, #017cb4 100%); } .dataGridSelectedRowCell { - /* border-left: 1px dotted #628cd5; */ - border-bottom: 0px solid #628cd5; + border-left: 1px dotted #628cd5; + border-bottom: 0px solid #628cd5; } /** @@ -149,12 +143,4 @@ */ .dataGridKeyboardSelectedCell { border: selectionBorderWidth solid #d7dde8; -} - -.fontBold { - font-weight: bold; -} - -.fontNormal { - font-weight: normal; } \ No newline at end of file Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css~HEAD (from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css&r1=1522276&r2=1522277&rev=1522277&view=diff ============================================================================== (empty) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org