[Erp5-report] r42326 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 14 09:04:21 CET 2011
Author: ivan
Date: Fri Jan 14 09:04:20 2011
New Revision: 42326
URL: http://svn.erp5.org?rev=42326&view=rev
Log:
Use Jquery. Update dependency list.
Modified:
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewRssGadgetAsJSON.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/RssFeed_getSummaryAsHTML.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getJavaScriptRelativeUrlList.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
erp5/trunk/bt5/erp5_knowledge_pad/bt/change_log
erp5/trunk/bt5/erp5_knowledge_pad/bt/dependency_list
erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewRssGadgetAsJSON.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewRssGadgetAsJSON.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewRssGadgetAsJSON.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewRssGadgetAsJSON.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -65,7 +65,7 @@ gadget_title_dom_id = \'%s_gadget_title\
# return some JavaScript which will update respective page\n
gadget_title = request.get(\'rss_gadget_title\', box.getSpecialiseValue().getTitle())\n
gadget_title = unicode(gadget_title).encode(\'utf-8\')[:40]\n
-javascript = \'getElement("%s").innerHTML="%s";\' %(gadget_title_dom_id, gadget_title)\n
+javascript = \'$("#%s").html("%s");\' %(gadget_title_dom_id, gadget_title)\n
\n
request.RESPONSE.setHeader("Content-Type", "application/json;; charset=utf-8")\n
result = {"body": html,\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/RssFeed_getSummaryAsHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/RssFeed_getSummaryAsHTML.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/RssFeed_getSummaryAsHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/RssFeed_getSummaryAsHTML.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -55,7 +55,7 @@
\n
<div class="teaser"\n
tal:attributes="class python: test(is_read, \'teaser read\', \'teaser unread\');\n
- onclick string:if(this.className!=\'teaser read\'){this.className=\'teaser read\';;MochiKit.Async.doSimpleXMLHttpRequest(\'Base_setRssItemReadInSelection\', {\'selection_name\':\'${selection_name}\',\'item\':\'${md5}\'})};;toggle(\'${dom_id}\');">\n
+ onclick string:if(this.className!=\'teaser read\'){this.className=\'teaser read\';;$.get(\'Base_setRssItemReadInSelection\', {\'selection_name\':\'${selection_name}\',\'item\':\'${md5}\'})};;$(\'#${dom_id}\').toggle();">\n
<img class="thumbnail-image"\n
tal:condition="python: image not in ((), None, [])"\n
tal:attributes="src python: image[0]" alt="Thumbnail"/>\n
@@ -78,8 +78,7 @@
</div>\n
</div>\n
\n
-</tal:block>\n
-
+</tal:block>
]]></unicode> </value>
</item>
@@ -97,7 +96,7 @@
</item>
<item>
<key> <string>output_encoding</string> </key>
- <value> <string>utf-8</string> </value>
+ <value> <string>iso-8859-15</string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -114,7 +114,7 @@
<br/>\n
<br/>\n
<button type="button"\n
- onclick="MochiKit.Visual.toggle(\'add_new_tab_dialog\');"\n
+ onclick="$(\'#add_new_tab_dialog\').toggle();"\n
i18n:translate="" \n
i18n:domain="ui">Cancel</button>\n
<button type="button"\n
@@ -140,7 +140,7 @@
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
- onclick="MochiKit.Visual.toggle(\'rename_tab_dialog\');">Cancel</button>\n
+ onclick="$(\'#rename_tab_dialog\').toggle();">Cancel</button>\n
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getJavaScriptRelativeUrlList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getJavaScriptRelativeUrlList.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getJavaScriptRelativeUrlList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getJavaScriptRelativeUrlList.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -59,8 +59,7 @@
#\n
# BBB: For the history, erp5_xhtml_appearance.js is included by default when\n
# js_list is not pre-defined before the global definitions.\n
-\n
-js_list = (\'MochiKit/MochiKit.js\', \'erp5.js\', \'erp5_knowledge_box.js\',)\n
+js_list = (\'MochiKit/MochiKit.js\',\'jquery/core/jquery.js\', \'jquery/ui/js/jquery-ui.js\', \'erp5.js\', \'erp5_knowledge_box.js\',)\n
return js_list\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts92251979.92</string> </value>
+ <value> <string>ts94401374.54</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] Fri Jan 14 09:04:20 2011
@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts94407027.22</string> </value>
+ <value> <string>ts94990647.19</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -40,13 +40,10 @@ var is_knowledge_template_used = 0;\n
var invisible_gadgets={};\n
\n
function createCustomKnowledgePadOnServer(){\n
- d = MochiKit.Async.doSimpleXMLHttpRequest("ERP5Site_createDefaultKnowledgePadListForUser", \n
- {\'mode\': mode,\n
- \'default_pad_group\': default_pad_group});\n
- d.addCallback(handleServerSuccess);\n
- function handleServerSuccess(res){\n
- response = res.responseText;\n
- window.location=cancel_url + \'/view?active_pad_url=\'+response;}\n
+ $.ajax({url:"ERP5Site_createDefaultKnowledgePadListForUser", \n
+ data:{mode: mode,\n
+ default_pad_group: default_pad_group},\n
+ success:function(data){window.location=cancel_url + "/view?active_pad_url=" + data;}});\n
}\n
\n
function showCreateDefaultKnowledgePadWarningMessage(){\n
@@ -55,10 +52,6 @@ function showCreateDefaultKnowledgePadWa
createCustomKnowledgePadOnServer();}\n
}\n
\n
-function handleServerError(res){\n
- /*alert(\'Error on server\');*/\n
-};\n
-\n
function createCookie(name, value, days, path) {\n
if (days){\n
var date = new Date();\n
@@ -71,74 +64,84 @@ function createCookie(name, value, days,
\n
function updater(url, box_relative_url, dom_id, \n
parent_web_section_url, editable_mode, additionnal_request_params){\n
- /* request box content from server */\n
+ /* Get content from server */\n
request_params = {};\n
- /* getting parameters for the request in the form\'s hidden inputs */\n
- inputs = MochiKit.DOM.getElement(dom_id).getElementsByTagName(\'input\');\n
- forEach(inputs, function (input){\n
- if(input.type == \'hidden\'){\n
- // turn \'gadget_form_id\' into \'form_id\'\n
- if(input.name == \'gadget_form_id\'){\n
- request_params[\'form_id\'] = input.value;}\n
- else if(input.name.substring(input.name.length,input.name.length-5) == \':list\'){\n
- if(typeof(request_params[input.name]) == \'undefined\'){\n
- request_params[input.name] = new Array()\n
- }\n
- request_params[input.name].push(input.value);\n
- }\n
+ additionnal_request_params = typeof(additionnal_request_params) != \'undefined\' ? additionnal_request_params : [];\n
+\n
+ // getting parameters for the request in the form\'s hidden inputs\n
+ input_list = $("#" + dom_id).find("input");\n
+\n
+ function extractHiddenInputs(index){\n
+ element = $(this);\n
+ type = element.attr("type");\n
+ name = element.attr("name");\n
+ value = element.val();\n
+ is_list = name.substring(name.length, name.length - 5) == ":list";\n
+ if(type == "hidden"){\n
+ if(name == "gadget_form_id"){\n
+ // turn \'gadget_form_id\' into \'form_id\'\n
+ request_params["form_id"] = value;}\n
+ else if(is_list){\n
+ if(typeof(request_params[name]) == "undefined"){\n
+ request_params[name] = new Array()}\n
+ request_params[name].push(value);}\n
else{\n
- request_params[input.name] = input.value;\n
- }\n
- }\n
- });\n
-\n
- /*getting parameters for request from the parameter additionnal_request_params*/\n
- forEach(keys(additionnal_request_params), function (key){\n
- request_params[key] = additionnal_request_params[key];\n
- });\n
-\n
- request_params[\'box_relative_url\'] = box_relative_url;\n
- request_params[\'parent_web_section_url\'] = parent_web_section_url; \n
- request_params[\'is_gadget_mode:int\'] = 1; \n
- request_params[\'editable_mode:int\'] = editable_mode; \n
-\n
- MochiKit.DOM.getElement(dom_id).style.opacity = 0.5;\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(url, request_params);\n
- d.addCallbacks(handleServerSuccess, handleServerError);\n
- function handleServerSuccess(res){\n
- content_type = res.getResponseHeader(\'Content-Type\');\n
+ // not list input\n
+ request_params[name] = value;}\n
+ }}\n
+ \n
+ input_list.each(extractHiddenInputs);\n
+\n
+ // getting parameters for request from the parameter additionnal_request_params\n
+ $.each(additionnal_request_params, \n
+ function (key, value){request_params[key] = additionnal_request_params[key];});\n
+ \n
+ request_params["box_relative_url"] = box_relative_url;\n
+ request_params["parent_web_section_url"] = parent_web_section_url; \n
+ request_params["is_gadget_mode:int"] = 1; \n
+ request_params["editable_mode:int"] = editable_mode; \n
+ \n
+ // set transperancy to show an activity is going on\n
+ $("#" + dom_id).css("opacity", 0.5);\n
+ $.ajax({url:url,\n
+ data: request_params,\n
+ success: handleServerSuccess,\n
+ error: handleServerError,\n
+ // it\'s important for Zope to have traditional way of encoding an URL\n
+ traditional: 1});\n
+ \n
+ function handleServerSuccess(data, text_status, xhr){\n
+ content_type = xhr.getResponseHeader(\'Content-Type\');\n
if(content_type.search("application/json")!=-1){\n
- /* server returned JSON which may contain HTML & JavaScript */\n
- text = res.responseText \n
- json_dict = evalJSON(text);\n
- html = json_dict[\'body\'];\n
- eval(json_dict[\'javascript\']);}\n
+ // server returned JSON which may contain HTML & JavaScript\n
+ html = data[\'body\'];\n
+ eval(data[\'javascript\']);}\n
else{\n
/* server returned HTML */\n
- html = res.responseText;}\n
- /* set HTML as returned from server */\n
- MochiKit.DOM.getElement(dom_id).innerHTML = html;\n
- MochiKit.DOM.getElement(dom_id).style.opacity = 1.0;};\n
+ html = data;}\n
+ $("#" + dom_id).html(html);\n
+ $("#" + dom_id).css("opacity", 1.0);\n
+ }\n
\n
function handleServerError(res){\n
- MochiKit.DOM.getElement(dom_id).innerHTML = \'Server side error.\';\n
- MochiKit.DOM.getElement(dom_id).style.opacity = 1.0;};\n
+ $("#" + dom_id).html("Server side error.");\n
+ $("#" + dom_id).css("opacity", 1.0);\n
+ }\n
}\n
\n
+\n
function checkForActivitiesOnServer(timeout, return_url, mode, default_pad_group){\n
/* check if activities are over and refresh current page */\n
window.setInterval(\n
function () {\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(\'ERP5Site_hasUserActivity\',\n
- {\'js_call\': 1,\n
- \'mode\': mode,\n
- \'default_pad_group\': default_pad_group});\n
- d.addCallback(handleServerSuccess);\n
- function handleServerSuccess(res){\n
- if(res.responseText==\'False\'){window.location=return_url;}\n
- }}, \n
+ $.ajax({url:"ERP5Site_hasUserActivity",\n
+ data: {js_call: 1,\n
+ mode: mode,\n
+ default_pad_group: default_pad_group},\n
+ success: function (data){if(data=="False"){window.location=return_url;}}\n
+ })},\n
timeout);\n
-}\n
+};\n
\n
function stickPadOnWebSection(create_url,\n
knowledge_pad_url,\n
@@ -146,32 +149,27 @@ function stickPadOnWebSection(create_url
cancel_url){\n
/* stick pad on Web Section and then check if \n
activities are over and refresh current page */\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(create_url, \n
- {\'knowledge_pad_url\': knowledge_pad_url,\n
- \'cancel_url\': cancel_url});\n
- d.addCallbacks(handleServerSuccess, handleServerError);\n
- function handleServerSuccess(res){\n
- window.location=cancel_url+\'?active_pad_url=\'+res.responseText;};\n
-};\n
+ $.ajax({url: create_url,\n
+ data: {knowledge_pad_url: knowledge_pad_url,\n
+ cancel_url: cancel_url},\n
+ success: function(data){window.location=cancel_url + "?active_pad_url=" + data;}\n
+ });\n
+}\n
\n
function createDefaultPadOnServer(timeout, create_url,\n
default_pad_group, return_url, mode){\n
/* create default tab on server and then check if \n
activities are over and refresh current page */\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(create_url, \n
- {\'default_pad_group\': default_pad_group,\n
- \'mode\': mode});\n
- d.addCallbacks(handleServerSuccess, handleServerError);\n
- function handleServerSuccess(res){\n
- checkForActivitiesOnServer(timeout, return_url, mode, default_pad_group);};\n
-};\n
+ $.ajax({url: create_url, \n
+ data: {default_pad_group: default_pad_group,\n
+ mode: mode},\n
+ success: function(data){checkForActivitiesOnServer(timeout, return_url, mode, default_pad_group);}});\n
+}\n
\n
-// This function can be used to submit gadget preferences form whenever\n
-// an enter is pressed in form\n
function submitGadgetPreferenceFormOnEnter(event, form_fields_main_prefix, box_relative_url){\n
- if(event.keyCode == 13){\n
- submitSynchronousGadgetPreferenceForm(form_fields_main_prefix, box_relative_url);\n
- }\n
+ /* This function can be used to submit gadget preferences form whenever\n
+ an enter is pressed in form */\n
+ if(event.keyCode == 13){submitSynchronousGadgetPreferenceForm(form_fields_main_prefix, box_relative_url);}\n
}\n
\n
function submitSynchronousGadgetPreferenceForm(\n
@@ -180,21 +178,11 @@ function submitSynchronousGadgetPreferen
/* this will add respective gadget knowledge box relative url and\n
gadget ERP5 preference form field_prefix (so multiple gadgets can \n
safely coexist in one HTML page with one HTML form */\n
- appendChildNodes(document.forms[0], \n
- INPUT({\'value\':box_relative_url, \n
- \'name\': \'box_relative_url\', \n
- \'type\':\'hidden\'}));\n
- appendChildNodes(document.forms[0], \n
- INPUT({\'value\':form_fields_main_prefix, \n
- \'name\': \'form_fields_main_prefix\', \n
- \'type\':\'hidden\'}));\n
- // append current return URL so we know where to redirect user\n
redirect_url = window.location.protocol + "//" + window.location.host + window.location.pathname\n
- appendChildNodes(document.forms[0], \n
- INPUT({\'value\':redirect_url, \n
- \'name\': "gadget_redirect_url", \n
- \'type\':\'hidden\'}));\n
- clickSaveButton(\'KnowledgeBox_baseEdit\');\n
+ $("form").append(\'<input type="hidden" name="box_relative_url" value="\' +box_relative_url + \'">\');\n
+ $("form").append(\'<input type="hidden" name="form_fields_main_prefix" value="\' +form_fields_main_prefix + \'">\');\n
+ $("form").append(\'<input type="hidden" name="gadget_redirect_url" value="\' +redirect_url + \'">\');\n
+ clickSaveButton("KnowledgeBox_baseEdit"); \n
};\n
\n
function submitAsynchronousGadgetPreferenceForm(\n
@@ -203,78 +191,78 @@ function submitAsynchronousGadgetPrefere
box_relative_url, \n
visual_block_dom_id, \n
form_fields_main_prefix){\n
- // iterate over all possible form elements within edit form,\n
- // collect them and send to server\n
- var request_str = "?box_relative_url=" + box_relative_url+ "&form_fields_main_prefix=" + form_fields_main_prefix + "&";\n
- forEach(MochiKit.DOM.getElementsByTagAndClassName(\'input\', null, form_dom_id) , function (item) {\n
- if (item.type == "checkbox"){\n
- if (item.checked){request_str+=item.name + \':boolean=True&\';}\n
- else {request_str+=item.name + \':boolean=False&\';}}\n
- if (item.type == "radio"){\n
- if (item.checked){request_str+=item.name + \'=\'+item.value+\'&\';}}\n
- if (item.type == "text"){request_str+=item.name + \'=\' + item.value + \'&\';}\n
- if (item.type == "password"){request_str+=item.name + \'=\' + item.value + \'&\';}\n
- });\n
- forEach(MochiKit.DOM.getElementsByTagAndClassName(\'select\', null, form_dom_id), function (item) {\n
- //support multifield in gadget edit form\n
- if (item.multiple){\n
- forEach(MochiKit.DOM.getElementsByTagAndClassName(\'option\', null, item), function (selection) {\n
- if(selection.selected){\n
- request_str+=item.name + \'=\' + selection.value + \'&\';\n
- }\n
- });\n
- }else{\n
- request_str+=item.name + \'=\' + item.value + \'&\';\n
- }\n
- });\n
-\n
- /* save form preferences to remote server*/\n
- url = "KnowledgeBox_baseEdit" + request_str;\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(url);\n
- d.addCallback(handleServerSuccess);\n
- function handleServerSuccess(res){\n
- /* update content view area back from server */\n
- updater(view_form_url, box_relative_url, visual_block_dom_id);\n
- MochiKit.Visual.toggle(form_dom_id);}\n
- };\n
+ /* Iterate over all possible form elements within edit form,\n
+ collect them and send to server*/\n
+ var request_str = "box_relative_url=" + box_relative_url+ "&form_fields_main_prefix=" + form_fields_main_prefix + "&";\n
+ \n
+ //input tags\n
+ $("#" + form_dom_id).find("input").each(\n
+ function (index) {\n
+ element = $(this);\n
+ type = element.attr("type");\n
+ name = element.attr("name");\n
+ is_checked = element.attr("checked");\n
+ value = element.val()\n
+ if (type == "checkbox"){\n
+ if (is_checked){request_str+=name + ":boolean=True&";}\n
+ else {request_str+=name + ":boolean=False&";}}\n
+ if (type == "radio" && is_checked){request_str+=name + "="+value+"&";}\n
+ if (type == "text" || type == "password"){request_str+=name + "=" + value + "&";}\n
+ } );\n
+ \n
+ // select tags\n
+ $("#" + form_dom_id).find("select").each(\n
+ function (index) {\n
+ element = $(this);\n
+ name = element.attr("name");\n
+ is_multiple = element.attr("multiple");\n
+ value = element.val() \n
+ if (is_multiple){\n
+ //support multifield selects in gadget edit form\n
+ element.children("option").each(\n
+ function (index) {\n
+ option = $(this);\n
+ if(option.attr("selected")){request_str+=element.attr("name") + \'=\' + option.val() + \'&\';}\n
+ }); }\n
+ else{request_str+=name + \'=\' + value + \'&\';} });\n
+ \n
+ // save form preferences to remote server\n
+ $.ajax({url: "KnowledgeBox_baseEdit?" + request_str,\n
+ success: function (data){\n
+ updater(view_form_url, box_relative_url, visual_block_dom_id);\n
+ $("#" + form_dom_id).toggle();} });\n
+}\n
\n
-function updateServerBoxColumnLayout(container){\n
- // read columns structure from DOM ..\n
+function updateServerBoxColumnLayout(event, ui){\n
+ /* read columns structure from DOM and save it to server */\n
var columns_arr = new Array;\n
- var columns = MochiKit.DOM.getElementsByTagAndClassName("div", "portal-column");\n
+ var columns = $("div.portal-column");\n
// sort alphabetically as it\'s required to get proper layout from DOM\n
- columns.sort(keyComparator("id")); \n
- for (var i = 0; i < columns.length; i++){\n
- column_items = MochiKit.DOM.getElementsByTagAndClassName("div", "block", columns[i]);\n
+ columns.sort(function(a, b) {\n
+ var compA = $(a).attr("id").toUpperCase();\n
+ var compB = $(b).attr("id").toUpperCase();\n
+ return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;})\n
+\n
+ columns.each(function(column_index, column){\n
+ column = $(this);\n
var items_arr = new Array;\n
- for (var j = 0; j < column_items.length; j++){\n
- items_arr[j] = column_items[j].id;};\n
- columns_arr[i] = items_arr.join(\'|\')\n
- };\n
- var layout = columns_arr.join(\'##\');\n
+ column_items = column.find("div.block");\n
+ column_items.each(function(box_index, box){\n
+ items_arr[box_index] = column_items[box_index].id;}); \n
+ columns_arr[column_index] = items_arr.join(\'|\') });\n
+ \n
+ var layout = columns_arr.join("##");\n
// .. and send it to server only if it\'s different\n
- // XXX: This may bloat ZODB as everry change is a chnage to an ZODB object.\n
if (layout!=last_layout){\n
last_layout = layout;\n
- MochiKit.Async.doSimpleXMLHttpRequest("KnowledgePad_saveBoxColumnLayout", {user_layout: layout});\n
- }\n
- return\n
-}\n
-\n
-function addBoxToServer(url, dom_id, gadget_relative_url){\n
- /* add gadget to knowledge pad */\n
- d = MochiKit.Async.doSimpleXMLHttpRequest(url, {gadget_relative_url: gadget_relative_url});\n
- d.addCallback(handleServerSuccess);\n
- function handleServerSuccess(res){\n
- button = MochiKit.DOM.getElement(dom_id);\n
- button.innerHTML = res.responseText;\n
- button.disabled = true;}\n
+ $.ajax({url: "KnowledgePad_saveBoxColumnLayout", \n
+ data: {user_layout: layout}});}\n
}\n
\n
function showAddNewPadPopup(){\n
- MochiKit.Visual.toggle(\'add_new_tab_dialog\');\n
+ $("#add_new_tab_dialog").toggle();\n
// set focus on new Pad title after toggle effect is over \n
- setTimeout("MochiKit.DOM.getElement(\'new_pad_title\').focus()", 500 );\n
+ setTimeout("$(\'#new_pad_title\').focus()", 500 );\n
}\n
\n
function showRenamePadPopup(knowledge_pad_relative_url, knowledge_pad_title_dom_id){\n
@@ -282,55 +270,53 @@ function showRenamePadPopup(knowledge_pa
active_knowledge_pad_relative_url = knowledge_pad_relative_url;\n
active_knowledge_pad_title_dom_id = knowledge_pad_title_dom_id;\n
// init rename dialog input field to current active pad\n
- MochiKit.DOM.getElement("new_knowledge_pad_title").value = MochiKit.DOM.getElement(knowledge_pad_title_dom_id).innerHTML;\n
+ $("#new_knowledge_pad_title")[0].value = $("#"+knowledge_pad_title_dom_id)[0].innerHTML;\n
// show rename dialog\n
- MochiKit.Visual.toggle("rename_tab_dialog");\n
+ $("#rename_tab_dialog").toggle();\n
// set focus on new Pad title after toggle effect is over \n
- setTimeout("MochiKit.DOM.getElement(\'new_knowledge_pad_title\').focus()", 500 );\n
+ setTimeout("$(\'#new_knowledge_pad_title\').focus()", 500);\n
}\n
\n
function loadPadFromServer(pad_relative_url, selected_pad_dom_id, mode){\n
/* Load Pad from server */\n
// show some animation\n
- MochiKit.DOM.getElement("loading-wrapper").style.display="block";\n
- \n
- d = MochiKit.Async.loadJSONDoc(\'KnowledgePag_getPadAsJSON\', \n
- {\'pad_relative_url\':pad_relative_url,\n
- \'mode\':mode});\n
- d.addCallbacks(handleServerSuccess, metadataFetchFailed);\n
-\n
+ $("#loading-wrapper").first().show()\n
+ $.ajax({url: "KnowledgePag_getPadAsJSON", \n
+ data: {pad_relative_url: pad_relative_url,\n
+ mode: mode},\n
+ dataType: "json",\n
+ success: handleServerSuccess});\n
// set old pad to not selected\n
- pads_container = MochiKit.DOM.getElement("tabs");\n
- old_selected_pad = MochiKit.DOM.getFirstElementByTagAndClassName("li", "tab_selected", pads_container);\n
- old_selected_pad.setAttribute("class", "tab");\n
- pad_actions = MochiKit.DOM.getFirstElementByTagAndClassName("div", "pad-actions", old_selected_pad);\n
- pad_actions.style.display="none";\n
+ old_selected_pad = $("#tabs ul").children("li.tab_selected").first()\n
+ old_selected_pad.removeClass("tab_selected");\n
+ old_selected_pad.addClass("tab");\n
\n
+ pad_actions = old_selected_pad.children("div.pad-actions").first();\n
+ pad_actions.hide();\n
+ \n
// set new selected pad class \n
- new_selected_pad = MochiKit.DOM.getElement(selected_pad_dom_id);\n
- new_selected_pad.setAttribute("class", "tab tab_selected");\n
+ new_selected_pad = $("#" + selected_pad_dom_id).first();\n
+ new_selected_pad.addClass("tab_selected");\n
\n
// enable "settings" for this pad and hide instant switch\n
- pad_actions = getFirstElementByTagAndClassName("div", "pad-actions", new_selected_pad);\n
- pad_actions.style.display="block";\n
+ pad_actions = new_selected_pad.children("div.pad-actions").first()\n
+ pad_actions.show()\n
\n
// set new active pad\n
active_knowledge_pad_relative_url = pad_relative_url;\n
\n
- function metadataFetchFailed(meta){}\n
- \n
- function handleServerSuccess(meta){\n
- body = meta.body\n
- javascript = meta.javascript\n
- body_element = MochiKit.DOM.getElement(\'pad-body-wrapper\');\n
+ //function metadataFetchFailed(meta){}\n
+ function handleServerSuccess(data){\n
+ body = data.body\n
+ javascript = data.javascript\n
+ body_element = $("#pad-body-wrapper")[0]\n
body_element.innerHTML = body;\n
// init new Pad\n
initialize();\n
// execute JS code provided by server\n
eval(javascript);\n
// give some timeout as we can be sometimes two fast loading a tab\n
- setTimeout("MochiKit.DOM.getElement(\'loading-wrapper\').style.display=\'none\';", 250 );\n
- }\n
+ setTimeout("$(\'#loading-wrapper\').first().hide();", 250 );};\n
}\n
\n
function addNewPad(cancel_url, knowledge_pad_relative_url, mode){\n
@@ -346,17 +332,15 @@ function addPadOnServerOnEnter(event, cr
/* Catch and submit form when ENTER is pressed */\n
if(event.keyCode == 13){\n
addPadOnServer(create_url, mode, cancel_url);\n
- return false;\n
- }\n
+ return false;}\n
}\n
\n
function addPadOnServer(create_url,\n
mode,\n
cancel_url){\n
/* add pad on server */\n
- pad_title = MochiKit.DOM.getElement(\'new_pad_title\');\n
- pad_title_value = pad_title.value\n
- window.location = create_url + \'?redirect_url=\' + cancel_url + \'&mode=\' + mode + \'&pad_title=\'+pad_title_value ;\n
+ pad_title_value = $("#new_pad_title").first().val();\n
+ window.location = create_url + "?redirect_url=" + cancel_url + "&mode=" + mode + "&pad_title=" + pad_title_value;\n
};\n
\n
function removeKnowledgePadFromServer(knowledge_pad_relative_url, mode){\n
@@ -367,15 +351,13 @@ function removeKnowledgePadFromServer(kn
var user_choice = true;\n
user_choice = confirm("Are you sure you want to remove this pad from your home?");\n
if (user_choice==true){\n
- location.href="ERP5Site_deleteKnowledgePad?knowledge_pad_relative_url=" + knowledge_pad_relative_url+"&mode="+mode;}\n
- }\n
+ location.href="ERP5Site_deleteKnowledgePad?knowledge_pad_relative_url=" + knowledge_pad_relative_url+"&mode="+mode;} }\n
}\n
\n
function renameKnowledgePadToServerOnEnter(event){\n
if(event.keyCode == 13){\n
renameKnowledgePadToServer();\n
- return false;\n
- }\n
+ return false;}\n
return true;\n
}\n
\n
@@ -384,118 +366,114 @@ function renameKnowledgePadToServer(){\n
showCreateDefaultKnowledgePadWarningMessage();}\n
else{\n
// rename it locally and update server asynchonously\n
- title_element = MochiKit.DOM.getElement(active_knowledge_pad_title_dom_id)\n
- input_element = MochiKit.DOM.getElement("new_knowledge_pad_title")\n
- var knowledge_pad_title = input_element.value;\n
- title_element.innerHTML = knowledge_pad_title;\n
- MochiKit.Async.doSimpleXMLHttpRequest("ERP5Site_renameKnowledgePad", \n
- {knowledge_pad_relative_url: active_knowledge_pad_relative_url,\n
- knowledge_pad_title: knowledge_pad_title});\n
+ title_element = $("#"+active_knowledge_pad_title_dom_id).first()\n
+ input_element = $("#new_knowledge_pad_title")\n
+ var knowledge_pad_title = input_element.val();\n
+ title_element.html(knowledge_pad_title);\n
+ $.ajax({url: "ERP5Site_renameKnowledgePad", \n
+ data: {knowledge_pad_relative_url: active_knowledge_pad_relative_url,\n
+ knowledge_pad_title: knowledge_pad_title}}); \n
}\n
- //anyway toggle show dialog\n
- MochiKit.Visual.toggle("rename_tab_dialog");\n
+ $("#rename_tab_dialog").toggle();\n
}\n
\n
function initialize(){\n
- // define sortable columns\n
+ // initialize sortable columns\n
if (is_knowledge_template_used==0){\n
// allow drag and drop only if we are dealing with a pad we can modify\n
- var sortables = MochiKit.DOM.getElementsByTagAndClassName(\'div\', \'portal-column\');\n
- forEach(sortables, function (item) {\n
- // eliminate undraggable columns by checking exact match\n
- if (item.className==\'portal-column\'){\n
- MochiKit.Sortable.create(item.id, {"constraint" : false,\n
- "containment" : sortables,\n
- "handle": "handle",\n
- "only": "block",\n
- "tag": "div",\n
- "scroll": "true",\n
- "hoverclass": "block-hover",\n
- "dropOnEmpty": "true",\n
- "onUpdate": updateServerBoxColumnLayout,\n
- "starteffect" : MochiKit.Base.noop,\n
- "endeffect" : MochiKit.Base.noop\n
- });\n
- };\n
- })}\n
+ sortable_list = $("div.portal-column");\n
+ function makeSortables(index){\n
+ element = $(this);\n
+ if (element.attr("class") == "portal-column"){\n
+ // eliminate undraggable columns by checking exact match\n
+ element.sortable({handle: "h3.handle",\n
+ connectWith: sortable_list,\n
+ placeholder: "block-hover",\n
+ forcePlaceholderSize: 1,\n
+ opacity: 0.8,\n
+ containment: "document",\n
+ delay: 100,\n
+ stop: updateServerBoxColumnLayout});} }\n
+ if (sortable_list!=null) sortable_list.each(makeSortables);\n
+ }\n
\n
// enable show/hide tabs\n
- tabs = MochiKit.DOM.getElement(\'tabs\');\n
- tabs_switcher = MochiKit.DOM.getElement("tabs_switcher");\n
- add_gadget = MochiKit.DOM.getElement("add_new_gadget_link")\n
- if(tabs_switcher){\n
- connect(tabs_switcher, \'onclick\', function (){\n
- var is_tabs_visible=0;\n
- if(tabs.style.display!=\'block\'){\n
- is_tabs_visible=1;\n
- MochiKit.DOM.getElement("tab_switcher_visible").style.display = "block";\n
- MochiKit.DOM.getElement("tab_switcher_hidden").style.display = "none";\n
- add_gadget.className = "border_bottom1px";\n
- tabs_switcher.className = "border_bottom1px";\n
- }\n
- else{\n
- MochiKit.DOM.getElement("tab_switcher_hidden").style.display = "block";\n
- MochiKit.DOM.getElement("tab_switcher_visible").style.display = "none";\n
- add_gadget.className = "border_bottom0px";\n
- tabs_switcher.className = "border_bottom0px";\n
- }\n
- MochiKit.Visual.toggle(tabs);\n
- createCookie("is_tabs_visible", is_tabs_visible, 365);\n
- });}\n
-\n
+ tabs = $("#tabs");\n
+ tabs_switcher = $("#tabs_switcher"); \n
+ add_gadget = $("#add_new_gadget_link");\n
+ \n
+ function toggleTabNavigation(){\n
+ /* Toggle tabs navigation */\n
+ var is_tabs_visible=0;\n
+ if(tabs.css("display")!="block"){\n
+ is_tabs_visible=1;\n
+ $("#tab_switcher_visible").show();\n
+ $("#tab_switcher_hidden").hide();}\n
+ else{\n
+ $("#tab_switcher_visible").hide();\n
+ $("#tab_switcher_hidden").show();}\n
+ tabs.toggle();\n
+ createCookie("is_tabs_visible", is_tabs_visible, 365); }\n
+ \n
+ function bindGadgetHandlers(index, box){\n
+ /* Bind all gadgets handlers */\n
+ box = $(this)\n
+ var edit = box.find("a.block-edit-form").first();\n
+ var edit_form = box.find("div.edit-form").first();\n
+ var remove = box.find("a.block-remove").first(); \n
+ var minimize = box.find("a.block-minimize").first(); \n
+ var minimize_wrapper = box.find("div.minimize_wrapper").first(); \n
+ if(minimize){\n
+ minimize.bind("click", function (){\n
+ if (is_knowledge_template_used){showCreateDefaultKnowledgePadWarningMessage();}\n
+ else{\n
+ minimize_wrapper.toggle();\n
+ box_id = box.attr("id")\n
+ js_dom_id = box_id + "_content";\n
+ js_code = invisible_gadgets[js_dom_id];\n
+ if (js_code!=undefined){\n
+ eval(js_code);\n
+ // gadget is now visible, i.e. no need to query server just toggle locally dom\n
+ delete invisible_gadgets[js_dom_id];}\n
+ $.ajax({url: "KnowledgeBox_toggleVisibility", \n
+ data: {box_relative_url: box_id}});\n
+ }\n
+ });}\n
+\n
+ if(edit){\n
+ edit.bind("click", function (){\n
+ if (is_knowledge_template_used){showCreateDefaultKnowledgePadWarningMessage();}\n
+ else{edit_form.toggle()}});}\n
+ \n
+ if(remove){\n
+ remove.bind("click", function (){\n
+ if (is_knowledge_template_used){showCreateDefaultKnowledgePadWarningMessage();}\n
+ else{\n
+ user_choice = confirm("Are you sure you want to remove this gadget from your personalized page?");\n
+ if (user_choice==true){\n
+ box_id = box.attr("id");\n
+ box.toggle();\n
+ $.ajax({url: "KnowledgePad_deleteBox", \n
+ data: {box_relative_url: box_id}});}\n
+ }});}\n
+ }\n
+ \n
+ // tabs navigation\n
+ if(tabs_switcher){tabs_switcher.bind("click", toggleTabNavigation);}\n
+ \n
// for each box (gadget) add respective event handlers\n
- var boxes = MochiKit.DOM.getElementsByTagAndClassName("div", "block");\n
- forEach(boxes, function (box) {\n
- var edit = MochiKit.DOM.getFirstElementByTagAndClassName(\'a\',\n
- \'block-edit-form\', box);\n
- var edit_form = MochiKit.DOM.getFirstElementByTagAndClassName(\'div\', \n
- \'edit-form\', box);\n
- var remove = MochiKit.DOM.getFirstElementByTagAndClassName(\'a\', \n
- \'block-remove\', box);\n
- var minimize = MochiKit.DOM.getFirstElementByTagAndClassName(\'a\', \n
- \'block-minimize\', box);\n
- var minimize_wrapper = MochiKit.DOM.getFirstElementByTagAndClassName(\'div\', \n
- \'minimize_wrapper\', box);\n
- if(minimize){\n
- connect(minimize, \'onclick\', function (){\n
- if (is_knowledge_template_used){\n
- showCreateDefaultKnowledgePadWarningMessage();}\n
- else{\n
- // togle DOM element (locally)\n
- MochiKit.Visual.toggle(minimize_wrapper);\n
- js_dom_id = box.id + \'_content\';\n
- js_code = invisible_gadgets[js_dom_id];\n
- if (js_code!=undefined){\n
- eval(js_code);\n
- // gadget is now visible, i.e. no need to query server just toggle locally dom\n
- delete invisible_gadgets[js_dom_id];}\n
- // update server \n
- MochiKit.Async.doSimpleXMLHttpRequest("KnowledgeBox_toggleVisibility", \n
- {box_relative_url: box.id});}});\n
- }\n
- if(edit){\n
- connect(edit, \'onclick\', function (){\n
- if (is_knowledge_template_used){\n
- showCreateDefaultKnowledgePadWarningMessage();}\n
- else{MochiKit.Visual.toggle(edit_form);}});\n
- }\n
-\n
- if(remove){\n
- connect(remove, \'onclick\', function (){\n
- if (is_knowledge_template_used){\n
- showCreateDefaultKnowledgePadWarningMessage();}\n
- else{\n
- user_choice = confirm("Are you sure you want to remove this gadget from your personalized page?");\n
- if (user_choice==true){\n
- MochiKit.Visual.toggle(box);\n
- MochiKit.Async.doSimpleXMLHttpRequest("KnowledgePad_deleteBox", \n
- {box_relative_url: box.id});}}});\n
- }\n
- });\n
+ gadget_list = $("div.block");\n
+ if (gadget_list!=null){\n
+ gadget_list.each(bindGadgetHandlers);\n
+ // when dom is loaded we need to remove all gadget\'s scripts otherwise currently when a gadget is moved\n
+ // its HTML is getting executed again, thus making unecessary calls to server, etc ...\n
+ gadget_list.each(\n
+ function (index, box){ $(this).find("script").remove();});\n
+ }\n
}\n
\n
// call function after load of document\n
-MochiKit.DOM.addLoadEvent(initialize);\n
+$(document).ready(initialize);\n
]]></string> </value>
@@ -506,7 +484,7 @@ MochiKit.DOM.addLoadEvent(initialize);\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>20374</int> </value>
+ <value> <int>17664</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/change_log?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/change_log [utf8] Fri Jan 14 09:04:20 2011
@@ -1,3 +1,6 @@
+2011-01-14 Ivan
+* Use Jquery
+
2010-12-13 nicolas.dumazet
* Migrate Tools to portal type classes
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/dependency_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/dependency_list?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/dependency_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/dependency_list [utf8] Fri Jan 14 09:04:20 2011
@@ -1 +1,3 @@
-erp5_base
\ No newline at end of file
+erp5_base
+erp5_jquery
+erp5_jquery_ui
\ No newline at end of file
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=42326&r1=42325&r2=42326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Fri Jan 14 09:04:20 2011
@@ -1 +1 @@
-671
\ No newline at end of file
+674
\ No newline at end of file
More information about the Erp5-report
mailing list