deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sync with latest Instiki trunk (to the extent that the bizarre stuff being committed there makes any sense).

Browse source
This commit is contained in:
Jacques Distler 2007-03-08 22:35:49 -06:00
parent a656772622
commit 46e78c2317
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/admin/edit_web.rhtml
View file

@ -61,8 +61,7 @@
<br/> <br/>
</p> </p>
<a href="#" <a href="#" onclick="toggleView('additionalStyle');return false;">
onclick="document.getElementById('additionalStyle').style.display='block';return false;">
Stylesheet tweaks &gt;&gt;</a> Stylesheet tweaks &gt;&gt;</a>
<em> <em>
- add or change styles used by this web; styles defined here take precedence over - add or change styles used by this web; styles defined here take precedence over
@ -70,8 +69,7 @@
tags.</em> tags.</em>
<br/> <br/>
<textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20" <textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
style="display: none; margin-top: 10px; margin-bottom: 5px;" style="display:none" name="additional_style"><%= @web.additional_style %>
name="additional_style"><%= @web.additional_style %>
</textarea> </textarea>
</div> </div>

2
app/views/layouts/default.rhtml
View file

@ -30,7 +30,7 @@
<%= @style_additions %> <%= @style_additions %>
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>
</style> </style>
<%= javascript_include_tag :defaults %>
<% if @web %> <% 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_headlines') %>
<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %> <%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %>

5
public/javascripts/application.js
View file

@ -1,2 +1,7 @@
// Place your application-specific JavaScript functions and classes here // Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults // This file is automatically included by javascript_include_tag :defaults
function toggleView(id)
{
(document.getElementById(id).style.display == 'block') ? document.getElementById(id).style.display='none' : document.getElementById(id).style.display='block';
}

2
public/stylesheets/instiki.css
View file

@ -292,8 +292,6 @@ white-space:nowrap;
} }
div#editForm textarea#content { div#editForm textarea#content {
height:400px;
width:70%;
} }
div#MarkupHelp { div#MarkupHelp {