NarrativeWeb: Fixed problem on DownloadPage. Style sheets: Removed elements from DownloadPage. Download page and files now share the same copyright license as the remaining of the pages.

svn: r15742

src/plugins/webreport/NarrativeWeb.py

@@ -3579,7 +3579,7 @@ class DownloadPage(BasePage):
 
         # do NOT include a Download Page
         if not self.report.inc_download:
-            return None
+            return
 
         # menu options for class
         # download and description #1
@@ -3591,9 +3591,6 @@ class DownloadPage(BasePage):
         dlfname2 = self.report.dl_fname2
         dldescr2 = self.report.dl_descr2
 
-        # download copyright
-        dlcopy = self.report.dl_copy
-
         # if no filenames at all, return???
         if dlfname1 or dlfname2:
 
@@ -3607,7 +3604,9 @@ class DownloadPage(BasePage):
                 msg = _("This page is for the user/ creator of this Family Tree/ "
                     "Narrative website to share a couple of files with you "
                     "regarding their family.  If there are any files listed "
-                    "below, clicking on them will allow you to download them.")
+                    "below, clicking on them will allow you to download them.  The"
+                    "download page and files have the same copyright as the remainder "
+                    "of these web pages.")
                 download += Html("p", msg, id = "description")
 
                 # begin download table and table head
@@ -3680,13 +3679,6 @@ class DownloadPage(BasePage):
                         else:
                             tcell += " "
 
-        # display Copyright license for these files
-        copyright = self.get_copyright_license(dlcopy)
-        if copyright: 
-            msg = _("The Copyright License for these files are: ")
-            download += Html("p", msg, id = "description") 
-            download += Html("a", copyright, class_ = "copyright")
-
         # clear line for proper styling
         # create footer section
         footer = self.write_footer()
@@ -5499,7 +5491,6 @@ class NavWebReport(Report):
         self.dl_descr1 = self.options['dl_descr1']
         self.dl_fname2 = self.options['down_fname2']
         self.dl_descr2 = self.options['dl_descr2']
-        self.dl_copy = self.options['dl_cright']
 
         self.encoding = self.options['encoding']
 
@@ -6499,12 +6490,6 @@ class NavWebOptions(MenuReportOptions):
         self.__dl_descr2.set_help(_('Give a description for this file.'))
         menu.add_option(category_name, 'dl_descr2', self.__dl_descr2)
 
-        self.__dl_cright = EnumeratedListOption(_('Download Copyright License'), 0 )
-        for index, copt in enumerate(_COPY_OPTIONS):
-            self.__dl_cright.add_item(index, copt)
-        self.__dl_cright.set_help( _("The copyright to be used for this download file?"))
-        menu.add_option(category_name, "dl_cright", self.__dl_cright)
-
         self.__download_changed()
 
     def __add_advanced_options(self, menu):
@@ -6668,13 +6653,11 @@ class NavWebOptions(MenuReportOptions):
             self.__dl_descr1.set_available(True)
             self.__down_fname2.set_available(True)
             self.__dl_descr2.set_available(True)
-            self.__dl_cright.set_available(True)
         else:
             self.__down_fname1.set_available(False)
             self.__dl_descr1.set_available(False)
             self.__down_fname2.set_available(False)
             self.__dl_descr2.set_available(False)
-            self.__dl_cright.set_available(False)
 
 # FIXME. Why do we need our own sorting? Why not use Sort.Sort?
 def sort_people(db, handle_list):

src/plugins/webstuff/css/Web_Basic-Blue.css

@@ -336,7 +336,6 @@ table.infolist thead tr th a:hover {
 table.infolist tr td {
     font: normal 1.1em/1.4em serif;
     vertical-align: middle;
-    background-color: #BCEAF6;
     padding: 6px 0 6px 10px;
 }
 table.infolist tr td a {

src/plugins/webstuff/css/Web_Mainz.css

@@ -58,6 +58,7 @@ Middle Light            images/Web_Mainz_MidLight.png
 
 body {
     font-family:Georgia, serif;
+    width: 965px;
     color:#7D5925;
     margin:0;
     padding:0 14px 0 14px;
@@ -75,7 +76,6 @@ img {
     background:none;
 }
 .content {
-    width:965px;
     margin:0 auto;
     padding-bottom:.5em;
     background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
@@ -770,38 +770,32 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
 ----------------------------------------------------- */
 div#Download {
     margin: 0;
-    padding:0px 20px 0px 20px;
-    width: 965px;
 }
 div#Download table.download {
     border: solid 1px #000;
-    margin: .1cm 0px .5cm 0px;
     width: 100%;
+    margin: 10px 0px 10px 0px;
 }
 div#Download table.download tbody tr#Row02 {
     border-bottom: solid 1px #000;
 }
 div#Download table.download tbody tr td { 
     border: solid 1px #000;
+    padding: 5px 0px 5px 5px;
     text-align: left;
-    padding: 5px 0px 5px 0px;
 }
 div#Download table.download td.ColumnFilename {
-    width: 30%;
+    width: 20%;
 }
 div#Download table.download td.ColumnFilename a {
     font-weight: bold;
     font-style: italic;
 }
 div#Download table.download td.ColumnDescription {
-    width: 45%;
+    width: 30%;
 }
 div#Download table.download td.ColumnModified {
-    width: 17%;
+    width: 20%;
-}
-div#Download a.copyright a img {
-    float: center;
-    text-align: center;
 }
 
 /* Repositories
@@ -812,6 +806,7 @@ div#RepositoryList, div#RepositoryDetail {
 }
 div#RepositoryList table.repolist tbody tr td {
     border-bottom: dashed 1px #000;
+    padding: 2px 0px 2px 0px;
 }
 div#RepositoryList table.repolist tbody tr td a {
     display: block;