Author: dongxu
Date: Thu Sep 12 04:33:24 2013
New Revision: 1522361
URL: http://svn.apache.org/r1522361
Log:
layout the label setting view
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
Modified:
james/hupa/trunk/.gitignore
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
Modified: james/hupa/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522361&r1=1522360&r2=1522361&view=diff
==============================================================================
--- james/hupa/trunk/.gitignore (original)
+++ james/hupa/trunk/.gitignore Thu Sep 12 04:33:24 2013
@@ -40,4 +40,10 @@ client/src/main/webapp/hupa/
>>>>>>> add gitignore to ignore files by git
=======
+<<<<<<< HEAD
>>>>>>> update git ignore
+=======
+client/src/main/gwt-unitCache/
+client/src/main/webapp/WEB-INF/deploy/
+client/src/main/webapp/hupa/
+>>>>>>> layout the label setting view
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java?rev=1522361&view=auto
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
(added)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
Thu Sep 12 04:33:24 2013
@@ -0,0 +1,38 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.client.ui;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DecoratorPanel;
+
+public class SettingFolderActionView extends Composite{
+
+ public SettingFolderActionView() {
+ initWidget(binder.createAndBindUi(this));
+ }
+
+ interface Binder extends UiBinder<DecoratorPanel,
SettingFolderActionView> {
+ }
+
+ private static Binder binder = GWT.create(Binder.class);
+
+}
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml?rev=1522361&view=auto
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
(added)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
Thu Sep 12 04:33:24 2013
@@ -0,0 +1,94 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file
to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the
specific
+ language governing permissions and limitations under the License. -->
+<!DOCTYPE ui:UiBinder SYSTEM 'http://dl.google.com/gwt/DTD/xhtml.ent'>
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'
ui:generateFormat='com.google.gwt.i18n.rebind.format.PropertiesFormat'
+ ui:generateLocales='default'>
+ <ui:style>
+
+ .propform fieldset {
+ margin-bottom: 20px;
+ border: 0;
+ padding: 0;
+ }
+
+ .propform fieldset legend {
+ display: block;
+ font-size: 14px;
+ font-weight: bold;
+ padding-bottom: 10px;
+ margin-bottom: 0;
+ }
+
+ .propform fieldset fieldset legend {
+ color: #666;
+ font-size: 12px;
+ }
+
+ fieldset.floating {
+ float: left;
+ margin-right: 10px;
+ margin-bottom: 10px;
+ }
+
+ table{
+ border-collapse: collapse;
+ border-spacing:
+ 0;
+ }
+
+ table.attribute {
+ border-spacing: 0;
+ border-collapse: collapse;
+ }
+
+ table.attribute td {
+ width: 80%;
+ padding: 4px
+ 10px;
+ background: #eee;
+ border-bottom: 2px solid #fff;
+ }
+ table.noBorder td{
+ border:0;
+ }
+ </ui:style>
+ <g:DecoratorPanel addStyleNames="{style.propform}">
+ <g:CaptionPanel captionText="Properties">
+ <g:VerticalPanel>
+ <g:CaptionPanel captionText="Location">
+ <g:VerticalPanel
addStyleNames="{style.attribute}">
+ <g:HorizontalPanel
addStyleNames="{style.noBorder}">
+ <g:Label>
+ <ui:msg
key='folderName'>Folder Name:</ui:msg>
+ </g:Label>
+ <g:TextBox
ui:field='_name' name="_name" />
+ </g:HorizontalPanel>
+ <g:HorizontalPanel
addStyleNames="{style.noBorder}">
+ <g:Label>
+ <ui:msg
key='parentFolder'>Parent Folder:</ui:msg>
+ </g:Label>
+ <g:ListBox
ui:field='_parent'>
+ <g:item
value="1">---</g:item>
+ <g:item
value="2" selected="selected">inbox</g:item>
+ </g:ListBox>
+ </g:HorizontalPanel>
+ </g:VerticalPanel>
+ </g:CaptionPanel>
+ <g:CaptionPanel captionText="Infomation">
+ <g:VerticalPanel
addStyleNames="{style.attribute}">
+ </g:VerticalPanel>
+ </g:CaptionPanel>
+ </g:VerticalPanel>
+ </g:CaptionPanel>
+ </g:DecoratorPanel>
+
+</ui:UiBinder>
\ No newline at end of file
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=1522361&r1=1522360&r2=1522361&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 04:33:24 2013
@@ -9,6 +9,7 @@
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
<<<<<<< HEAD
+<<<<<<< HEAD
<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'>
@@ -132,6 +133,8 @@
</g:SplitLayoutPanel>
=======
+=======
+>>>>>>> layout the label setting view
<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'>
@@ -219,6 +222,10 @@
width: 100%;
z-index: 100;
}
+
+ .boxcontent {
+ padding: 10px;
+ }
</ui:style>
<g:SplitLayoutPanel ui:field="thisPanel"
@@ -258,9 +265,14 @@
</g:west>
<g:center>
<g:SimpleLayoutPanel
addStyleNames="{style.uibox} {style.contentbox}">
- <g:HTML>
- <h2
class="{style.boxtitle}">PlayGround</h2>
- </g:HTML>
+ <g:HTMLPanel>
+ <h2
class="{style.boxtitle}">Folder properties</h2>
+ <g:FlowPanel
addStyleNames="{style.boxcontent}">
+
<hupa:SettingFolderActionView />
+
<g:Button>Save</g:Button>
+ </g:FlowPanel>
+ <div
class="{style.statusbar}" />
+ </g:HTMLPanel>
</g:SimpleLayoutPanel>
</g:center>
</g:SplitLayoutPanel>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css?rev=1522361&r1=1522360&r2=1522361&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
Thu Sep 12 04:33:24 2013
@@ -28,6 +28,7 @@
background-position: center 0;
}
<<<<<<< HEAD
+<<<<<<< HEAD
@external .gwt-SplitLayoutPanel-HDragger;
@external .gwt-SplitLayoutPanel-VDragger;
@@ -55,3 +56,28 @@
@external .gwt-SplitLayoutPanel-HDragger;
@external .gwt-SplitLayoutPanel-VDragger;
>>>>>>> add splitter
+=======
+
+@external .gwt-SplitLayoutPanel-HDragger;
+@external .gwt-SplitLayoutPanel-VDragger;
+.statusbar {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 27px;
+ padding-left: 8px;
+ border-top: 1px solid #ddd;
+ border-radius: 0 0 4px 4px;
+ background: #eaeaea;
+ background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #eaeaea),
+ color-stop(100%, #c8c8c8) );
+ background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
+ background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
+ background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+>>>>>>> layout the label setting view
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522361&r1=1522360&r2=1522361&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 04:33:24 2013
@@ -176,26 +176,5 @@
>>>>>>> refactoring theme 1 - login page
<!-- load the application at the end when loading is being shown -->
<script type="text/javascript" language="javascript"
src="hupa/hupa.nocache.js"></script>
- <div class="vY nq">
- <div class="vX UC">
- <div class="J-J5-Ji">
- <div class="vh">
- <div class="J-J5-Ji">
- <div class="vZ"><span class="v1">Loading...</span></div>
- </div>
- </div>
- </div>
- </div>
-</div>
- <div class="b8 UC" aria-live="polite" aria-atomic="true">
- <div class="J-J5-Ji top">
- <div class="vh">2 conversations have been moved to the
Inbox.
- <a class="" target="_blank"
href="http://support.google.com/mail/bin/answer.py?hl=en&ctx=mail&answer=18522";>Learn
more</a>
- <span class="" id="link_undo" tabindex="0" role="link"
idlink="">Undo</span>
- </div>
- </div>
- </div>
- </body>
-
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
