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

XHTML validity fixes from ticket:138 [JosephSHuang]

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-04-28 05:35:58 +00:00
parent eae0312932
commit 396c651487
4 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title> <title>
@ -49,7 +48,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<body> <body>
<div id="Container"> <div id="Container">
<div id="Content"> <div id="Content">
<h1 id="pageName"> <h1 id="pageName">
<% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %> <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>
<%= @web.name %> <%= @web.name %>

4
app/views/navigation.rhtml
View file

@ -3,7 +3,7 @@ def list_item(text, link_options, description, accesskey = nil)
link_options[:controller] = 'wiki' link_options[:controller] = 'wiki'
link_options[:web] = @web.address link_options[:web] = @web.address
link_to_unless_current(text, link_options, :title => description, :accesskey => accesskey) { link_to_unless_current(text, link_options, :title => description, :accesskey => accesskey) {
content_tag('b', text, 'title' => description, 'accesskey' => accesskey, 'class' => 'navOn') content_tag('b', text, 'title' => description, 'class' => 'navOn')
} }
end end
%> %>
@ -22,7 +22,7 @@ end
'Download a zip with all the pages in this wiki', 'X' 'Download a zip with all the pages in this wiki', 'X'
%> | %> |
<input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search"
onClick="this.value == 'Search' ? this.value = '' : true" /> onfocus="if (this.value == 'Search' ) this.value = '' " />
<% 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' %> |
<% end%> <% end%>

2
app/views/wiki/page.rhtml
View file

@ -98,7 +98,7 @@
<% end %> <% end %>
</div> </div>
<script language="Javascript"> <script language="Javascript" type="text/Javascript">
function toggleChanges() { function toggleChanges() {
if (document.getElementById("changes").style.display == "none") { if (document.getElementById("changes").style.display == "none") {
document.getElementById("changes").style.display = "block"; document.getElementById("changes").style.display = "block";

18
public/stylesheets/instiki.css
View file

@ -28,22 +28,22 @@ a { color: #000; }
a:visited { color: #666; } a:visited { color: #666; }
a:hover { color: #fff; background-color:#000; } a:hover { color: #fff; background-color:#000; }
h1, h2, h3 { color: #333; font-family: georgia, verdana; } h1, h2, h3 { color: #333; font-family: georgia, verdana, sans-serif; }
h1 { font-size: 28px } h1 { font-size: 28px }
h2 { font-size: 19px } h2 { font-size: 19px }
h3 { font-size: 16px } h3 { font-size: 16px }
h1#pageName { h1#pageName {
margin: 5px 0px 0px 0px; margin: 5px 0 0;
padding: 0px 0px 0px 0px; padding: 0;
line-height: 28px; line-height: 28px;
} }
h1#pageName small { h1#pageName small {
color: grey; color: #444;
line-height: 10px; line-height: 10px;
font-size: 10px; font-size: 10px;
padding: 0px; padding: 0;
} }
a.nav, a.nav:link, a.nav:visited { color: #000; } a.nav, a.nav:link, a.nav:visited { color: #000; }
@ -72,7 +72,7 @@ li { margin-bottom: 7px }
.navOn{ .navOn{
font-size: 11px; font-size: 11px;
color: grey; color: #444;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
} }
@ -107,7 +107,7 @@ pre {
ol.setup { ol.setup {
font-size: 19px; font-size: 19px;
font-family: georgia, verdana; font-family: georgia, verdana, sans-serif;
padding-left: 25px; padding-left: 25px;
} }
@ -149,13 +149,13 @@ ol.setup li {
} }
#error { #error {
color: darkred; color: #8b0000;
font-style: italic; font-style: italic;
width: 600px; width: 600px;
} }
#info { #info {
color: darkgreen; color: #006400;
font-style: italic; font-style: italic;
width: 600px; width: 600px;
} }