Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-11-09 12:01:20 -06:00
commit 7189863225
2 changed files with 11 additions and 3 deletions

View file

@ -9,7 +9,8 @@ end
%>
<div class="navigation">
<% if params['action'] != 'published' then %>
<span class="skipNav"><a href='#navEnd'>Skip the Navigation Links</a> |</span>
<%- if params['action'] != 'published' then -%>
<%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
<%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> |
<%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %> |
@ -22,8 +23,9 @@ end
onfocus="this.value == 'Search' ? this.value = '' : true"
onblur="this.value == '' ? this.value = 'Search' : true" /></fieldset>
<% end %>
<% else %>
<% else -%>
<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %>
<% end%>
<% end-%>
<span id='navEnd'></span>
</div>

View file

@ -6,6 +6,12 @@ font-size:1em;
line-height:1.3em;
}
.skipNav {
position:relative;
left:-1000em;
font-size:0em;
}
#Container {
margin:0 10px;
text-align:center;