Beginning of work to allow Drop Down menu to work with class SourcePage's Citation Referents section.

svn: r18796

src/plugins/webreport/NarrativeWeb.py

@@ -1534,7 +1534,7 @@ class BasePage(object):
         head += links
 
         # begin header section
-        headerdiv = (Html("div", id = 'header') +
+        headerdiv = Html("div", id = 'header') + (
             Html("h1", html_escape(self.title_str), id = "SiteTitle", inline = True)
         )
         body += headerdiv
@@ -1552,13 +1552,12 @@ class BasePage(object):
             user_header += note
 
         # Begin Navigation Menu
-        if self.report.navigation == "Drop":
+        if self.report.navigation == "DropDown":
             body += self.display_drop_menu()
-
         else: 
             body += self.display_nav_links(title)
 
-        # return to its caller, page and body
+        # return page, head, and body
         return page, head, body
 
     def get_nav_menu_hyperlink(self, url_fname, nav_text):
@@ -1624,7 +1623,7 @@ class BasePage(object):
             with Html("div", class_ = "container") as container:
                 index = 0
                 for rows in range(num_rows):
-                    unordered = Html("ul", class_ = "menu", id = "menu")
+                    unordered = Html("ul", class_ = "menu", id = "dropmenu")
 
                     cols = 0
                     while (cols <= num_cols and index < number_items):
@@ -1741,7 +1740,7 @@ class BasePage(object):
         # begin navigation menu division...
         with Html("div", class_ = "wrapper", id = "nav", role = "navigation") as navigation:
             with Html("div", class_ = "container") as container:
-                unordered = Html("ul", class_ = "menu", id = "menu")
+                unordered = Html("ul", class_ = "menu", id = "dropmenu")
 
                 if self.report.use_home:
                     list = Html("li", self.get_nav_menu_hyperlink(self.report.index_fname, _("Html|Home")))
@@ -4433,6 +4432,7 @@ class SourcePage(BasePage):
         BasePage.__init__(self, report, title, source.get_gramps_id())
 
         inc_repositories = self.report.options["inc_repository"]
+        self.navigation = self.report.options["navigation"]
 
         of = self.report.create_file(src_handle, "src")
         self.up = True
@@ -4503,8 +4503,36 @@ class SourcePage(BasePage):
             the_lists = Utils.get_source_and_citation_referents(src_handle, self.dbase_)
             if the_lists:
                 (citation_list, citation_referents_list) = the_lists
+                if citation_referents_list:
+
+                    # if the menu layout if DropDown, then add these items to the web page?
+                    if self.navigation == "DropDown":
+
+                        # add DropDown Citations Style Sheet
+                        fname = "/".join(["styles", "narrative-citations.css"])
+                        url = self.report.build_url_fname(fname, None, self.up)
+                        head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet")
+
+                        # add javascript code to handle if the user's browser is IE6?
+                        fname = "/".join(["js", "jquery-1.3.2.min.js"])
+                        url = self.report.build_url_fname(fname, None, self.up)
+                        head += Html("script", type = "text/javascript", language = "javascript", src = url, inline = True)
+
+                        with Html("script", type = "text/javascript", language = "javascript") as jsc:
+                            head += jsc
+
+                            jsc += """
+        $(function() {
+          if ($.browser.msie && $.browser.version.substr(0,1)<7)
+          {
+			$('li').has('ul').mouseover(function(){
+				$(this).children('ul').show();
+				}).mouseout(function(){
+				$(this).children('ul').hide();
+				})
+          }
+        });"""
 
-                # begin Citation Referents and section title
                     with Html("div", class_ ="subsection", id = "SourceCitationReferents") as section:
                         sourcedetail += section
                         section += Html("h4", _("Citation References"), inline =True)
@@ -4571,37 +4599,10 @@ class SourcePage(BasePage):
                                     for family_handle in family_list:
                                         family = self.dbase_.get_family_from_handle(family_handle)
                                         if (family and family_handle in db_family_handles):
-                                        husband, spouse = [None]*2
-
-                                        husband_handle = family.get_father_handle()
-                                        spouse_handle = family.get_mother_handle()
-
-                                        if (husband_handle and husband_handle in ppl_handle_list):
-                                            husband = self.dbase_.get_person_from_handle(husband_handle)
-                                            if husband:
-                                                husband_name = self.get_name(husband)
-                                                husband_link = self.family_link(family_handle, husband_name,
-                                                                                family.get_gramps_id(), self.up)
-
-                                        if (spouse_handle and spouse_handle in ppl_handle_list):
-                                            spouse = self.dbase_.get_person_from_handle(spouse_handle)
-                                            if spouse:
-                                                spouse_name = self.get_name(spouse)
-                                                spouse_link = self.family_link(family_handle, spouse_name,
-                                                                               family.get_gramps_id(), self.up)
-
-                                        if spouse and husband:
                                             ordered3.extend(
-                                                Html("li", '%s' % husband_link + _("and") + '%s' % spouse_link)
+                                                self.__get_family_link(family, ppl_handle_list)
-                                            )
-                                        elif spouse:
-                                            ordered3.extend(
-                                                Html("li", spouse_link)
-                                            )
-                                        elif husband:
-                                            ordered3.extend(
-                                                Html("li", husband_link)
                                             )
+
                                     list2 += ordered3
                                     ordered2 += list2
 
@@ -4638,41 +4639,11 @@ class SourcePage(BasePage):
                                                     for (classname, newhandle) in self.dbase_.find_backlink_handles(event_handle, ["Family"]):
                                                         family = self.dbase_.get_family_from_handle(newhandle)
                                                         if (family and newhandle in db_family_handles):
-                                                        husband, spouse = [None]*2
-
-                                                        husband_handle = family.get_father_handle()
-                                                        spouse_handle = family.get_mother_handle()
-
-                                                        if (husband_handle and husband_handle in ppl_handle_list):
-                                                            husband = self.dbase_.get_person_from_handle(husband_handle)
-                                                            if husband:
-                                                                husband_name = self.get_name(husband)
-                                                                hlink = self.family_link(newhandle, husband_name,
-                                                                                         family.get_gramps_id(), self.up)
-
-                                                        if (spouse_handle and spouse_handle in ppl_handle_list):
-                                                            spouse = self.dbase_.get_person_from_handle(spouse_handle)
-                                                            if spouse:
-                                                                spouse_name = self.get_name(spouse)
-                                                                slink = self.family_link(newhandle, spouse_name,
-                                                                                         family.get_gramps_id(), self.up)
-
-                                                        if spouse and husband:
-                                                            title_str = ("%s" % hlink + _(" and ") + "%s" % slink + ", %s" % event_date)
                                                             ordered4.extend(
-                                                                Html("li", title_str)
+                                                                self.__get_family_link(family, ppl_handle_list)
-                                                            )
-                                                        elif spouse:
-                                                            ordered4.extend(
-                                                                Html("li", slink + ", %s" % event_date, inline = True)
-                                                            )
-                                                        elif husband:
-                                                            ordered4.extend(
-                                                                Html("li", hlink + ", %s" % event_date, inline = True)
                                                             )
 
-                                            # any other event type...
+                                                # any other event types...
-                                            # this occurs when an event has multiple participants...
                                                 else:
                                                     back_handle_list = self.dbase_.find_backlink_handles(event_handle, ["Person"])
                                                     back_handle_list = [(classname, handle) for (classname, handle) in back_handle_list]
@@ -4685,10 +4656,11 @@ class SourcePage(BasePage):
                                                                         Html("li", self.event_link(event_handle, self.get_name(obj) + ", %s" % event_date,
                                                                                                    event.get_gramps_id(), self.up))
                                                                     )
+                                                        # this occurs when an event has multiple participants...
                                                         else:
                                                             list4 = Html("li", event_date)
 
-                                                        # ordered and list item #5, Multiple Participants...
+                                                            # ordered and list item #5, Multiple Participants in an event...
                                                             ordered5 = Html("ol", class_ = "Col5 Multiple-Participants")
 
                                                             for (classname, newhandle) in back_handle_list:
@@ -4804,6 +4776,36 @@ class SourcePage(BasePage):
         # and close the file
         self.XHTMLWriter(sourcepage, of)
 
+    def __get_family_link(self, family, ppl_handle_list):
+        """
+        returns the husband and spouse link...
+        """
+        husband, spouse = [None]*2
+
+        husband_handle = family.get_father_handle()
+        spouse_handle = family.get_mother_handle()
+
+        if (husband_handle and husband_handle in ppl_handle_list):
+            husband = self.dbase_.get_person_from_handle(husband_handle)
+            if husband:
+                husband_name = self.get_name(husband)
+                husband_link = self.family_link(family.get_handle(), husband_name, family.get_gramps_id(), self.up)
+
+        if (spouse_handle and spouse_handle in ppl_handle_list):
+            spouse = self.dbase_.get_person_from_handle(spouse_handle)
+            if spouse:
+                spouse_name = self.get_name(spouse)
+                spouse_link = self.family_link(family.get_handle(), spouse_name, family.get_gramps_id(), self.up)
+
+        web_link = Html("li")
+        if spouse and husband:
+            web_link += 'H%s' % husband_link + _("and") + '%s' % spouse_link
+        elif spouse:
+            web_link += spouse_link
+        elif husband:
+            web_link += husband_link
+        return web_link
+
 class CitationPage(BasePage):
     def __(self, report, title, citation_handle):
         self.dbase_ = report.database
@@ -7078,16 +7080,23 @@ class NavWebReport(Report):
         if CSS[self.css]["navigation"]: 
             if self.navigation == "Horizontal":
                 fname = CSS["Horizontal-Menus"]["filename"]
-
             elif self.navigation == "Vertical":
                 fname = CSS["Vertical-Menus"]["filename"]
             elif self.navigation == "Fade":
                 fname = CSS["Fade-Menus"]["filename"]
-            elif self.navigation == "Drop":
+            elif self.navigation == "DropDown":
-                fname = CSS["Drop-Menus"]["filename"]
+                fname = CSS["DropDown-Menus"]["filename"]
             self.copy_file(fname, "narrative-menus.css", "styles")
 
-        # copy narrative-maps if Place or Family Map pages?
+            # copy SourcePage DropDown Citations Style Sheet
+            fname = CSS["DropDown-Citations"]["filename"]
+            self.copy_file(fname, "narrative-citations.css", "styles")
+
+            # copy jquery javascript file...
+            fname = CSS["DropDown-Citations"]["javascript"]
+            self.copy_file(fname, "jquery-1.3.2.min.js", "js")
+
+        # copy narrative-maps Style Sheet if Place or Family Map pages are being created?
         if (self.placemappages or self.familymappages):
             fname = CSS["NarrativeMaps"]["filename"] 
             self.copy_file(fname, "narrative-maps.css", "styles")
@@ -7729,12 +7738,11 @@ class NavWebOptions(MenuReportOptions):
         self.__css.connect("value-changed", self.__stylesheet_changed)
 
         _nav_opts = [
-            (_("Horizontal - Default"),              "Horizontal"),
+            (_("Horizontal -- Default"),              "Horizontal"),
-            (_("Vertical - Left side"),              "Vertical"),
+            (_("Vertical   -- Left Side"),            "Vertical"),
             (_("Fade       -- WebKit Browsers Only"), "Fade"),
-            (_("Drop-Down -- WebKit Browsers Only"), "Drop")
+            (_("Drop-Down  -- WebKit Browsers Only"), "DropDown")
         ]
-
         self.__navigation = EnumeratedListOption(_("Navigation Menu Layout"), _nav_opts[0][1])
         for layout in _nav_opts:
             self.__navigation.add_item(layout[1], layout[0])
@@ -7744,8 +7752,7 @@ class NavWebOptions(MenuReportOptions):
         self.__stylesheet_changed()
 
         self.__ancestortree = BooleanOption(_("Include ancestor's tree"), True)
-        self.__ancestortree.set_help(_('Whether to include an ancestor graph '
+        self.__ancestortree.set_help(_('Whether to include an ancestor graph on each individual page'))
-                                       'on each individual page'))
         addopt( "ancestortree", self.__ancestortree )
         self.__ancestortree.connect('value-changed', self.__graph_changed)
 

src/plugins/webstuff/css/Makefile.am

@@ -16,6 +16,7 @@ DATAFILES = \
 	Web_Basic-Peach.css \
 	Web_Basic-Spruce.css \
 	Web_DropDown-Menus.css \
+	Web_DropDown-Citations.css \
 	Web_Fade-Menus.css \
 	Web_Horizontal-Menus.css \
 	Web_Mainz.css \

src/plugins/webstuff/css/Web_DropDown-Citations.css

@@ -0,0 +1,203 @@
+/* Main menu */
+
+#menu
+{
+	width: 100%;
+	margin: 0;
+	padding: 10px 0 0 0;
+	list-style: none;  
+	background: #111;
+	background: -moz-linear-gradient(#444, #111); 
+    background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));	
+	background: -webkit-linear-gradient(#444, #111);	
+	background: -o-linear-gradient(#444, #111);
+	background: -ms-linear-gradient(#444, #111);
+	background: linear-gradient(#444, #111);
+	-moz-border-radius: 50px;
+	border-radius: 50px;
+	-moz-box-shadow: 0 2px 1px #9c9c9c;
+	-webkit-box-shadow: 0 2px 1px #9c9c9c;
+	box-shadow: 0 2px 1px #9c9c9c;
+}
+
+#menu li
+{
+	float: left;
+	padding: 0 0 10px 0;
+	position: relative;
+	line-height: 0;
+}
+
+#menu a 
+{
+	float: left;
+	height: 25px;
+	padding: 0 25px;
+	color: #999;
+	text-transform: uppercase;
+	font: bold 12px/25px Arial, Helvetica;
+	text-decoration: none;
+	text-shadow: 0 1px 0 #000;
+}
+
+#menu li:hover > a
+{
+	color: #fafafa;
+}
+
+*html #menu li a:hover /* IE6 */
+{
+	color: #fafafa;
+}
+
+#menu li:hover > ul
+{
+	display: block;
+}
+
+/* Sub-menu */
+
+#menu ul
+{
+    list-style: none;
+    margin: 0;
+    padding: 0;    
+    display: none;
+    position: absolute;
+    top: 35px;
+    left: 0;
+    z-index: 99999;    
+    background: #444;
+    background: -moz-linear-gradient(#444, #111);
+    background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
+    background: -webkit-linear-gradient(#444, #111);    
+    background: -o-linear-gradient(#444, #111);	
+    background: -ms-linear-gradient(#444, #111);	
+    background: linear-gradient(#444, #111);
+    -moz-box-shadow: 0 0 2px rgba(255,255,255,.5);
+    -webkit-box-shadow: 0 0 2px rgba(255,255,255,.5);
+    box-shadow: 0 0 2px rgba(255,255,255,.5);	
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+}
+
+#menu ul ul
+{
+  top: 0;
+  left: 150px;
+}
+
+#menu ul li
+{
+    float: none;
+    margin: 0;
+    padding: 0;
+    display: block;  
+    -moz-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
+    -webkit-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
+    box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
+}
+
+#menu ul li:last-child
+{   
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;    
+}
+
+#menu ul a
+{    
+    padding: 10px;
+	height: 10px;
+	width: 130px;
+	height: auto;
+    line-height: 1;
+    display: block;
+    white-space: nowrap;
+    float: none;
+	text-transform: none;
+}
+
+*html #menu ul a /* IE6 */
+{    
+	height: 10px;
+}
+
+*:first-child+html #menu ul a /* IE7 */
+{    
+	height: 10px;
+}
+
+#menu ul a:hover
+{
+    background: #0186ba;
+	background: -moz-linear-gradient(#04acec,  #0186ba);	
+	background: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
+	background: -webkit-linear-gradient(#04acec,  #0186ba);
+	background: -o-linear-gradient(#04acec,  #0186ba);
+	background: -ms-linear-gradient(#04acec,  #0186ba);
+	background: linear-gradient(#04acec,  #0186ba);
+}
+
+#menu ul li:first-child > a
+{
+    -moz-border-radius: 5px 5px 0 0;
+    border-radius: 5px 5px 0 0;
+}
+
+#menu ul li:first-child > a:after
+{
+    content: '';
+    position: absolute;
+    left: 30px;
+    top: -8px;
+    width: 0;
+    height: 0;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-bottom: 8px solid #444;
+}
+
+#menu ul ul li:first-child a:after
+{
+    left: -8px;
+    top: 12px;
+    width: 0;
+    height: 0;
+    border-left: 0;	
+    border-bottom: 5px solid transparent;
+    border-top: 5px solid transparent;
+    border-right: 8px solid #444;
+}
+
+#menu ul li:first-child a:hover:after
+{
+    border-bottom-color: #04acec; 
+}
+
+#menu ul ul li:first-child a:hover:after
+{
+    border-right-color: #04acec; 
+    border-bottom-color: transparent; 	
+}
+
+
+#menu ul li:last-child > a
+{
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+}
+
+/* Clear floated elements */
+#menu:after 
+{
+	visibility: hidden;
+	display: block;
+	font-size: 0;
+	content: " ";
+	clear: both;
+	height: 0;
+}
+
+* html #menu             { zoom: 1; } /* IE6 */
+*:first-child+html #menu { zoom: 1; } /* IE7 */

src/plugins/webstuff/css/Web_DropDown-Menus.css

@@ -41,7 +41,7 @@ div#header {
 
 /*     Drop Down Navigation Menu
 ------------------------------------------------------ */
-#menu {
+#dropmenu {
     width: 100%;
     margin: 0;
     padding: 10px 0 0 0;
@@ -59,12 +59,12 @@ div#header {
     -webkit-box-shadow: 0 2px 1px #9c9c9c;
     box-shadow: 0 2px 1px #9c9c9c;
 }
-#menu li {
+#dropmenu li {
     float: left;
     padding: 0 0 10px 0;
     position: relative;
 }
-#menu a {
+#dropmenu a {
     float: left;
     height: 25px;
     padding: 0 25px;
@@ -74,21 +74,21 @@ div#header {
     text-decoration: none;
     text-shadow: 0 1px 0 #000;
 }
-#menu li:hover > a {
+#dropmenu li:hover > a {
     color: #fafafa
 }
 
-*html #menu li a:hover /* IE6 */
+*html #dropmenu li a:hover /* IE6 */
 {
     color: #fafafa
 }
-#menu li:hover > ul {
+#dropmenu li:hover > ul {
     display: block
 }
 
 /*     Sub-menu
 ------------------------------------------------------ */
-#menu ul {
+#dropmenu ul {
     list-style: none;
     margin: 0;
     padding: 0;
@@ -107,7 +107,7 @@ div#header {
     -moz-border-radius: 5px;
     border-radius: 5px;
 }
-#menu ul li {
+#dropmenu ul li {
     float: none;
     margin: 0;
     padding: 0;
@@ -116,12 +116,12 @@ div#header {
     -webkit-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
     box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
 }
-#menu ul li:last-child {
+#dropmenu ul li:last-child {
     -moz-box-shadow: none;
     -webkit-box-shadow: none;
     box-shadow: none;
 }
-#menu ul a {
+#dropmenu ul a {
     padding: 10px;
     height: auto;
     line-height: 1;
@@ -130,17 +130,17 @@ div#header {
     float: none;
     text-transform: none;
 }
-*html #menu ul a /* IE6 */
+*html #dropmenu ul a /* IE6 */
 {
     height: 10px;
     width: 150px;
 }
-*:first-child+html #menu ul a /* IE7 */
+*:first-child+html #dropmenu ul a /* IE7 */
 {
     height: 10px;
     width: 150px;
 }
-#menu ul a:hover {
+#dropmenu ul a:hover {
     background: #0186ba;
     background: -moz-linear-gradient(#04acec,  #0186ba);
     background: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
@@ -149,11 +149,11 @@ div#header {
     background: -ms-linear-gradient(#04acec,  #0186ba);
     background: linear-gradient(#04acec,  #0186ba);
 }
-#menu ul li:first-child a {
+#dropmenu ul li:first-child a {
     -moz-border-radius: 5px 5px 0 0;
     border-radius: 5px 5px 0 0;
 }
-#menu ul li:first-child a:after {
+#dropmenu ul li:first-child a:after {
     content: '';
     position: absolute;
     left: 30px;
@@ -164,17 +164,17 @@ div#header {
     border-right: 5px solid transparent;
     border-bottom: 8px solid #444;
 }
-#menu ul li:first-child a:hover:after {
+#dropmenu ul li:first-child a:hover:after {
     border-bottom-color: #04acec
 }
-#menu ul li:last-child a {
+#dropmenu ul li:last-child a {
     -moz-border-radius: 0 0 5px 5px;
     border-radius: 0 0 5px 5px;
 }
 
 /*     Clear floated elements
 ------------------------------------------------------ */
-#menu:after {
+#dropmenu:after {
     visibility: hidden;
     display: block;
     font-size: 0;
@@ -183,8 +183,8 @@ div#header {
     height: 0;
 }
 
-* html #menu             { zoom: 1; } /* IE6 */
+* html #dropmenu             { zoom: 1; } /* IE6 */
-*:first-child+html #menu { zoom: 1; } /* IE7 */
+*:first-child+html #dropmenu { zoom: 1; } /* IE7 */
 
 /*    Alphabet Navigation and Year Menu
 ------------------------------------------------------ */

src/plugins/webstuff/webstuff.py

@@ -122,18 +122,23 @@ def load_on_reg(dbstate, uistate, plugin):
         ["Horizontal-Menus", 0, "", 
          path_css('Web_Horizontal-Menus.css'), None, [], [] ],
 
-        # Horizontal Fade Navigation Style Sheet
-        ["Fade-Menus", 0, "", 
-         path_css('Web_Fade-Menus.css'), None, [], [] ],
-
-        # WebKit/ Html5/ CSS3 Drop Down Menus Style Sheet
-        ["Drop-Menus", 0, "",
-         path_css("Web_DropDown-Menus.css"), None, [], [] ],
-
         # Vertical Navigation Menus Style Sheet
         ["Vertical-Menus", 0, "", 
          path_css('Web_Vertical-Menus.css'), None, [], [] ],
 
+        # WebKit/ Html5/ CSS3 Fade Navigation Menus Style Sheet
+        ["Fade-Menus", 0, "", 
+         path_css('Web_Fade-Menus.css'), None, [], [] ],
+
+        # WebKit/ Html5/ CSS3 Drop Down Navigation Menus Style Sheet
+        ["DropDown-Menus", 0, "",
+         path_css("Web_DropDown-Menus.css"), None, [], [], ],
+
+        # WebKit/ Html5/ CSS3 Drop Down Citations Style Sheet
+        ["DropDown-Citations", 0, "",
+         path_css("Web_DropDown-Citations.css"), None, [],
+         path_js("jquery-1.3.2.min.js"),                 ],
+
         # GeoView style sheet with its image
         ["GeoView", 0, "GeoView", 
          path_css("GeoView.css"), None,