Sync with latest Instiki trunk (to the extent that the bizarre stuff being committed there makes any sense).
This commit is contained in:
parent
a656772622
commit
46e78c2317
4 changed files with 8 additions and 7 deletions
|
@ -61,8 +61,7 @@
|
|||
<br/>
|
||||
</p>
|
||||
|
||||
<a href="#"
|
||||
onclick="document.getElementById('additionalStyle').style.display='block';return false;">
|
||||
<a href="#" onclick="toggleView('additionalStyle');return false;">
|
||||
Stylesheet tweaks >></a>
|
||||
<em>
|
||||
- add or change styles used by this web; styles defined here take precedence over
|
||||
|
@ -70,8 +69,7 @@
|
|||
tags.</em>
|
||||
<br/>
|
||||
<textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
|
||||
style="display: none; margin-top: 10px; margin-bottom: 5px;"
|
||||
name="additional_style"><%= @web.additional_style %>
|
||||
style="display:none" name="additional_style"><%= @web.additional_style %>
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
<%= @style_additions %>
|
||||
<%= @web ? @web.additional_style : '' %>
|
||||
</style>
|
||||
|
||||
<%= javascript_include_tag :defaults %>
|
||||
<% if @web %>
|
||||
<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>
|
||||
<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue