client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml - james-hupa - Git at Google

 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> use DockLayoutPanel as the App Layout
 <!-- 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. -->
 <<<<<<< HEAD
 =======
 <!--
     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.
 -->
 >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 =======
 >>>>>>> use DockLayoutPanel as the App Layout

 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 <<<<<<< HEAD
 	<ui:style>
 	</ui:style>
 	<g:DockLayoutPanel unit='EM'>
 		<g:north size='8'>
 			<g:LayoutPanel ui:field="northPanel">
 			<g:layer left="0px" width="84px" top="0px" height="64">
 				<g:SimplePanel ui:field="logoContainer"/></g:layer>
 			<g:layer right="12px" width="37%" >
 				<g:SimplePanel ui:field="topContainer" /></g:layer>
 			</g:LayoutPanel>
 		</g:north>
 		<g:south size='2'>
 			<g:HTMLPanel  ui:field="southPanel">
 			</g:HTMLPanel>
 		</g:south>
 		<g:west size='12'>
 			<g:SimplePanel ui:field="westPanel"/>
 		</g:west>
 		<g:east size='0'>
 			<g:SimplePanel ui:field="eastPanel" />
 		</g:east>
 		<g:center>
 			<g:LayoutPanel ui:field="centerPanel"/>
 		</g:center>
 	</g:DockLayoutPanel>
 =======
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 <<<<<<< HEAD
 =======
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> Change to new mvp framework - first step
              xmlns:g='urn:import:com.google.gwt.user.client.ui'
              xmlns:my='urn:import:org.apache.hupa.client.ui'>
   <ui:image field="maincontent"/>
   <ui:image field="masterv"/>
   <ui:image field="mainmenu"/>
   <ui:style>
     @sprite .menuPanel {
       gwt-image: 'mainmenu';
       background-position: center center;
       height: 100%;
       width: 100%;
       border: 1px solid gray;
     }

     @sprite .mvPanel {
       gwt-image: 'masterv';
       background-position: center center;
       height: 100%;
       width: 100%;
       border: 1px solid gray;
     }

     @sprite .mainPanel {
       gwt-image: 'maincontent';
       background-position: center center;
       height: 100%;
       width: 100%;
       border: 1px solid gray;
     }
   </ui:style>
   <g:LayoutPanel>
     <g:layer>
       <g:SimplePanel ui:field="menuPanel" addStyleNames="{style.menuPanel}">
       </g:SimplePanel>
     </g:layer>
     <g:layer>
       <g:SimplePanel ui:field="mvPanel" addStyleNames="{style.mvPanel}"/>
     </g:layer>
     <g:layer>
       <g:SimplePanel ui:field="mainPanel" addStyleNames="{style.mainPanel}"/>
     </g:layer>
   </g:LayoutPanel>
 <<<<<<< HEAD
 >>>>>>> Change to new mvp framework - first step
 =======
 =======
 >>>>>>> decorate the theme
 	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:my='urn:import:org.apache.hupa.client.ui'>
 =======
 	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:h='urn:import:org.apache.hupa.client.ui'>
 >>>>>>> use DataGrid instead of CellTable to list messages.
 	<ui:style>
 		.Hupa {
 			text-align: left;
 			margin-top: 0px;
 			padding: 0px;
 			width: 100%;
 			min-width: 800px;
 			margin-top: 15px;
 		}

 		.northPanel {
 			clear: both;
 			border: 1px solid #7FAAFF;
 			box-shadow: 0 1px 4px grey;
 			border-radius: 5px;
 			overflow: hidden;
 			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 {
 			height: 64px;
 			background-color: #C5D9FF;
 <<<<<<< HEAD
 <<<<<<< HEAD
 			background:  literal("-moz-linear-gradient(#FFFFFF, #C5D9FF)");
 =======
 			background: literal("-moz-linear-gradient(#FFFFFF, #C5D9FF)");
 >>>>>>> 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;
 		}

 		.hupa-main {
 			clear: both;
 			margin: 8px 8px 8px 8px;
 			min-height: 500px;
 <<<<<<< HEAD
 			background: literal("-moz-linear-gradient(#eaeaea, #fafafa)");
 			background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)");
 			background: literal("-o-linear-gradient(#eaeaea, #fafafa)");
 =======
 			background: -moz-linear-gradient(#eaeaea, #fafafa);
 			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 {
 			border: 1px solid #7FAAFF;
 			box-shadow: 0 1px 4px grey;
 			border-radius: 5px;
 			overflow: hidden;
 <<<<<<< HEAD
 			background: literal("-moz-linear-gradient(#eaeaea, #fafafa)");
 			background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)");
 			background: literal("-o-linear-gradient(#eaeaea, #fafafa)");
 =======
 			background: -moz-linear-gradient(#eaeaea, #fafafa);
 			background: -webkit-linear-gradient(#eaeaea, #fafafa);
 			background: -o-linear-gradient(#eaeaea, #fafafa);
 >>>>>>> decorate the theme
 			clear: both;
 			margin: 8px 8px 8px 8px;
 		}

 		.centerPanel {
 			clear: both;
 			border: 1px solid #7FAAFF;
 			box-shadow: 0 1px 4px grey;
 			border-radius: 5px;
 			overflow: hidden;
 <<<<<<< HEAD
 			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);
 			background: -o-linear-gradient(#eaeaea, #fafafa);
 >>>>>>> decorate the theme
 			clear: both;
 			margin: 8px 8px 8px 8px;
 			min-height: 500px;
 =======
 			margin: 0px 8px 8px 8px;
 <<<<<<< HEAD
 <<<<<<< HEAD
 			min-height: 400px;
 >>>>>>> make it look more beautiful
 =======
 			min-height: 300px;
 =======
 >>>>>>> make messages list pager be available
 		}
 		.southPanel{
 			text-align: center;
 >>>>>>> make it look more beautiful
 		}
 	</ui:style>
 <<<<<<< HEAD
 	<g:LayoutPanel addStyleNames="{style.Hupa}">
 		<g:layer>
 <<<<<<< HEAD
 <<<<<<< HEAD
 			<g:SimplePanel ui:field="topPanel" addStyleNames="{style.topPanel}">
 			</g:SimplePanel>
 =======
 			<g:FlowPanel ui:field="topPanel" addStyleNames="{style.topPanel}">
 				<g:HTMLPanel addStyleNames="{style.hupa-logo}" />
 				<my:TopView ui:field="topView" addStyleNames="{style.topView}" />
 			</g:FlowPanel>
 >>>>>>> decorate the theme
 =======
 			<g:SimplePanel ui:field="topPanel" addStyleNames="{style.topPanel}">
 			</g:SimplePanel>
 >>>>>>> introduce the top activity
 		</g:layer>
 		<g:layer>
 			<g:SimplePanel ui:field="westPanel" addStyleNames="{style.westPanel}" />
 		</g:layer>
 		<g:layer>
 			<g:SimplePanel ui:field="mainPanel" addStyleNames="{style.mainPanel}" />
 		</g:layer>
 	</g:LayoutPanel>
 <<<<<<< HEAD
 >>>>>>> decorate the theme
 =======
 >>>>>>> Change to new mvp framework - first step
 =======
 >>>>>>> decorate the theme
 =======
 	<g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}">
 =======
 	<ui:style>
 	</ui:style>
 	<g:DockLayoutPanel unit='EM'>
 >>>>>>> refactoring theme 1 - login page
 		<g:north size='8'>
 			<g:LayoutPanel ui:field="northPanel">
 			<g:layer left="0px" width="84px" top="0px" height="64">
 				<g:SimplePanel ui:field="logoContainer"/></g:layer>
 			<g:layer right="12px" width="37%" >
 				<g:SimplePanel ui:field="topContainer" /></g:layer>
 			</g:LayoutPanel>
 		</g:north>
 		<g:south size='2'>
 			<g:HTMLPanel  ui:field="southPanel">
 			</g:HTMLPanel>
 		</g:south>
 		<g:west size='12'>
 			<g:SimplePanel ui:field="westPanel"/>
 		</g:west>
 		<g:east size='0'>
 			<g:SimplePanel ui:field="eastPanel" />
 		</g:east>
 		<g:center>
 			<g:LayoutPanel ui:field="centerPanel"/>
 		</g:center>
 	</g:DockLayoutPanel>
 >>>>>>> use DockLayoutPanel as the App Layout
 </ui:UiBinder>
	<<<<<<< HEAD
	<<<<<<< HEAD
	<<<<<<< HEAD
	<<<<<<< HEAD
	=======
	>>>>>>> use DockLayoutPanel as the App Layout
	<!-- 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. -->
	<<<<<<< HEAD
	=======
	<!--
	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.
	-->
	>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
	=======
	>>>>>>> use DockLayoutPanel as the App Layout

	<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
	<<<<<<< HEAD
	<ui:style>
	</ui:style>
	<g:DockLayoutPanel unit='EM'>
	<g:north size='8'>
	<g:LayoutPanel ui:field="northPanel">
	<g:layer left="0px" width="84px" top="0px" height="64">
	<g:SimplePanel ui:field="logoContainer"/></g:layer>
	<g:layer right="12px" width="37%" >
	<g:SimplePanel ui:field="topContainer" /></g:layer>
	</g:LayoutPanel>
	</g:north>
	<g:south size='2'>
	<g:HTMLPanel ui:field="southPanel">
	</g:HTMLPanel>
	</g:south>
	<g:west size='12'>
	<g:SimplePanel ui:field="westPanel"/>
	</g:west>
	<g:east size='0'>
	<g:SimplePanel ui:field="eastPanel" />
	</g:east>
	<g:center>
	<g:LayoutPanel ui:field="centerPanel"/>
	</g:center>
	</g:DockLayoutPanel>
	=======
	<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
	<<<<<<< HEAD
	=======
	<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
	<<<<<<< HEAD
	<<<<<<< HEAD
	>>>>>>> Change to new mvp framework - first step
	xmlns:g='urn:import:com.google.gwt.user.client.ui'
	xmlns:my='urn:import:org.apache.hupa.client.ui'>
	<ui:image field="maincontent"/>
	<ui:image field="masterv"/>
	<ui:image field="mainmenu"/>
	<ui:style>
	@sprite .menuPanel {
	gwt-image: 'mainmenu';
	background-position: center center;
	height: 100%;
	width: 100%;
	border: 1px solid gray;
	}

	@sprite .mvPanel {
	gwt-image: 'masterv';
	background-position: center center;
	height: 100%;
	width: 100%;
	border: 1px solid gray;
	}

	@sprite .mainPanel {
	gwt-image: 'maincontent';
	background-position: center center;
	height: 100%;
	width: 100%;
	border: 1px solid gray;
	}
	</ui:style>
	<g:LayoutPanel>
	<g:layer>
	<g:SimplePanel ui:field="menuPanel" addStyleNames="{style.menuPanel}">
	</g:SimplePanel>
	</g:layer>
	<g:layer>
	<g:SimplePanel ui:field="mvPanel" addStyleNames="{style.mvPanel}"/>
	</g:layer>
	<g:layer>
	<g:SimplePanel ui:field="mainPanel" addStyleNames="{style.mainPanel}"/>
	</g:layer>
	</g:LayoutPanel>
	<<<<<<< HEAD
	>>>>>>> Change to new mvp framework - first step
	=======
	=======
	>>>>>>> decorate the theme
	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:my='urn:import:org.apache.hupa.client.ui'>
	=======
	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:h='urn:import:org.apache.hupa.client.ui'>
	>>>>>>> use DataGrid instead of CellTable to list messages.
	<ui:style>
	.Hupa {
	text-align: left;
	margin-top: 0px;
	padding: 0px;
	width: 100%;
	min-width: 800px;
	margin-top: 15px;
	}

	.northPanel {
	clear: both;
	border: 1px solid #7FAAFF;
	box-shadow: 0 1px 4px grey;
	border-radius: 5px;
	overflow: hidden;
	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 {
	height: 64px;
	background-color: #C5D9FF;
	<<<<<<< HEAD
	<<<<<<< HEAD
	background: literal("-moz-linear-gradient(#FFFFFF, #C5D9FF)");
	=======
	background: literal("-moz-linear-gradient(#FFFFFF, #C5D9FF)");
	>>>>>>> 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;
	}

	.hupa-main {
	clear: both;
	margin: 8px 8px 8px 8px;
	min-height: 500px;
	<<<<<<< HEAD
	background: literal("-moz-linear-gradient(#eaeaea, #fafafa)");
	background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)");
	background: literal("-o-linear-gradient(#eaeaea, #fafafa)");
	=======
	background: -moz-linear-gradient(#eaeaea, #fafafa);
	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 {
	border: 1px solid #7FAAFF;
	box-shadow: 0 1px 4px grey;
	border-radius: 5px;
	overflow: hidden;
	<<<<<<< HEAD
	background: literal("-moz-linear-gradient(#eaeaea, #fafafa)");
	background: literal("-webkit-linear-gradient(#eaeaea, #fafafa)");
	background: literal("-o-linear-gradient(#eaeaea, #fafafa)");
	=======
	background: -moz-linear-gradient(#eaeaea, #fafafa);
	background: -webkit-linear-gradient(#eaeaea, #fafafa);
	background: -o-linear-gradient(#eaeaea, #fafafa);
	>>>>>>> decorate the theme
	clear: both;
	margin: 8px 8px 8px 8px;
	}

	.centerPanel {
	clear: both;
	border: 1px solid #7FAAFF;
	box-shadow: 0 1px 4px grey;
	border-radius: 5px;
	overflow: hidden;
	<<<<<<< HEAD
	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);
	background: -o-linear-gradient(#eaeaea, #fafafa);
	>>>>>>> decorate the theme
	clear: both;
	margin: 8px 8px 8px 8px;
	min-height: 500px;
	=======
	margin: 0px 8px 8px 8px;
	<<<<<<< HEAD
	<<<<<<< HEAD
	min-height: 400px;
	>>>>>>> make it look more beautiful
	=======
	min-height: 300px;
	=======
	>>>>>>> make messages list pager be available
	}
	.southPanel{
	text-align: center;
	>>>>>>> make it look more beautiful
	}
	</ui:style>
	<<<<<<< HEAD
	<g:LayoutPanel addStyleNames="{style.Hupa}">
	<g:layer>
	<<<<<<< HEAD
	<<<<<<< HEAD
	<g:SimplePanel ui:field="topPanel" addStyleNames="{style.topPanel}">
	</g:SimplePanel>
	=======
	<g:FlowPanel ui:field="topPanel" addStyleNames="{style.topPanel}">
	<g:HTMLPanel addStyleNames="{style.hupa-logo}" />
	<my:TopView ui:field="topView" addStyleNames="{style.topView}" />
	</g:FlowPanel>
	>>>>>>> decorate the theme
	=======
	<g:SimplePanel ui:field="topPanel" addStyleNames="{style.topPanel}">
	</g:SimplePanel>
	>>>>>>> introduce the top activity
	</g:layer>
	<g:layer>
	<g:SimplePanel ui:field="westPanel" addStyleNames="{style.westPanel}" />
	</g:layer>
	<g:layer>
	<g:SimplePanel ui:field="mainPanel" addStyleNames="{style.mainPanel}" />
	</g:layer>
	</g:LayoutPanel>
	<<<<<<< HEAD
	>>>>>>> decorate the theme
	=======
	>>>>>>> Change to new mvp framework - first step
	=======
	>>>>>>> decorate the theme
	=======
	<g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}">
	=======
	<ui:style>
	</ui:style>
	<g:DockLayoutPanel unit='EM'>
	>>>>>>> refactoring theme 1 - login page
	<g:north size='8'>
	<g:LayoutPanel ui:field="northPanel">
	<g:layer left="0px" width="84px" top="0px" height="64">
	<g:SimplePanel ui:field="logoContainer"/></g:layer>
	<g:layer right="12px" width="37%" >
	<g:SimplePanel ui:field="topContainer" /></g:layer>
	</g:LayoutPanel>
	</g:north>
	<g:south size='2'>
	<g:HTMLPanel ui:field="southPanel">
	</g:HTMLPanel>
	</g:south>
	<g:west size='12'>
	<g:SimplePanel ui:field="westPanel"/>
	</g:west>
	<g:east size='0'>
	<g:SimplePanel ui:field="eastPanel" />
	</g:east>
	<g:center>
	<g:LayoutPanel ui:field="centerPanel"/>
	</g:center>
	</g:DockLayoutPanel>
	>>>>>>> use DockLayoutPanel as the App Layout
	</ui:UiBinder>