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 %>

8
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
%> %>
@ -15,14 +15,14 @@ end
<%= 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'}, <%= list_item 'Recently Revised', {:action =>'recently_revised'},
'Pages sorted by when they were last changed', 'U' 'Pages sorted by when they were last changed', 'U'
%> | %> |
<%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> | <%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> |
<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> |
<%= list_item 'Export', {:action => 'export'}, <%= list_item 'Export', {:action => 'export'},
'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";

112
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; }
@ -53,16 +53,16 @@ li { margin-bottom: 7px }
.navigation { .navigation {
margin-top: 5px; margin-top: 5px;
font-size : 12px; font-size : 12px;
color: #999; color: #999;
} }
.navigation a:hover { color: #fff; background-color:#000; } .navigation a:hover { color: #fff; background-color:#000; }
.navigation a { .navigation a {
font-size: 11px; font-size: 11px;
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
.navigation small a { .navigation small a {
@ -71,31 +71,31 @@ 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;
} }
.help { .help {
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 11px; font-size: 11px;
} }
.inputBox { .inputBox {
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 11px; font-size: 11px;
background-color: #eee; background-color: #eee;
padding: 5px; padding: 5px;
margin-bottom: 20px; margin-bottom: 20px;
} }
blockquote { blockquote {
display: block; display: block;
margin: 0px 0px 20px 0px; margin: 0px 0px 20px 0px;
padding: 0px 30px; padding: 0px 30px;
font-size:11px; font-size:11px;
line-height:17px; line-height:17px;
font-style: italic; font-style: italic;
} }
@ -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;
} }
@ -131,7 +131,7 @@ ol.setup li {
} }
.diffins, ins.diffmod { .diffins, ins.diffmod {
background: lightgreen; background: lightgreen;
} }
#footer { #footer {
@ -149,74 +149,74 @@ 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;
} }
#TextileHelp table { #TextileHelp table {
margin-bottom: 0; margin-bottom: 0;
} }
#TextileHelp table+h3 { #TextileHelp table+h3 {
margin-top: 11px; margin-top: 11px;
} }
#TextileHelp table td { #TextileHelp table td {
font-size: 11px; font-size: 11px;
padding: 3px; padding: 3px;
vertical-align: top; vertical-align: top;
border-top: 1px dotted #ccc; border-top: 1px dotted #ccc;
} }
#TextileHelp table td.arrow { #TextileHelp table td.arrow {
padding-right: 5px; padding-right: 5px;
padding-left: 10px; padding-left: 10px;
color: #999; color: #999;
} }
#TextileHelp table td.label { #TextileHelp table td.label {
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
font-size: 10px; font-size: 10px;
padding-right: 15px; padding-right: 15px;
color: #000; color: #000;
} }
#TextileHelp h3 { #TextileHelp h3 {
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
font-weight: normal; font-weight: normal;
margin: 0 0 5px 0; margin: 0 0 5px 0;
padding: 5px 0 0 0; padding: 5px 0 0 0;
} }
#TextileHelp p { #TextileHelp p {
font-size: 10px; font-size: 10px;
} }
.rightHandSide { .rightHandSide {
float: right; float: right;
width: 147px; width: 147px;
margin-left: 10px; margin-left: 10px;
padding-left: 20px; padding-left: 20px;
border-left: 1px dotted #ccc; border-left: 1px dotted #ccc;
} }
.rightHandSide p { .rightHandSide p {
font-size: 10px; font-size: 10px;
} }
.newsList { .newsList {
margin-top: 20px; margin-top: 20px;
} }
.newsList p { .newsList p {
margin-bottom:30px margin-bottom:30px
} }