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 [3/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/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Fri Dec 10 20:40:08 2010
@@ -20,10 +20,11 @@
<script type="text/javascript">
function cmsSave() {
var simpleFormAction = '<@o...@ofbizUrl>';
- var editor = dojo.widget.byId("w_editor");
- if (editor) {
- var cmsdata = dojo.byId("cmsdata");
- cmsdata.value = editor.getEditorContent();
+ var editor = jQuery("#cmseditor");
+ if (editor.length) {
+ var cmsdata = jQuery("#cmsdata");
+ var data = editor.elrte('val');
+ cmsdata.val(data);
}
// get the cmsform
@@ -39,11 +40,15 @@
if (uploadValue == null || uploadValue == "") {
form.action = simpleFormAction;
}
+
+ // if we have a file upload make a 'real' form submit, ajax submits won't work in this cases
+ form.submit();
+ return false;
}
// submit the form
if (form != null) {
- form.submit();
+ ajaxSubmitForm(form, "<#if content?has_content>${content.contentId!}</#if>");
} else {
alert("Cannot find the cmsform!");
}
@@ -54,14 +59,14 @@
function selectDataType(contentId) {
var selectObject = document.forms['cmsdatatype'].elements['dataResourceTypeId'];
var typeValue = selectObject.options[selectObject.selectedIndex].value;
- callEditor(true, contentId, '', typeValue);
+ callDocument(true, contentId, '', typeValue);
}
</script>
<#-- cms menu bar -->
<div id="cmsmenu" style="margin-bottom: 8px;">
<#if (content?has_content)>
- <a href="javascript:void(0);" onclick="javascript:callEditor(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">${uiLabelMap.ContentQuickSubContent}</a>
+ <a href="javascript:void(0);" onclick="javascript:callDocument(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">${uiLabelMap.ContentQuickSubContent}</a>
<a href="javascript:void(0);" onclick="javascript:callPathAlias('${content.contentId}');" class="tabButton">${uiLabelMap.ContentPathAlias}</a>
<a href="javascript:void(0);" onclick="javascript:callMetaInfo('${content.contentId}');" class="tabButton">${uiLabelMap.ContentMetaTags}</a>
</#if>
@@ -305,7 +310,7 @@
<td colspan="2">
<textarea id="cmsdata" name="textData" cols="40" rows="6" style="display: none;">
<#if (dataText?has_content)>
- ${dataText.textData}
+ ${StringUtil.wrapString(dataText.textData!)}
</#if>
</textarea>
</td>
@@ -346,7 +351,11 @@
<tr>
<td colspan="2">
<div id="editorcontainer" class="nocolumns">
- <div id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;"></div>
+ <div id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;">
+ <#if (dataText?has_content)>
+ ${StringUtil.wrapString(dataText.textData!)}
+ </#if>
+ </div>
</div>
</td>
</tr>
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl Fri Dec 10 20:40:08 2010
@@ -29,7 +29,7 @@
<#-- cms menu bar -->
<div id="cmsmenu" style="margin-bottom: 8px;">
<#if (content?has_content)>
- <a href="javascript:void(0);" onclick="javascript:callEditor(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">Quick Sub-Content</a>
+ <a href="javascript:void(0);" onclick="javascript:callDocument(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">Quick Sub-Content</a>
<a href="javascript:void(0);" onclick="javascript:callPathAlias('${content.contentId}');" class="tabButton">Path Alias</a>
<a href="javascript:void(0);" onclick="javascript:callMetaInfo('${content.contentId}');" class="selected">Meta Tags</a>
</#if>
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Fri Dec 10 20:40:08 2010
@@ -16,242 +16,398 @@
specific language governing permissions and limitations
under the License.
-->
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+
+<link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
<script type="text/javascript">
- //var djConfig = {
- // isDebug: false
- //};
-
- dojo.require("dojo.widget.*");
- dojo.require("dojo.event.*");
- dojo.require("dojo.io.*");
+ jQuery(document).ready(loadTrees());
- var treeSelected = false;
var contentRoot = '${contentRoot?if_exists}';
var webSiteId = '${webSiteId?if_exists}';
var editorUrl = '<@o...@ofbizUrl>';
var aliasUrl = '<@o...@ofbizUrl>';
var metaUrl = '<@o...@ofbizUrl>';
- dojo.addOnLoad(function() {
- dojo.event.topic.subscribe("webCmsNodeSelected",
- function(message) {
- treeSelected = true;
- callEditor(false, message.node.widgetId, message.node.object);
- }
- );
- dojo.event.topic.subscribe("newLong/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'ELECTRONIC_TEXT');
- }
- );
- dojo.event.topic.subscribe("newShort/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'SHORT_TEXT');
- }
- );
- dojo.event.topic.subscribe("newUrl/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'URL_RESOURCE');
- }
- );
- dojo.event.topic.subscribe("newImage/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'IMAGE_OBJECT');
- }
- );
- dojo.event.topic.subscribe("newVideo/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'VIDEO_OBJECT');
- }
- );
- dojo.event.topic.subscribe("newAudio/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'AUDIO_OBJECT');
- }
- );
- dojo.event.topic.subscribe("newObject/engage",
- function (menuItem) {
- var node = menuItem.getTreeNode();
- callEditor(true, node.widgetId, '', 'OTHER_OBJECT');
- }
- );
+ function loadTrees() {
+ createSubsitesTree();
+ createMenusTree();
+ createErrorTree();
+ }
- var cmsdata = dojo.byId("cmsdata");
- if (cmsdata) {
- createEditor(cmsdata.value);
- } else {
- createEditor();
- }
- //alert("On load called!");
- });
+ function cutNameLength(name) {
+ var leng = 27;
+ return name.substring(0, leng);
+ }
- function createEditor(text) {
- var currentEditor = dojo.widget.byId("w_editor");
- if (currentEditor) {
- currentEditor.destroy(true);
- }
+<#-- creating the JSON Data -->
+var rawdata_subsites = [
+ <#if (subsites?has_content)>
+ <@fillTree assocList = subsites/>
+ <#macro fillTree assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+ <#if assocChilds?has_content>
+ "children": [
+ <@fillTree assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+ </#macro>
+ </#if>
+];
- // display parent div
- dojo.html.show("editorcontainer");
+var rawdata_menus = [
+ <#if (menus?has_content)>
+ <@fillTree assocList = menus/>
+ <#macro fillTree assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+ <#if assocChilds?has_content>
+ "children": [
+ <@fillTree assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+ </#macro>
+ </#if>
+];
- // get the editor tag
- var editorNode = dojo.byId("cmseditor");
+var rawdata_errors = [
+ <#if (errors?has_content)>
+ <@fillTree assocList = errors/>
+ <#macro fillTree assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+ <#if assocChilds?has_content>
+ "children": [
+ <@fillTree assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+ </#macro>
+ </#if>
+];
- if (editorNode) {
- if (text) {
- editorNode.innerHTML = text;
+<#-------------------------------------------------------------------------------------create Tree-->
+ function createSubsitesTree() {
+ jQuery(function () {
+ jQuery("#subsites").jstree({
+ "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
+ "core" : {
+ "html_titles" : true,
+ },
+ "json_data" : {
+ "data" : rawdata_subsites,
+ "progressive_render" : false
+ },
+ 'contextmenu': {
+ 'items': {
+ 'ccp' : false,
+ 'create' : false,
+ 'rename' : false,
+ 'remove' : false,
+ 'create1' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceLongText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'ELECTRONIC_TEXT');
+ }
+ },
+ 'create2' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceShortText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'SHORT_TEXT');
+ }
+ },
+ 'create3' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceUrlResource}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'URL_RESOURCE');
+ }
+ },
+ 'create4' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentDataResourceImage}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'IMAGE_OBJECT');
+ }
+ },
+ 'create5' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceVideo}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'VIDEO_OBJECT');
+ }
+ },
+ 'create6' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceAudio}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'AUDIO_OBJECT');
+ }
+ },
+ 'create7' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceOther}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'OTHER_OBJECT');
+ }
+ }
+ }
}
+ });
+ });
+ }
- // create the widget
- dojo.widget.createWidget("Editor2", { id: 'w_editor', minHeight: '300px',
- htmlEditing: true }, editorNode);
- }
- }
+ function createMenusTree() {
+ jQuery(function () {
+ jQuery("#menus").jstree({
+ "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
+ "core" : {
+ "html_titles" : true,
+ },
+ "json_data" : {
+ "data" : rawdata_menus,
+ "progressive_render" : false
+ },
+ 'contextmenu': {
+ 'items': {
+ 'ccp' : false,
+ 'create' : false,
+ 'rename' : false,
+ 'remove' : false,
+ 'create1' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceLongText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'ELECTRONIC_TEXT');
+ }
+ },
+ 'create2' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceShortText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'SHORT_TEXT');
+ }
+ },
+ 'create3' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceUrlResource}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'URL_RESOURCE');
+ }
+ },
+ 'create4' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentDataResourceImage}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'IMAGE_OBJECT');
+ }
+ },
+ 'create5' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceVideo}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'VIDEO_OBJECT');
+ }
+ },
+ 'create6' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceAudio}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'AUDIO_OBJECT');
+ }
+ },
+ 'create7' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceOther}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'OTHER_OBJECT');
+ }
+ }
+ }
+ }
+ });
+ });
+ }
- function callMetaInfo(contentId) {
- var ctx = new Array();
- ctx['contentId'] = contentId;
+ function createErrorTree() {
+ jQuery(function () {
+ jQuery("#errors").jstree({
+ "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
+ "core" : {
+ "html_titles" : true,
+ },
+ "json_data" : {
+ "data" : rawdata_errors,
+ "progressive_render" : false
+ },
+ 'contextmenu': {
+ 'items': {
+ 'ccp' : false,
+ 'create' : false,
+ 'rename' : false,
+ 'remove' : false,
+ 'create1' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceLongText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'ELECTRONIC_TEXT');
+ }
+ },
+ 'create2' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceShortText}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'SHORT_TEXT');
+ }
+ },
+ 'create3' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceUrlResource}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'URL_RESOURCE');
+ }
+ },
+ 'create4' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentDataResourceImage}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'IMAGE_OBJECT');
+ }
+ },
+ 'create5' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceVideo}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'VIDEO_OBJECT');
+ }
+ },
+ 'create6' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceAudio}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'AUDIO_OBJECT');
+ }
+ },
+ 'create7' : {
+ 'label' : "${uiLabelMap.CommonNew} ${uiLabelMap.ContentResourceOther}",
+ 'action' : function(obj) {
+ callDocument(true, obj.attr('id'), '', 'OTHER_OBJECT');
+ }
+ }
+ }
+ }
+ });
+ });
+ }
+<#-------------------------------------------------------------------------------------callDocument function-->
+ function callDocument(sub, contentId, objstr, dataResourceTypeId) {
+ var ctx = {};
+ ctx['contentRoot'] = contentRoot;
ctx['webSiteId'] = webSiteId;
- // deselect the tree
- var tree = dojo.widget.byId("webCmsTreeSelector");
- if (tree && treeSelected) {
- tree.deselect();
- treeSelected = false;
- }
-
- // destroy the editor
- var editor = dojo.widget.byId("w_editor");
- if (editor) {
- editor.destroy(true);
- }
- //dojo.html.hide("editorcontainer");
-
- // get the meta-info screen
- var bindArgs = {
- url: metaUrl,
- method: 'POST',
- mimetype: 'text/html',
- content: ctx,
- error: function(type, data, evt) {
- alert("An error occured loading content! : " + data);
- },
- load: function(type, data, evt) {
- var innerPage = dojo.byId('cmscontent');
- innerPage.innerHTML = data;
+ if (sub && contentId) {
+ if (dataResourceTypeId) {
+ ctx['dataResourceTypeId'] = dataResourceTypeId;
}
- };
- dojo.io.bind(bindArgs);
- }
- function callPathAlias(contentId) {
- var ctx = new Array();
- ctx['contentId'] = contentId;
- ctx['webSiteId'] = webSiteId;
+ ctx['contentIdFrom'] = contentId;
+ ctx['contentAssocTypeId'] = 'SUB_CONTENT';
- // deselect the tree
- var tree = dojo.widget.byId("webCmsTreeSelector");
- if (tree && treeSelected) {
- tree.deselect();
- treeSelected = false;
}
- // destroy the editor
- var editor = dojo.widget.byId("w_editor");
- if (editor) {
- editor.destroy(true);
+ if (contentId != null && contentId.length) {
+ ctx['contentId'] = contentId;
}
- //dojo.html.hide("editorcontainer");
- // get the alias screen
- var bindArgs = {
- url: aliasUrl,
- method: 'POST',
- mimetype: 'text/html',
- content: ctx,
- error: function(type, data, evt) {
- alert("An error occured loading content! : " + data);
+ //jQuerry Ajax Request
+ jQuery.ajax({
+ url: editorUrl,
+ type: 'POST',
+ data: ctx,
+ error: function(msg) {
+ alert("An error occured loading content! : " + msg);
},
- load: function(type, data, evt) {
- var innerPage = dojo.byId('cmscontent');
- innerPage.innerHTML = data;
+ success: function(msg) {
+ jQuery('#cmscontent').html(msg);
+
+ // CREATE / LOAD Editor
+ createEditor();
}
- };
- dojo.io.bind(bindArgs);
- }
+ });
+ }
- function callEditor(sub, contentId, objstr, dataResourceTypeId) {
- var ctx = new Array();
- if (objstr != null && objstr.length > 0) {
- var obj = objstr.split("|");
- ctx['contentIdFrom'] = obj[0];
- ctx['contentAssocTypeId'] = obj[1];
- ctx['fromDate'] = obj[2];
+<#-------------------------------------------------------------------------------------createEditor function-->
+ function createEditor() {
+ var opts = {
+ cssClass : 'el-rte',
+ height : 350,
+ toolbar : 'maxi',
+ doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
+ cssfiles : ['css/elrte-inner.css']
}
+ jQuery('#cmseditor').elrte(opts);
+ }
+<#-------------------------------------------------------------------------------------callMetaInfo function-->
+function callMetaInfo(contentId) {
+ var ctx = {"contentId" : contentId, "webSiteId" : webSiteId};
- ctx['contentRoot'] = contentRoot;
- ctx['webSiteId'] = webSiteId;
+ // destroy the editor
+ destroyEditor();
- if (sub && contentId) {
- if (dataResourceTypeId) {
- ctx['dataResourceTypeId'] = dataResourceTypeId;
+ jQuery.ajax({
+ url: metaUrl,
+ type: 'POST',
+ data: ctx,
+ error: function(msg) {
+ alert("An error occured loading content! : " + msg);
+ },
+ success: function(msg) {
+ jQuery('#cmscontent').html(msg);
}
+ });
+ }
- ctx['contentIdFrom'] = contentId;
- ctx['contentAssocTypeId'] = 'SUB_CONTENT';
+<#-------------------------------------------------------------------------------------callPathAlias function-->
+ function callPathAlias(contentId) {
+ var ctx = {"contentId" : contentId, "webSiteId" : webSiteId};
- // deselect the tree
- var tree = dojo.widget.byId("webCmsTreeSelector");
- if (tree && treeSelected) {
- tree.deselect();
- treeSelected = false;
- }
- } else {
- if (contentId != null && contentId.length > 0) {
- ctx['contentId'] = contentId;
- } else {
- // deselect the tree
- var tree = dojo.widget.byId("webCmsTreeSelector");
- if (tree && treeSelected) {
- tree.deselect();
- treeSelected = false;
- }
- }
- }
+ // destroy the editor
+ destroyEditor();
- var bindArgs = {
- url: editorUrl,
- method: 'POST',
- mimetype: 'text/html',
- content: ctx,
- error: function(type, data, evt) {
- alert("An error occured loading editor! : " + data.message);
+ // get the alias screen
+ jQuery.ajax({
+ url: metaUrl,
+ type: 'POST',
+ data: ctx,
+ error: function(msg) {
+ alert("An error occured loading content! : " + msg);
},
- load: function(type, data, evt) {
- var editPage = dojo.byId('cmscontent');
- editPage.innerHTML = data;
-
- // load the data
- var cmsdata = dojo.byId("cmsdata");
-
- // create the editor
- if (cmsdata) {
- createEditor(cmsdata.value);
- } else {
- createEditor();
- }
+ success: function(msg) {
+ jQuery('#cmscontent').html(msg);
}
- };
- dojo.io.bind(bindArgs);
+ });
}
+<#-------------------------------------------------------------------------------------saveMetaInfo function-->
function saveMetaInfo(form) {
// save title
document.cmsmeta_title.objectInfo.value = form.title.value;
@@ -270,102 +426,66 @@
ajaxSubmitForm(document.cmsmeta_metaKeywords);
}
+<#-------------------------------------------------------------------------------------pathSave function-->
function pathSave(contentId) {
- //dojo.html.hide("submit");
-
var form = document.cmspathform;
if (form != null) {
var url = form.action;
- var bindArgs = {
+ jQuery.ajax({
url: url,
- method: "POST",
- mimetype: "text/json",
- formNode: form,
- error: function(type, data, evt) {
+ type: 'POST',
+ data: jQuery(form).serialize(),
+ error: function(msg) {
alert("An error occurred.");
},
- load: function(type, data, evt) {
+ success: function(msg) {
callPathAlias(contentId);
}
- };
- dojo.io.bind(bindArgs);
+ });
}
}
+<#-------------------------------------------------------------------------------------pathRemove function-->
function pathRemove(websiteId, pathAlias, contentId) {
var remAliasUrl = '<@o...@ofbizUrl>';
- var ctx = new Array();
- ctx['pathAlias'] = pathAlias;
- ctx['webSiteId'] = webSiteId;
-
- // get the alias screen
- var bindArgs = {
- url: remAliasUrl,
- method: 'POST',
- mimetype: 'text/html',
- content: ctx,
- error: function(type, data, evt) {
- alert("An error occured! : " + data);
- },
- load: function(type, data, evt) {
- callPathAlias(contentId);
- }
- };
- dojo.io.bind(bindArgs);
+ jQuery.ajax({
+ url: remAliasUrl,
+ type: 'POST',
+ data: {"pathAlias" : pathAlias, "webSiteId" : webSiteId},
+ error: function(msg) {
+ alert("An error occured! : " + msg);
+ },
+ success: function(msg) {
+ callPathAlias(contentId);
+ }
+ });
}
- function ajaxSubmitForm(form) {
+<#-------------------------------------------------------------------------------------ajaxSubmitForm function-->
+ function ajaxSubmitForm(form, contentId) {
if (form != null) {
var url = form.action;
- var bindArgs = {
+ jQuery.ajax({
url: url,
- method: "POST",
- mimetype: "text/json",
- formNode: form,
- error: function(type, data, evt) {
- alert("An error occurred submitting form.");
+ type: 'POST',
+ async: false,
+ data: jQuery(form).serialize(),
+ success: function(data) {
+ // if the content id is set reload the contentScreen
+ if (contentId && contentId.length) {
+ callDocument('', contentId, '', '');
+ }
},
- load: function(type, data, evt) {
+ error: function(msg) {
+ alert("An error occurred submitting form.");
}
- };
- dojo.io.bind(bindArgs);
+ });
}
}
+
</script>
-<style type="text/css">
-.dojoContextMenu {
- background-color: #ccc;
- font-size: 10px;
-}
-</style>
-
-<#-- looping macro -->
-<#macro fillTree assocList>
- <#if (assocList?has_content)>
- <#list assocList as assoc>
- <#assign thisContent = assoc.getRelatedOne("ToContent")/>
- <div dojoType="TreeNode" title="${thisContent.contentName?default(assoc.contentIdTo)}" widgetId="${assoc.contentIdTo}"
- object="${assoc.contentId}|${assoc.contentAssocTypeId}|${assoc.fromDate}">
- <#assign assocs = thisContent.getRelated("FromContentAssoc")?if_exists/>
- <#if (assocs?has_content)>
- <@fillTree assocList = assocs/>
- </#if>
- </div>
- </#list>
- </#if>
-</#macro>
-
-<dl dojoType="TreeContextMenu" id="webCmsContextMenu" style="font-size: 1em; color: #ccc;">
- <dt dojoType="TreeMenuItem" id="newLong" caption="New Long Text"/>
- <dt dojoType="TreeMenuItem" id="newShort" caption="New Short Text"/>
- <dt dojoType="TreeMenuItem" id="newUrl" caption="New URL"/>
- <dt dojoType="TreeMenuItem" id="newImage" caption="New Image"/>
- <dt dojoType="TreeMenuItem" id="newVideo" caption="New Video"/>
- <dt dojoType="TreeMenuItem" id="newAudio" caption="New Audio"/>
- <dt dojoType="TreeMenuItem" id="newObject" caption="New Object"/>
-</dl>
<div class="label">
${uiLabelMap.ContentWebSiteContent}
@@ -375,24 +495,10 @@
</div>
<div> </div>
-<dojo:TreeSelector widgetId="webCmsTreeSelector" eventNames="select:webCmsNodeSelected"></dojo:TreeSelector>
-<div dojoType="Tree" menu="webCmsContextMenu" widgetId="webCmsTree" selector="webCmsTreeSelector" toggler="fade" toggleDuration="500">
- <#if (subsites?has_content)>
- <@fillTree assocList = subsites/>
- </#if>
-</div>
+<div id="subsites"></div>
<#if (!subsites?has_content)>
<a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddTree}</a>
</#if>
-
-<div> </div>
-<div> </div>
-
-<dl dojoType="TreeContextMenu" id="webMenuContextMenu" style="font-size: 1em; color: #ccc;">
- <dt dojoType="TreeMenuItem" id="newItem" caption="New Menu Item"/>
- <dt dojoType="TreeMenuItem" id="newMenu" caption="New Menu"/>
-</dl>
-
<div class="label">
${uiLabelMap.ContentWebSiteMenus}
</div>
@@ -401,13 +507,7 @@
</div>
<div> </div>
-<dojo:TreeSelector widgetId="webMenuTreeSelector" eventNames="select:webMenuNodeSelected"></dojo:TreeSelector>
-<div dojoType="Tree" menu="webMenuContextMenu" widgetId="webMenuTree" selector="webMenuTreeSelector" toggler="fade" toggleDuration="500">
- <#if (menus?has_content)>
- ${menus}
- <@fillTree assocList = menus/>
- </#if>
-</div>
+<div id="menus"></div>
<#if (!menus?has_content)>
<a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddMenu}</a>
</#if>
@@ -415,10 +515,6 @@
<div> </div>
<div> </div>
-<dl dojoType="TreeContextMenu" id="webErrorContextMenu" style="font-size: 1em; color: #ccc;">
- <dt dojoType="TreeMenuItem" id="newErrorPage" caption="New Error Page"/>
-</dl>
-
<div class="label">
${uiLabelMap.ContentWebSiteErrors}
</div>
@@ -426,14 +522,7 @@
${uiLabelMap.ContentWebSiteAddNewErrors}
</div>
<div> </div>
-
-<dojo:TreeSelector widgetId="webErrorTreeSelector" eventNames="select:webErrorNodeSelected"></dojo:TreeSelector>
-<div dojoType="Tree" menu="webErrorContextMenu" widgetId="webErrorTree" selector="webErrorTreeSelector" toggler="fade" toggleDuration="500">
- <#if (errors?has_content)>
- ${errors}
- <@fillTree assocList = errors/>
- </#if>
-</div>
+<div id="errors"></div>
<#if (!errors?has_content)>
<a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddError}</a>
-</#if>
\ No newline at end of file
+</#if>
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl Fri Dec 10 20:40:08 2010
@@ -20,7 +20,7 @@
<#-- cms menu bar -->
<div id="cmsmenu" style="margin-bottom: 8px;">
<#if (content?has_content)>
- <a href="javascript:void(0);" onclick="javascript:callEditor(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">Quick Sub-Content</a>
+ <a href="javascript:void(0);" onclick="javascript:callDocument(true, '${content.contentId}', '', 'ELECTRONIC_TEXT');" class="tabButton">Quick Sub-Content</a>
<a href="javascript:void(0);" onclick="javascript:callPathAlias('${content.contentId}');" class="selected">Path Alias</a>
<a href="javascript:void(0);" onclick="javascript:callMetaInfo('${content.contentId}');" class="tabButton">Meta Tags</a>
</#if>
Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Fri Dec 10 20:40:08 2010
@@ -142,7 +142,6 @@ under the License.
<screen name="WebSiteCMS">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<set field="titleProperty" value="PageTitleEditWebSiteCMS"/>
<set field="tabButtonItem" value="WebSiteCMS"/>
<set field="labelTitleProperty" value="PageTitleEditWebSiteCMS"/>
@@ -217,6 +216,8 @@ under the License.
<entity-one entity-name="ElectronicText" value-field="dataText">
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
+
+ <set field="dummy" value="${groovy: print('dataText'============== + dataText)"/>
<set field="parameters.fromDate" type="Timestamp" from-field="parameters.fromDate"/>
<entity-one entity-name="ContentAssoc" value-field="assoc">
<field-map field-name="contentId" from-field="parameters.contentIdFrom"/>
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Fri Dec 10 20:40:08 2010
@@ -82,7 +82,7 @@ under the License.
<screen name="navigateContent">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
<set field="titleProperty" value="PageTitleNavigateContent"/>
<set field="tabButtonItem" value="navigateContent"/>
<set field="labelTitleProperty" value="PageTitleNavigateContent"/>
@@ -461,11 +461,10 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="ListContentTree">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="ListContentTree"/>
@@ -486,11 +485,10 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="LookupContentTree">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="${uiLabelMap.PageTitleLookupContent}"/>
@@ -521,15 +519,14 @@ under the License.
</widgets>
</section>
</decorator-section>
- </decorator-screen>
+ </decorator-screen>
</widgets>
</section>
</screen>
-
+
<screen name="LookupDetailContentTree">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="${uiLabelMap.PageTitleLookupContent}"/>
@@ -566,7 +563,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="ViewContentDetail">
<section>
<actions>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Fri Dec 10 20:40:08 2010
@@ -500,7 +500,7 @@ under the License.
<alt-target use-when="electronicText==null" target="addHtmlText"/>
<auto-fields-entity entity-name="ElectronicText"/>
<field name="dataResourceId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><display/></field>
- <field name="textData" id-name="textData" encode-output="false"><textarea cols="120" rows="20" visual-editor-enable="true"/></field>
+ <field name="textData" id-name="textData" encode-output="true"><textarea cols="120" rows="20" visual-editor-enable="true" /></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Fri Dec 10 20:40:08 2010
@@ -66,7 +66,6 @@ under the License.
<screen name="navigateDataResource">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<set field="titleProperty" value="PageTitleNavigateDataResources"/>
<set field="tabButtonItem" value="navigateDataResource"/>
<set field="labelTitleProperty" value="PageTitleNavigateDataResources"/>
@@ -80,7 +79,7 @@ under the License.
<section>
<widgets>
<container id="cmsnav" style="left">
- <screenlet title="${uiLabelMap.PageTitleNavigateDataResources}'">
+ <screenlet title="${uiLabelMap.PageTitleNavigateDataResources}">
<include-screen name="navigateMenu"/>
</screenlet>
</container>
Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Fri Dec 10 20:40:08 2010
@@ -70,8 +70,8 @@ under the License.
<field name="contentId" title="${uiLabelMap.ContentBlogEntryId}" use-when="contentId!=void&&contentId!=null"><display/></field>
<field name="contentName" title="${uiLabelMap.ContentArticleName}"><text size="40"/></field>
<field name="description"><textarea cols="60" rows="2"/></field>
- <field name="summaryData" title="${uiLabelMap.ContentSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
- <field name="articleData" title="${uiLabelMap.ContentBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="100" rows="20" visual-editor-enable="true"/></field>
+ <field name="summaryData" title="${uiLabelMap.ContentSummary}" widget-style="inputBox"><textarea cols="60" rows="4"/></field>
+ <field name="articleData" title="${uiLabelMap.ContentBlogArticle}" widget-style="inputBox"><textarea cols="100" rows="20" visual-editor-enable="true"/></field>
<field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field>
<field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}">
<drop-down>
Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Fri Dec 10 20:40:08 2010
@@ -219,7 +219,7 @@ under the License.
<field name="ownerContentId"><hidden value="${parameters.forumId}"/></field>
<field name="caContentId"><hidden value="${parameters.forumMessageIdTo}"/></field>
<field name="caContentAssocTypeId"><hidden value="RESPONSE"/></field>
- <field name="forumMessageText" parameter-name="textData"><textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link"/></field>
+ <field name="forumMessageText" parameter-name="textData"><textarea rows="10" visual-editor-enable="true" visual-editor-buttons="compact"/></field>
<field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="AddForumThreadMessage" type="single" extends="AddForumMessage" target="updateForumThreadMessage"
Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Fri Dec 10 20:40:08 2010
@@ -84,9 +84,6 @@ under the License.
<set field="tabButtonItem" value="EmployeeProfile"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
<set field="partyId" from-field="parameters.partyId"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
- <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Fri Dec 10 20:40:08 2010
@@ -121,8 +121,7 @@ function lookupBom() {
<td align="right">${uiLabelMap.CommonFromDate}</td>
<td> </td>
<td>
- <input type="text" name="fromDate" size="25" maxlength="40" value=""/>
- <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="50" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class="tooltip">(${uiLabelMap.ManufacturingWillBeSetToNow})</span>
</td>
</tr>
@@ -159,8 +158,7 @@ function lookupBom() {
<td width="26%" align="right">${uiLabelMap.CommonThruDate}</td>
<td> </td>
<td width="74%">
- <input type="text" name="thruDate" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30"/>
- <a href="javascript:call_cal(document.editProductAssocForm.thruDate,<#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("thruDate"))?exists>'${request.getParameter("thruDate")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Fri Dec 10 20:40:08 2010
@@ -72,10 +72,7 @@ function lookupInventory() {
<td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
<td width='5%'> </td>
<td>
- <input type='text' size='25' name='eventDate' value='${requestParameters.eventDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookupinventory.eventDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate?if_exists}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Fri Dec 10 20:40:08 2010
@@ -48,8 +48,7 @@ function addRoutingTask() {
${uiLabelMap.CommonFromDate}
</th>
<td>
- <input type="text" name="fromDate" size="25"/>
- <a href="javascript:call_cal(document.addtaskassocform.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td align="center" width="40%"> </td>
</tr>
@@ -64,8 +63,7 @@ function addRoutingTask() {
${uiLabelMap.CommonThruDate}
</th>
<td>
- <input type="text" name="thruDate" size="25"/>
- <a href="javascript:call_cal(document.addtaskassocform.thruDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td> </td>
</tr>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri Dec 10 20:40:08 2010
@@ -198,9 +198,6 @@ under the License.
<set field="tabButtonItem" value="profile"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
- <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Dec 10 20:40:08 2010
@@ -7362,9 +7362,9 @@
</property>
<property key="OrderPartySelectRoleForParty">
<value xml:lang="de">Rolle für Akteur wählen</value>
- <value xml:lang="en">Select Role For Party</value>
+ <value xml:lang="en">Select Role(s) For Party</value>
<value xml:lang="es">Elija rol para el participante</value>
- <value xml:lang="fr">Choisir le rôle pour l'acteur</value>
+ <value xml:lang="fr">Choisir le ou les rôles pour l'acteur</value>
<value xml:lang="it">Seleziona Ruolo Per Soggetto</value>
<value xml:lang="nl">Rol voor relatie selecteren</value>
<value xml:lang="pt_BR">Selecionar papel para o participante</value>
@@ -8029,7 +8029,7 @@
<value xml:lang="de">Beschaffungsauftrag</value>
<value xml:lang="en">Purchase Order</value>
<value xml:lang="es">Pedido de compra</value>
- <value xml:lang="fr">une commande d'achat</value>
+ <value xml:lang="fr">Commande d'achat</value>
<value xml:lang="it">Ordine Acquisto</value>
<value xml:lang="nl">Inkoopbestelling</value>
<value xml:lang="pt_BR">Pedido de compra</value>
Propchange: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
+/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Fri Dec 10 20:40:08 2010
@@ -110,8 +110,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
<td>
<div>
- <input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}"</#if>/>
- <a href="javascript:call_cal(document.quickaddform.itemDesiredDeliveryDate,'${defaultDesiredDeliveryDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}" <#else> value=""</#if> className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/>
${uiLabelMap.OrderUseDefaultDesiredDeliveryDate}
</div>
@@ -121,8 +120,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderShipAfterDate} :</div></td>
<td>
<div>
- <input type="text" size="20" maxlength="30" name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}"/>
- <a href="javascript:call_cal(document.quickaddform.shipAfterDate,'${shoppingCart.getDefaultShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
@@ -130,8 +128,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderShipBeforeDate} :</div></td>
<td>
<div>
- <input type="text" size="20" maxlength="30" name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}"/>
- <a href="javascript:call_cal(document.quickaddform.shipBeforeDate,'${shoppingCart.getDefaultShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Fri Dec 10 20:40:08 2010
@@ -196,24 +196,20 @@ under the License.
<tr>
<td>
<div>${uiLabelMap.OrderShipAfterDate}
- <input type="text" size="20" maxlength="30" name="shipAfterDate_${cartLineIndex}"
- value="${cartLine.getShipAfterDate()?default("")}"/>
- <a href="javascript:call_cal(document.cartform.shipAfterDate_${cartLineIndex},'${shoppingCart.getShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate_${cartLineIndex}" value="${cartLine.getShipAfterDate()?default('')}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
<td> </td>
<td>
<div>${uiLabelMap.OrderShipBeforeDate}
- <input type="text" size="20" maxlength="30" name="shipBeforeDate_${cartLineIndex}"
- value="${cartLine.getShipBeforeDate()?default("")}"/>
- <a href="javascript:call_cal(document.cartform.shipBeforeDate_${cartLineIndex},'${shoppingCart.getShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate_${cartLineIndex}" value="${cartLine.getShipBeforeDate()?default('')}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
</table>
</td>
</tr>
-
+
<#-- Show Associated Products (not for Variants) -->
<#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc",
Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"))?if_exists/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Fri Dec 10 20:40:08 2010
@@ -138,23 +138,23 @@ ${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) {
- var element = Event.element(event);
- if (element.identify().startsWith('comments_')) {
+function getConfigDetails() {
+ var element = jQuery(this);
+ if (element.attr("id").is("[id^='comments_']")) {
// don't update the price for comment change
return;
}
- new Ajax.Request('/ordermgr/control/getConfigDetailsEvent',{parameters: $('configFormId').serialize(), requestHeaders: {Accept: 'application/json'},
-
- onSuccess: function(transport){
- var data = transport.responseText.evalJSON(true);
-
- if (data._ERROR_MESSAGE_LIST_ != undefined) {
+ jQuery.ajax({
+ url: '/ordermgr/control/getConfigDetailsEvent',
+ data: jQuery('configFormId').serialize(),
+ type: "POST",
+ success: function(data) {
+ if (data._ERROR_MESSAGE_LIST_ != undefined) {
//console.log(data._ERROR_MESSAGE_LIST_);
//alert(data._ERROR_MESSAGE_LIST_);
}else if (data._ERROR_MESSAGE_ != undefined) {
@@ -167,15 +167,12 @@ function getConfigDetails(event) {
var configId = data.configId;
document.getElementById('totalPrice').innerHTML = totalPrice;
document.addToShoppingList.configId.value = configId;
- event.stop();
}
- },
+ },
+ error: function(data) {
- onFailure: function(transport) {
- var data = transport.responseText.evalJSON(true);
- //console.log('Failure');
}
- });
+ });
}
-->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Fri Dec 10 20:40:08 2010
@@ -521,8 +521,8 @@ ${virtualJavaScript?if_exists}
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<table width="100%"><tr>
- <td nowrap="nowrap" align="right">Start Date<br />(yyyy-mm-dd)</td><td><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" border="0" alt="Calendar"/></a></td>
- <td nowrap="nowrap" align="right">End Date<br />(yyyy-mm-dd)</td><td><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" border="0" alt="Calendar"/></a></td></tr>
+ <@htmlTemplate.renderDateTimeField name="reservStart" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="startDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="reservEnd" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="endDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<tr>
<#--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> </td-->
<td nowrap="nowrap" align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Fri Dec 10 20:40:08 2010
@@ -36,7 +36,7 @@ under the License.
<span id="${productInfoLinkId}" class="popup_link"><img src="<@o...@ofbizContentUrl>" alt="Small Image"/></span>
</a>
</div>
- <div id="${productDetailId}" class="popup" >
+ <div id="${productDetailId}" class="popup" style="display:none;">
<table>
<tr valign="top">
<td>
@@ -49,7 +49,11 @@ under the License.
</table>
</div>
<script type="text/javascript">
- new Popup('${productDetailId}','${productInfoLinkId}', {position: 'none'})
+ jQuery("#${productInfoLinkId}").hover(function() {
+ jQuery("#${productDetailId}").fadeIn("slow");
+ }, function () {
+ jQuery("#${productDetailId}").fadeOut("fast");
+ });
</script>
<div class="productbuy">
<#-- check to see if introductionDate hasn't passed yet -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Fri Dec 10 20:40:08 2010
@@ -149,8 +149,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipBeforeDate"/>
- <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipBeforeDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
@@ -162,8 +161,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipAfterDate"/>
- <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Fri Dec 10 20:40:08 2010
@@ -175,10 +175,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="shipAfterDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.shipAfterDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
@@ -190,10 +188,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="shipBeforeDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.shipBeforeDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
@@ -206,10 +202,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="cancelBackOrderDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.cancelBackOrderDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="cancelBackOrderDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="cancelBackOrderDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Fri Dec 10 20:40:08 2010
@@ -107,11 +107,11 @@ under the License.
<tr>
<td width="100%">
<table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <form method="post" action="<@o...@ofbizUrl>">
+ <form method="post" action="<@o...@ofbizUrl>" name="addAdditionalPartyForm" id="addAdditionalPartyForm">
<tr>
<td> </td>
<td>
- <select name="additionalRoleTypeId" size="5" multiple="multiple">
+ <select name="additionalRoleTypeId" id="additionalRoleTypeId" size="5" multiple="multiple">
<#list roles as role>
<option value="${role.roleTypeId}">${role.get("description",locale)}</option>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/images/js/ConvertUom.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/images/js/ConvertUom.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/images/js/ConvertUom.js (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/images/js/ConvertUom.js Fri Dec 10 20:40:08 2010
@@ -18,17 +18,19 @@
*/
function getConvertedPrice(element, uomId, uomIdTo, rowCount, orderCurrencyUnitPrice, unitCost) {
- var request = $F('getConvertedPrice');
- new Ajax.Request(request, {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- if (data.convertedValue && confirm($('alertMessage').value)) {
- $('unitCost_'+rowCount).value = data.convertedValue;
+ var request = jQuery('#getConvertedPrice').val();
+ jQuery.ajax({
+ url: request,
+ data: { uomId : uomId, uomIdTo : uomIdTo, originalValue : element.value }
+ async: true,
+ type: "POST",
+ success: function(data){
+ if (data.convertedValue && confirm(jQuery('#alertMessage').val())) {
+ jQuery('#unitCost_'+rowCount).val(data.convertedValue);
} else {
- $('orderCurrencyUnitPrice_'+rowCount).value = orderCurrencyUnitPrice;
- $('unitCost_'+rowCount).value = unitCost;
+ jQuery('#orderCurrencyUnitPrice_'+rowCount).val(orderCurrencyUnitPrice);
+ jQuery('#unitCost_'+rowCount).val(unitCost);
}
- }, parameters: { uomId : uomId, uomIdTo : uomIdTo, originalValue : element.value }
+ }
});
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js Fri Dec 10 20:40:08 2010
@@ -16,22 +16,16 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
*/
-
var validateNewShippingAdd = null;
-document.observe('dom:loaded', function() {
- if ($('addShippingAddress')) {
- validateNewShippingAdd = new Validation('addShippingAddress', {immediate: true, onSubmit: false});
- Event.observe($('countryGeoId'), 'change', function() {
+jQuery(document).ready( function() {
+
+ var addShippingAddress = jQuery('#addShippingAddress');
+ if (addShippingAddress.length) {
+ // add the form validator
+ addShippingAddress.validate();
+
+ jQuery('#countryGeoId').change( function() {
getAssociatedStateList('countryGeoId', 'stateProvinceGeoId', 'advice-required-stateProvinceGeoId', 'states');
});
- getAssociatedStateList('countryGeoId', 'stateProvinceGeoId', 'advice-required-stateProvinceGeoId', 'states');
- }
- if ($('submitAddShippingAddress')) {
- Event.observe($('submitAddShippingAddress'), 'click', submitValidNewShippingAddressForm);
- }
-})
-function submitValidNewShippingAddressForm() {
- if (validateNewShippingAdd.validate()) {
- $('addShippingAddress').submit();
}
-}
+});
\ No newline at end of file