From ab9e9ecc3abd687be74baaed8fa26b3934ec49bf Mon Sep 17 00:00:00 2001
From: shameem_z <devnull@localhost>
Date: Mon, 29 Oct 2007 12:50:57 +0000
Subject: [PATCH] Refactoring of Create Client/U_WebMenu in Posterita

---
 .../src/web/jsp/login/chooseApplication.jsp   | 44 ++++---------------
 posterita/src/web/jsp/pos/posLogin.jsp        |  2 +-
 posterita/src/web/jsp/pos/posSubMenu.jsp      |  4 +-
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/posterita/src/web/jsp/login/chooseApplication.jsp b/posterita/src/web/jsp/login/chooseApplication.jsp
index 8d31336bdb..d9ed30796f 100644
--- a/posterita/src/web/jsp/login/chooseApplication.jsp
+++ b/posterita/src/web/jsp/login/chooseApplication.jsp
@@ -73,7 +73,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 			<tr>
 				<td>
 					<font class="title">
-						Posterita Applications
+						Posterita POS Applications
 					</font>
 				</td>
 				
@@ -97,57 +97,31 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 			
 			<tr>
 				<td class="main">
-				<table align="center">
+				<table align="center" width="100%">
 				<tr>
-				<td width="400px">
+				<td>
 					<Fieldset>
 					<legend><font class="title">POS</font></legend>
 					<table width="100%" border="0" class="display">
 						<logic:present name="<%=Constants.WEB_APPLICATIONS%>">
-							<logic:iterate id="app" name="<%=Constants.WEB_APPLICATIONS%>" indexId="count">
-								<logic:equal name="app" property="applicationType" value="<%= Constants.APP_POS%>">
+							<logic:iterate id="store" name="<%=Constants.WEB_APPLICATIONS%>" indexId="count">
 								<tr>
 									<td class="submenu">
 									<li class="submenu">
-										<html:link href="SetApplicationParametersAction.do?action=setApplicationParameters" paramName="app" paramId="applicationName" paramProperty="applicationWebContext" styleClass="submenu">
-											<bean:write name="app" property="applicationName"/>
+										<html:link href="SetApplicationParametersAction.do?action=setApplicationParameters" paramName="store" paramId="storeId" paramProperty="storeId" styleClass="submenu">
+											<bean:write name="store" property="applicationName"/>
 										</html:link>
 									</li>
 									</td>
 								</tr>
-									
-								</logic:equal>
 							</logic:iterate>
 						</logic:present>
 					</table>
 					</Fieldset>
 				</td>
-				<td width="400px"  valign="top">
-					<fieldset>
-					<legend><font class="title">Webstore</font></legend>
-					<table width="100%" border="0" class="display">
-							<logic:present name="<%=Constants.WEB_APPLICATIONS%>">
-								<logic:iterate id="app" name="<%=Constants.WEB_APPLICATIONS%>">
-									<logic:equal name="app" property="applicationType" value="<%= Constants.APP_WEBSTORE%>">
-										<tr>
-											<td>
-											<li class="submenu">
-												<html:link href="SetApplicationParametersAction.do?action=setApplicationParameters" paramName="app" paramId="applicationName" paramProperty="applicationWebContext" styleClass="submenu">
-													<bean:write name="app" property="applicationName"/>
-												</html:link>
-											</li>
-											</td>
-										</tr>
-									</logic:equal>
-								</logic:iterate>
-							</logic:present>
-						</table>
-						</fieldset>
-					</td>
-					
-					</tr>
-					</table>
-					</td>
+				</tr>
+				</table>
+				</td>
 			</tr>
 		</table>
 		
diff --git a/posterita/src/web/jsp/pos/posLogin.jsp b/posterita/src/web/jsp/pos/posLogin.jsp
index 44ff465905..b14b138477 100644
--- a/posterita/src/web/jsp/pos/posLogin.jsp
+++ b/posterita/src/web/jsp/pos/posLogin.jsp
@@ -75,7 +75,7 @@ String appName = (String) request.getSession().getServletContext().getAttribute(
 				<table>
 				<tr>
 					<td colspan="2">
-						<%@ include file="/jsp/include/errors.jsp" %>
+						<%@ include file="/jsp/include/errors.jsp"%>
 					</td>
 				</tr>
 				<tr>
diff --git a/posterita/src/web/jsp/pos/posSubMenu.jsp b/posterita/src/web/jsp/pos/posSubMenu.jsp
index 4d2eb6db7c..ba896ccf76 100644
--- a/posterita/src/web/jsp/pos/posSubMenu.jsp
+++ b/posterita/src/web/jsp/pos/posSubMenu.jsp
@@ -27,8 +27,8 @@
 <%@ page import="org.posterita.user.*" %>
 <%@ page import="org.posterita.lib.UdiConstants" %>
 <%@ page import="java.util.Properties"%>
-<%@ page import="org.compiere.model.X_U_Menu" %>
-<%@ page import="org.posterita.model.UDIU_Menu" %>
+<%@ page import="org.compiere.model.X_U_WebMenu" %>
+<%@ page import="org.posterita.model.U_WebMenu" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="org.posterita.core.MenuItem" %>