[OFBiz] SVN: r7477 - in trunk/specialized/opentravelsystem/webapp/hotelbackend: WEB-INF accounting catalog hotelbackendimages includes order screens
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Tue May 2 04:44:40 CDT 2006
Author: hansbak
Date: 2006-05-02 04:43:48 -0500 (Tue, 02 May 2006)
New Revision: 7477
Added:
trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tab.jpg
Modified:
trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/maincss.css
trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tabstyles.css
trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/order/appheaderReservations.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/MainScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml
Log:
further design changes and datadownload updated
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -453,6 +453,11 @@
<response name="success" type="view" value="findParties"/>
</request-map>
+ <request-map uri="findDisabledParties">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="findDisabledParties"/>
+ </request-map>
+
<request-map uri="partyFinancialHistory">
<security https="true" auth="true"/>
<response name="success" type="view" value="partyFinancialHistory"/>
@@ -3145,6 +3150,7 @@
<view-map name="OrderPurchaseReportProduct" type="screenfop" page="component://opentravelsystem/webapp/hotelbackend/screens/OrderScreens.xml#OrderPurchaseReportProduct" content-type="application/pdf" encoding="none"/>
<!-- parties -->
<view-map name="findParties" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml#findParties"/>
+ <view-map name="findDisabledParties" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml#findDisabledParties"/>
<view-map name="editParty" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml#editParty"/>
<view-map name="editCompany" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml#editCompany"/>
<view-map name="partyFinancialHistory" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml#partyFinancialHistory"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl 2006-05-02 09:43:48 UTC (rev 7477)
@@ -29,27 +29,24 @@
<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if>
<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if>
-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {page.headerItem?default("void") : "headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {page.headerItem?default("void") : "headerButtonRightSelected"}>
+<#assign unselectedTabClassName = "appButton">
+<#assign selectedTabClassMap = {page.headerItem?default("void") : "appButtonSelected"}>
+
<#if requestAttributes.userLogin?has_content>
<div class="apptitle"> Accounting</div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>mainAccounting</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
- <div class="col"><a href="<@ofbizUrl>findInvoices</@ofbizUrl>" class="${selectedLeftClassMap.invoices?default(unselectedLeftClassName)}">${uiLabelMap.AccountingInvoicesMenu}</a></div>
- <div class="col"><a href="<@ofbizUrl>findPayments</@ofbizUrl>" class="${selectedLeftClassMap.payments?default(unselectedLeftClassName)}">${uiLabelMap.AccountingPaymentsMenu}</a></div>
- <!--div class="col"><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>" class="${selectedLeftClassMap.Ledger?default(unselectedLeftClassName)}">Gen.Ledger</a></div-->
- <div class="col"><a href="<@ofbizUrl>AccountingReports</@ofbizUrl>" class="${selectedLeftClassMap.Reports?default(unselectedLeftClassName)}">Reports</a></div>
- <!--div class="col"><a href="<@ofbizUrl>DataExchange</@ofbizUrl>" class="${selectedLeftClassMap.DataExchange?default(unselectedLeftClassName)}">Bank Upload</a></div-->
- <div class="col"><a href="<@ofbizUrl>Utilities</@ofbizUrl>" class="${selectedLeftClassMap.Utilities?default(unselectedLeftClassName)}">Utilities</a></div>
- <!--div class="col"><a href="<@ofbizUrl>AdminMain</@ofbizUrl>" class="${selectedLeftClassMap.Setup?default(unselectedLeftClassName)}">Setup</a></div-->
-
+<div class="appContainer">
+ <a href="<@ofbizUrl>mainAccounting</@ofbizUrl>" class="${selectedTabClassMap.main?default(unselectedTabClassName)}">${uiLabelMap.CommonMain}</a>
+ <a href="<@ofbizUrl>findInvoices</@ofbizUrl>" class="${selectedTabClassMap.invoices?default(unselectedTabClassName)}">${uiLabelMap.AccountingInvoicesMenu}</a>
+ <a href="<@ofbizUrl>findPayments</@ofbizUrl>" class="${selectedTabClassMap.payments?default(unselectedTabClassName)}">${uiLabelMap.AccountingPaymentsMenu}</a>
+ <!--div class="col"><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>" class="${selectedTabClassMap.Ledger?default(unselectedTabClassName)}">Gen.Ledger</a>-->
+ <a href="<@ofbizUrl>AccountingReports</@ofbizUrl>" class="${selectedTabClassMap.Reports?default(unselectedTabClassName)}">Reports</a>
+ <!--div class="col"><a href="<@ofbizUrl>DataExchange</@ofbizUrl>" class="${selectedTabClassMap.DataExchange?default(unselectedTabClassName)}">Bank Upload</a>-->
+ <a href="<@ofbizUrl>Utilities</@ofbizUrl>" class="${selectedTabClassMap.Utilities?default(unselectedTabClassName)}">Utilities</a>
+ <!--div class="col"><a href="<@ofbizUrl>AdminMain</@ofbizUrl>" class="${selectedTabClassMap.Setup?default(unselectedTabClassName)}">Setup</a>-->
<#if userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
+ <a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedTabClassMap.logout?default(unselectedTabClassName)}">${uiLabelMap.CommonLogout}</a>
<#else>
- <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
+ <a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedTabClassMap.login?default(unselectedTabClassName)}'>${uiLabelMap.CommonLogin}</a>
</#if>
- <div class="col-fill"> </div>
</div>
-</#if>
\ No newline at end of file
+</#if>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl 2006-05-02 09:43:48 UTC (rev 7477)
@@ -1,3 +1,29 @@
+<#--
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author Andy Zeneski (jaz at ofbiz.org)
+ *@author Catherine.Heintz at nereide.biz (migration to UiLabel)
+ *@version $Rev: 5462 $
+ *@since 2.1
+-->
<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if>
@@ -3,54 +29,24 @@
<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if>
+<#assign unselectedTabClassName = "appButton">
+<#assign selectedTabClassMap = {page.headerItem?default("void") : "appButtonSelected"}>
-
- <#assign displayApps = [
- {"title":"${uiLabelMap.opentravelsystemMain}", "tabname":"main", "url":"mainCatalog"}
- ,{"title":"${uiLabelMap.opentravelsystemCategories}","tabname":"categories", "url":"EditProdCatalogCategories"}
- ,{"title":"${uiLabelMap.opentravelsystemProducts}", "tabname":"products", "url":"EditProducts"}
- ,{"title":"${uiLabelMap.opentravelsystemFixedAssets}","tabname":"fixedassets", "url":"EditFixedAssets"}
- ,{"title":"${uiLabelMap.opentravelsystemStore}", "tabname":"store", "url":"EditProductStore"}
- ,{"title":"Produkt Upload", "tabname":"importProduct", "url":"importProduct"}
- ]>
-
-<#assign unselectedClass = {"appheader_col" : "appheader_tabdownblock", "appheader_center" : "appheader_tabdowncenter", "appheader_link" : "appheader_tablink"}>
-<#assign selectedClass = {"appheader_col" : "appheader_mainblock", "appheader_center" : "appheader_tabupcenter", "appheader_link" : "appheader_tablinkselected"}>
-<#if !appTabButtonItem?has_content><#assign appTabButtonItem = page.appTabButtonItem?default("void")></#if>
-<#assign thisAppOpt = page.headerItem?default("void")>
-
<#if requestAttributes.userLogin?has_content>
<div class="apptitle"> ${uiLabelMap.opentravelsystemCatalog}</div>
-<table class="appheader_appbar" width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr bgcolor="#f9f4a2">
- <td width="5px" class="appheader_appbarleft"> </td>
- <td height="19px" width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <#list displayApps as display>
- <#if thisAppOpt == display.tabname>
- <#assign class = selectedClass>
- <#else>
- <#assign class = unselectedClass>
- </#if>
- <td valign="bottom" height="19px" class="${class.appheader_col}">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="${class.appheader_center}"><a href=<#if display.title == "Website">"${display.url}" target="newwindow"<#else>"<@ofbizUrl>${display.url}</@ofbizUrl>"</#if> title="" class="${class.appheader_link}">${display.title}</a></td>
- <td class="appheader_betweenstabs" width="1px"> </td>
- </tr>
- </table>
- </td>
- </#list>
- <td width="100%">
- <table width="100% border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="100%" class="appheader_appbarright" height="21px"> </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+<div class="appContainer">
+ <a href="<@ofbizUrl>mainCatalog</@ofbizUrl>" class="${selectedTabClassMap.main?default(unselectedTabClassName)}">${uiLabelMap.opentravelsystemMain}</a>
+ <a href="<@ofbizUrl>EditProdCatalogCategories</@ofbizUrl>" class="${selectedTabClassMap.categories?default(unselectedTabClassName)}">${uiLabelMap.opentravelsystemCategories}</a>
+ <a href="<@ofbizUrl>EditProducts</@ofbizUrl>" class="${selectedTabClassMap.products?default(unselectedTabClassName)}">${uiLabelMap.opentravelsystemProducts}</a>
+ <a href="<@ofbizUrl>EditFixedAssets</@ofbizUrl>" class="${selectedTabClassMap.fixedassets?default(unselectedTabClassName)}">${uiLabelMap.opentravelsystemFixedAssets}</a>
+ <a href="<@ofbizUrl>EditProductStore</@ofbizUrl>" class="${selectedTabClassMap.store?default(unselectedTabClassName)}">${uiLabelMap.opentravelsystemStore}</a>
+ <!--div class="col"><a href="<@ofbizUrl>selectStore</@ofbizUrl>" class="${selectedTabClassMap.selectStore?default(unselectedTabClassName)}">${uiLabelMap.selectStore}</a>-->
+ <a href="<@ofbizUrl>importProduct</@ofbizUrl>" class="${selectedTabClassMap.importProduct?default(unselectedTabClassName)}">importProduct</a>
+
+ <#if userLogin?has_content>
+ <a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedTabClassMap.logout?default(unselectedTabClassName)}">${uiLabelMap.CommonLogout}</a>
+ <#else>
+ <a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedTabClassMap.login?default(unselectedTabClassName)}'>${uiLabelMap.CommonLogin}</a>
+ </#if>
+
+</div>
</#if>
\ No newline at end of file
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/maincss.css
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/maincss.css 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/maincss.css 2006-05-02 09:43:48 UTC (rev 7477)
@@ -1,4 +1,3 @@
-
/* This CSS file is used for all OFBiz applications EXCEPT ecommerce. */
/* See the "ecommain.css" file for ecommerce. */
@@ -16,6 +15,12 @@
margin-left: 10px;
}
+h1 {
+font-size:10px;
+font-weight:normal;
+display: inline;
+}
+
FORM {
margin: 0px;
}
@@ -34,9 +39,8 @@
.head1 {
font-family: Verdana, Arial, Helvetica, sans-serif;
-margin: 0px;
-padding: 2px;
-font-size: 11pt;
+padding-top: 10px;
+font-size: 12pt;
font-weight: bold;
color: #a91930;
}
@@ -86,7 +90,6 @@
A.tabletext, DIV.tabletext, SPAN.tabletext, P.tabletext, .tabletext {
font-size: 10px;
text-decoration: none;
-font-weight:bold;
font-family: Verdana, Arial, Helvetica, sans-serif;
}
@@ -126,16 +129,17 @@
.boxhead {
font-family: Verdana, Arial, Helvetica, sans-serif;
margin: 0px;
-font-size: 9pt;
+font-size: 8pt;
text-decoration: none;
color: #FFFFFF;
+font-weight: bold;
}
DIV.boxtop {
margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto;
padding: 0; text-align: center;
font-family: Verdana, Arial, Helvetica, sans-serif;
-background: #000099;
+background: #070872;
padding-top: 1px;
padding-bottom: 1px;
padding-right: 4px;
@@ -199,7 +203,7 @@
}
.boxtop {
-background: #000099;
+background: #070872;
padding-top: 1px;
padding-bottom: 1px;
padding-right: 4px;
@@ -223,59 +227,19 @@
padding-right: 5px; padding-left: 5px;
}
-/* ===== Tab/Button Bar Styles ===== */
-.tabContainer {
-background: #FFFFFF;
-padding-top: 4px;
-margin-bottom: 10px;
-}
-
-A.tabButton {
+.tableheadtext {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
-font-weight: bold;
text-decoration: none;
-color: #000099;
-background: #D4D0C8;
-padding-right: 5px;
-padding-left: 5px;
-padding-top: 1px;
-padding-bottom: 1px;
-border: solid #000099 1px;
-}
-
-A.tabButton:hover {
-color: #FFFFFF;
-background: #000099;
-border: solid #000099 1px;
-}
-
-A.tabButtonSelected {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
font-weight: bold;
-text-decoration: none;
-color: #FFFFFF;
-background: #000099;
-padding-right: 5px;
-padding-left: 5px;
-padding-top: 1px;
-padding-bottom: 1px;
-border: solid #000099 1px;
+color: #000000;
}
-A.tabButtonSelected:hover {
-color: #FFFFFF;
-border: solid #000099 1px;
-}
-
-.tableheadtext {
+.tabletext {
font-family: Verdana, Arial, Helvetica, sans-serif;
-font-weight: bold;
-text-align: left;
font-size: 10px;
text-decoration: none;
-color: #070872;
+color: #000000;
}
A.tableheadbutton {
@@ -299,7 +263,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
text-indent: -10px;
}
@@ -308,11 +272,11 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
}
A.browsecategorybutton:hover {
-color: #000099;
+color: #070872;
text-decoration: underline;
}
@@ -327,17 +291,12 @@
A.buttontext, .buttontextdisabled {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
+font-weight: bold;
text-decoration: underline;
-background: white;
-margin-right:4px;
-margin-top:4px;
-margin-bottom:4px;
-}
-
-A.buttontext {
color: #070872;
}
+
A.buttontext:hover {
color: #a91930;
text-decoration: underline;
@@ -348,7 +307,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
}
A.linktext:hover {
@@ -365,7 +324,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
}
@@ -504,7 +463,7 @@
padding: 1px 4px 1px 4px;
}
A.buttontextbig {
-color: #000099;
+color: #070872;
}
.buttontextbigdisabled {
color: #CCCCCC;
@@ -525,7 +484,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
background: #B4B0AA;
border-right: solid white 1px;
padding-right: 10px;
@@ -543,7 +502,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
background: #D4D0C8;
border-right: solid white 1px;
padding-right: 10px;
@@ -555,7 +514,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
background: #B4B0AA;
border-left: solid white 1px;
padding-right: 10px;
@@ -574,7 +533,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
background: #D4D0C8;
border-left: solid white 1px;
padding-right: 10px;
@@ -597,7 +556,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
background: #D4D0C8;
padding-right: 10px;
padding-left: 10px;
@@ -625,7 +584,7 @@
font-size: 12pt;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;
-color: #000099;
+color: #070872;
white-space: nowrap;
}
@@ -638,7 +597,6 @@
}
.insideHeaderText {
-margin-bottom: 10px;
margin-right:20px;
font-size: 10px;
font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -651,7 +609,7 @@
font-size: 10px;
font-weight: bold;
text-decoration: none;
-color: #000099;
+color: #070872;
}
A.insideHeaderLink:hover {
@@ -677,7 +635,7 @@
font-size: 8pt;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;
-color: #000099;
+color: #070872;
text-decoration: none;
}
a.headersmalllink:hover {
@@ -705,7 +663,7 @@
margin: 0px;
font-size: 8pt;
font-weight: bold;
-color: #000099;
+color: #070872;
}
.ontab {
@@ -736,7 +694,7 @@
a.offlnk {
font-size: 10px;
font-weight: bold;
-color: #000099;
+color: #070872;
font-family: Verdana, Arial, Helvetica, sans-serif;
text-decoration: none;
padding: 2px;
@@ -813,6 +771,7 @@
margin: 2px;
}
+
.selectBox {
font-family: Verdana, Arial, Helvetica, sans-serif;
background: #FFFFFF;
@@ -848,9 +807,9 @@
font-size: 9pt;
font-weight: bold;
text-decoration: none;
-color: #a91930;
-background: white;
-border: #999999 solid 1px;
+color: #070872;
+background: #f9f4a2;
+border: #CCCCCC solid 1px;
margin: 2px;
}
@@ -866,8 +825,9 @@
}
.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover {
-color: #070872;
-text-decoration: underline;
+color: #a91930;
+text-decoration: none;
+border: #CCCCCC solid 1px;
}
.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit {
@@ -894,16 +854,19 @@
}
/* Form layout styles to simulate a table-style layout */
+
.form-row {
-clear: both;
+vertical-align: top;
+/*clear: both;*/
padding-top: 2px;
}
-.form-label {
-font-size: 10px;
-float: left;
-width: 180px;
-text-align: left;
+#ecom-mainarea .form-label {
+float: left;
+width: 100px;
+font-size:9pt;
+color: #070872;
+padding-top:2px;
}
.form-field {
float: left;
@@ -976,7 +939,7 @@
color:black;
background:#ffffff;
font-size:12pt;
-font-weight:medium;
+font-weight:normal;
font-family:verdana, arial, sans-serif;
text-align:left;
text-decoration:none;
@@ -986,22 +949,3 @@
border-left:1px solid black;
}
-
-/* ecom-mainarea wraps what is below the header including the divs for left, main, right columns as applicable */
-#product-mainarea {
-position: relative;
-background: #FFFFFF;
-width: 100%;
-padding-top:15px;
-}
-
-#product-mainarea .left {
-/* alt: position: absolute; left: 0px; top: 0px; */
-float: left;
-height: 100%;
-width: 100px;
-background: #FFFFFF;
-padding-right:20px;
-padding-top:5px;
-/* border:1px solid #000; */
-}
Added: trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tab.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tab.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tabstyles.css
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tabstyles.css 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/hotelbackendimages/tabstyles.css 2006-05-02 09:43:48 UTC (rev 7477)
@@ -1,4 +1,5 @@
.treewrapper {
+.treewrapper {
margin-left: 10px;
}
@@ -20,6 +21,7 @@
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #070872;
+color: #070872;
}
.tabdown_mouseover {
@@ -53,6 +55,7 @@
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #f9f4a2;
+color:#a91930;
}
.appbar {
@@ -268,3 +271,544 @@
}
+.treewrapper {
+margin-left: 10px;
+}
+
+.treeitem {
+color: blue;
+font-family: Arial, Helvetica, sans-serif;
+font-size: 10pt;
+font-weight: bold;
+border: #888888 solid 1px;
+}
+
+
+/* Main Appbar*/
+.tabdown {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tab.jpg);
+font-size: 9pt;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #070872;
+color: #070872;
+}
+
+.tabdown_mouseover {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+color:#a91930;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #070872;
+}
+
+.tabup {
+padding-top:1px;
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+color:#a91930;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #f9f4a2;
+}
+
+.tabup_mouseover {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #f9f4a2;
+color:#a91930;
+}
+
+.appbar {
+width:97.2%;
+}
+
+.appbarleft {
+border-bottom: 1px solid #070872;
+margin-left:9px;
+}
+
+.appbarright {
+border-bottom: 1px solid #070872;
+margin-right:40px;
+}
+
+/* Main Appbar END*/
+
+
+/* Main Area's */
+DIV.centerarea {
+width:95%;
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color: #f9f4a2;
+}
+
+DIV.contentarea {
+background-color: #FFFFFF;
+border-left: solid #070872 1px;
+border-right: solid #070872 1px;
+border-bottom: solid #070872 1px;
+border-top: solid #070872 1px;
+padding: 10px;
+margin-top: 1px;
+}
+
+DIV.endcolumns {
+ clear: both;
+}
+/* Main Area's END*/
+
+
+/* TabBars */
+.tabContainer {
+background: #FFFFFF;
+padding-top: 4px;
+margin-bottom: 10px;
+}
+
+A.tabButton {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #070872;
+background: #B4B0AA;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+
+A.tabButton:hover {
+color: #FFFFFF;
+background: #B4B0AA;
+border: solid #070872 1px;
+}
+
+A.tabButtonSelected {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #FFFFFF;
+background: #a91930;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+/* TabBars END*/
+
+
+/* AppHeaders */
+.apptitle {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+letter-spacing:2px;
+background-color: #f9f4a2;
+font-size: 10pt;
+font-weight: bold;
+color: #a91930;
+display: block;
+width: 100%;
+margin-bottom: 2px;
+text-align: right;
+}
+
+.appContainer {
+background-color: #f9f4a2;
+padding-top: 4px;
+}
+
+A.appButton {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #070872;
+background: #B4B0AA;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+
+A.appButton:hover {
+color: #a91930;
+background: #FFFFFF;
+border-top: solid #070872 1px;
+border-right: solid #070872 1px;
+border-left: solid #070872 1px;
+border-bottom: solid #FFFFFF 1px;
+}
+
+A.appButtonSelected {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #a91930;
+background: #FFFFFF;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border-top: solid #070872 1px;
+border-right: solid #070872 1px;
+border-left: solid #070872 1px;
+border-bottom: solid #FFFFFF 1px;
+}
+/* Apheaders END*/
+
+
+DIV.simple-right-small {
+float: right;
+width: 20px;
+text-align: right;
+}
+
+DIV.simple-right-half {
+float: right;
+width: 50%;
+text-align: right;
+}
+
+DIV.screenlet {
+background-color: #FFFFFF;
+border: 1px solid #999999;
+margin-bottom: 10px;
+}
+
+DIV.screenlet-body {
+background-color: #FFFFFF;
+padding: 4px;
+}
+
+#column-container {
+position: relative;
+background-color: #FFFFFF;
+margin: auto;
+width: 100%;
+}
+
+#column-container .left {
+float: left; margin-right: 10px;
+/* alt: position: absolute; top: 0px; left: 0px; */
+width: 220px;
+}
+#column-container .right {
+float: right; margin-left: 10px;
+width: 220px;
+}
+
+#column-container .leftonly {
+margin-left: 230px;
+width: auto;
+}
+#column-container .rightonly {
+margin-right: 230px;
+width: auto;
+}
+#column-container .center {
+margin-left: 230px;
+margin-right: 230px;
+width: auto;
+}
+#column-container .nocolumns {
+width: auto;
+}
+
+DIV.column-left-wide {
+float: left;
+width: 300px;
+background-color: #CCCCCC;
+border: black solid 2px;
+overflow: auto;
+}
+
+
+margin-left: 10px;
+}
+
+.treeitem {
+color: blue;
+font-family: Arial, Helvetica, sans-serif;
+font-size: 10pt;
+font-weight: bold;
+border: #888888 solid 1px;
+}
+
+
+/* Main Appbar*/
+.tabdown {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tab.jpg);
+font-size: 9pt;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #070872;
+}
+
+.tabdown_mouseover {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+color:#a91930;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #070872;
+}
+
+.tabup {
+padding-top:1px;
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+color:#a91930;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #f9f4a2;
+}
+
+.tabup_mouseover {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/hotelbackend/hotelbackendimages/tabSelected.jpg);
+font-size: 9pt;
+font-weight: bold;
+text-align: center;
+vertical-align: middle;
+border-bottom: 1px solid #f9f4a2;
+}
+
+.appbar {
+width:97.2%;
+}
+
+.appbarleft {
+border-bottom: 1px solid #070872;
+margin-left:9px;
+}
+
+.appbarright {
+border-bottom: 1px solid #070872;
+margin-right:40px;
+}
+
+/* Main Appbar END*/
+
+
+/* Main Area's */
+DIV.centerarea {
+width:95%;
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color: #f9f4a2;
+}
+
+DIV.contentarea {
+background-color: #FFFFFF;
+border-left: solid #070872 1px;
+border-right: solid #070872 1px;
+border-bottom: solid #070872 1px;
+border-top: solid #070872 1px;
+padding: 10px;
+margin-top: 1px;
+}
+
+DIV.endcolumns {
+ clear: both;
+}
+/* Main Area's END*/
+
+
+/* TabBars */
+.tabContainer {
+background: #FFFFFF;
+padding-top: 4px;
+margin-bottom: 10px;
+}
+
+A.tabButton {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #070872;
+background: #B4B0AA;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+
+A.tabButton:hover {
+color: #FFFFFF;
+background: #B4B0AA;
+border: solid #070872 1px;
+}
+
+A.tabButtonSelected {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #FFFFFF;
+background: #a91930;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+/* TabBars END*/
+
+
+/* AppHeaders */
+.apptitle {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+letter-spacing:2px;
+background-color: #f9f4a2;
+font-size: 10pt;
+font-weight: bold;
+color: #a91930;
+display: block;
+width: 100%;
+margin-bottom: 2px;
+text-align: right;
+}
+
+.appContainer {
+background-color: #f9f4a2;
+padding-top: 4px;
+}
+
+A.appButton {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #070872;
+background: #B4B0AA;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border: solid #070872 1px;
+}
+
+A.appButton:hover {
+color: #a91930;
+background: #FFFFFF;
+border-top: solid #070872 1px;
+border-right: solid #070872 1px;
+border-left: solid #070872 1px;
+border-bottom: solid #FFFFFF 1px;
+}
+
+A.appButtonSelected {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+font-weight: bold;
+text-decoration: none;
+color: #a91930;
+background: #FFFFFF;
+padding-right: 5px;
+padding-left: 5px;
+padding-top: 1px;
+padding-bottom: 1px;
+border-top: solid #070872 1px;
+border-right: solid #070872 1px;
+border-left: solid #070872 1px;
+border-bottom: solid #FFFFFF 1px;
+}
+/* Apheaders END*/
+
+
+DIV.simple-right-small {
+float: right;
+width: 20px;
+text-align: right;
+}
+
+DIV.simple-right-half {
+float: right;
+width: 50%;
+text-align: right;
+}
+
+DIV.screenlet {
+background-color: #FFFFFF;
+border: 1px solid #999999;
+margin-bottom: 10px;
+}
+
+DIV.screenlet-body {
+background-color: #FFFFFF;
+padding: 4px;
+}
+
+#column-container {
+position: relative;
+background-color: #FFFFFF;
+margin: auto;
+width: 100%;
+}
+
+#column-container .left {
+float: left; margin-right: 10px;
+/* alt: position: absolute; top: 0px; left: 0px; */
+width: 220px;
+}
+#column-container .right {
+float: right; margin-left: 10px;
+width: 220px;
+}
+
+#column-container .leftonly {
+margin-left: 230px;
+width: auto;
+}
+#column-container .rightonly {
+margin-right: 230px;
+width: auto;
+}
+#column-container .center {
+margin-left: 230px;
+margin-right: 230px;
+width: auto;
+}
+#column-container .nocolumns {
+width: auto;
+}
+
+DIV.column-left-wide {
+float: left;
+width: 300px;
+background-color: #CCCCCC;
+border: black solid 2px;
+overflow: auto;
+}
+
+
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-05-02 09:43:48 UTC (rev 7477)
@@ -35,18 +35,18 @@
<#if requestAttributes.userLogin?has_content>
<#assign displayApps = [
- {"title":"ProductManagement", "url":"mainCatalog"}
- ,{"title":"OrdersReservationsManagement", "url":"findorders"}
- ,{"title":"PartiesManagement", "url":"findParties?statusId=PARTYREL-ACTIVE"}
- ,{"title":"AccountingManagement", "url":"mainAccounting"}
- ,{"title":"WebsiteManagement", "url":"findElectronicTexts"}
- ,{"title":"SysAdmin", "url":"sysAdminMain"}
- ,{"title":"Logout", "url":"logout"}
+ {"title":"Product", "url":"mainCatalog"}
+ ,{"title":"Reservations", "url":"findorders"}
+ ,{"title":"Parties", "url":"findParties?statusId=PARTYREL-ACTIVE"}
+ ,{"title":"Accounting", "url":"mainAccounting"}
+ ,{"title":"Website", "url":"findElectronicTexts"}
+ ,{"title":"SysAdmin", "url":"sysAdminMain"}
+ ,{"title":"Logout", "url":"logout"}
]>
-<#else>
+<#--<#else>
<#assign displayApps = [
{"title":"Login", "url":"checkLogin/main"}
- ]>
+ ]>-->
</#if>
<script language="JavaScript">
@@ -56,14 +56,17 @@
function ReturnClass(tab,toclass) {
document.getElementById(tab).className= toclass;
}
+
</script>
<#assign unselectedClass = {
-"tab" : "tabdowncenter",
+"tab" : "tabdown",
+"tab_mouseover" : "tabdown_mouseover",
"link" : "tablink"}>
<#assign selectedClass = {
-"tab" : "tabupcenter",
+"tab" : "tabup",
+"tab_mouseover" : "tabup_mouseover",
"link" : "tablinkselected"}>
<#if !appTabButtonItem?has_content><#assign appTabButtonItem = page.appTabButtonItem?default("void")></#if>
@@ -71,32 +74,26 @@
<table class="appbar" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF">
- <td width="5px" class="appbarleft"> </td>
+ <td class="appbarleft"> </td>
<td height="21px" width="100%">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
+ <#if displayApps?has_content>
<#list displayApps as display>
<#if thisAppOpt == display.title>
<#assign class = selectedClass>
<#else>
<#assign class = unselectedClass>
- </#if>
- <#--DEZE SYNTAX MOET BETER KUNNEN< LIJKT ME-->
- <#if requestAttributes.userLogin?has_content>
-
- <#else>
- <#assign class = selectedClass>
- </#if>
- <td width="107px">
- <table height="21px" width="107px" border="0" cellspacing="0" cellpadding="0">
+ </#if>
+ <td>
+ <table height="21px" width="120px" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td width="107px" height="21px" class="${class.tab}" id="${"uiLabelMap.opentravelsystem${display.title}"?eval}" onMouseOver="ChangeClass('${"uiLabelMap.opentravelsystem${display.title}"?eval}', '${class.tab}');" onMouseOut="ChangeClass('${"uiLabelMap.opentravelsystem${display.title}"?eval}', '${class.tab}');"><a href=<#if display.title == "Website">"${display.url}" target="newwindow"<#else>"<@ofbizUrl>${display.url}</@ofbizUrl>"</#if> title="" class="${class.link}">${"uiLabelMap.opentravelsystem${display.title}"?eval}</a></td>
- <td height="1px" class="betweenstabs"> </td>
- </tr>
-
+ <td height="21px" onclick="window.location='${display.url}'" style="cursor:pointer; cursor:hand" class="${class.tab}" id="${"uiLabelMap.${display.title}"?eval}" onMouseOver="ChangeClass('${"uiLabelMap.${display.title}"?eval}', '${class.tab_mouseover}');" onMouseOut="ChangeClass('${"uiLabelMap.${display.title}"?eval}', '${class.tab}');">${"uiLabelMap.${display.title}"?eval}</td>
+ </tr>
</table>
</td>
</#list>
+ </#if>
<td width="100%">
<table width="100% border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl 2006-05-02 09:43:48 UTC (rev 7477)
@@ -43,7 +43,7 @@
<script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@ofbizContentUrl>/${activeApp}/hotelbackendimages/maincss.css</@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@ofbizContentUrl>/${activeApp}/hotelbackendimages/tabstyles.css</@ofbizContentUrl>' type='text/css'>
- <link rel='stylesheet' href='<@ofbizContentUrl>/${activeApp}/hotelbackendimages/calendarTable.css</@ofbizContentUrl>' type='text/css'>
+
${layoutSettings.extraHead?if_exists}
<#if htmlEdit?exists>
<script language="Javascript" type="text/javascript" src="/${activeApp}/html/whizzywig.js"></script>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/order/appheaderReservations.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/order/appheaderReservations.ftl 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/order/appheaderReservations.ftl 2006-05-02 09:43:48 UTC (rev 7477)
@@ -29,23 +29,21 @@
<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if>
<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if>
-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {page.headerItem?default("void") : "headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {page.headerItem?default("void") : "headerButtonRightSelected"}>
+<#assign unselectedTabClassName = "appButton">
+<#assign selectedTabClassMap = {page.headerItem?default("void") : "appButtonSelected"}>
+
<#if requestAttributes.userLogin?has_content>
<div class="apptitle"> Reservations</div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>findorders</@ofbizUrl>" class="${selectedLeftClassMap.findorders?default(unselectedLeftClassName)}">List Reservations</a></div>
- <div class="col"><a href="<@ofbizUrl>downloadorder</@ofbizUrl>" class="${selectedLeftClassMap.downloadorder?default(unselectedLeftClassName)}">Download Reservations</a></div>
- <!--div class="col"><a href="<@ofbizUrl>statistics</@ofbizUrl>" class="${selectedLeftClassMap.statistics?default(unselectedLeftClassName)}">Statistics</a></div-->
- <!--div class="col"><a href="<@ofbizUrl>reports</@ofbizUrl>" class="${selectedLeftClassMap.reports?default(unselectedLeftClassName)}">Reports</a></div-->
+<div class="appContainer">
+ <a href="<@ofbizUrl>findorders</@ofbizUrl>" class="${selectedTabClassMap.findorders?default(unselectedTabClassName)}">List Reservations</a>
+ <a href="<@ofbizUrl>downloadorder</@ofbizUrl>" class="${selectedTabClassMap.downloadorder?default(unselectedTabClassName)}">Download Reservations</a>
+ <!--div class="col"><a href="<@ofbizUrl>statistics</@ofbizUrl>" class="${selectedTabClassMap.statistics?default(unselectedTabClassName)}">Statistics</a></div-->
+ <!--div class="col"><a href="<@ofbizUrl>reports</@ofbizUrl>" class="${selectedTabClassMap.reports?default(unselectedTabClassName)}">Reports</a></div-->
<#if userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
+ <a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedTabClassMap.logout?default(unselectedTabClassName)}">${uiLabelMap.CommonLogout}</a>
<#else>
- <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
+ <a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedTabClassMap.login?default(unselectedTabClassName)}'>${uiLabelMap.CommonLogin}</a>
</#if>
- <div class="col-fill"> </div>
</div>
</#if>
\ No newline at end of file
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -53,7 +53,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditProductCategory"/>
- <set field="headerItem" value="category"/>
+ <set field="page.headerItem" value="categories"/>
<set field="tabButtonItem" value="EditCategory"/>
<set field="labelTitleProperty" value="ProductCategory"/>
@@ -94,6 +94,7 @@
<if-has-permission permission="CATALOG" action="_VIEW"/>
</condition-->
<actions>
+ <set field="tabButtonItem" value="Categories"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="categories"/>
<set field="productStoreId" from-field="parameters.userLogin.partyId"/>
@@ -146,6 +147,7 @@
<section>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="tabButtonItem" value="Products"/>
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="categories"/>
@@ -214,6 +216,7 @@
<section>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="tabButtonItem" value="FixedAssets"/>
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="fixedassets"/>
@@ -309,7 +312,7 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="products"/>
- <set field="page.tabButtonItem" value="EditProduct"/>
+ <set field="tabButtonItem" value="Product"/>
<set field="title" value="Edit Product"/>
<set field="titleProperty" value="PageTitleEditProduct"/>
<set field="labelTitleProperty" value="ProductProduct"/>
@@ -322,9 +325,9 @@
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <platform-specific>
+ <!--<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
- </platform-specific>
+ </platform-specific>-->
<label style="head1">${uiLabelMap.ProductEditProduct}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label>
</container>
<include-form name="EditProduct" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
@@ -345,7 +348,7 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="products"/>
- <set field="page.tabButtonItem" value="EditProductCategories"/>
+ <set field="tabButtonItem" value="Categories"/>
<set field="title" value="Edit Product Categories"/>
<set field="titleProperty" value="PageTitleEditProductCategories"/>
<set field="labelTitleProperty" value="ProductCategories"/>
@@ -383,7 +386,7 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="products"/>
- <set field="page.tabButtonItem" value="EditProductPrices"/>
+ <set field="tabButtonItem" value="Prices"/>
<set field="title" value="Edit Product Prices"/>
<set field="titleProperty" value="PageTitleEditProductPrices"/>
<set field="labelTitleProperty" value="ProductPrices"/>
@@ -403,9 +406,9 @@
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <platform-specific>
+ <!--<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
- </platform-specific>
+ </platform-specific>-->
<label style="head1">${uiLabelMap.PageTitleEditProductPrices}: ${product.productName} [${uiLabelMap.CommonId}:${productId}]</label>
</container>
<include-form name="UpdateProductPrice" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -422,7 +425,7 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="products"/>
- <set field="page.tabButtonItem" value="EditProductContent"/>
+ <set field="tabButtonItem" value="Content"/>
<set field="title" value="Edit Product Content"/>
<set field="titleProperty" value="PageTitleEditProductPrices"/>
<set field="labelTitleProperty" value="ProductPrices"/>
@@ -434,9 +437,9 @@
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <platform-specific>
+ <!--<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
- </platform-specific>
+ </platform-specific>-->
<label style="head1">${uiLabelMap.PageTitleEditProductContent}: ${product.productName} [${uiLabelMap.CommonId}:${productId}]</label>
</container>
<platform-specific>
@@ -455,7 +458,7 @@
<set field="page.appTabButtonItem" value="Product"/>
<set field="title" value="Edit Product for Asset Usage attributes"/>
<set field="titleProperty" value="PageTitleEditProductAssetUsage"/>
- <set field="tabButtonItem" value="EditProductAssetUsage"/>
+ <set field="tabButtonItem" value="AssetUsage"/>
<set field="labelTitleProperty" value="ProductAssetUsage"/>
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-name="product"/>
@@ -467,9 +470,9 @@
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <platform-specific>
+ <!--<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
- </platform-specific>
+ </platform-specific>-->
<label style="head1">${uiLabelMap.ProductEditProduct}: ${product.productName} [${uiLabelMap.CommonId}:${productId}]</label>
</container>
<include-form name="EditProductAssetUsage" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -494,7 +497,7 @@
<set field="page.appTabButtonItem" value="Product"/>
<set field="title" value="Edit Product for Asset Usage attributes"/>
<set field="titleProperty" value="PageTitleEditProductAssetUsage"/>
- <set field="tabButtonItem" value="EditProductAssetUsage"/>
+ <set field="tabButtonItem" value="AssetUsage"/>
<set field="labelTitleProperty" value="ProductAssetUsage"/>
<set field="extraFunctionName" value="uiLabelMap.AccountingFixedAssetProductUpd"/>
<entity-one entity-name="FixedAssetProduct" value-name="fixedAssetProduct"/>
@@ -573,7 +576,7 @@
<section>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="page.tabButtonItem" value="EditFixedAsset"/>
+ <set field="tabButtonItem" value="EditFixedAsset"/>
<set field="title" value="Edit Fixed Asset"/>
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="titleProperty" value="PageTitleListFixedAssetProducts"/>
@@ -672,7 +675,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditCategoryRollup"/>
- <set field="headerItem" value="category"/>
+ <set field="page.headerItem" value="categories"/>
<set field="tabButtonItem" value="EditCategoryRollup"/>
<set field="labelTitleProperty" value="ProductRollup"/>
@@ -756,7 +759,7 @@
<section>
<actions>
<set field="title" value="Import product data"/>
- <set field="headerItem" value="importProduct"/>
+ <set field="page.headerItem" value="importproduct"/>
</actions>
<widgets>
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
@@ -777,10 +780,9 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditProductStore"/>
- <set field="headerItem" value="store"/>
+ <set field="page.headerItem" value="store"/>
<set field="tabButtonItem" value="EditProductStore"/>
- <set field="labelTitleProperty" value="ProductStore"/>
-
+ <set field="labelTitleProperty" value="ProductStore"/>
<set field="productStoreId" from-field="parameters.userLogin.partyId"/>
<entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
</actions>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -88,10 +88,20 @@
<decorator-section name="body">
<container style="centerarea">
- <platform-specific><html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl"/></html></platform-specific>
+ <label style="apptitle" text="${uiLabelMap.opentravelsystemCatalog}"/>
+ <include-menu location="component://opentravelsystem/webapp/hotelbackend/screens/Menus.xml" name="ProductAppBar"/>
+ <!--<platform-specific><html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl"/></html></platform-specific>-->
<container style="contentarea">
<container style="${MainColumnStyle}">
<platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+ <section>
+ <condition>
+ <not><if-empty field-name="productId"/></not>
+ </condition>
+ <widgets>
+ <include-menu location="component://opentravelsystem/webapp/hotelbackend/screens/Menus.xml" name="ProductTabBar"/>
+ </widgets>
+ </section>
<decorator-section-include name="body"/>
</container>
<container style="endcolumns"><label text="&nbsp;"/></container>
@@ -260,7 +270,7 @@
</condition>
<actions>
<set field="appTabButtonItem" value="Parties"/>
- <set field="headerItem" value="ContactLists"/>
+ <set field="headerItem" value="contactlists"/>
</actions>
<widgets>
<decorator-screen name="main-decorator">
@@ -311,7 +321,7 @@
<screen name="SecurityGroupDecorator">
<section>
<actions>
- <set field="headerItem" value="Security"/>
+ <set field="page.headerItem" value="security"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator">
@@ -410,9 +420,9 @@
<section>
<condition><not><if-empty field-name="productId"/></not></condition>
<widgets>
- <platform-specific>
+ <!--<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
- </platform-specific>
+ </platform-specific>-->
<container>
<label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
</container>
@@ -482,7 +492,7 @@
<screen name="FixedAssetDecorator">
<section>
<actions>
- <set field="page.headerItem" value="FixedAssets"/>
+ <set field="page.headerItem" value="fixedassets"/>
</actions>
<widgets>
<decorator-screen name="CatalogDecorator">
@@ -509,7 +519,7 @@
<screen name="CommonPaymentDecorator">
<section>
<actions>
- <set field="headerItem" value="payments"/>
+ <set field="page.headerItem" value="payments"/>
</actions>
<widgets>
<decorator-screen name="mainAccountingDecorator">
@@ -542,7 +552,7 @@
<screen name="CommonInvoiceDecorator">
<section>
<actions>
- <set field="headerItem" value="invoices"/>
+ <set field="page.headerItem" value="invoices"/>
</actions>
<widgets>
<decorator-screen name="mainAccountingDecorator">
@@ -575,7 +585,7 @@
<screen name="CommonAccountingDecorator">
<section>
<actions>
- <set field="headerItem" value="Accounting"/>
+ <set field="page.headerItem" value="Accounting"/>
</actions>
<widgets>
<decorator-screen name="mainAccountingDecorator">
@@ -609,7 +619,7 @@
<screen name="CommonAdminDecorator">
<section>
<actions>
- <set field="headerItem" value="companies"/>
+ <set field="page.headerItem" value="companies"/>
<set field="title" value="GL Account defaults"/>
<set field="requestParameters.organizationPartyId" from-scope="user" from-field="productStoreId" />
</actions>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/MainScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/MainScreens.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/MainScreens.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -99,7 +99,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditSecurityGroupUserLogins"/>
- <set field="tabButtonItem" value="Security"/>
+ <set field="headerItem" value="Security"/>
<set field="labelTitleProperty" value="PartyUserLoginsForSecurityGroup"/>
<set field="groupId" from-field="parameters.organizationPartyId"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -29,27 +29,27 @@
default-align-style="col" menu-container-style="row" fill-style="col-fill" orientation="horizontal" type="simple">
</menu>
- <menu name="PartyAppBar" default-menu-item-name="main" default-selected-style="headerButtonLeftSelected" selected-menuitem-context-field-name="headerItem"
- default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="headerButtonLeft"
- default-align-style="col" menu-container-style="row" fill-style="col-fill" orientation="horizontal" type="simple">
- <menu-item name="Find" title="Find"><link target="findParties?statusId=PARTYREL-ACTIVE"/></menu-item>
- <menu-item name="Disabled" title="Disabled Parties"><link target="findParties?statusId=PARTYREL-DELETED"/></menu-item>
- <menu-item name="Security" title="Security"><link target="security"/></menu-item>
- <menu-item name="ContactLists" title="ContactLists"><link target="ListContactLists"/></menu-item>
- <menu-item name="CompanyInfo" title="CompanyInfo"><link target="editCompany?organizationPartyId=${organizationPartyId}"/></menu-item>
- <menu-item name="Help" title="Help" align-style="col-right"><link target="javascript:popUp('help?app=${appTabButtonItem}&function=${headerItem}&tab=${tabButtonItem}','help',450,600)" url-mode="plain"/></menu-item>
+ <menu name="PartyAppBar" selected-menuitem-context-field-name="page.headerItem" default-menu-item-name="main" default-selected-style="appButtonSelected"
+ default-title-style="appButton" default-tooltip-style="tabletext" default-widget-style="appButton"
+ menu-container-style="appContainer" orientation="horizontal" type="simple">
+ <menu-item name="find" title="Find"><link target="findParties?statusId=PARTYREL-ACTIVE"/></menu-item>
+ <menu-item name="disabled" title="Disabled Parties"><link target="findDisabledParties?statusId=PARTYREL-DELETED"/></menu-item>
+ <menu-item name="security" title="Security"><link target="security"/></menu-item>
+ <menu-item name="contactlist" title="ContactLists"><link target="ListContactLists"/></menu-item>
+ <menu-item name="companies" title="CompanyInfo"><link target="editCompany?organizationPartyId=${organizationPartyId}"/></menu-item>
+ <menu-item name="help" title="Help"><link target="javascript:popUp('help?app=${appTabButtonItem}&function=${headerItem}&tab=${tabButtonItem}','help',450,600)" url-mode="plain"/></menu-item>
</menu>
<menu name="PartyTabBar" default-menu-item-name="EditParty" default-selected-style="tabButtonSelected"
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
- orientation="horizontal" title="simple">
+ menu-container-style="tabContainer" orientation="horizontal" title="simple">
<menu-item name="EditParty" title="Edit Party">
<link target="editParty?partyId=${partyId}"/>
</menu-item>
<menu-item name="FinHistory" title="Fin.History">
<link target="partyFinancialHistory?partyId=${partyId}"/>
</menu-item>
- <menu-item name="Visits" title="Visits">
+ <menu-item name="showvisits" title="Visits">
<link target="showvisits?partyId=${partyId}"/>
</menu-item>
<!--menu-item name="EditPartyRelationships" title="${uiLabelMap.PartyRelationships}">
@@ -80,6 +80,7 @@
<link target="ListPartyContactLists?partyId=${partyId}"/>
</menu-item>
</menu>
+
<menu name="ContactListTabBar" default-menu-item-name="ContactList" default-selected-style="tabButtonSelected"
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
orientation="horizontal" type="simple">
@@ -105,4 +106,45 @@
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
orientation="horizontal" type="simple">
</menu>
+
+ <menu name="ProductAppBar" selected-menuitem-context-field-name="page.headerItem" default-menu-item-name="main" default-selected-style="appButtonSelected"
+ default-title-style="appButton" default-tooltip-style="tabletext" default-widget-style="appButton"
+ menu-container-style="appContainer" orientation="horizontal" type="simple">
+ <menu-item name="main" title="${uiLabelMap.opentravelsystemMain}"><link target="mainCatalog"/></menu-item>
+ <menu-item name="categories" title="${uiLabelMap.opentravelsystemCategories}"><link target="EditProdCatalogCategories"/></menu-item>
+ <menu-item name="products" title="${uiLabelMap.opentravelsystemProducts}"><link target="EditProducts"/></menu-item>
+ <menu-item name="fixedassets" title="${uiLabelMap.opentravelsystemFixedAssets}"><link target="EditFixedAssets"/></menu-item>
+ <menu-item name="store" title="${uiLabelMap.opentravelsystemStore}"><link target="EditProductStore"/></menu-item>
+ <!--<menu-item name="${uiLabelMap.selectStore}" title="${uiLabelMap.selectStore}"><link target="selectStore"/></menu-item>-->
+ <menu-item name="importproduct" title="${uiLabelMap.opentravelsystemImportProduct}"><link target="importProduct"/></menu-item>
+ </menu>
+
+ <menu name="ProductTabBar" default-menu-item-name="EditProduct" default-selected-style="tabButtonSelected"
+ default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
+ menu-container-style="tabContainer" orientation="horizontal" title="simple">
+ <menu-item name="Product" title="${uiLabelMap.ProductProduct}"><link target="EditProduct?productId=${productId}"/></menu-item>
+ <menu-item name="Prices" title="${uiLabelMap.ProductPrices}"><link target="EditProductPrices?productId=${productId}"/></menu-item>
+ <menu-item name="Content" title="${uiLabelMap.ProductContent}"><link target="EditProductContent?productId=${productId}"/></menu-item>
+ <menu-item name="Categories" title="${uiLabelMap.ProductCategories}"><link target="EditProductCategories?productId=${productId}"/></menu-item>
+ <menu-item name="QuickAddVariants" title="${uiLabelMap.ProductVariants}">
+ <condition>
+ <and>
+ <not><if-empty field-name="product"/></not>
+ <not><if-empty field-name="product.isVirtual"/></not>
+ <if-compare field-name="product.isVirtual" operator="equals" value="Y"/>
+ </and>
+ </condition>
+ <link target="QuickAddVariants?productId=${productId}"/>
+ </menu-item>
+ <menu-item name="AssetUsage" title="${uiLabelMap.ProductAssetUsage}">
+ <condition>
+ <and>
+ <not><if-empty field-name="product"/></not>
+ <not><if-empty field-name="product.productTypeId"/></not>
+ <if-compare field-name="product.productTypeId" operator="equals" value="ASSET_USAGE"/>
+ </and>
+ </condition>
+ <link target="EditProductAssetUsage?productId=${productId}"/>
+ </menu-item>
+ </menu>
</menus>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -36,9 +36,9 @@
<form name="ListParties" type="list" separate-columns="true"
title="Party List" default-title-style="tableheadtext"
default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="findParties" list-iterator-name="listIt" default-entity-name="PartyNameView">
+ paginate-target="findParties" list-name="listIt" default-entity-name="PartyNameView">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
<field-map field-name="entityName" value="PartyRelationshipAndPartyDetail"/>
<field-map field-name="orderBy" value="partyId"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml 2006-05-02 07:51:47 UTC (rev 7476)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml 2006-05-02 09:43:48 UTC (rev 7477)
@@ -28,10 +28,10 @@
<section>
<actions>
<set field="title" value="Find a Party"/>
- <set field="headerItem" value="Find"/>
+ <set field="page.headerItem" value="find"/>
<set field="titleProperty" value="PageTitleFindInvoice"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -46,6 +46,28 @@
</section>
</screen>
+ <screen name="findDisabledParties">
+ <section>
+ <actions>
+ <set field="title" value="Find a Party"/>
+ <set field="headerItem" value="disabled"/>
+ <set field="titleProperty" value="PageTitleFindInvoice"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><link target="editParty" text="${uiLabelMap.CommonCreateNew} Party" style="buttontext"/></container>
+ <container><label style="head1" text="Find Parties"/></container>
+ <include-form name="FindParties" location="component://opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml"/>
+ <include-form name="ListParties" location="component://opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="editParty">
<section>
<actions>
More information about the Svn
mailing list