From d99f44650cd3130e9a4ecc4c4bf66e79fbd4200a Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Mon, 18 May 2009 04:25:42 +0100 Subject: [PATCH] [svn] Turn main menu into dropdown (well actually, drop up) menu. --- media/css/main3.css | 31 +++-------------------- media/js/base.js | 61 ++++++++++++++++++++++++++++++--------------- templates/base.html | 30 ++++++++++++++++++++-- 3 files changed, 73 insertions(+), 49 deletions(-) diff --git a/media/css/main3.css b/media/css/main3.css index 384d9b3..77657a0 100644 --- a/media/css/main3.css +++ b/media/css/main3.css @@ -1,20 +1,3 @@ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td - { - - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; - } - html, body { height: 100%; } @@ -343,16 +326,10 @@ h1 { #footerLinks{ position:fixed; - text-align: center; - bottom:0; - left:0; - width:100%; - background-color:#000; - color:#999 -} - -#footerLinks a{ - color:#FFF + bottom:0px; + padding: 0; + margin-left:130px; + margin-right:130px; } /*.fadeIn { diff --git a/media/js/base.js b/media/js/base.js index 0dc562b..7a7ed5e 100644 --- a/media/js/base.js +++ b/media/js/base.js @@ -1,4 +1,22 @@ +/* The following serves to stretch the content div to the bottom of the margin images, or vice versa*/ +function contentHeight(){ +setMaxHeight($(".rightMargin,#content,.leftMargin,#col2"),$("#content")); +}; + +function setMaxHeight(group, target) { + tallest = 0; + group.each(function() { + thisHeight = $(this).height(); + if(thisHeight > tallest) { + tallest = thisHeight; + } + }); + target.height(tallest); +} + + +/*This is the jquery comment stuff */ $(document).ready(function() { $('.searchable li').quicksearch({ @@ -19,6 +37,11 @@ $(".toggleEyeCandy").click(function () { $(".toggleEyeCandy").toggle(); }); +$(".toggleMenu").click(function () { + $("ul.dropdown li:not(.toggleMenu)").toggle(); + $(".toggleMenu").toggle(); + }); + $(".nav").css('opacity','7') $(".footer").hide(); $(".fadeIn").hide(); @@ -36,11 +59,11 @@ function linkHover(hoverLink,image){ $(hoverLink).hover( function() { $(image).fadeIn("slow"); - $(hoverLink).css("background","gray"); +/* $(hoverLink).css("background","gray");*/ }, function() { $(image).fadeOut("slow"); - $(hoverLink).css("background","black"); +/* $(hoverLink).css("background","black");*/ } ); @@ -48,27 +71,25 @@ $(hoverLink).hover( }; -linkHover("#expoWebsiteLink","#richardBanner"); -linkHover("#cuccLink","#timeMachine"); +linkHover("#cavesLink","#richardBanner"); +linkHover("#caversLink","#timeMachine"); linkHover("#surveyBinderLink","#surveyHover"); linkHover("#troggle","#timeMachine"); +/*dropdown (well, up actually) menu code from http://css-tricks.com/simple-jquery-dropdowns/*/ +$("ul.dropdown li").hover( + function(){ + $(this).addClass("hover"); + $('ul:first',this).css('visibility','visible') + }, + + function(){ + $(this).removeClass("hover"); + $('ul:first',this).css('visibility', 'hidden'); + }); + $("ul.dropdown li ul li:has(ul)").find("a:first").append(" » "); +/* end dropdown menu code */ + }); -function contentHeight(){ -setMaxHeight($(".rightMargin,#content,.leftMargin,#col2"),$("#content")); -}; - -function setMaxHeight(group, target) { - tallest = 0; - group.each(function() { - thisHeight = $(this).height(); - if(thisHeight > tallest) { - tallest = thisHeight; - } - }); - target.height(tallest); -} - - diff --git a/templates/base.html b/templates/base.html index de1f73c..ff37cd0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,10 +3,12 @@ + {% block title %}Troggle{% endblock %} + @@ -59,7 +61,31 @@ window.onload = contentHeight; {% endblock margins %} -