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

NarrativeWeb and Web_Visually.css will now show exif tage/keys.

Browse Source 
svn: r12828
This commit is contained in:
Rob G. Healey 2009-07-21 00:59:38 +00:00
parent 3337f3044e
commit f979f8ee63
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/Web_Visually.css
View File

@ -672,8 +672,16 @@ table.individuallist tbody tr td.ColumnPartner a:hover {
margin-top:1.5em; margin-top:1.5em;
margin-bottom:0; margin-bottom:0;
border-style:solid; border-style:solid;
border-width:8px 0 0 0; border-width:2px 0 1px 0;
border-color:#453619; border-color:#000;
}
table.exifdata tr td.ColumnAttribute {
border-top:solid 1px #000;
width:60%;
}
table.exiflist tr td.ColumnValue {
border-top:solid 1px #000;
width:45%;
} }
/* Contact /* Contact

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

@ -524,9 +524,6 @@ class BasePage(object):
text = _CC[copy_nr] % {'gif_fname' : url} text = _CC[copy_nr] % {'gif_fname' : url}
section += Html('p', text, id='copyright') section += Html('p', text, id='copyright')
# add clear line for proper styling
section += fullclear
# return footer to its caller # return footer to its caller
return section return section
@ -603,8 +600,7 @@ class BasePage(object):
user_header += note_text user_header += note_text
# Begin Navigation Menu # Begin Navigation Menu
navigation = self.display_nav_links(title) body += self.display_nav_links(title)
body += navigation
# return to its caller, page and body # return to its caller, page and body
return page, body return page, body
@ -1695,12 +1691,12 @@ class MediaPage(BasePage):
except ImportError: except ImportError:
pylib = False pylib = False
if pylib: if (pylib and mime_type.startswith('image/')):
image = pyexiv2.Image.photo image = pyexiv2.Image('%s' % Utils.media_path_full(db, photo.get_path()))
image.readMetadata() image.readMetadata()
if image.exifKeys(): if image.exifKeys():
for x in xrange(len(image.exifKeys()) - 1): for x in xrange(len(image.exifKeys())):
exifimagedata.append(image.exifKeys()[x]) exifimagedata.append(image.exifKeys()[x])
################################################# #################################################
@ -1857,7 +1853,7 @@ class MediaPage(BasePage):
if mime_type: if mime_type:
trow = Html('tr') + ( trow = Html('tr') + (
Html('td', _('File Type'), class_='ColumnAttribute', inline=True), Html('td', _('File Type'), class_='ColumnAttribute', inline=True),
Html('td', mime_type, class_='ColumnValue', unline=True) Html('td', mime_type, class_='ColumnValue', inline=True)
) )
table += trow table += trow
@ -1871,22 +1867,28 @@ class MediaPage(BasePage):
table += trow table += trow
# display image Exif tags/ keys if any? # display image Exif tags/ keys if any?
if len(exifimagedata) and pylib: if ((pylib and mime_type.startswith('image/')) and len(exifimagedata)):
with Html('div', class_='infolist', id='ExifList') as exif:
mediadetail += exif # add clearline for increased styling
mediadetail += fullclear
with Html('div', class_='infolist', id='ExifList') as exifdetail:
mediadetail += exifdetail
# add exif title header
exifdetail += Html('h4', _('Image Exif Tags'), inline=True)
# begin exif table # begin exif table
with Html('table', class_='exifdata') as table: with Html('table', class_='exifdata') as table:
exif += table exifdetail += table
for xdata in exifimagedata: for xdata in exifimagedata:
trow = Html('tr') trow = Html('tr') + (
Html('td', xdata, class_='ColumnAttribute', inline=True),
Html('td', image[xdata], class_='ColumnValue', inline=True)
)
table += trow table += trow
tcell1 = Html('td', xdata, class_='ColumnAttribute', inline=True)
tcell2 = Html('td', image[x], class_='ColumnValue', inline=True)
trow += (tcell1, tcell2)
# get media notes # get media notes
notes = self.display_note_list(photo.get_note_list()) notes = self.display_note_list(photo.get_note_list())
if notes is not None: if notes is not None:
@ -2192,12 +2194,12 @@ class HomePage(BasePage):
homepage, body = self.write_header(_('Home')) homepage, body = self.write_header(_('Home'))
# begin home division # begin home division
with Html('div', class_='content', id='Home') as home: with Html('div', class_='content', id='Home') as section:
body += home body += section
homeimg = report.add_image('homeimg') homeimg = report.add_image('homeimg')
if homeimg is not None: if homeimg is not None:
home += homeimg section += homeimg
note_id = report.options['homenote'] note_id = report.options['homenote']
if note_id: if note_id:
@ -2205,7 +2207,7 @@ class HomePage(BasePage):
note_text = self.get_note_format(note) note_text = self.get_note_format(note)
# attach note # attach note
home += note_text section += note_text
# create clear line for proper styling # create clear line for proper styling
# create footer section # create footer section