diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 842a4ea4f..46f1823d6 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-02-14 Don Allingham + * src/plugins/NavWebPage.py: include more information about CC licenses + in the ALT and TITLE tags. * src/plugins/GraphViz.py: use new style links for narrative web page generator * src/DbPrompter.py: Try to give a more intelligent error message on an diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index d50b00fb0..db382eac9 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -111,12 +111,12 @@ _character_sets = [ ] _cc = [ - 'Creative Commons License', - 'Creative Commons License', - 'Creative Commons License', - 'Creative Commons License', - 'Creative Commons License', - 'Creative Commons License', + 'Creative Commons License - By attribution', + 'Creative Commons License - By attribution, No derivations', + 'Creative Commons License - By attribution, Share-alike', + 'Creative Commons License - By attribution, Non-commercial', + 'Creative Commons License - By attribution, Non-commercial, No derivations', + 'Creative Commons License - By attribution, Non-commerical, Share-alike', ] @@ -2107,7 +2107,7 @@ class WebReport(Report.Report): # Copy the Creative Commons icon if the a Creative Commons # license is requested - if 1 < self.copyright < 7: + if 0 < self.copyright < 7: from_path = os.path.join(const.dataDir,"somerights20.gif") to_path = os.path.join("images","somerights20.gif") self.store_file(archive,self.target_path,from_path,to_path)