Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
77dcb015f3
|
@ -9,8 +9,8 @@ end
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<div class="navigation">
|
<div class="navigation">
|
||||||
<span class="skipNav"><a href='#navEnd'>Skip the Navigation Links</a> |</span>
|
<span class="skipNav"><a href='#navEnd'>Skip the Navigation Links</a> | </span>
|
||||||
<%- if params['action'] != 'published' then -%>
|
<%- if params['action'] != 'published' then -%>
|
||||||
<%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
|
<%= 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 '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' %> |
|
<%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %> |
|
||||||
|
@ -23,9 +23,9 @@ end
|
||||||
onfocus="this.value == 'Search' ? this.value = '' : true"
|
onfocus="this.value == 'Search' ? this.value = '' : true"
|
||||||
onblur="this.value == '' ? this.value = 'Search' : true" /></fieldset>
|
onblur="this.value == '' ? this.value = 'Search' : true" /></fieldset>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else -%>
|
<%- else -%>
|
||||||
<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
|
<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
|
||||||
<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %>
|
<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %>
|
||||||
<% end-%>
|
<% end-%>
|
||||||
<span id='navEnd'></span>
|
<span id='navEnd'></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue