You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/27 16:52:12 UTC
svn commit: r1001766 [8/8] - in /ofbiz/branches/jquery: ./
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/content/ applications/content/data/
applications/order/script/org/ofbiz/order/customer/
applications/order/webapp/orderm...
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js Mon Sep 27 14:52:08 2010
@@ -0,0 +1,23 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: UA (Ukrainian)
+ */
+jQuery.extend(jQuery.validator.messages, {
+ required: "Це поле необÑ
Ñдно заповниÑи.",
+ remote: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ð¿ÑавилÑне знаÑеннÑ.",
+ email: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÐºÐ¾ÑекÑÐ½Ñ Ð°Ð´ÑеÑÑ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð¿Ð¾ÑÑи.",
+ url: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÐºÐ¾ÑекÑний URL.",
+ date: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÐºÐ¾ÑекÑÐ½Ñ Ð´Ð°ÑÑ.",
+ dateISO: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÐºÐ¾ÑекÑÐ½Ñ Ð´Ð°ÑÑ Ñ ÑоÑмаÑÑ ISO.",
+ number: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÑиÑло.",
+ digits: "ÐводиÑе поÑÑÑбно лиÑе ÑиÑÑи.",
+ creditcard: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ð¿ÑавилÑний Ð½Ð¾Ð¼ÐµÑ ÐºÑедиÑÐ½Ð¾Ñ ÐºÐ°ÑÑи.",
+ equalTo: "ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ñаке ж знаÑÐµÐ½Ð½Ñ Ñе Ñаз.",
+ accept: "ÐÑÐ´Ñ Ð»Ð°Ñка, вибеÑÑÑÑ Ñайл з пÑавилÑним ÑозÑиÑеннÑм.",
+ maxlength: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ð½Ðµ бÑлÑÑе {0} ÑимволÑв."),
+ minlength: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ð½Ðµ менÑе {0} ÑимволÑв."),
+ rangelength: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð¾Ð²Ð¶Ð¸Ð½Ð¾Ñ Ð²Ñд {0} до {1} ÑимволÑв."),
+ range: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÑиÑло вÑд {0} до {1}."),
+ max: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÑиÑло, менÑе або ÑÑвно {0}."),
+ min: jQuery.validator.format("ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÑиÑло, бÑлÑÑе або ÑÑвно {0}.")
+});
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js Mon Sep 27 14:52:08 2010
@@ -0,0 +1,12 @@
+/*
+ * Localized default methods for the jQuery validation plugin.
+ * Locale: DE
+ */
+jQuery.extend(jQuery.validator.methods, {
+ date: function(value, element) {
+ return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value);
+ },
+ number: function(value, element) {
+ return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value);
+ }
+});
\ No newline at end of file
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js Mon Sep 27 14:52:08 2010
@@ -0,0 +1,9 @@
+/*
+ * Localized default methods for the jQuery validation plugin.
+ * Locale: NL
+ */
+jQuery.extend(jQuery.validator.methods, {
+ date: function(value, element) {
+ return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value);
+ }
+});
\ No newline at end of file
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js Mon Sep 27 14:52:08 2010
@@ -0,0 +1,9 @@
+/*
+ * Localized default methods for the jQuery validation plugin.
+ * Locale: PT_BR
+ */
+jQuery.extend(jQuery.validator.methods, {
+ date: function(value, element) {
+ return this.optional(element) || /^\d\d?\/\d\d?\/\d\d\d?\d?$/.test(value);
+ }
+});
\ No newline at end of file
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/todo
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/todo?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/todo (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/todo Mon Sep 27 14:52:08 2010
@@ -0,0 +1,172 @@
+1.3
+---
+
+- checkout datejs.com for a proper date implementation -> complete but very heavy parser, currently overkill
+
+- rewrite required-method to use jQuery's extended val() on selects[/radios/checkboxes]
+- consider a field-validator object that encapsulates a single element and all methods working on it
+- export API browser
+- add example/support for other URL schemes like svn://....
+- document min/max/range methods for checkboxes/selects
+
+/**
+ * Return false, if the element is
+ *
+ * - some kind of text input and its value is too short
+ *
+ * - a set of checkboxes has not enough boxes checked
+ *
+ * - a select and has not enough options selected
+ *
+ * Works with all kind of text inputs, checkboxes and select.
+ *
+ * @example <input name="firstname" class="{minLength:5}" />
+ * @desc Declares an optional input element with at least 5 characters (or none at all).
+ *
+ * @example <input name="firstname" class="{required:true,minLength:5}" />
+ * @desc Declares an input element that must have at least 5 characters.
+ *
+ * @example <fieldset>
+ * <legend>Spam</legend>
+ * <label for="spam_email">
+ * <input type="checkbox" id="spam_email" value="email" name="spam" validate="required:true,minLength:2" />
+ * Spam via E-Mail
+ * </label>
+ * <label for="spam_phone">
+ * <input type="checkbox" id="spam_phone" value="phone" name="spam" />
+ * Spam via Phone
+ * </label>
+ * <label for="spam_mail">
+ * <input type="checkbox" id="spam_mail" value="mail" name="spam" />
+ * Spam via Mail
+ * </label>
+ * <label for="spam" class="error">Please select at least two types of spam.</label>
+ * </fieldset>
+ * @desc Specifies a group of checkboxes. To validate, at least two checkboxes must be selected.
+ *
+ * @param Number min
+ * @name jQuery.validator.methods.minLength
+ * @type Boolean
+ * @cat Plugins/Validate/Methods
+ */
+
+ /**
+ * Return false, if the element is
+ *
+ * - some kind of text input and its value is too short or too long
+ *
+ * - a set of checkboxes has not enough or too many boxes checked
+ *
+ * - a select and has not enough or too many options selected
+ *
+ * Works with all kind of text inputs, checkboxes and selects.
+ *
+ * @example <input name="firstname" class="{rangeLength:[3,5]}" />
+ * @desc Declares an optional input element with at least 3 and at most 5 characters (or none at all).
+ *
+ * @example <input name="firstname" class="{required:true,rangeLength:[3,5]}" />
+ * @desc Declares an input element that must have at least 3 and at most 5 characters.
+ *
+ * @example <select id="cars" class="{required:true,rangeLength:[2,3]}" multiple="multiple">
+ * <option value="m_sl">Mercedes SL</option>
+ * <option value="o_c">Opel Corsa</option>
+ * <option value="vw_p">VW Polo</option>
+ * <option value="t_s">Titanic Skoda</option>
+ * </select>
+ * @desc Specifies a select that must have at least two but no more than three options selected.
+ *
+ * @param Array<Number> min/max
+ * @name jQuery.validator.methods.rangeLength
+ * @type Boolean
+ * @cat Plugins/Validate/Methods
+ */
+
+- document numberOfInvalids and hideErrors
+
+/**
+ * Returns the number of invalid elements in the form.
+ *
+ * @example $("#myform").validate({
+ * showErrors: function() {
+ * $("#summary").html("Your form contains " + this.numberOfInvalids() + " errors, see details below.");
+ * this.defaultShowErrors();
+ * }
+ * });
+ * @desc Specifies a custom showErrors callback that updates the number of invalid elements each
+ * time the form or a single element is validated.
+ *
+ * @name jQuery.validator.prototype.numberOfInvalids
+ * @type Number
+ */
+
+ /**
+ * Hides all error messages in this form.
+ *
+ * @example var validator = $("#myform").validate();
+ * $(".cancel").click(function() {
+ * validator.hideErrors();
+ * });
+ * @desc Specifies a custom showErrors callback that updates the number of invalid elements each
+ * time the form or a single element is validated.
+ *
+ * @name jQuery.validator.prototype.hideErrors
+ */
+
+- remove deprecated methods
+
+- css references
+ - http://test5.caribmedia.com/CSS/Secrets/members/michiel/floating-forms.html
+ - http://paularmstrongdesigns.com/projects/awesomeform/
+ - http://dnevnikeklektika.com/uni-form/
+
+- consider validation on page load, disabling required-checks
+- completely rework showErrors: manually settings errors is currently extremely flawed and utterly useless, eg. errors disappear if some other validation is triggered
+- add custom event to remote validation for adding more parameters
+
+- document focusInvalid()
+- document validation lifecycle: setup (add event handlers), run validation (prepare form, validate elements, display errors/submit form)
+ -> show where the user can hook in via callbacks
+
+- AND depedency: specify multiple expressions as an array
+
+- add custom events for form and elements instead of more callbacks (additional options/callbacks)
+ - beforeValidation: Callback, called before doing any validation
+ - beforeSubmit: Callback, called before submitting the form (default submit or calling submitHandler, if specified)
+
+- animations!!
+- ajax validation:
+ - in combination with autocomplete (mustmatch company name, fill out address details, validate required)
+ - validate zip code in comparison to address, if match and state is missing, fill out state
+- strong password check/integration: http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/
+
+- stop firefox password manager to popup before validation - check mozilla bug tracker?
+
+- overload addMethod with a Option-variant:
+$.validator.addMethod({
+ name: "custom",
+ message: "blablabla",
+ parameteres: false,
+ handler: function() { ... }
+});
+
+ Examples:
+ - wordpress comment form, make it a drop-in method
+ - ajaxForm() integration
+ - ajaxSubmit with rules-option, more/less options to ajaxSubmit
+ - watermark integration http://digitalbush.com/projects/watermark-input-plugin
+ - datepicker integration
+ - timepicker integration ( http://labs.perifer.se/timedatepicker/ )
+ - integration with CakePHP ( https://trac.cakephp.org/ticket/2359 )
+ - integration with tabs: http://www.netix.sk/forms/test.html
+ - intergration with rich-text-editors (FCKEditor, Codepress)
+ http://www.fyneworks.com/jquery/FCKEditor/
+
+2.0
+---
+- attachValidation, removeValidation, validate (with UI), valid (without UI)
+- (re)move current addMethod implementation
+- move rules plugin option
+- move metadata support
+- make validate method chainable
+ -> provide an accessor for the validator if necessary at all
+- move a few default methods to additionals, eg. dateXXX, creditcard, definitely accept
\ No newline at end of file
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Sep 27 14:52:08 2010
@@ -1421,7 +1421,7 @@ public class ModelForm extends ModelWidg
lowIndex = 0;
highIndex = ((Integer) context.get("viewSize")).intValue();
}
-
+
if (iter != null) {
// render item rows
int itemIndex = -1;
@@ -1447,6 +1447,8 @@ public class ModelForm extends ModelWidg
localContext.push(itemMap);
}
+ // reset/remove the BshInterpreter now as well as later because chances are there is an interpreter at this level of the stack too
+ this.resetBshInterpreter(localContext);
localContext.push();
localContext.put("previousItem", previousItem);
previousItem = FastMap.newInstance();
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Mon Sep 27 14:52:08 2010
@@ -458,11 +458,17 @@ public abstract class ModelFormAction {
try {
// don't want to do this: context.put("defaultFormResultList", null);
finder.runFind(context, WidgetWorker.getDelegator(context));
+
+ /* NOTE DEJ20100925: this should not be running any more as it causes actions in a list or multi
+ * form definition to overwrite the desired list elsewhere, this was the really old way of doing
+ * it that was removed a long time ago and needs to stay gone to avoid issues; the form's list
+ * should be found by explicitly matching the name:
Object obj = context.get(this.actualListName);
if (obj != null && ((obj instanceof List) || (obj instanceof EntityListIterator))) {
String modelFormListName = modelForm.getListName();
context.put(modelFormListName, obj);
}
+ */
} catch (GeneralException e) {
String errMsg = "Error doing entity query by condition: " + e.toString();
Debug.logError(e, errMsg, module);
@@ -502,11 +508,17 @@ public abstract class ModelFormAction {
try {
// don't want to do this: context.put("defaultFormResultList", null);
finder.runFind(context, WidgetWorker.getDelegator(context));
+
+ /* NOTE DEJ20100925: this should not be running any more as it causes actions in a list or multi
+ * form definition to overwrite the desired list elsewhere, this was the really old way of doing
+ * it that was removed a long time ago and needs to stay gone to avoid issues; the form's list
+ * should be found by explicitly matching the name:
Object obj = context.get(this.actualListName);
if (obj != null && ((obj instanceof List) || (obj instanceof EntityListIterator))) {
String modelFormListName = modelForm.getListName();
context.put(modelFormListName, obj);
}
+ */
} catch (GeneralException e) {
String errMsg = "Error doing entity query by condition: " + e.toString();
Debug.logError(e, errMsg, module);
@@ -515,7 +527,3 @@ public abstract class ModelFormAction {
}
}
}
-
-
-
-
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon Sep 27 14:52:08 2010
@@ -1156,7 +1156,7 @@ public class ModelFormField {
condTrue = boolVal.booleanValue();
} else {
throw new IllegalArgumentException("Return value from use-when condition eval was not a Boolean: "
- + retVal.getClass().getName() + " [" + retVal + "] on the field " + this.name + " of form " + this.modelForm.getName());
+ + (retVal != null ? retVal.getClass().getName() : "null") + " [" + retVal + "] on the field " + this.name + " of form " + this.modelForm.getName());
}
return condTrue;
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001171
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001754
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Sep 27 14:52:08 2010
@@ -1349,7 +1349,7 @@ under the License.
<!-- used in blog -->
<request-map uri="MainBlog">
- <security https="true" auth="false"/>
+ <security https="false" auth="false"/>
<response name="success" type="view" value="MainBlog"/>
</request-map>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css Mon Sep 27 14:52:08 2010
@@ -23,8 +23,6 @@ width: inherit;
font-size: 100%;
text-decoration: none;
font-family: Verdana, Arial, Helvetica, sans-serif;
-padding-right: 210px;
-padding-left: 160px;
}
.treeHeader, .treeHeaderCurrent {
@@ -165,7 +163,7 @@ display: inline;
.bloghr {
border: 0.1em solid #999999;
color: white;
-background: #000099;
+background: #1C334D;
padding: 4px;
height: 13px;
}
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Sep 27 14:52:08 2010
@@ -219,8 +219,7 @@ under the License.
<set field="currentMenuItemName" from-field="currentMenuItemName" default-value="all" from-scope="user"/>
<set field="leftbarScreenName" value="leftbar"/>
<set field="rightbarScreenName" value="rightbar"/>
- <set field="leftbarScreenLocation" value="component://ecommerce/widget/CommonScreens.xml"/>
- <set field="rightbarScreenLocation" value="component://ecommerce/widget/CommonScreens.xml"/>
+ <set field="MainColumnStyle" value="center"/>
</actions>
<widgets>
<decorator-screen name="main-decorator">
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001171
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001754
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001171
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001754
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001171
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001754