[Erp5-report] r40444 kazuhiko - in /experimental/bt5: erp5_jquery_plugin_jixedbar/PathTempl...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Nov 22 10:31:38 2010
New Revision: 40444

URL: http://svn.erp5.org?rev=40444&view=rev
Log:
change the location of the folder : portal_skins/erp5_jquery/core -> portal_skins/erp5_jquery/jquery/core etc. to avoid possible conflict.

Added:
    experimental/bt5/erp5_jquery_plugin_jixedbar/PathTemplateItem/portal_skins/erp5_jquery/jquery/
    experimental/bt5/erp5_jquery_plugin_jixedbar/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/
      - copied from r40442, experimental/bt5/erp5_jquery_plugin_jixedbar/PathTemplateItem/portal_skins/erp5_jquery/plugin/
Removed:
    experimental/bt5/erp5_jquery_plugin_jixedbar/PathTemplateItem/portal_skins/erp5_jquery/plugin/
Modified:
    experimental/bt5/erp5_jquery_plugin_jixedbar/bt/revision
    experimental/bt5/erp5_jquery_plugin_jixedbar/bt/template_path_list
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
    experimental/bt5/erp5_web_ung_theme/bt/revision

Modified: experimental/bt5/erp5_jquery_plugin_jixedbar/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_jquery_plugin_jixedbar/bt/revision?rev=40444&r1=40443&r2=40444&view=diff
==============================================================================
--- experimental/bt5/erp5_jquery_plugin_jixedbar/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_jquery_plugin_jixedbar/bt/revision [utf8] Mon Nov 22 10:31:38 2010
@@ -1 +1 @@
-4
\ No newline at end of file
+5
\ No newline at end of file

Modified: experimental/bt5/erp5_jquery_plugin_jixedbar/bt/template_path_list
URL: http://svn.erp5.org/experimental/bt5/erp5_jquery_plugin_jixedbar/bt/template_path_list?rev=40444&r1=40443&r2=40444&view=diff
==============================================================================
--- experimental/bt5/erp5_jquery_plugin_jixedbar/bt/template_path_list [utf8] (original)
+++ experimental/bt5/erp5_jquery_plugin_jixedbar/bt/template_path_list [utf8] Mon Nov 22 10:31:38 2010
@@ -1,2 +1,2 @@
-portal_skins/erp5_jquery/plugin/jixedbar
-portal_skins/erp5_jquery/plugin/jixedbar/**
\ No newline at end of file
+portal_skins/erp5_jquery/jquery/plugin/jixedbar
+portal_skins/erp5_jquery/jquery/plugin/jixedbar/**
\ No newline at end of file

Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml?rev=40444&r1=40443&r2=40444&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] Mon Nov 22 10:31:38 2010
@@ -57,8 +57,8 @@
                             global js_list js_list | python:[];\n
                             global css_list css_list | python:[];\n
                             dummy  python:css_list.extend(css_list_ung_template);\n
-                            js_url_list python:[\'portal_skins/erp5_jquery/core/jquery.js\',\n
-                                                \'portal_skins/erp5_jquery/ui/js/jquery-ui.js\',\n
+                            js_url_list python:[\'jquery/core/jquery.js\',\n
+                                                \'jquery/ui/js/jquery-ui.js\',\n
                                                 \'ung_js/ung.js\'];\n
                             dummy python:js_list.extend([item for item in js_url_list if item not in js_list]);">\n
         <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n

Modified: experimental/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/bt/revision?rev=40444&r1=40443&r2=40444&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Nov 22 10:31:38 2010
@@ -1 +1 @@
-81
\ No newline at end of file
+82
\ No newline at end of file