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/12/10 21:40:26 UTC
svn commit: r1044503 [9/15] - in /ofbiz/trunk: ./
applications/accounting/webapp/accounting/finaccounttrans/
applications/accounting/webapp/accounting/images/
applications/accounting/webapp/accounting/payment/
applications/accounting/webapp/ap/invoices...
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Fri Dec 10 20:40:08 2010
@@ -30,7 +30,7 @@ under the License.
<#if inPlaceEditorUrl?has_content || class?has_content || alert=="true" || title?has_content>
<span <#if idName?has_content>id="cc_${idName}"</#if> <#if title?has_content>title="${title}"</#if> <@renderClass class alert />><#t/>
</#if>
-
+
<#if description?has_content>
${description?replace("\n", "<br />")}<#t/>
<#else>
@@ -54,7 +54,7 @@ under the License.
<#if value?has_content> value="${value}"</#if><#rt/>
<#if textSize?has_content> size="${textSize}"</#if><#rt/>
<#if maxlength?has_content> maxlength="${maxlength}"</#if><#rt/>
- <#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/>
+ <#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/>
<#if id?has_content> id="${id}"</#if><#rt/>
<#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/>
<#if clientAutocomplete?has_content && clientAutocomplete=="false"> autocomplete="off"</#if><#rt/>
@@ -64,7 +64,7 @@ under the License.
</#if>
</#macro>
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons>
<textarea name="${name}"<#t/>
<@renderClass className alert />
<#if cols?has_content> cols="${cols}"</#if><#rt/>
@@ -76,12 +76,25 @@ under the License.
<#if value?has_content>${value}</#if><#t/>
</textarea><#lt/>
<#if visualEdtiorEnalble?has_content>
- <script language="javascript" src="/images/htmledit/whizzywig.js" type="text/javascript"></script><#rt/>
- <script language="javascript" type="text/javascript"> buttonPath = "/images/htmledit/"; cssFile="/images/htmledit/simple.css"; makeWhizzyWig("${id?default("")}", "${buttons?default("")}")</script>
+ <script language="javascript" src="/images/jquery/plugins/elrteEditor/elrte.min.js" type="text/javascript"></script><#rt/>
+ <#if language?has_content && language != "en">
+ <script language="javascript" src="/images/jquery/plugins/elrteEditor/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
+ </#if>
+ <link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <script language="javascript" type="text/javascript">
+ var opts = {
+ cssClass : 'el-rte',
+ lang : '${language!"en"}',
+ toolbar : '${buttons?default("maxi")}',
+ doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
+ cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css']
+ }
+ jQuery('#${id?default("")}').elrte(opts);
+ </script>
</#if>
</#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName>
+<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName event="" action="">
<span class="view-calendar">
<input type="text" name="${name}" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/>
<#if title?has_content> title="${title}"</#if>
@@ -90,16 +103,24 @@ under the License.
<#if maxlength?has_content> maxlength="${maxlength}"</#if>
<#if id?has_content> id="${id}"</#if>/><#rt/>
<#if dateType!="time" >
- <#if shortDateInput?exists && shortDateInput>
- <a href="javascript:call_cal_notime(document.<#rt/>
- <#else>
- <a href="javascript:call_cal(document.<#rt/>
- </#if>
- ${formName}.<#t/>
- <#if timeDropdownParamName?has_content>${timeDropdownParamName}</#if><#t/>
- <#if defaultDateTimeString?has_content>,'${defaultDateTimeString}'</#if>);"<#lt/>
- title="<#if localizedIconTitle?has_content>${localizedIconTitle}</#if>"><#rt/>
- </a><#rt/>
+ <script type="text/javascript">
+ <#if shortDateInput?exists && shortDateInput>
+ jQuery("#${id}").datepicker({
+ <#else>
+ jQuery("#${id}").datetimepicker({
+ showSecond: true,
+ timeFormat: 'hh:mm:ss',
+ stepHour: 1,
+ stepMinute: 5,
+ stepSecond: 10,
+ </#if>
+ showOn: 'button',
+ buttonImage: '',
+ buttonText: '',
+ buttonImageOnly: false,
+ dateFormat: 'yy-mm-dd'
+ });
+ </script>
</#if>
<#if timeDropdown?has_content && timeDropdown=="time-dropdown">
<select name="${timeHourName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
@@ -134,13 +155,8 @@ under the License.
</#macro>
<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch>
-<#if ajaxEnabled><input type="text"<#else><select</#if> name="${name?default("")}<#rt/>
-<#if ajaxEnabled>
-_description"<#if id?has_content> id="${id}_description"</#if><#if currentValue?has_content> value="${explicitDescription}"</#if>/><#rt/>
-<input type="hidden" name="${name}"<#if id?has_content> id="${id}"</#if><#if currentValue?has_content> value="${currentValue}"</#if>/><#rt/>
-<script language="JavaScript" type="text/javascript">var data = {${ajaxOptions}};ajaxAutoCompleteDropDown('<#if id?has_content>${id}_description</#if>','${id}',data,{autoSelect:${autoSelect},frequency:${frequency},minChars:${minChars},choices:${choices},partialSearch:${partialSearch},partialChars:${partialChars},ignoreCase:${ignoreCase},fullSearch:${fullSearch}});</script>
-<#else>
-" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
+<span class="ui-widget">
+<select name="${name?default("")}<#rt/>" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
<#if firstInList?has_content && currentValue?has_content && !multiple?has_content>
<option selected="selected" value="${currentValue}">${explicitDescription}</option><#rt/>
<option value="${currentValue}">---</option><#rt/>
@@ -156,6 +172,7 @@ _description"<#if id?has_content> id="${
</#if>
</#list>
</select>
+</span>
<#if otherFieldName?has_content>
<noscript><input type='text' name='${otherFieldName}' /></noscript>
<script type='text/javascript' language='JavaScript'><!--
@@ -167,7 +184,16 @@ if(disa && document.styleSheets)
document.${formName}.${fieldName}.style.visibility = 'hidden';
//--></script>
</#if>
+
+<#if ajaxEnabled>
+<script language="JavaScript" type="text/javascript">
+ ajaxAutoCompleteDropDown();
+ jQuery(function() {
+ jQuery("#${id}").combobox();
+ });
+</script>
</#if>
+
</#macro>
<#macro renderCheckField items className alert id allChecked currentValue name event action>
@@ -348,15 +374,27 @@ ${item.description}</span>
<#macro renderDateFindField className alert name localizedInputTitle value size maxlength dateType formName defaultDateTimeString imgSrc localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty>
<span class="view-calendar">
-<input type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+<input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
<#if dateType != "time">
-<#if dateType == "date">
-<a href="javascript:call_cal_notime(document.<#rt/>
-<#else>
-<a href="javascript:call_cal(document.<#rt/>
-</#if>
-<#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld0_value,</#if>'<#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');" title="${localizedIconTitle}"><#rt/>
-</a><#rt/>
+ <script type="text/javascript">
+ <#if dateType == "date">
+ jQuery("#${name?html}_fld0_value").datepicker({
+ <#else>
+ jQuery("#${name?html}_fld0_value").datetimepicker({
+ showSecond: true,
+ timeFormat: 'hh:mm:ss',
+ stepHour: 1,
+ stepMinute: 5,
+ stepSecond: 10,
+ </#if>
+ showOn: 'button',
+ buttonImage: '',
+ buttonText: '',
+ buttonImageOnly: false,
+ dateFormat: 'yy-mm-dd'
+ });
+ </script>
+<#rt/>
</#if>
<#if titleStyle?has_content>
<span class="${titleStyle}"><#rt/>
@@ -371,15 +409,27 @@ ${item.description}</span>
</span><#rt/>
</#if>
<#rt/>
-<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+<input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
<#if dateType != "time">
-<#if dateType == "date">
-<a href="javascript:call_cal_notime(document.<#rt/>
-<#else>
-<a href="javascript:call_cal(document.<#rt/>
-</#if>
-<#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld1_value,'</#if><#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');" title="${localizedIconTitle}"><#rt/>
-</a><#rt/>
+ <script type="text/javascript">
+ <#if dateType == "date">
+ jQuery("#${name?html}_fld1_value").datepicker({
+ <#else>
+ jQuery("#${name?html}_fld1_value").datetimepicker({
+ showSecond: true,
+ timeFormat: 'hh:mm:ss',
+ stepHour: 1,
+ stepMinute: 5,
+ stepSecond: 10,
+ </#if>
+ showOn: 'button',
+ buttonImage: '',
+ buttonText: '',
+ buttonImageOnly: false,
+ dateFormat: 'yy-mm-dd'
+ });
+ </script>
+<#rt/>
</#if>
<#if titleStyle?has_content>
<span class="${titleStyle}"><#rt/>
@@ -427,20 +477,42 @@ ${item.description}</span>
<span class="field-lookup">
<#if size?has_content && size=="0"><input type="hidden" <#if name?has_content> name="${name}"/></#if><#else><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if>
<#if presentation?has_content && descriptionFieldName?has_content && presentation == "window">
- <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}'<#rt/>
+ <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}', '${presentation}'<#rt/>
+ <#if targetParameterIter?has_content>
+ <#list targetParameterIter as item>
+ ,document.${formName}.${item}.value<#rt>
+ </#list>
+ </#if>
+ );"></a><#rt>
<#elseif presentation?has_content && presentation == "window">
- <a href="javascript:call_fieldlookup2(document.${formName}.${name},'${fieldFormName}'<#rt/>
-<#elseif descriptionFieldName?has_content>
- <a href="javascript:call_fieldlookupLayer3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}','${width}','${height}','${position}','${fadeBackground}','${initiallyCollapsed}'<#rt/>
+ <a href="javascript:call_fieldlookup2(document.${formName}.${name},'${fieldFormName}', '${presentation}'<#rt/>
+ <#if targetParameterIter?has_content>
+ <#list targetParameterIter as item>
+ ,document.${formName}.${item}.value<#rt>
+ </#list>
+ </#if>
+ );"></a><#rt>
<#else>
- <a href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${fieldFormName}','${width}','${height}','${position}','${fadeBackground}','${initiallyCollapsed}'<#rt/>
-</#if>
-<#if targetParameterIter?has_content>
- <#list targetParameterIter as item>
-,document.${formName}.${item}.value<#rt>
- </#list>
+ <#if ajaxEnabled?has_content && ajaxEnabled>
+ <#if parameters?has_content && parameters._LAST_VIEW_NAME_?has_content>
+ <#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=" + parameters._LAST_VIEW_NAME_ />
+ <#else>
+ <#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=main"/>
+ </#if>
+ <#if !ajaxUrl?contains("searchValueFieldName=")>
+ <#if descriptionFieldName?has_content && showDescription == "true">
+ <#local ajaxUrl = ajaxUrl + "&searchValueFieldName=" + descriptionFieldName />
+ <#else>
+ <#local ajaxUrl = ajaxUrl + "&searchValueFieldName=" + name />
+ </#if>
+ </#if>
+ </#if>
+ <script type="text/javascript">
+ jQuery(document).ready(function(){
+ new ConstructLookup("${fieldFormName}", "${id}", document.${formName?html}.${name?html}, <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>, "${formName?html}", "${width}", "${height}", "${position}", "${fadeBackground}", <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}", "${showDescription}"<#else>"", ""</#if>, '${presentation!}');
+ });
+ </script>
</#if>
-);"></a><#rt>
<#if disabled?has_content && disabled><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
</span>
<#if ajaxEnabled?has_content && ajaxEnabled>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Fri Dec 10 20:40:08 2010
@@ -26,7 +26,7 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@renderField value /></#macro>
<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Fri Dec 10 20:40:08 2010
@@ -42,7 +42,7 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value/></#macro>
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@renderField value/></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@renderField value/></#macro>
<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value/></#macro>
Modified: ofbiz/trunk/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Fri Dec 10 20:40:08 2010
@@ -33,8 +33,8 @@
projectmgr/build.xml,
ldap/build.xml,
crowd/build.xml,
- googlecheckout/build.xml,
- webpos/build.xml"/>
+ googlecheckout/build.xml"/>
+ <!-- For the Web POS add "webpos/build.xml" to the list above -->
<!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->
<!-- For Shark add "shark/build.xml" to the list above, in the specialpurpose-builds list (after workflow) -->
Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Dec 10 20:40:08 2010
@@ -23,11 +23,8 @@ under the License.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)!"CMS Site Generic Title (Set subcontent 'title' on your content!)"}</title>
<link rel="shortcut icon" href="/images/ofbiz.ico" />
- <script language="javascript" src="/images/prototypejs/prototype.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
- <script language="javascript" src="/images/calendarDateSelect/calendar_date_select.js" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
<link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
<link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/>
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Fri Dec 10 20:40:08 2010
@@ -33,9 +33,12 @@ under the License.
<load-component component-location="ebay"/>
<load-component component-location="ebaystore"/>
<load-component component-location="myportal"/>
- <load-component component-location="webpos"/>
<load-component component-location="crowd"/>
<load-component component-location="ldap"/>
+ <!-- The component below are not maintained by the community, or at least not very actively
+ Still they are functional (or at least should be).
+ So if you need them simply uncomment and have a look also in the build file -->
+ <!-- <load-component component-location="webpos"/>-->
<!-- <load-component component-location="workflow"/> -->
<!-- <load-component component-location="shark"/> -->
</component-loader>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl Fri Dec 10 20:40:08 2010
@@ -21,18 +21,18 @@ under the License.
//<![CDATA[
function selectChange(formId, elementId) {
if (elementId.id == 'searchProductStoreId') {
- $('searchCatalogId')[$('searchCatalogId').selectedIndex].value = "";
- if ($('searchCategoryId').selectedIndex) {
- $('searchCategoryId')[$('searchCategoryId').selectedIndex].value = "";
+ document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId').selectedIndex].value = "";
+ if (document.getElementById('searchCategoryId').selectedIndex) {
+ document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = "";
} else {
- $('searchCategoryId').value = "";
+ document.getElementById('searchCategoryId').value = "";
}
}
if (elementId.id == 'searchCatalogId') {
- if ($('searchCategoryId').selectedIndex) {
- $('searchCategoryId')[$('searchCategoryId').selectedIndex].value = "";
+ if (document.getElementById('searchCategoryId').selectedIndex) {
+ document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = "";
} else {
- $('searchCategoryId').value = "";
+ document.getElementById('searchCategoryId').value = "";
}
}
formId.action="<@o...@ofbizUrl>";
@@ -40,14 +40,14 @@ under the License.
}
function submit (id) {
var formId = id;
- if(!$('searchCatalogId').empty() && !$('searchProductStoreId').empty()){
- $(formId).submit();
+ if(!jQuery('#searchCatalogId').is(":empty") && !jQuery('#searchProductStoreId').is(":empty")){
+ document.getElementById(formId).submit();
} else {
- if($('searchProductStoreId').empty()) {
- $('productStoreErrorMessage').show();
+ if(jQuery('#searchProductStoreId').is(":empty")) {
+ jQuery('#productStoreErrorMessage').fadeIn('fast');
}
- if($('searchCatalogId').empty()) {
- $('catalogErrorMessage').show();
+ if(jQuery('#searchCatalogId').is(":empty")) {
+ jQuery('#catalogErrorMessage').fadeIn('fast');
}
}
}
@@ -58,7 +58,7 @@ under the License.
<h3>${uiLabelMap.ProductAdvancedSearchInCategory}</h3>
</div>
<div class="screenlet-body">
- <form id="advToKeywordSearchform" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+ <form id="advToKeywordSearchform" name="advToKeywordSearchform" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
<fieldset>
<input type="hidden" name="VIEW_SIZE" value="25"/>
<input type="hidden" name="PAGING" value="Y"/>
@@ -84,7 +84,7 @@ under the License.
${uiLabelMap.ProductProductStore}:
</td>
<td valign="middle">
- <select name="productStoreId" id="searchProductStoreId" onchange="javascript:selectChange($('advToKeywordSearchform'), $('searchProductStoreId'));">
+ <select name="productStoreId" id="searchProductStoreId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchProductStoreId'));">
<#if ebayConfigList?has_content>
<#list ebayConfigList as ebayConfig>
<#assign productStore = delegator.findOne("ProductStore", {"productStoreId" : ebayConfig.productStoreId}, true) />
@@ -105,7 +105,7 @@ under the License.
</td>
<td valign="middle">
<div>
- <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange($('advToKeywordSearchform'), $('searchCatalogId'));" class="required">
+ <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchCatalogId'));" class="required">
<#list prodCatalogList as prodCatalog>
<#assign displayDesc = prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") />
<#if (18 < displayDesc?length)>
@@ -377,7 +377,7 @@ under the License.
<tr>
<td align="center" colspan="2">
<hr />
- <a href="javascript:submit($('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
+ <a href="javascript:submit(document.getElementById('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
</td>
</tr>
</table>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Fri Dec 10 20:40:08 2010
@@ -107,7 +107,7 @@ under the License.
<td align="right" class="label">${uiLabelMap.CommonWebsite}</td>
<td> </td>
<td>
- <select name="webSiteId" onchange="javascript:changeWebSite($('ProductsExportToEbay'));">
+ <select name="webSiteId" onchange="javascript:changeWebSite(document.getElementById('ProductsExportToEbay'));">
<#list webSiteList as webSite>
<#assign displayDesc = webSite.siteName?default("${uiLabelMap.ProductNoDescription}")>
<#if (18 < displayDesc?length)>
Propchange: ofbiz/trunk/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
+/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Fri Dec 10 20:40:08 2010
@@ -586,4 +586,4 @@ public class EbayStoreOrder {
// assign the item to its ship group
cart.setItemShipGroupQty(cartItem, qty, groupIdx);
}
-}
+}
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl Fri Dec 10 20:40:08 2010
@@ -17,104 +17,106 @@ specific language governing permissions
under the License.
-->
<script language="Javascript" type="text/javascript">
- function countAreaChars(areaName,limit,charleft)
+ function countAreaChars(areaName, limit, charleft)
{
- if (areaName.value.length>limit){
+ if (areaName.value.length > limit){
areaName.value=areaName.value.substring(0,limit);
}else{
- charleft.innerHTML = (limit - areaName.value.length) + " charactors left.";
+ charleft.innerHTML = (limit - areaName.value.length) + " ${uiLabel.CommonCharactorsLeft}";
}
}
- function retrieveThemeColorSchemeByThemeId(url,themeId,productStoreId){
- var pars = 'themeId='+themeId+'&productStoreId='+productStoreId;
- var myAjax = new Ajax.Request( url, {
- method: 'get',
- parameters: pars,
- onLoading: function loading(){
- $('loading').innerHTML = ' Please wait...';
- },
- onComplete: function retrieveThemeColorSchemeByThemeId(originalRequest){
- if(originalRequest.responseJSON!=null){
- var resp = eval("("+originalRequest.responseText+")");
- if(resp.storeColorPrimary!=null)$('storePrimaryColor').value = resp.storeColorPrimary;
- if(resp.storeColorAccent!=null)$('storeSecondaryColor').value = resp.storeColorAccent;
- if(resp.storeColorSecondary!=null)$('storeAccentColor').value = resp.storeColorSecondary;
-
- if(resp.storeFontTypeFontFaceValue!=null) selectOption($('storeNameFont'),resp.storeFontTypeFontFaceValue);
- if(resp.storeFontTypeNameFaceColor!=null)$('storeNameFontColor').value = resp.storeFontTypeNameFaceColor;
- if(resp.storeFontTypeSizeFaceValue!=null) selectOption($('storeNameFontSize'), resp.storeFontTypeSizeFaceValue);
-
- if(resp.storeFontTypeTitleColor!=null)$('storeTitleFontColor').value = resp.storeFontTypeTitleColor;
- if(resp.storeFontTypeFontTitleValue!=null)selectOption($('storeTitleFont'),resp.storeFontTypeFontTitleValue);
- if(resp.storeFontSizeTitleValue!=null)selectOption($('storeTitleFontSize'),resp.storeFontSizeTitleValue);
-
- if(resp.storeFontTypeDescColor!=null)$('storeDescFontColor').value = resp.storeFontTypeDescColor;
- if(resp.storeFontTypeFontDescValue!=null) selectOption($('storeDescFont'),resp.storeFontTypeFontDescValue);
- if(resp.storeDescSizeValue!=null) selectOption($('storeDescFontSize'),resp.storeDescSizeValue);
- }
- $('loading').innerHTML = '';
- }
- } );
+ function retrieveThemeColorSchemeByThemeId(url, themeId, productStoreId){
+ var pars = 'themeId='+themeId+'&productStoreId='+productStoreId;
+
+ jQuery.ajax({
+ url: url,
+ type: "GET",
+ data: pars,
+ beforeStart: function() {document.getElementById('loading').innerHTML = ' ${uiLabel.CommonPleaseWait}';},
+ success: function(data) {
+ if (data != null){
+ var resp = eval("("+data+")");
+ if (resp.storeColorPrimary!=null) document.getElementById('storePrimaryColor').value = resp.storeColorPrimary;
+ if (resp.storeColorAccent!=null) document.getElementById('storeSecondaryColor').value = resp.storeColorAccent;
+ if (resp.storeColorSecondary!=null) document.getElementById('storeAccentColor').value = resp.storeColorSecondary;
+
+ if (resp.storeFontTypeFontFaceValue!=null) selectOption( document.getElementById('storeNameFont'),resp.storeFontTypeFontFaceValue);
+ if (resp.storeFontTypeNameFaceColor!=null) document.getElementById('storeNameFontColor').value = resp.storeFontTypeNameFaceColor;
+ if (resp.storeFontTypeSizeFaceValue!=null) selectOption( document.getElementById('storeNameFontSize'), resp.storeFontTypeSizeFaceValue);
+
+ if (resp.storeFontTypeTitleColor!=null) document.getElementById('storeTitleFontColor').value = resp.storeFontTypeTitleColor;
+ if (resp.storeFontTypeFontTitleValue!=null) selectOption( document.getElementById('storeTitleFont'),resp.storeFontTypeFontTitleValue);
+ if (resp.storeFontSizeTitleValue!=null) selectOption( document.getElementById('storeTitleFontSize'),resp.storeFontSizeTitleValue);
+
+ if (resp.storeFontTypeDescColor!=null) document.getElementById('storeDescFontColor').value = resp.storeFontTypeDescColor;
+ if (resp.storeFontTypeFontDescValue!=null) selectOption( document.getElementById('storeDescFont'),resp.storeFontTypeFontDescValue);
+ if (resp.storeDescSizeValue!=null) selectOption( document.getElementById('storeDescFontSize'),resp.storeDescSizeValue);
+ }
+ document.getElementById('loading').innerHTML = '';
+ }
+ });
}
- function selectOption(myselect,val){
+
+ function selectOption(myselect, val){
for (var i=0; i<myselect.options.length; i++){
if ( myselect.options[i].value == val){
myselect.options[i].selected=true;
break;
}
-
+
}
}
- function switchTheme(url,themeId,productStoreId){
+ function switchTheme(url, themeId, productStoreId){
var size = document.StoreSettingForm.storeThemeType.length;
var selectTheme = '';
for(i=0;i<size;i++){
- if(document.StoreSettingForm.storeThemeType[i].checked){
+ if (document.StoreSettingForm.storeThemeType[i].checked){
selectTheme = document.StoreSettingForm.storeThemeType[i].value;
break;
}
}
- if(selectTheme=='Basic'){
- //retrieve basic theme by ajax then print new select list
+ if (selectTheme == 'Basic') {
+ //retrieve basic theme by ajax then print new select list
document.StoreSettingForm.storeAdvancedTheme.disabled = true;
document.StoreSettingForm.storeAdvancedThemeColor.disabled = true;
-
+
document.StoreSettingForm.storeBasicTheme.disabled = false;
document.StoreSettingForm.storePrimaryColor.disabled = false;
document.StoreSettingForm.storeSecondaryColor.disabled = false;
document.StoreSettingForm.storeAccentColor.disabled = false;
-
+
document.StoreSettingForm.storeNameFont.disabled = false;
document.StoreSettingForm.storeNameFontSize.disabled = false;
document.StoreSettingForm.storeNameFontColor.disabled = false;
-
+
document.StoreSettingForm.storeTitleFont.disabled = false;
document.StoreSettingForm.storeTitleFontSize.disabled = false;
document.StoreSettingForm.storeTitleFontColor.disabled = false;
-
+
document.StoreSettingForm.storeDescFont.disabled = false;
document.StoreSettingForm.storeDescFontSize.disabled = false;
document.StoreSettingForm.storeDescFontColor.disabled = false;
document.StoreSettingForm.themeType.value = "Basic";
- }else if(selectTheme=='Advanced'){
+
+ } else if (selectTheme == 'Advanced') {
document.StoreSettingForm.themeType.value = "Advanced";
document.StoreSettingForm.storeBasicTheme.disabled = true;
document.StoreSettingForm.storePrimaryColor.disabled = true;
document.StoreSettingForm.storeSecondaryColor.disabled = true;
document.StoreSettingForm.storeAccentColor.disabled = true;
-
+
document.StoreSettingForm.storeNameFont.disabled = true;
document.StoreSettingForm.storeNameFontSize.disabled = true;
document.StoreSettingForm.storeNameFontColor.disabled = true;
-
+
document.StoreSettingForm.storeTitleFont.disabled = true;
document.StoreSettingForm.storeTitleFontSize.disabled = true;
document.StoreSettingForm.storeTitleFontColor.disabled = true;
-
+
document.StoreSettingForm.storeDescFont.disabled = true;
document.StoreSettingForm.storeDescFontSize.disabled = true;
document.StoreSettingForm.storeDescFontColor.disabled = true;
-
+
document.StoreSettingForm.storeAdvancedTheme.disabled = false;
document.StoreSettingForm.storeAdvancedThemeColor.disabled = false;
}
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl Fri Dec 10 20:40:08 2010
@@ -21,10 +21,10 @@ under the License.
//<![CDATA[
function selectChange(formId, elementId) {
if (elementId.id == 'searchCatalogId') {
- if ($('searchCategoryId').selectedIndex) {
- $('searchCategoryId')[$('searchCategoryId').selectedIndex].value = "";
+ if (document.getElementById('searchCategoryId').selectedIndex) {
+ document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = "";
} else {
- $('searchCategoryId').value = "";
+ document.getElementById('searchCategoryId').value = "";
}
}
formId.action="<@o...@ofbizUrl>";
@@ -32,11 +32,11 @@ under the License.
}
function submit (id) {
var formId = id;
- if(!$('searchCatalogId').empty()){
- $(formId).submit();
+ if(!jQuery('#searchCatalogId').is(":empty")){
+ document.getElementById(formId).submit();
} else {
- if($('searchCatalogId').empty()) {
- $('catalogErrorMessage').show();
+ if(jQuery('#searchCatalogId').is(":empty")) {
+ jQuery('#catalogErrorMessage').fadeIn("fast");
}
}
}
@@ -60,7 +60,7 @@ under the License.
</td>
<td valign="middle">
<div>
- <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange($('advToKeywordSearchform'), $('searchCatalogId'));" class="required">
+ <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchCatalogId'));" class="required">
<#list prodCatalogList as prodCatalog>
<#assign displayDesc = prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") />
<#if (18 < displayDesc?length)>
@@ -132,7 +132,7 @@ under the License.
<tr>
<td align="center" colspan="2">
<hr />
- <a href="javascript:submit($('productSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
+ <a href="javascript:submit(document.getElementById('productSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
</td>
</tr>
</table>
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Fri Dec 10 20:40:08 2010
@@ -71,61 +71,63 @@ under the License.
if (cateId.indexOf(':')!= -1) {
cateId = cateId.substring(0,cateId.indexOf(':'));
}
- var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId;
- var myAjax = new Ajax.Request( url, {
- method: 'get',
- parameters: pars,
- onLoading: function loading(){
- $('loading').innerHTML = '<b>Please wait...</b>';
- } ,
- onComplete: function writeCategoryList(originalRequest){
- $('loading').innerHTML = '';
- if(originalRequest.responseJSON!=null){
- removeOptions($(id));
- var resp = eval("("+originalRequest.responseText+")");
- var leng = resp.size();
- for (i=0;i<leng;i++) {
- if (i == 0) {
- $(id).options[0] = new Option("Please select","");
- }
- var optVal = resp[i].CategoryCode;
- var optName = resp[i].CategoryName;
- var isLeaf = resp[i].IsLeafCategory;
- $(id).options[i+1] = new Option(optName,optVal+":"+isLeaf);
- }
- }
- }
- } );
+ var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId;
+ jQuery.ajax({
+ url: url,
+ type: "GET",
+ data: pars,
+ beforeStart: function({document.getElementById('loading').innerHTML = '<b>${uiLabel.CommonPleaseWait}</b>';}),
+ success: function(data) {
+ document.getElementById('loading').innerHTML = '';
+ if(data != null){
+ removeOptions(document.getElementById(id));
+ var resp = eval("("+data+")");
+ var leng = resp.size();
+ for (i=0;i<leng;i++) {
+ if (i == 0) {
+ document.getElementById(id).options[0] = new Option("${uiLabel.CommonPleaseSelect}","");
+ }
+ var optVal = resp[i].CategoryCode;
+ var optName = resp[i].CategoryName;
+ var isLeaf = resp[i].IsLeafCategory;
+ document.getElementById(id).options[i+1] = new Option(optName,optVal+":"+isLeaf);
+ }
+ }
+ }
+ });
}
function retrieveTemplateByTemGroupId(templateGroupId,productStoreId,pkCategoryId){
- var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId;
+ var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId;
var url = '<@o...@ofbizUrl>';
- var myAjax = new Ajax.Request( url, {
- method: 'get',
- parameters: pars,
- onComplete: function writeItemTemplates(originalRequest){
- removeOptions('theme');
- previewPic(":http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif");
- if(originalRequest.responseJSON!=null){
- var resp = eval("("+originalRequest.responseText+")");
- var leng = resp.size();
- var j = 0;
- for (i=0;i<leng+1;i++) {
- if (i == 0) {
- $('theme').options[0] = new Option("Please select","_NA_");
- } else {
- var optVal = resp[i].TemplateId+":"+resp[i].TemplateImageURL;
- $('theme').options[i] = new Option(resp[i].TemplateName,optVal);
- j++;
- }
- }
- }
+
+ jQuery.ajax({
+ url: url,
+ type: "GET",
+ data: pars,
+ success: function(data){
+ removeOptions('theme');
+ previewPic(":http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif");
+ if(data!=null){
+ var resp = eval("("+data+")");
+ var leng = resp.size();
+ var j = 0;
+ for (i=0;i<leng+1;i++) {
+ if (i == 0) {
+ document.getElementById('theme').options[0] = new Option("${uiLabel.CommonPleaseSelect}","_NA_");
+ } else {
+ var optVal = resp[i].TemplateId+":"+resp[i].TemplateImageURL;
+ document.getElementById('theme').options[i] = new Option(resp[i].TemplateName,optVal);
+ j++;
+ }
}
- } );
+ }
+ }
+ });
}
+
function removeOptions(id){
- var elSel = $(id);
+ var elSel = jQuery("#" + id);
var i;
for (i = elSel.length - 1; i>=0; i--) {
elSel.remove(i);
@@ -133,21 +135,21 @@ under the License.
}
function enabledItemTemplate(val){
var field = "enabledTheme";
- if ($(field).checked) {
- $('themeGroup').disabled = false;
- $('theme').disabled = false;
+ if (document.getElementById(field).checked) {
+ document.getElementById('themeGroup').disabled = false;
+ document.getElementById('theme').disabled = false;
} else {
- $('themeGroup').disabled = true;
- $('theme').disabled = true;
+ document.getElementById('themeGroup').disabled = true;
+ document.getElementById('theme').disabled = true;
}
}
function previewPic(val) {
if (val != null) val = val.substr(val.indexOf(":")+1);
- $('themeImg').src = val;
+ document.getElementById('themeImg').src = val;
}
function toggleDisp() {
for (var i=0;i<arguments.length;i++){
- var d = $(arguments[i]);
+ var d = document.getElementById(arguments[i]);
if (d.style.display == 'none')
d.style.display = 'block';
else
@@ -155,34 +157,34 @@ under the License.
}
}
function toggleTab(num,numelems,opennum,animate) {
- if ($('tabContent'+num).style.display == 'none'){
+ if (document.getElementById('tabContent'+num).style.display == 'none'){
for (var i=1;i<=numelems;i++){
if ((opennum == null) || (opennum != i)){
var temph = 'tabHeader_'+i;
- var h = $(temph);
+ var h = document.getElementById(temph);
if (!h){
- var h = $('tabHeaderActive_');
+ var h = document.getElementById('tabHeaderActive_');
h.id = temph;
}
var tempc = 'tabContent'+i;
- var c = $(tempc);
+ var c = document.getElementById(tempc);
if(c.style.display != 'none'){
if (animate || typeof animate == 'undefined')
- Effect.toggle(tempc,'blind',{duration:0.2, queue:{scope:'menus', limit: 3}});
+ jQuery("#" + tempc).animate({opacity: 'toggle', height: 'toggle'}, "slow");
else
toggleDisp(tempc);
}
}
}
- var h = $('tabHeader_'+num);
+ var h = document.getElementById('tabHeader_'+num);
if (h){
h.id = 'tabHeaderActive_';
}
h.blur();
- var c = $('tabContent'+num);
+ var c = document.getElementById('tabContent'+num);
c.style.marginTop = '2px';
if (animate || typeof animate == 'undefined'){
- Effect.toggle('tabContent'+num,'blind',{duration:0.2, queue:{scope:'menus', position:'end', limit: 3}});
+ jQuery("#tabContent" + num).animate({opacity: 'toggle', height: 'toggle'}, "slow");
}else{
toggleDisp('tabContent'+num);
}
@@ -211,9 +213,9 @@ under the License.
<#if contentList?has_content>
<#list contentList as content>
<#if !isProductId?has_content>
- <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:$('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${content.product.productId?if_exists}';$('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li>
+ <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li>
<#else>
- <li <#if isProductId?exists && isProductId?if_exists == content.product.productId?if_exists >class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:$('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${content.product.productId?if_exists}';$('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li>
+ <li <#if isProductId?exists && isProductId?if_exists == content.product.productId?if_exists >class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li>
</#if>
<#assign id = id+1>
</#list>
@@ -305,7 +307,7 @@ under the License.
</#if>
</#if>
</select>
- <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@o...@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()?if_exists}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:$('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${isProductId?if_exists}';$('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a>
+ <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@o...@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()?if_exists}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:document.getElementById('ProductsExportToEbay').action = '<@o...@ofbizUrl>?isProductId=${isProductId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a>
</div>
<input type="hidden" name="primaryCateId" value="${primaryCateId?if_exists}"/>
<div id="ebayCategory_Name">${priCateName?if_exists}</div>
@@ -491,17 +493,25 @@ under the License.
<td width="60%" valign="top">
<table cellspacing="0">
<tr><td>
- <script language="javascript" src="/images/htmledit/whizzywig.js" type="text/javascript"></script>
- <script language="javascript" type="text/javascript"> buttonPath = "/images/htmledit/"; cssFile="/images/htmledit/simple.css";</script>
+ <script language="javascript" src="/images/jquery/plugins/elrteEditor/elrte.min.js" type="text/javascript"></script>
+ <link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <script language="javascript" type="text/javascript">
+ var opts = {
+ cssClass : 'el-rte',
+ toolbar : 'maxi',
+ doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
+ cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css']
+ }
+ </script>
<textarea id="description" name="description" style="width:800px; height:300px">
<#if item.getDescription()?exists>description<#else>${item.getDescription()?if_exists}</#if>
</textarea>
<script type="text/javascript">
- makeWhizzyWig("description", "all");
+ jQuery('#description').elrte(opts);
</script>
</td></tr>
</table>
- </td>
+ </td>
<td width="30%" valign="top">
<table align="left" width="60%" height="100%" cellspacing="0">
<tr>
@@ -535,7 +545,7 @@ under the License.
<td valign="top">
<script type="text/javascript">
function popUpImg(){
- //popUp($('themeImg').src, 'themeImgBig', '400', '550');
+ //popUp(document.getElementById('themeImg').src, 'themeImgBig', '400', '550');
}
</script>
<a id="themeImgUrl" href="javascript:popUpImg();"><img hspace="5" height="120" border="0" align="top" width="100" id="themeImg" name="themeImg" src="http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif" alt="" /></a>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml Fri Dec 10 20:40:08 2010
@@ -23,11 +23,10 @@ under the License.
<VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="02"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/prototypejs/popup.css" sequenceId="03"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="04"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="03"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="07"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="08"/>
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Fri Dec 10 20:40:08 2010
@@ -22,11 +22,7 @@ under the License.
<head>
<title>Main</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Fri Dec 10 20:40:08 2010
@@ -138,16 +138,16 @@ ${virtualJavaScript?if_exists}
<script language="JavaScript" type="text/javascript">
<!--
-document.observe('dom:loaded', function() {
- Event.observe($('configFormId'),'change',getConfigDetails);
+jQuery(document).ready(function () {
+ jQuery('#configFormId').change(getConfigDetails)
});
function getConfigDetails(event) {
- new Ajax.Request('<@o...@ofbizUrl>',{parameters: $('configFormId').serialize(), requestHeaders: {Accept: 'application/json'},
-
- onSuccess: function(transport){
- var data = transport.responseText.evalJSON(true);
-
+ jQuery.ajax({
+ url: '<@o...@ofbizUrl>',
+ type: 'POST',
+ data: jQuery('#configFormId').serialize(),
+ success: function(data) {
if (data._ERROR_MESSAGE_LIST_ != undefined) {
//console.log(data._ERROR_MESSAGE_LIST_);
//alert(data._ERROR_MESSAGE_LIST_);
@@ -162,13 +162,7 @@ function getConfigDetails(event) {
document.getElementById('totalPrice').innerHTML = totalPrice;
document.addToShoppingList.configId.value = configId;
event.stop();
- }
- },
-
- onFailure: function(transport) {
- var data = transport.responseText.evalJSON(true);
- //console.log('Failure');
- }
+ }
});
}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Fri Dec 10 20:40:08 2010
@@ -609,8 +609,8 @@ ${virtualJavaScript?if_exists}
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<div class="inline">
- <label>Start Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a>
- <label>End Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a>
+ <label>Start Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action="" name="reservStart" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservStart1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <label>End Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action="" name="reservEnd" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservEnd1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
<div>
<#--td nowrap="nowrap" align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap="nowrap"> </td-->
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl Fri Dec 10 20:40:08 2010
@@ -63,7 +63,7 @@ under the License.
<textarea class="textAreaBox" name="productReview" cols="40"></textarea>
</div>
<div>
- <a href="javascript:$('reviewProduct').submit();" class="button">[${uiLabelMap.CommonSave}]</a>
+ <a href="javascript:document.getElementById('reviewProduct').submit();" class="button">[${uiLabelMap.CommonSave}]</a>
<a href="<@o...@ofbizUrl>" class="button">[${uiLabelMap.CommonCancel}]</a>
</div>
</fieldset>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl Fri Dec 10 20:40:08 2010
@@ -19,7 +19,7 @@ under the License.
<div class="screenlet">
<h2>${uiLabelMap.PartyChangePassword}</h2>
<a href="<@o...@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a>
- <a href="javascript:$('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a>
+ <a href="javascript:document.getElementById('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a>
<div class="screenlet-body">
<form id="changepasswordform" method="post" action="<@o...@ofbizUrl>">
<fieldset>
@@ -43,6 +43,6 @@ under the License.
</fieldset>
</form>
<a href="<@o...@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a>
- <a href="javascript:$('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a>
+ <a href="javascript:document.getElementById('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a>
</div>
</div>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Fri Dec 10 20:40:08 2010
@@ -25,35 +25,35 @@ under the License.
lastFocusedName = formElement.name;
}
function clickUsername() {
- if ($('UNUSEEMAIL').checked) {
+ if (document.getElementById('UNUSEEMAIL').checked) {
if (lastFocusedName == "UNUSEEMAIL") {
- $('PASSWORD').focus();
+ jQuery('#PASSWORD').focus();
} else if (lastFocusedName == "PASSWORD") {
- $('UNUSEEMAIL').focus();
+ jQuery('#UNUSEEMAIL').focus();
} else {
- $('PASSWORD').focus();
+ jQuery('#PASSWORD').focus();
}
}
}
function changeEmail() {
- if ($('UNUSEEMAIL').checked) {
- $('USERNAME').value = $F('CUSTOMER_EMAIL');
+ if (document.getElementById('UNUSEEMAIL').checked) {
+ document.getElementById('USERNAME').value = jQuery('#CUSTOMER_EMAIL').val();
}
}
function setEmailUsername() {
- if ($('UNUSEEMAIL').checked) {
- $('USERNAME').value = $F('CUSTOMER_EMAIL');
- // don't disable, make the browser not submit the field: $('USERNAME').disabled=true;
+ if (document.getElementById('UNUSEEMAIL').checked) {
+ document.getElementById('USERNAME').value = jQuery('#CUSTOMER_EMAIL').val();
+ // don't disable, make the browser not submit the field: document.getElementById('USERNAME').disabled=true;
} else {
- $('USERNAME').value='';
- // $('USERNAME').disabled=false;
+ document.getElementById('USERNAME').value='';
+ // document.getElementById('USERNAME').disabled=false;
}
}
function hideShowUsaStates() {
- if ($('customerCountry').value == "USA" || $('customerCountry').value == "UMI") {
- $('customerState').style.display = "block";
+ if (document.getElementById('customerCountry').value == "USA" || document.getElementById('customerCountry').value == "UMI") {
+ document.getElementById('customerState').style.display = "block";
} else {
- $('customerState').style.display = "none";
+ document.getElementById('customerState').style.display = "none";
}
}
//]]>
@@ -390,7 +390,7 @@ class name of "button". No other class n
button actions.
------------------------------------------------------------------------------->
<div class="buttons">
- <a href="javascript:$('newuserform').submit()">${uiLabelMap.CommonSave}</a>
+ <a href="javascript:document.getElementById('newuserform').submit()">${uiLabelMap.CommonSave}</a>
<a href="<@o...@ofbizUrl>" class="reset">${uiLabelMap.CommonBack}</a>
</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Fri Dec 10 20:40:08 2010
@@ -81,9 +81,11 @@ under the License.
<label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
<input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
</div>
+ <#--
<div>
<a name="submitEditBillToPostalAddress" id="submitEditBillToPostalAddress" class="button" onclick="updatePartyBillToPostalAddress('submitEditBillToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
<a class="popup_closebox button" href="javascript:void(0);">${uiLabelMap.CommonClose}</a>
</div>
+ -->
</fieldset>
</form>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Fri Dec 10 20:40:08 2010
@@ -75,9 +75,11 @@ under the License.
<label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
<input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
</div>
+ <#--
<div>
<a name="submitEditPostalAddress_${contactMech.contactMechId}" id="submitEditPostalAddress_${contactMech.contactMechId}" class="button" onclick="updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}')">${uiLabelMap.CommonSubmit}</a>
<a href="javascript:void(0);" class="popup_closebox button">${uiLabelMap.CommonClose}</a>
</div>
+ -->
</fieldset>
</form>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Fri Dec 10 20:40:08 2010
@@ -61,7 +61,7 @@ under the License.
</div>
</fieldset>
<div>
- <a id="submitEditUserForm" href="javascript:void(0);" class="button">${uiLabelMap.CommonSubmit}</a>
+ <input type="submit" id="submitEditUserForm" class="button" vlaue="${uiLabelMap.CommonSubmit}">
<a id="cancelEditUserForm" href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonCancel}</a>
</div>
</form>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Fri Dec 10 20:40:08 2010
@@ -81,9 +81,11 @@ under the License.
<label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
<input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> />
</div>
+ <#--
<div>
<a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="button" onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
<a class="popup_closebox button">${uiLabelMap.CommonClose}</a>
</div>
+ -->
</fieldset>
</form>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Fri Dec 10 20:40:08 2010
@@ -26,7 +26,7 @@ under the License.
<div class="screenlet-body">
<#-- Add address -->
<a class="button" id="addAddress" href="javascript:void(0)">${uiLabelMap.EcommerceAddNewAddress}</a>
- <div id="displayCreateAddressForm" class="popup" style="display: none;">
+ <div id="displayCreateAddressForm" style="display: none;">
<div id="serverError" class="errorMessage"></div>
<form id="createPostalAddressForm" method="post" action="">
<fieldset>
@@ -68,7 +68,7 @@ under the License.
<div id="states">
<label for="stateProvinceGeoId">${uiLabelMap.PartyState}*
<span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
- </label>
+ </label>
<select name="stateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%">
<#if stateProvinceGeoId?has_content>
<option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option>
@@ -85,16 +85,24 @@ under the License.
<label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
<input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
</div>
- <div>
- <a href="javascript:void(0);" id="submitPostalAddressForm" class="button" onclick="createPartyPostalAddress('submitPostalAddressForm')">${uiLabelMap.CommonSubmit}</a>
- <a href="javascript:void(0);" class="popup_closebox button" >${uiLabelMap.CommonClose}</a>
- </div>
</fieldset>
</form>
</div>
<script type="text/javascript">
//<![CDATA[
- new Popup('displayCreateAddressForm','addAddress', {modal: true, position: 'center', trigger: 'click'})
+ jQuery("#displayCreateAddressForm").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var createAddressForm = jQuery("#displayCreateAddressForm");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ createPartyPostalAddress();
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
+ jQuery("#addAddress").click(function(){jQuery("#displayCreateAddressForm").dialog("open")});
//]]>
</script>
</div>
@@ -130,12 +138,24 @@ under the License.
<li>${uiLabelMap.PartyPostalInformationNotFound}</li>
</#if>
</ul>
- <div id="displayEditBillToPostalAddress" class="popup" style="display: none;">
+ <div id="displayEditBillToPostalAddress" style="display: none;">
<#include "EditBillToAddress.ftl" />
</div>
<script type="text/javascript">
//<![CDATA[
- new Popup('displayEditBillToPostalAddress', 'updateBillToPostalAddress', {modal: true, position: 'center', trigger: 'click'})
+ jQuery("#displayEditBillToPostalAddress").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var createAddressForm = jQuery("#displayEditBillToPostalAddress");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyBillToPostalAddress();
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
+ jQuery("#updateBillToPostalAddress").click(function(){jQuery("#displayEditBillToPostalAddress").dialog("open")});
//]]>
</script>
@@ -166,12 +186,24 @@ under the License.
<li>${uiLabelMap.PartyPostalInformationNotFound}</li>
</#if>
</ul>
- <div id="displayEditShipToPostalAddress" class="popup" style="display: none;">
+ <div id="displayEditShipToPostalAddress" style="display: none;">
<#include "EditShipToAddress.ftl" />
</div>
<script type="text/javascript">
//<![CDATA[
- new Popup('displayEditShipToPostalAddress','updateShipToPostalAddress', {modal: true, position: 'center', trigger: 'click'})
+ jQuery("#displayEditShipToPostalAddress").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var createAddressForm = jQuery("#displayEditShipToPostalAddress");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyShipToPostalAddress('submitEditShipToPostalAddress');
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
+ jQuery("#updateShipToPostalAddress").click(function(){jQuery("#displayEditShipToPostalAddress").dialog("open")});
//]]>
</script>
</div>
@@ -190,7 +222,7 @@ under the License.
<#if !(partyContactMechValueMap.partyContactMechPurposes?has_content)>
<#assign postalAddressFlag = "Y" />
<#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
- <div id="displayEditAddressForm_${contactMech.contactMechId}" class="popup" style="display: none;">
+ <div id="displayEditAddressForm_${contactMech.contactMechId}" style="display: none;">
<#include "EditPostalAddress.ftl" />
</div>
<#if postalAddress?exists>
@@ -222,13 +254,24 @@ under the License.
<form id="deletePostalAddress_${contactMech.contactMechId}" method= "post" action= "<@o...@ofbizUrl>">
<fieldset>
<input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}" />
- <a href="javascript:$('deletePostalAddress_${contactMech.contactMechId}').submit()" class='button'>${uiLabelMap.CommonDelete}</a>
</fieldset>
- </form>
+ </form>
</div>
<script type="text/javascript">
//<![CDATA[
- new Popup('displayEditAddressForm_${contactMech.contactMechId}','update_${contactMech.contactMechId}', {modal: true, position: 'center', trigger: 'click'})
+ jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var createAddressForm = jQuery("#displayEditAddressForm_${contactMech.contactMechId}");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}');
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
+ jQuery("#update_${contactMech.contactMechId}").click(function(){jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog("open")});
//]]>
</script>
<#else>