[Erp5-report] r42327 ivan - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 14 09:08:22 CET 2011
Author: ivan
Date: Fri Jan 14 09:08:22 2011
New Revision: 42327
URL: http://svn.erp5.org?rev=42327&view=rev
Log:
Web toolbar's JavaScript code should use JQuery rather than MochiKit which is to be deprecated.
Modified:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_getSummaryAsHTML.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.js.xml
erp5/trunk/bt5/erp5_web/bt/revision
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_getSummaryAsHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_getSummaryAsHTML.xml?rev=42327&r1=42326&r2=42327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_getSummaryAsHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_getSummaryAsHTML.xml [utf8] Fri Jan 14 09:08:22 2011
@@ -49,7 +49,7 @@
dom_id python: (\'%s-%s\' %(box_relative_url, here.getRelativeUrl())).replace(\'/\',\'_\')">\n
<div class="document-gadget-quick-preview">\n
<div class="teaser"\n
- tal:attributes="onclick string:toggle(\'${dom_id}\');">\n
+ tal:attributes="onclick string:$(\'#${dom_id}\').toggle();">\n
<img alt="Icon" class="icon"\n
tal:attributes="src icon" />\n
\n
@@ -82,8 +82,7 @@
</div>\n
</div>\n
\n
-</tal:block>\n
-
+</tal:block>
]]></unicode> </value>
</item>
@@ -101,7 +100,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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.js.xml?rev=42327&r1=42326&r2=42327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.js.xml [utf8] Fri Jan 14 09:08:22 2011
@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts50863427.77</string> </value>
+ <value> <string>ts94991458.99</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -24,30 +24,46 @@
</item>
<item>
<key> <string>data</string> </key>
- <value> <string>function initialize_toolbar(){\n
- // for each menues\n
- var menus = getElementsByTagAndClassName(\'li\', \'toolboxSection\');\n
- forEach(menus, function (menu) {\n
- var menu_title = getFirstElementByTagAndClassName(\'h3\', \'menu_title\', menu);\n
- var item = getFirstElementByTagAndClassName(\'div\', \'menu\', menu);\n
- connect(menu_title, \'onclick\', function (){display_menu(item)});\n
- });\n
-}\n
+ <value> <string>/*\n
+Copyright (c) 2011-2012 Nexedi SARL and Contributors. All Rights Reserved.\n
+\n
+This program is Free Software; you can redistribute it and/or\n
+modify it under the terms of the GNU General Public License\n
+as published by the Free Software Foundation; either version 2\n
+of the License, or (at your option) any later version.\n
+\n
+This program is distributed in the hope that it will be useful,\n
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n
+GNU General Public License for more details.\n
+\n
+You should have received a copy of the GNU General Public License\n
+along with this program; if not, write to the Free Software\n
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
+*/\n
+\n
+\n
+function initialize_toolbar(){\n
+ /* initialize all toolbar menues */\n
+ $("li.toolboxSection").each(\n
+ function (index, menu){\n
+ menu = $(this);\n
+ var menu_title = menu.children("h3.menu_title").first();\n
+ var item = menu.children("div.menu").first();\n
+ menu_title.bind("click", function (){display_menu(item)} );\n
+ })}\n
\n
function display_menu(clicked_item){\n
- toggle(clicked_item, \'appear\', {duration:0});\n
- // for each menues\n
- var menus = getElementsByTagAndClassName(\'li\', \'toolboxSection\');\n
- forEach(menus, function (menu) {\n
- var item = getFirstElementByTagAndClassName(\'div\', \'menu\', menu);\n
- if (item != clicked_item) {\n
- //item.style.display = \'none\';\n
- fade(item, {duration:0});\n
- }\n
- });\n
-}\n
+ /* when called funtion will display current menu and hide rest */\n
+ clicked_item.toggle();\n
+ $("li.toolboxSection").each(\n
+ function (index, menu){\n
+ menu = $(this);\n
+ var item = menu.children("div.menu").first();\n
+ if (item.parent().attr("id") != clicked_item.parent().attr("id")) {item.hide();}\n
+ })};\n
\n
-initialize_toolbar();\n
+$(document).ready(initialize_toolbar);\n
</string> </value>
</item>
<item>
@@ -56,7 +72,7 @@ initialize_toolbar();\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>809</int> </value>
+ <value> <int>1497</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=42327&r1=42326&r2=42327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Fri Jan 14 09:08:22 2011
@@ -1 +1 @@
-1038
\ No newline at end of file
+1024
\ No newline at end of file
More information about the Erp5-report
mailing list