diff --git a/src/Editors/_EditMediaRef.py b/src/Editors/_EditMediaRef.py index ed964fc7d..dd280f2d3 100644 --- a/src/Editors/_EditMediaRef.py +++ b/src/Editors/_EditMediaRef.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2000-2006 Donald N. Allingham +# Copyright (C) 2008-2009 Stephane Charette # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/data/Makefile.am b/src/data/Makefile.am index f215a221e..25b8cd22f 100644 --- a/src/data/Makefile.am +++ b/src/data/Makefile.am @@ -12,6 +12,7 @@ dist_pkgdata_DATA = \ system_filters.xml \ tips.xml\ lds.xml\ + behaviour.css\ Web_Basic-Ash.css\ Web_Basic-Cypress.css\ Web_Basic-Lilac.css\ diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index 14a84df18..13630b518 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -481,6 +481,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index 25fc71697..45b6c7e84 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -478,6 +478,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index 5f456ca59..b10970a72 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -480,6 +480,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index ace35036e..1feb32dc0 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -481,6 +481,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 686b0ab5d..9fd7ccdbf 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -481,6 +481,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index 0d8542b6c..63f7d5d25 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -498,6 +498,10 @@ table.individuallist tbody tr td.ColumnName a { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index ede7e69ca..345e0ddcd 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -514,6 +514,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css index 2e61c8664..b39699e9e 100644 --- a/src/data/Web_Print-Default.css +++ b/src/data/Web_Print-Default.css @@ -296,6 +296,10 @@ table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents display:none; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index 4fdfb58e8..6bbe8d058 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -524,6 +524,10 @@ table.individuallist tbody tr td.ColumnName a:hover { font-weight:normal; } #GalleryDisplay { + margin:0 auto; + padding:0; + position:relative; + overflow:hidden; text-align:center; } #GalleryDisplay img { diff --git a/src/data/behaviour.css b/src/data/behaviour.css new file mode 100644 index 000000000..9d7dab56a --- /dev/null +++ b/src/data/behaviour.css @@ -0,0 +1,89 @@ +/* +------------------------------------------------------------------------------- +GRAMPS cascading style sheet for common behaviour independant of styles +Style Name: n/a (used by many different styles) +Style Author: Stephane Charette and Jason Simanek +------------------------------------------------------------------------------- +GRAMPS is a Free Software Project for Genealogy, offering a professional +genealogy program, and a wiki open to all. It is a community project, created, +developed and governed by genealogists. + +Go to to learn more! + +License +------------------------------------------------------------------------------- +Copyright 2009 Stephane Charette and Jason Simanek +This file is part of the GRAMPS program. + +GRAMPS is free software: you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation, version 2 of the License. + +GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +GRAMPS. If not, see . +------------------------------------------------------------------------------- +$Id: NWeb-Screen_Basic-Ash.css 11712 2009-01-25 10:00:30Z s_charette $ +*/ + +/* ------------- */ +/* Image Gallery */ +/* ------------- */ + +/* ensure RegionBox
    is hidden and has no margins/padding that would shift the image */ +ol.RegionBox { + display:none; + list-style:none; + margin:0; + padding:0; +} + +/* show the RegionBox
      When the mouse hovers over the gallery */ +div#GalleryDisplay:hover ol.RegionBox { + display:block; +} + +/* define how
    1. tags should normally look within RegionBox */ +ol.RegionBox li { + margin:0; + padding:0; + display:block; + position:absolute; + text-align:center; + text-decoration:none; + border:dashed 1px #999; + background:url(../../../images/blank.gif) repeat; + /* IE doesn't work correctly with "hover" if the
    2. tag is empty, + * so fill the
    3. with a blank image; this way the mouse will be + * considered in the
    4. tag anywhere over the background image + */ +} + +/* use a solid border when the mouse hovers over the
    5. tags */ +ol.RegionBox li:hover { + z-index:100; + border:solid 1px #FFF; +} + +/* links are kept hidden... */ +ol.RegionBox li a { + display:none; +} + +/* ...until we hover over them */ +ol.RegionBox li:hover a { + display:block; + text-decoration:none; + border-bottom:solid 1px #FFF; + background-color:#888; + color:#FFF; +} + +/* underline is hidden until we hover over the links */ +ol.RegionBox li:hover a:hover { + text-decoration:underline; +} + diff --git a/src/images/Makefile.am b/src/images/Makefile.am index 640315293..10ddf35d5 100644 --- a/src/images/Makefile.am +++ b/src/images/Makefile.am @@ -54,6 +54,7 @@ map_tile_images = \ dist_pkgdata_DATA = \ bad.png\ + blank.gif\ caution.png\ good.png\ gramps.png\ diff --git a/src/images/blank.gif b/src/images/blank.gif new file mode 100644 index 000000000..e565824aa Binary files /dev/null and b/src/images/blank.gif differ diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 73c0f04a9..863fb53c8 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -345,6 +345,12 @@ class BasePage: (const.PROGRAM_NAME, const.VERSION, const.URL_HOMEPAGE)) of.write('\t\n' % self.author) + # Link to css behaviours + fname = os.path.join("styles", "behaviour.css") + url = self.report.build_url_fname(fname, None, self.up) + of.write('\t\n' % url) + # Link to screen stylesheet fname = os.path.join("styles", self.report.css) url = self.report.build_url_fname(fname, None, self.up) @@ -568,7 +574,6 @@ class BasePage: of.write('\t\t

      %s

      \n' % _('Weblinks')) of.write('\t\t
        \n') - index = 1 for url in urllist: uri = url.get_path() descr = url.get_description() @@ -583,7 +588,6 @@ class BasePage: else: of.write('\t\t\t
      1. %s' % (uri, descr)) of.write('
        2. \n') - index = index + 1 of.write('\t\t
      \n') of.write('\t\n\n') @@ -656,14 +660,12 @@ class BasePage: key = operator.itemgetter(1), cmp = locale.strcoll) - index = 1 for (path, name, gid) in sortlist: - of.write('\t\t\t
    6. ') + of.write('\t\t\t
    7. TEST ') # Note. 'path' already has a filename extension url = self.report.build_url_fname(path, None, self.up) self.person_link(of, url, name, gid) of.write('
      8. \n') - index = index + 1 of.write('\t\t
    \n') of.write('\t\n') @@ -1140,6 +1142,73 @@ class MediaPage(BasePage): # TODO. How do we pass my_media_list down for use in BasePage? BasePage.__init__(self, report, title, photo.gramps_id) + """ + ************************************* + GRAMPS feature #2634 -- attempt to highlight subregions in media + objects and link back to the relevant web page. + + This next section of code builds up the "records" we'll need to + generate the html/css code to support the subregions + ************************************* + """ + + # TODO, FIXME: Please code review this next block! + + # get all of the backlinks to this media object; meaning all of + # the people, events, places, etc..., that use this image + _region_items = set() + for (classname, newhandle) in db.find_backlink_handles(handle): + + # for each of the backlinks, get the relevant object from the db + # and determine a few important things, such as a text name we + # can use, and the URL to a relevant web page + _obj = None + _name = "" + _linkurl = "#" + if classname == "Person": + _obj = db.get_person_from_handle( newhandle ) + # what is the shortest possible name we could use for this person? + _name = _obj.get_primary_name().get_call_name() + if not _name or _name == "": + _name = _obj.get_primary_name().get_first_name() + _linkurl = report.build_url_fname_html(_obj.handle, 'ppl', True) + if classname == "Event": + _obj = db.get_event_from_handle( newhandle ) + _name = _obj.get_description() + + # if we found a db object to work with... + if _obj: + + # get a list of all media refs for this object + medialist = _obj.get_media_list() + + # go media refs looking for one that points to this image + for mediaref in medialist: + rh = mediaref.get_referenced_handles() + (classname, h) = rh[0] + + # if the handles indicate this is a match... + if h == handle: + + # get the rectangle (if any) defined in this media ref + rectangle = mediaref.get_rectangle() + if rectangle: + (x1, y1, x2, y2) = rectangle + # GRAMPS gives us absolute coordinates, + # but we need relative width + height + w = x2 - x1 + h = y2 - y1 + + # remember all this information, cause we'll need + # need it later when we output the
  1. ...
    2. tags + item = (_name, x1, y1, w, h, _linkurl) + _region_items.add(item) + """ + ************************************* + end of code that looks for and prepares the media object regions + ************************************* + """ + of = self.report.create_file(handle, 'img') self.up = True @@ -1178,8 +1247,10 @@ class MediaPage(BasePage): of.write('\t
    \n') if mime_type: if mime_type.startswith("image/"): - of.write('\t\t
    \n') - if target_exists: + if not target_exists: + of.write('\t\t
    \n') + of.write('\t\t\t(%s)' % _("The file has been moved or deleted")) + else: # if the image is spectacularly large, then force the client # to resize it, and include a "\n' % (width, height)) + + # Feature #2634; display the mouse-selectable regions. + # See the large block at the top of this function where + # the various regions are stored in _region_items + if len(_region_items) > 0: + of.write('\t\t\t
      \n') + while len(_region_items) > 0: + (name, x, y, w, h, linkurl) = _region_items.pop() + of.write('\t\t\t\t
    1. ' + '%s
      2. \n' % + (x, y, w, h, linkurl, name)) + of.write('\t\t\t
    \n') + + # display the image + of.write('\t\t\t') + if scale != 1.0: of.write('' % url) of.write('%s' % (width, height, url, html_escape(self.page_title))) if scale != 1.0: of.write('') of.write('\n') - else: - of.write('\t\t\t(%s)' % _("The file has been moved or deleted")) of.write('\t\t
    \n\n') else: import tempfile @@ -2807,6 +2896,10 @@ class NavWebReport(Report): Copy all of the CSS and image files for Narrated Web """ + # copy behaviour stylesheet + fname = os.path.join(const.DATA_DIR, "behaviour.css") + self.copy_file(fname, "behaviour.css", "styles") + # copy screen stylesheet fname = os.path.join(const.DATA_DIR, self.css) self.copy_file(fname, self.css, "styles") @@ -2833,6 +2926,9 @@ class NavWebReport(Report): # include GRAMPS favicon imgs += ["favicon.ico"] + # we need the blank image gif neede by behaviour.css + imgs += ["blank.gif"] + # copy Ancestor Tree graphics if needed??? if self.graph: imgs += ["Web_Gender_Female.png",