Skip to content

erp5
erp5
Commit 4f54f400 authored by Lingnan Wu's avatar Lingnan Wu Committed by Kazuhiko Shiozaki
Browse files
Options

merge bt5/erp5_jquery to product/ERP5/bootstrap/erp5_jquery

parent 22aac504
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 585 deletions
bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_setupMaxmaDemoStandardBT5.xml
View file @ 4f54f400
......@@ -56,7 +56,6 @@ bt5_installation_list = (\'erp5_simulation\',\n
\'erp5_dhtml_style\',\n
\'erp5_jquery\',\n
\'erp5_jquery_ui\',\n
\'erp5_xhtml_jquery_style\',\n
\'erp5_web\',\n
\'erp5_ingestion_mysql_innodb_catalog\',\n
\'erp5_ingestion\',\n
......
bt5/erp5_configurator_maxma_demo/TestTemplateItem/testMaxmaDemoConfigurationWorkflow.py
View file @ 4f54f400
......@@ -41,7 +41,6 @@ class TestMaxmaDemoConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
'erp5_dhtml_style',
'erp5_jquery',
'erp5_jquery_ui',
'erp5_xhtml_jquery_style',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
'erp5_web',
......
bt5/erp5_configurator_maxma_demo/bt/revision
View file @ 4f54f400
26
\ No newline at end of file
27
\ No newline at end of file
bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml
View file @ 4f54f400
......@@ -54,7 +54,6 @@
\n
bt5_installation_list = (\'erp5_dhtml_style\',\n
\'erp5_jquery_ui\',\n
\'erp5_xhtml_jquery_style\',\n
\'erp5_ingestion_mysql_innodb_catalog\',\n
\'erp5_dms\',\n
\'erp5_accounting\',\n
......
bt5/erp5_configurator_standard/bt/revision
View file @ 4f54f400
664
\ No newline at end of file
665
\ No newline at end of file
bt5/erp5_credential/bt/dependency_list
View file @ 4f54f400
erp5_base
erp5_crm
erp5_web
erp5_xhtml_jquery_style
\ No newline at end of file
bt5/erp5_credential/bt/revision
View file @ 4f54f400
421
\ No newline at end of file
422
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style.xml deleted 100644 → 0
View file @ 22aac504
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_xhtml_jquery_style</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/ERP5Site_getJavaScriptRelativeUrlList.xml deleted 100644 → 0
View file @ 22aac504
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># This script returns an iterable of the paths to standard JavaScript objects.\n
# If you want to customize your own site, please override this script\n
# in your own skin folder. Note that the returned items must be\n
# relative URLs instead of absolute URLs, i.e. they must be traversable\n
# from the portal object. This is required for further processing of JavaScript\n
# data, e.g. compression.\n
#\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
js_list = (\'jquery/core/jquery.min.js\', \'erp5.js\',)\n
return js_list\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Site_getJavaScriptRelativeUrlList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5_xhtml_appearance.js.xml deleted 100644 → 0
View file @ 22aac504
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="DTMLMethod" module="OFS.DTMLMethod"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>erp5_xhtml_appearance.js</string> </value>
</item>
<item>
<key> <string>_vars</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>globals</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>raw</string> </key>
<value> <string>/*\n
Copyright (c) 2002-2007 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
var fixLeftRightHeightAndFocusOnLoad = function () {\n
fixLeftRightHeightAndFocus(1);\n
};\n
$(document).ready(fixLeftRightHeightAndFocusOnLoad);\n
</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_xhtml_jquery_style/bt/change_log deleted 100644 → 0
View file @ 22aac504
2011-01-14 Ivan
* Initial import
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/copyright_list deleted 100644 → 0
View file @ 22aac504
Copyright (c) 2006-2007 Nexedi SA
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/dependency_list deleted 100644 → 0
View file @ 22aac504
erp5_xhtml_style
erp5_jquery
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/description deleted 100644 → 0
View file @ 22aac504
This bt5 provides ERP5's HTML style UI improvement using jQuery JavaScript library.
It is an extension of erp5_xhtml_style.
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/template_skin_id_list deleted 100644 → 0
View file @ 22aac504
erp5_xhtml_jquery_style
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/title deleted 100644 → 0
View file @ 22aac504
erp5_xhtml_jquery_style
\ No newline at end of file
bt5/erp5_xhtml_jquery_style/bt/version deleted 100644 → 0
View file @ 22aac504
5.4.7
\ No newline at end of file
product/ERP5/ERP5Site.py
View file @ 4f54f400
......@@ -2180,7 +2180,7 @@ class ERP5Generator(PortalGenerator):
"""
template_tool = p.portal_templates
if template_tool.getInstalledBusinessTemplate('erp5_core') is None:
for bt in ('erp5_property_sheets', 'erp5_core', p.erp5_catalog_storage,
for bt in ('erp5_property_sheets', 'erp5_core', p.erp5_catalog_storage, 'erp5_jquery',
'erp5_xhtml_style'):
if not bt:
continue
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_getJavaScriptRelativeUrlList.xml
View file @ 4f54f400
......@@ -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 = (\'erp5.js\',)\n
js_list = (\'jquery/core/jquery.min.js\', \'erp5.js\',)\n
return js_list\n
</string> </value>
</item>
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5_xhtml_appearance.js.xml
View file @ 4f54f400
......@@ -45,7 +45,11 @@ 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
// XXX: to be overriden in othe JavaScript based styles \n
\n
var fixLeftRightHeightAndFocusOnLoad = function () {\n
fixLeftRightHeightAndFocus(1);\n
};\n
$(document).ready(fixLeftRightHeightAndFocusOnLoad);\n
</string> </value>
</item>
<item>
......
product/ERP5/tests/testERP5Credential.py
View file @ 4f54f400
......@@ -59,7 +59,6 @@ class TestERP5Credential(ERP5TypeTestCase):
'erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_jquery',
'erp5_xhtml_jquery_style',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
'erp5_web',
......
product/ERP5/tests/testTemplateTool.py
View file @ 4f54f400
......@@ -627,8 +627,8 @@ class TestTemplateTool(ERP5TypeTestCase):
first_group = range(0, 6)
second_group = range(6, 8)
third_group = range(8, 10)
fourth_group = range(10, 13)
fifth_group = range(13, 14)
fourth_group = range(10, 12)
fifth_group = range(12, 13)
expected_position_dict = dict((('erp5_property_sheets', first_group),
('erp5_core_proxy_field_legacy', first_group),
......@@ -640,7 +640,6 @@ class TestTemplateTool(ERP5TypeTestCase):
('erp5_base', second_group),
('erp5_jquery', third_group),
('erp5_ingestion', third_group),
('erp5_xhtml_jquery_style', fourth_group),
('erp5_web', fourth_group),
('erp5_crm', fourth_group),
('erp5_credential', fifth_group)))
......
product/ERP5Configurator/tests/ConfiguratorTestMixin.py
View file @ 4f54f400
......@@ -45,7 +45,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
'erp5_dhtml_style',
'erp5_jquery',
'erp5_jquery_ui',
'erp5_xhtml_jquery_style',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
'erp5_web',
......@@ -69,7 +68,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
standard_bt5_list = ('erp5_dhtml_style',
'erp5_jquery_ui',
'erp5_xhtml_jquery_style',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_dms',
'erp5_accounting',
......
product/ERP5Type/tests/testFunctionalCore.py
View file @ 4f54f400
......@@ -42,7 +42,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_myisam_catalog',
'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test', 'erp5_forge',
'erp5_dhtml_style', 'erp5_dhtml_ui_test',
'erp5_jquery', 'erp5_jquery_ui', 'erp5_xhtml_jquery_style',
'erp5_jquery', 'erp5_jquery_ui',
'erp5_knowledge_pad',
'erp5_pdm',
'erp5_simulation',
......
product/ERP5Type/tests/testFunctionalKM.py
View file @ 4f54f400
......@@ -47,7 +47,7 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase):
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_myisam_catalog',
'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test', 'erp5_forge',
'erp5_dhtml_style', 'erp5_dhtml_ui_test',
'erp5_xhtml_jquery_style', 'erp5_jquery', 'erp5_jquery_ui',
'erp5_jquery', 'erp5_jquery_ui',
'erp5_knowledge_pad',
'erp5_trade', 'erp5_pdm', 'erp5_ooo_import',
'erp5_accounting', 'erp5_invoicing',
......
product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py
View file @ 4f54f400
......@@ -67,7 +67,7 @@ class TestZeleniumStandaloneUserTutorial(ERP5TypeFunctionalTestCase):
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_myisam_catalog',
'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test', 'erp5_forge',
'erp5_dhtml_style',
'erp5_xhtml_jquery_style', 'erp5_jquery', 'erp5_jquery_ui',
'erp5_jquery', 'erp5_jquery_ui',
'erp5_knowledge_pad',
'erp5_trade', 'erp5_pdm', 'erp5_ooo_import',
'erp5_accounting', 'erp5_invoicing',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7