Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated the jquery javascript library up to version 1.7.1.

Browse Source 
svn: r18834
This commit is contained in:
Rob G. Healey 2012-02-07 02:09:04 +00:00
parent cb76bbdae9
commit 6b8aa17495
4 changed files with 9292 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -152,6 +152,7 @@ src/plugins/webreport/Makefile
src/plugins/webstuff/Makefile src/plugins/webstuff/Makefile
src/plugins/webstuff/css/Makefile src/plugins/webstuff/css/Makefile
src/plugins/webstuff/images/Makefile src/plugins/webstuff/images/Makefile
src/plugins/webstuff/js/Makefile
src/DateHandler/Makefile src/DateHandler/Makefile
src/data/Makefile src/data/Makefile
src/glade/Makefile src/glade/Makefile

35
src/plugins/webreport/NarrativeWeb.py
View File

@ -4440,14 +4440,14 @@ class SourcePage(BasePage):
return return
# for use in determining if a citation referent is in the report database? # for use in determining if a citation referent is in the report database?
(db_family_handles, db_event_handles, db_place_handles, db_source_handles, db_repository_handles, (db_family_handles, db_event_handles, db_place_handles, db_source_handles,
db_media_handles, db_note_handles) = database_handles_list db_media_handles) = database_handles_list
self.page_title = source.get_title() self.page_title = source.get_title()
BasePage.__init__(self, report, title, source.get_gramps_id()) BasePage.__init__(self, report, title, source.get_gramps_id())
inc_repositories = self.report.options["inc_repository"] inc_repositories = self.report.options["inc_repository"]
self.navigation = self.report.options["navigation"] self.navigation = self.report.options["navigation"]
of = self.report.create_file(src_handle, "src") of = self.report.create_file(src_handle, "src")
self.up = True self.up = True
@ -4483,8 +4483,8 @@ class SourcePage(BasePage):
for (label, value) in [ for (label, value) in [
(_("Gramps ID"), source_gid), (_("Gramps ID"), source_gid),
(_("Author"), source.get_author()), (_("Author"), source.get_author()),
(_("Publication information"), source.get_publication_info()), (_("Abbreviation"), source.get_abbreviation()),
(_("Abbreviation"), source.get_abbreviation()) ]: (_("Publication information"), source.get_publication_info()) ]:
if value: if value:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True), Html("td", label, class_ = "ColumnAttribute", inline = True),
@ -4529,9 +4529,9 @@ class SourcePage(BasePage):
head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet") head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet")
# add javascript code to handle if the user's browser is IE6? # add javascript code to handle if the user's browser is IE6?
fname = "/".join(["js", "jquery-1.3.2.min.js"]) fname = "/".join(["js", "jQuery-1.7.1.js"])
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
head += Html("script", type = "text/javascript", language = "javascript", src = url, inline = True) head += Html("script", src = url, type = "text/javascript", language = "javascript", inline = True)
with Html("script", type = "text/javascript", language = "javascript") as jsc: with Html("script", type = "text/javascript", language = "javascript") as jsc:
head += jsc head += jsc
@ -4779,8 +4779,7 @@ class SourcePage(BasePage):
for repository_handle in repo_list: for repository_handle in repo_list:
repository = self.dbase_.get_repository_from_handle(repository_handle) repository = self.dbase_.get_repository_from_handle(repository_handle)
if (repository and repository_handle in db_repository_handles): if repository:
unordered3.extend( unordered3.extend(
Html("li", self.repository_link(repository_handle, repository.get_name(), Html("li", self.repository_link(repository_handle, repository.get_name(),
uplink = self.up), inline = True) uplink = self.up), inline = True)
@ -6980,8 +6979,7 @@ class NavWebReport(Report):
source_list = {} source_list = {}
database_handles_list = (self.database.get_family_handles(), self.database.get_event_handles(), database_handles_list = (self.database.get_family_handles(), self.database.get_event_handles(),
self.database.get_place_handles(), self.database.get_source_handles(), self.database.get_repository_handles(), self.database.get_place_handles(), self.database.get_source_handles(), self.database.get_media_object_handles())
self.database.get_media_object_handles(), self.database.get_note_handles())
self.base_pages() self.base_pages()
@ -7083,7 +7081,7 @@ class NavWebReport(Report):
fname = CSS["behaviour"]["filename"] fname = CSS["behaviour"]["filename"]
self.copy_file(fname, "behaviour.css", "styles") self.copy_file(fname, "behaviour.css", "styles")
# copy Menu Layout Cascade Style Sheet if Blue or Visually is being used? # copy Menu Layout Style Sheet if Blue or Visually is being used as the stylesheet?
if CSS[self.css]["navigation"]: if CSS[self.css]["navigation"]:
if self.navigation == "Horizontal": if self.navigation == "Horizontal":
fname = CSS["Horizontal-Menus"]["filename"] fname = CSS["Horizontal-Menus"]["filename"]
@ -7095,13 +7093,14 @@ class NavWebReport(Report):
fname = CSS["DropDown-Menus"]["filename"] fname = CSS["DropDown-Menus"]["filename"]
self.copy_file(fname, "narrative-menus.css", "styles") self.copy_file(fname, "narrative-menus.css", "styles")
# copy SourcePage DropDown Citations Style Sheet if self.navigation == "DropDown":
fname = CSS["DropDown-Citations"]["filename"] # copy SourcePage DropDown Citations Style Sheet
self.copy_file(fname, "narrative-citations.css", "styles") fname = CSS["DropDown-Citations"]["filename"]
self.copy_file(fname, "narrative-citations.css", "styles")
# copy jquery javascript file... # copy jquery javascript files for use in the Drop Down Citations section...
fname = CSS["DropDown-Citations"]["javascript"] fname = CSS["DropDown-Citations"]["javascript"]
self.copy_file(fname, "jquery-1.3.2.min.js", "js") self.copy_file(fname, "jQuery-1.7.1.js", "js")
# copy narrative-maps Style Sheet if Place or Family Map pages are being created? # copy narrative-maps Style Sheet if Place or Family Map pages are being created?
if (self.placemappages or self.familymappages): if (self.placemappages or self.familymappages):

9266
src/plugins/webstuff/js/jQuery-1.7.1.js Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/plugins/webstuff/webstuff.py
View File

@ -119,25 +119,25 @@ def load_on_reg(dbstate, uistate, plugin):
path_css('Web_Print-Default.css'), None, [], [] ], path_css('Web_Print-Default.css'), None, [], [] ],
# Horizontal Navigation Menus Style Sheet # Horizontal Navigation Menus Style Sheet
["Horizontal-Menus", 0, "", ["Horizontal-Menus", 0, "Horizontal Menus",
path_css('Web_Horizontal-Menus.css'), None, [], [] ], path_css('Web_Horizontal-Menus.css'), None, [], [] ],
# Vertical Navigation Menus Style Sheet # Vertical Navigation Menus Style Sheet
["Vertical-Menus", 0, "", ["Vertical-Menus", 0, "Vertical Menus",
path_css('Web_Vertical-Menus.css'), None, [], [] ], path_css('Web_Vertical-Menus.css'), None, [], [] ],
# WebKit/ Html5/ CSS3 Fade Navigation Menus Style Sheet # WebKit/ Html5/ CSS3 Fade Navigation Menus Style Sheet
["Fade-Menus", 0, "", ["Fade-Menus", 0, "Fade In/ Out Menus",
path_css('Web_Fade-Menus.css'), None, [], [] ], path_css('Web_Fade-Menus.css'), None, [], [] ],
# WebKit/ Html5/ CSS3 Drop Down Navigation Menus Style Sheet # WebKit/ Html5/ CSS3 Drop Down Navigation Menus Style Sheet
["DropDown-Menus", 0, "", ["DropDown-Menus", 0, "Drop Down Menus",
path_css("Web_DropDown-Menus.css"), None, [], [], ], path_css("Web_DropDown-Menus.css"), None, [], [] ],
# WebKit/ Html5/ CSS3 Drop Down Citations Style Sheet # WebKit/ Html5/ CSS3 Drop Down Citations Style Sheet
["DropDown-Citations", 0, "", ["DropDown-Citations", 0, "Drop Down Citations",
path_css("Web_DropDown-Citations.css"), None, [], path_css("Web_DropDown-Citations.css"), None, [],
path_js("jquery-1.3.2.min.js"), ], path_js("jQuery-1.7.1.js") ],
# GeoView style sheet with its image # GeoView style sheet with its image
["GeoView", 0, "GeoView", ["GeoView", 0, "GeoView",
@ -162,16 +162,12 @@ def load_on_reg(dbstate, uistate, plugin):
path_img("document.png")], [] ], path_img("document.png")], [] ],
# Gramps Fav icon #2 # Gramps Fav icon #2
["favicon2", 0, "favicon2", ["favicon2", 0, "FavIcon2",
path_img("favicon2.ico"), None, [], [] ], path_img("favicon2.ico"), None, [], [] ],
# copyright image # copyright image
['Copyright', 0, 'Copyright', ['Copyright', 0, 'Copyright',
path_img("somerights20.gif"), None, [], [] ], path_img("somerights20.gif"), None, [], [] ],
# document image in case the media object is not an image
['Document', 0, 'Document',
path_img("document.png"), None, [], [] ],
] ]
return CSS_FILES return CSS_FILES