From 396c651487e0ec91a4fd61b0a31f861d5678c65f Mon Sep 17 00:00:00 2001 From: Alexey Verkhovsky Date: Thu, 28 Apr 2005 05:35:58 +0000 Subject: [PATCH] XHTML validity fixes from ticket:138 [JosephSHuang] --- app/views/layouts/default.rhtml | 2 - app/views/navigation.rhtml | 8 +-- app/views/wiki/page.rhtml | 2 +- public/stylesheets/instiki.css | 112 ++++++++++++++++---------------- 4 files changed, 61 insertions(+), 63 deletions(-) diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index a596beab..42202b54 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -1,7 +1,6 @@ - @@ -49,7 +48,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <body> <div id="Container"> <div id="Content"> - <h1 id="pageName"> <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %> <%= @web.name %> diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml index 66bc1198..90753eb7 100644 --- a/app/views/navigation.rhtml +++ b/app/views/navigation.rhtml @@ -3,7 +3,7 @@ def list_item(text, link_options, description, accesskey = nil) link_options[:controller] = 'wiki' link_options[:web] = @web.address 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 %> @@ -15,14 +15,14 @@ end <%= 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 'Authors', {:action => 'authors'}, 'Who wrote what' %> | <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | <%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' - %> | + %> | <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 %> <%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | <% end%> diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml index 3e46ed23..6226a665 100644 --- a/app/views/wiki/page.rhtml +++ b/app/views/wiki/page.rhtml @@ -98,7 +98,7 @@ <% end %> </div> -<script language="Javascript"> +<script language="Javascript" type="text/Javascript"> function toggleChanges() { if (document.getElementById("changes").style.display == "none") { document.getElementById("changes").style.display = "block"; diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css index 4b34102e..d76fb133 100644 --- a/public/stylesheets/instiki.css +++ b/public/stylesheets/instiki.css @@ -28,22 +28,22 @@ a { color: #000; } a:visited { color: #666; } 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 } h2 { font-size: 19px } h3 { font-size: 16px } h1#pageName { - margin: 5px 0px 0px 0px; - padding: 0px 0px 0px 0px; - line-height: 28px; + margin: 5px 0 0; + padding: 0; + line-height: 28px; } h1#pageName small { - color: grey; - line-height: 10px; + color: #444; + line-height: 10px; font-size: 10px; - padding: 0px; + padding: 0; } a.nav, a.nav:link, a.nav:visited { color: #000; } @@ -53,16 +53,16 @@ li { margin-bottom: 7px } .navigation { margin-top: 5px; - font-size : 12px; + font-size : 12px; color: #999; } .navigation a:hover { color: #fff; background-color:#000; } .navigation a { - font-size: 11px; - color: black; - font-weight: bold; + font-size: 11px; + color: black; + font-weight: bold; } .navigation small a { @@ -71,31 +71,31 @@ li { margin-bottom: 7px } } .navOn{ - font-size: 11px; - color: grey; - font-weight: bold; - text-decoration: none; + font-size: 11px; + color: #444; + font-weight: bold; + text-decoration: none; } .help { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 11px; } .inputBox { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 11px; background-color: #eee; padding: 5px; margin-bottom: 20px; } blockquote { - display: block; - margin: 0px 0px 20px 0px; - padding: 0px 30px; - font-size:11px; - line-height:17px; + display: block; + margin: 0px 0px 20px 0px; + padding: 0px 30px; + font-size:11px; + line-height:17px; font-style: italic; } @@ -107,7 +107,7 @@ pre { ol.setup { font-size: 19px; - font-family: georgia, verdana; + font-family: georgia, verdana, sans-serif; padding-left: 25px; } @@ -131,7 +131,7 @@ ol.setup li { } .diffins, ins.diffmod { - background: lightgreen; + background: lightgreen; } #footer { @@ -149,74 +149,74 @@ ol.setup li { } #error { - color: darkred; + color: #8b0000; font-style: italic; width: 600px; } #info { - color: darkgreen; + color: #006400; font-style: italic; width: 600px; } #TextileHelp table { - margin-bottom: 0; + margin-bottom: 0; } #TextileHelp table+h3 { - margin-top: 11px; + margin-top: 11px; } #TextileHelp table td { - font-size: 11px; - padding: 3px; - vertical-align: top; - border-top: 1px dotted #ccc; + font-size: 11px; + padding: 3px; + vertical-align: top; + border-top: 1px dotted #ccc; } #TextileHelp table td.arrow { - padding-right: 5px; - padding-left: 10px; - color: #999; + padding-right: 5px; + padding-left: 10px; + color: #999; } #TextileHelp table td.label { - font-weight: bold; - white-space: nowrap; - font-size: 10px; - padding-right: 15px; - color: #000; + font-weight: bold; + white-space: nowrap; + font-size: 10px; + padding-right: 15px; + color: #000; } #TextileHelp h3 { - font-size: 11px; - font-weight: bold; - font-weight: normal; - margin: 0 0 5px 0; - padding: 5px 0 0 0; + font-size: 11px; + font-weight: bold; + font-weight: normal; + margin: 0 0 5px 0; + padding: 5px 0 0 0; } #TextileHelp p { - font-size: 10px; + font-size: 10px; } .rightHandSide { - float: right; - width: 147px; - margin-left: 10px; - padding-left: 20px; - border-left: 1px dotted #ccc; + float: right; + width: 147px; + margin-left: 10px; + padding-left: 20px; + border-left: 1px dotted #ccc; } .rightHandSide p { - font-size: 10px; + font-size: 10px; } .newsList { - margin-top: 20px; + margin-top: 20px; } .newsList p { margin-bottom:30px -} \ No newline at end of file +}