From 55b297d1fb46291fe6094a2c06cb07658d79ed54 Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Mon, 10 Oct 2011 20:41:25 +0000
Subject: [PATCH] Completed some work on RepositoryPage, some work on
 Navigation menus...

svn: r18283
---
 src/plugins/webreport/NarrativeWeb.py     | 34 +++++++++++------------
 src/plugins/webstuff/css/Web_Nebraska.css |  4 +--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 54ff50966..74d707a1c 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -5983,7 +5983,6 @@ class RepositoryPage(BasePage):
     """
     will create the individual Repository Pages
     """
-
     def __init__(self, report, title, repo, handle):
         gid = repo.get_gramps_id()
         BasePage.__init__(self, report, title, gid)
@@ -5998,7 +5997,7 @@ class RepositoryPage(BasePage):
             body += repositorydetail
 
             # repository name
-            repositorydetail += Html("h3", repo.name, inline = True)
+            repositorydetail += Html("h3", html_escape(repo.name), inline = True)
 
             # begin repository table
             with Html("table", class_ = "infolist repolist") as table:
@@ -6007,25 +6006,24 @@ class RepositoryPage(BasePage):
                 tbody = Html("tbody")
                 table += tbody
 
-                # repo gramps id
-                if not self.noid and gid:
-                    trow = Html("tr") + (
-                        Html("td", _("Gramps ID"), class_ ="ColumnAttribute", inline =True),
-                        Html("td", gid, class_ ="ColumnValue", inline =True)
+                if self.noid or not gid:
+                    gid = False
+
+                tbody.extend(
+                    ( Html("tr"),
+                        Html("td", label, class_ ="ColumnType"),
+                        Html("td", data or "&nbsp;", class_ ="ColumnAttribute")
                     )
-                    tbody += trow
-
-                # repository type
-                trow = Html("tr") + (
-                    Html("td", _("Type"), class_ ="ColumnAttribute", inline =True),
-                    Html("td", str(repo.type), class_ ="ColumnValue", inline =True)
+                    for label, data in [
+                        (_("Gramps ID"), gid),
+                        (_("Type"),      str(repo.get_type()))
+                    ]
                 )
-                tbody += trow
 
-            # repository: address(es)... repositort addresses do NOT have Sources
-            addresses = self.dump_addresses(repo.get_address_list(), False)
-            if addresses is not None:
-                repositorydetail += addresses
+            # repository: address(es)... repository addresses do NOT have Sources
+            repo_address = self.display_addr_list(repo.get_address_list(), False)
+            if repo_address is not None:
+                repositorydetail += repo_address
 
             # repository: urllist
             urllist = self.display_url_list(repo.get_url_list())
diff --git a/src/plugins/webstuff/css/Web_Nebraska.css b/src/plugins/webstuff/css/Web_Nebraska.css
index fae2af272..06312a428 100644
--- a/src/plugins/webstuff/css/Web_Nebraska.css
+++ b/src/plugins/webstuff/css/Web_Nebraska.css
@@ -233,7 +233,7 @@ div#alphabet ul li a, div#navigation ul li a, div#subnavigation ul li a {
     display: block;
     padding: 4px 8px 4px 8px;
     float: left;
-    font: bold 16px/100% sans;
+    font: bold .7em sans;
     margin: 0;
     text-decoration: none;
     color: #000;
@@ -1093,7 +1093,7 @@ div#pedigree {
     margin-right: 10px;
 }
 #footer p#copyright img {
-    margin-right: 10px;
+    margin-right: 10px[
 }
 #user_footer {
     width: 70%;