svn commit: r1295345 - in /ofbiz/trunk/specialpurpose/hh
Locked
 
|
Author: apatel
Date: Wed Feb 29 23:57:18 2012 New Revision: 1295345 URL: http://svn.apache.org/viewvc?rev=1295345&view=rev Log: Adding JQuery Mobile library. Also updated hhfacility application to use it. Lot more work needs to be done to make hhfacility application useful, We have a start :) Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl Wed Feb 29 23:57:18 2012 @@ -17,19 +17,5 @@ specific language governing permissions under the License. --> -</td> -</tr> -<tr class="boxtop"> -<td width=100%> -</td> -</tr> -<tr height=24 class="boxbottom"> -<td width=100%> -<span> -Hand Held Facility -</span> -</td> -</tr> -</table> -</body> + </body> </html> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Wed Feb 29 23:57:18 2012 @@ -17,53 +17,20 @@ specific language governing permissions under the License. --> -<html> -<head> -<script language="JavaScript" type="text/javascript"> -<!-- - // Setting of field focus to initialise the - // handheld forms - critical when scanner is being used. - focusField = ""; - function fieldFocus() { - if (focusField != "") { - document.forms[0].elements[focusField].focus(); - document.forms[0].elements[focusField].select(); - } - } - // Function to move to next field when enter pressed - // event is passed as firefox needs it to get keycode instead - // of using window.event, return false will stop form submit - function enter(e,nextfield) { - if (e.keyCode == 13) { - nextfield.focus(); - nextfield.select(); - return false; - } else { - return true; - } - } -//--> -</script> -<link rel="stylesheet" href="/images/maincss.css" type="text/css"> -<title>Hand Held Facility</title> -</head> -<body onload=fieldFocus()> -<#assign facility = parameters.facility?if_exists> -<table width=240 height=250 align=top> -<tr height=24> -<td width=100% align=top class='boxbottom'> -<!--<p align="right">${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p>--> -<span class="boxhead"> -<a href="<@ofbizUrl>/main</@ofbizUrl>">Main</a> -<#if facility?has_content><a href="<@ofbizUrl>/menu?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Menu</a></#if> -<a href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a> -</span> -</td> -</tr> -<tr class="boxtop"> -<td width=100%> -</td> -</tr> -<tr height=196> -<td width=100% align=top class='boxbottom'> +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <title>${applicationTitle?if_exists}</title> + <link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" /> + <script src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script> + <script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script> + <meta name="viewport" content="width=device-width, initial-scale=1"> + </head> + <body> + <div data-role="header"> + <a href="<@ofbizUrl>/main</@ofbizUrl>">Main</a> + <h1>${title?if_exists}</h1> + <a href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a> + </div> Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl Wed Feb 29 23:57:18 2012 @@ -18,12 +18,12 @@ under the License. --> <#assign facility = parameters.facility> -<span> -<ol> +<div data-role="content"> +<ul data-role="listview"> <li><a accesskey="1" href="<@ofbizUrl>/receipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Goods Receipt</a></li> <li><a accesskey="2" href="<@ofbizUrl>/movement?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Inventory Movement</a></li> <li><a accesskey="3" href="<@ofbizUrl>/picking?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Picking</a></li> <li><a accesskey="4" href="<@ofbizUrl>/packing?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Packing</a></li> <li><a accesskey="5" href="<@ofbizUrl>/stocktake?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Stocktake</a></li> -</ol> -</span> \ No newline at end of file +</ul> +</div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl Wed Feb 29 23:57:18 2012 @@ -19,9 +19,9 @@ under the License. <#assign facility = parameters.facility> -<span> - <ol> +<div data-role="content"> + <ul data-role="listview"> <li><a accesskey="1" href="<@ofbizUrl>/poreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">PO Receipt</a></li> <li><a accesskey="2" href="<@ofbizUrl>/productreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Product Receipt</a></li> - </ol> -</span> \ No newline at end of file + </ul> +</div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml Wed Feb 29 23:57:18 2012 @@ -36,7 +36,7 @@ under the License. <form name="POEnter" type="single" target="polinereceipt" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="OrderId" required-field="true" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field> + <field name="OrderId" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> @@ -44,7 +44,7 @@ under the License. <form name="ProductEnter" type="single" target="productqtyreceipt" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="productId" required-field="true"><text size="10" default-value=""/></field> + <field name="productId"><text size="10" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> @@ -64,7 +64,7 @@ under the License. <form name="FindProductStock" type="single" target="findstocktake" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="idValue" required-field="true"><text size="10" default-value=""/></field> + <field name="idValue"><text size="10" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1295345&r1=1295344&r2=1295345&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Wed Feb 29 23:57:18 2012 @@ -42,6 +42,9 @@ under the License. <screen name="FacilityDecorator"> <section> <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <set field="applicationTitle" value="mFacility"/> <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="parameters.facility"/> </actions> @@ -60,6 +63,9 @@ under the License. <screen name="login"> <section> + <actions> + <set field="title" value="Login Page"/> + </actions> <widgets> <decorator-screen name="CommonDecorator"> <decorator-section name="body"> @@ -74,6 +80,9 @@ under the License. <screen name="menu"> <section> + <actions> + <set field="title" value="Select Activity"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> @@ -86,12 +95,12 @@ under the License. <screen name="receipt"> <section> + <actions> + <set field="title" value="${uiLabelMap.ProductGoodsReceipt}"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductGoodsReceipt}</label> - </container> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/receipt.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> @@ -101,12 +110,12 @@ under the License. <screen name="poreceipt"> <section> + <actions> + <set field="title" value="${uiLabelMap.ProductReceiptPurchaseOrder}"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductReceiptPurchaseOrder}</label> - </container> <include-form name="POEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> </decorator-section> </decorator-screen> @@ -131,14 +140,12 @@ under the License. <screen name="productreceipt"> <section> <actions> + <set field="title" value="${uiLabelMap.ProductReceipt}"/> <set field="focusField" value="productId"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductReceipt}</label> - </container> <include-form name="ProductEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific> </decorator-section> @@ -210,15 +217,13 @@ under the License. <screen name="stocktake"> <section> <actions> + <set field="title" value="${uiLabelMap.PageTitleFindProductStocktake}"/> <set field="idValue" from-field="parameters.idValue"/> <script location="component://hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.PageTitleFindProductStocktake}</label> - </container> <include-form name="FindProductStock" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/stocktake.ftl"/></html></platform-specific> </decorator-section> @@ -230,6 +235,7 @@ under the License. <screen name="productstocktake"> <section> <actions> + <set field="title" value="${uiLabelMap.PageTitleProductStocktake}"/> <script location="component://hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy"/> <set field="locationSeqId" from-field="productFacilityLocations"/> @@ -237,9 +243,6 @@ under the License. <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.PageTitleProductStocktake}</label> - </container> <include-form name="ProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <include-form name="UpdateProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/productstocktake.ftl"/></html></platform-specific> @@ -252,6 +255,7 @@ under the License. <screen name="facilities"> <section> <actions> + <set field="title" value="Select Facility"/> <entity-condition entity-name="Facility" list="facilities"> <condition-expr field-name="facilityTypeId" value="WAREHOUSE"/> <order-by field-name="facilityId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |