Merge branch 'jmartinm/bibedit-integrate-jquery'
dd50a738b1d8
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 15 2011, 10:04.

Description

Merge branch 'jmartinm/bibedit-integrate-jquery'

jmartinm/bibedit-integrate-jquery: BibEdit: fix jEditable callback when pressing return BibEdit: hide delete record button by default BibEdit: add field in specific position BibEdit: fix apply all HP changes BibEdit: clean JavaScript code BibEdit: extract css into a separate file BibEdit: upgrade to jQuery 1.5

Amendments done during merge: Change location of hosted jQuery files. Fix top-level Makefile.am.

Beware, not all jQuery dependencies are included here as of yet. This will be fixed in later commits in this branch.

Conflicts:
modules/bibedit/lib/bibedit_engine.js

Committed

Tibor Simko <tibor.simko@cern.ch>

May 16 2011, 11:45

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:dd50a738b1d8: Merge branch 'jmartinm/bibedit-integrate-jquery' (authored by Tibor Simko <tibor.simko@cern.ch>).May 16 2011, 11:45

Commit	Author	Details	Committed
f935bd5e18ef	Javier Martin	BibEdit: fix jEditable callback when pressing return	Apr 12 2011
5a5927a85f9c	Javier Martin	BibEdit: hide delete record button by default	Apr 11 2011
422a919aad6b	Javier Martin	BibEdit: add field in specific position	Apr 11 2011
abdbc6bf33ac	Piotr Praczyk/Javier Martin	BibEdit: fix apply all HP changes	Apr 11 2011
4365321dc71b	Piotr Praczyk/Javier Martin	BibEdit: clean JavaScript code	Apr 11 2011
877c7a2853ea	Piotr Praczyk/Javier Martin	BibEdit: extract css into a separate file	Apr 11 2011
3d67a78cbefb	Piotr Praczyk/Javier Martin	BibEdit: upgrade to jQuery 1.5	Apr 11 2011

				Path
	M			Makefile.am
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/bibcirculation/lib/bibcirculationadminlib.py
	M			modules/bibedit/Makefile.am
	M			modules/bibedit/bin/Makefile.am
	P			modules/bibedit/bin/bibeditcache Copied from modules/miscutil/bin/inveniocfg.in
	M			modules/bibedit/lib/Makefile.am
	A			modules/bibedit/lib/bibedit_cachetool.py
	M			modules/bibedit/lib/bibedit_config.py
	M			modules/bibedit/lib/bibedit_display.js
	M			modules/bibedit/lib/bibedit_engine.js
	M			modules/bibedit/lib/bibedit_engine.py
	M			modules/bibedit/lib/bibedit_holdingpen.js
	M			modules/bibedit/lib/bibedit_keys.js
	M			modules/bibedit/lib/bibedit_menu.js
	M			modules/bibedit/lib/bibedit_templates.py
	M			modules/bibedit/lib/bibedit_utils.py
	M			modules/bibedit/lib/bibeditmulti_templates.py
	M			modules/bibedit/lib/marcxml.js
	M			modules/bibedit/web/Makefile.am
	A			modules/bibedit/web/bibedit.css
	M			modules/bibharvest/lib/bibharvest_templates.py
	M			modules/bibharvest/lib/oai_harvest_dblayer.py
	M			modules/bibharvest/web/admin/oai_harvest_admin.js
	M			modules/bibharvest/web/admin/oaiharvestadmin.py
	M			modules/bibmerge/lib/bibmerge_webinterface.py
	M			modules/bibupload/lib/batchuploader_templates.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/webstyle/css/invenio.css
	M			modules/websubmit/lib/functions/Move_Photos_to_Storage.py
	M			modules/websubmit/lib/websubmit_managedocfiles.py