[OFBiz] SVN: r7928 - in trunk/specialized/opentravelsystem: script/org/ofbiz/opentravelsystem webapp/hotelbackend/html webapp/hotelbackend/includes webapp/hotelbackend/screens
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Sun Jul 16 20:07:39 CDT 2006
Author: hansbak
Date: 2006-07-16 20:07:15 -0500 (Sun, 16 Jul 2006)
New Revision: 7928
Modified:
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/html/tabstyles.css
trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
Log:
improvement of grafical design
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml 2006-07-12 09:57:35 UTC (rev 7927)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml 2006-07-17 01:07:15 UTC (rev 7928)
@@ -639,15 +639,18 @@
</simple-method>
<simple-method method-name="createCommunicationEvent" short-description="Create an CommunicationEvent">
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
- <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
- </entity-one>
- <if-not-empty field-name="partyAcctgPreference">
- <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
- </check-permission>
- <check-errors/>
+ <if-not-empty field-name="parameters.userLogin.partyId"><!-- when executed by 'system', the partyId is empty -->
+ <set field="pref.partyId" from-field="parameters.userLogin.partyId"/>
+ <!-- take party belonging to 'to' address -->
+ <else>
+ <set field="pref.partyId" from-field="parameters.partyIdTo"/>
+ </else>
+ </if-not-empty>
+ <if-not-empty field-name="pref.partyId">
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
<sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}CommunicationEvent" env-name="nextCommunicationEventId"/>
<set field="parameters.communicationEventId" value="${partyAcctgPreference.invoiceIdPrefix}${nextCommunicationEventId}"/>
</if-not-empty>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/html/tabstyles.css
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/html/tabstyles.css 2006-07-12 09:57:35 UTC (rev 7927)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/html/tabstyles.css 2006-07-17 01:07:15 UTC (rev 7928)
@@ -12,50 +12,48 @@
/* Main Appbar*/
-.tabdown {
+.tabarea {
font-family: Arial, Helvetica, sans-serif;
-background-image: url(/backend/html/images/tab.gif);
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(/backend/html/images/tabSelected.gif);
-font-size: 9pt;
-color:#a91930;
-font-weight: bold;
-text-align: center;
-vertical-align: middle;
+.tabdown {
+background-image: url(/backend/html/images/tab.gif);
border-bottom: 1px solid #070872;
}
-.tabup {
-padding-top:1px;
-font-family: Arial, Helvetica, sans-serif;
-background-image: url(/backend/html/images/tabSelected.gif);
-font-size: 10pt;
+.tabupProduct {
+background-image: url(/backend/html/images/tabProduct.gif);
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(/backend/html/images/tabSelected.gif);
-font-size: 9pt;
-font-weight: bold;
-text-align: center;
-vertical-align: middle;
-border-bottom: 1px solid #f9f4a2;
+.tabupParties {
+background-image: url(/backend/html/images/tabParties.gif);
color:#a91930;
}
+.tabupReservations {
+background-image: url(/backend/html/images/tabReservations.gif);
+color:#a91930;
+}
+.tabupAccounting {
+background-image: url(/backend/html/images/tabAccounting.gif);
+color:#a91930;
+}
+.tabupWebsite {
+background-image: url(/backend/html/images/tabWebsite.gif);
+color:#a91930;
+}
+.tabupSysAdmin {
+background-image: url(/backend/html/images/tabSysAdmin.gif);
+color:#a91930;
+}
+.tabupLogout {
+background-image: url(/backend/html/images/tab.gif);
+color:#a91930;
+}
.appbar {
width:100%;
@@ -88,6 +86,48 @@
background-color: #f9f4a2;
}
+DIV.centerareaProduct {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#f9f4a2;
+}
+DIV.centerareaWebsite {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#c9c9ff;
+}
+DIV.centerareaParties {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#80b9ed;
+}
+DIV.centerareaAccounting {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#90b082;
+}
+DIV.centerareaReservations {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#e8b079;
+}
+DIV.centerareaSysAdmin {
+border-left: 1px solid #070872;
+border-right: 1px solid #070872;
+border-bottom: 1px solid #070872;
+padding:10px;
+background-color:#9f9ae8;
+}
DIV.contentarea {
background-color: #FFFFFF;
border-left: solid #070872 1px;
@@ -150,8 +190,7 @@
/* AppHeaders */
.apptitle {
font-family: Verdana, Arial, Helvetica, sans-serif;
-letter-spacing:2px;
-background-color: #f9f4a2;
+letter-spacing:2px;
font-size: 10pt;
font-weight: bold;
color: #a91930;
@@ -162,7 +201,6 @@
}
.appContainer {
-background-color: #f9f4a2;
padding-top: 4px;
width:100%;
}
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-07-12 09:57:35 UTC (rev 7927)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-07-17 01:07:15 UTC (rev 7928)
@@ -44,12 +44,12 @@
]>
<#elseif requestAttributes.userLogin?has_content && userLogin.partyId == "admin">
<#assign displayApps = [
- {"title":"Produktbeheer", "url":"mainCatalog", "label":"opentravelsystemProductManagement"}
- ,{"title":"Orderbeheer", "url":"findorders", "label":"opentravelsystemOrdersReservationsManagement"}
- ,{"title":"Relatiebeheer", "url":"findParties?statusId=PARTYREL-ACTIVE", "label":"opentravelsystemPartiesManagement"}
- ,{"title":"Boekhouding", "url":"mainAccounting", "label":"opentravelsystemAccountingManagement"}
- ,{"title":"Websitebeheer", "url":"findWebsiteContent", "label":"opentravelsystemWebsiteManagement"}
- ,{"title":"SystAdmin", "url":"sysAdminMain", "label":"opentravelsystemSysAdmin"}
+ {"title":"Product", "url":"mainCatalog", "label":"opentravelsystemProductManagement"}
+ ,{"title":"Reservations", "url":"findorders", "label":"opentravelsystemOrdersReservationsManagement"}
+ ,{"title":"Parties", "url":"findParties?statusId=PARTYREL-ACTIVE", "label":"opentravelsystemPartiesManagement"}
+ ,{"title":"Accounting", "url":"mainAccounting", "label":"opentravelsystemAccountingManagement"}
+ ,{"title":"Website", "url":"findWebsiteContent", "label":"opentravelsystemWebsiteManagement"}
+ ,{"title":"SysAdmin", "url":"sysAdminMain", "label":"opentravelsystemSysAdmin"}
,{"title":"Logout", "url":"logout", "label":"CommonLogout"}
]>
</#if>
@@ -64,16 +64,6 @@
</script>
-<#assign unselectedClass = {
-"tab" : "tabdown",
-"tab_mouseover" : "tabdown_mouseover",
-"link" : "tablink"}>
-
-<#assign selectedClass = {
-"tab" : "tabup",
-"tab_mouseover" : "tabup_mouseover",
-"link" : "tablinkselected"}>
-
<#if !appTabButtonItem?has_content><#assign appTabButtonItem = page.appTabButtonItem?default("void")></#if>
<#assign thisAppOpt = page.appTabButtonItem?default("void")>
@@ -85,13 +75,22 @@
<tr>
<#if displayApps?has_content>
<#list displayApps as display>
+ <#assign unselectedClass = {
+ "tab" :"tabdown",
+ "tab_mouseover" : "tabup"+display.title,
+ "link" : "tablink"}>
+
+ <#assign selectedClass = {
+ "tab" : "tabup"+display.title,
+ "tab_mouseover" : "tabup"+display.title,
+ "link" : "tablinkselected"}>
<#if thisAppOpt == display.title>
<#assign class = selectedClass>
<#else>
<#assign class = unselectedClass>
</#if>
<td>
- <table height="21px" width="120px" border="0" cellspacing="0" cellpadding="0">
+ <table height="21px" width="120px" border="0" class="tabarea" cellspacing="0" cellpadding="0">
<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.label}"?eval}</td>
</tr>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-07-12 09:57:35 UTC (rev 7927)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-07-17 01:07:15 UTC (rev 7928)
@@ -104,7 +104,7 @@
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaProduct">
<section>
<condition><not><if-empty field-name="userLogin"/></not></condition>
<widgets>
@@ -144,7 +144,7 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaWebsite">
<label style="apptitle" text="Website text pages."/>
<include-menu location="component://opentravelsystem/webapp/hotelbackend/screens/Menus.xml" name="WebsiteAppBar"/>
<container style="contentarea">
@@ -175,7 +175,7 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaParties">
<section>
<condition>
<if-empty field-name="parameters.popup"/>
@@ -233,7 +233,7 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaSysAdmin">
<section>
<condition>
<if-empty field-name="parameters.popup"/>
@@ -382,7 +382,7 @@
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaReservations">
<platform-specific><html><html-template location="component://opentravelsystem/webapp/hotelbackend/order/appheaderReservations.ftl"/></html></platform-specific>
<container style="contentarea">
<container style="${MainColumnStyle}">
@@ -409,7 +409,7 @@
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <container style="centerarea">
+ <container style="centerareaAccounting">
<platform-specific><html><html-template location="component://opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl"/></html></platform-specific>
<container style="contentarea">
<container style="${MainColumnStyle}">
More information about the Svn
mailing list