Changes to keep up with current css in trunk

svn: r18307
This commit is contained in:
Doug Blank 2011-10-13 00:13:00 +00:00
parent 5001870f8d
commit f7afdc9f6e
2 changed files with 5 additions and 6 deletions

View File

@ -14,7 +14,6 @@
<link href="/images/favicon2.ico" type="image/x-icon" rel="shortcut icon" />
{% block css %}
<link media="screen" href="/styles/css/behaviour.css" type="text/css" rel="stylesheet" />
<link media="screen" href="/styles/css/Web_Horizontal-Menus.css" type="text/css" rel="stylesheet" />
<link media="screen" href="/styles/css/{{css_theme}}" type="text/css" rel="stylesheet" />
<link media="print" href="/styles/css/Web_Print-Default.css" type="text/css" rel="stylesheet" />
<link type="text/css" href="/styles/css/swanky-purse/jquery-ui-1.7.2.custom.css" rel="stylesheet" />
@ -22,16 +21,16 @@
<script type="text/javascript" src="/styles/js/jquery-ui-1.7.2.custom.min.js"></script>
{% endblock %}
</head>
<body id= "NarrativeWeb" onload="document.getElementById('get_focus').focus();">
<body onload="document.getElementById('get_focus').focus();">
<div id="header">
<h1 id="SiteTitle">{% block heading %}Gramps-Connect{% endblock %}</h1>
</div>
<div id="navigation">
{% block navigation %}
<ul>
<li class="{{ tview|currentSection:"home" }}"><a href="/">Home</a></li>
<li {{ tview|currentSection:"home" }}><a href="/">Home</a></li>
{% for view in views %}
<li class="{{tview|currentSection:view.1 }}"><a href="/{{view.1}}/">{{view.0}}</a></li>
<li {{tview|currentSection:view.1 }}><a href="/{{view.1}}/">{{view.0}}</a></li>
{% endfor %}
{% if user.is_authenticated %}
<li><a href="/report">Reports</a></li>

View File

@ -106,8 +106,8 @@ register.filter('missing', missing)
def currentSection(view1, view2):
if view1.strip().lower() == view2.strip().lower():
return "CurrentSection"
return "OtherSection"
return "class=CurrentSection"
return ""
currentSection.is_safe = True
register.filter('currentSection', currentSection)