Safeguarding the past, present and future of RISC OS for everyone
Account
News | Downloads | Bugs | Bounties | Forums | Library
You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.
  • Changesets
  • » Changeset 90

Changeset 90

Updated I2 installation to site-wide look and feel. Uses shared templates.
Application helper changed to alter style of page headings.

  • Comitted by: adh
  • Date: Monday October 16 16:23:09 2006 (over 18 years ago)

Affected files:

  • Added rool/rails/i2/trunk/app/views/shared/
  • Added rool/rails/i2/trunk/app/views/shared/_powered.rhtml
  • Added rool/rails/i2/trunk/app/views/shared/_theme.rhtml
  • Added rool/rails/i2/trunk/app/views/versions/_wiki_words_help.rhtml
  • Updated rool/rails/i2/trunk/app/helpers/application_helper.rb (diff)
  • Updated rool/rails/i2/trunk/app/views/books/feed.rxml (diff)
  • Updated rool/rails/i2/trunk/app/views/layouts/application.rhtml (diff)
  • Updated rool/rails/i2/trunk/app/views/versions/_textile_help.rhtml (diff)
  • Updated rool/rails/i2/trunk/app/views/versions/new.rhtml (diff)
  • Updated rool/rails/i2/trunk/app/views/versions/show.rhtml (diff)
  • Updated rool/rails/i2/trunk/public/stylesheets/instiki.css (diff)

rool/rails/i2/trunk/app/helpers/application_helper.rb:

prev.current 
@title
end
end
17  
  17
def page_heading
if @page && (@page.title == 'Home Page') && (%w( show published print ).include?(@controller.action_name))
@book.name
elsif @book
22   content_tag("small", @book.name) + tag("br") + @title
  22 link_to(@book.name + ':', :controller => '/') + ' ' + @title
else
@title
end
... ...
def differences(original, new)
HTMLDiff.diff(original, new)
end
39  
  39
def link_to_author(author)
link_to(author.name, page_url(:page_title => author)) + " (#{author.ip})"
end
43  
  43
private
def linkize(body, existing_titles)
body.gsub(Version::PAGE_LINK) do

rool/rails/i2/trunk/app/views/books/feed.rxml:

prev.current 
xml.channel do
xml.title(@book.name)
xml.link(home_url)
6   xml.description "Tracking all versions for #{@book.name}"
  6 xml.description "ROOL I2 Wiki: Tracking all versions for #{@book.name}"
xml.language "en-us"
xml.ttl "40"

rool/rails/i2/trunk/app/views/layouts/application.rhtml:

prev.current 
1   <!DOCTYPE html
2   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4  
  1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
6   <head>
7   <title><%= page_title %></title>
  3 <head>
  4 <title><%= page_title %></title>
9   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  6 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  7 <%= auto_discovery_link_tag(:rss, feed_url) %>
  8 <%= stylesheet_link_tag 'instiki' %>
  9 <%= content_tag "style", @style_additions, :type => "text/css" %>
  10 </head>
11   <%= auto_discovery_link_tag(:rss, feed_url) %>
  12 <body>
  13 <%= render 'shared/fixed_header' %>
13   <style type="text/css">
14   h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
15   color: #393;
16   }
  15 <!-- Wiki contents table -->
18   #Container, #Content {
19   width: <%= @content_width || "600" %>px;
20   }
21   </style>
  17 <p />
  18 <table width="85%" cellspacing="0" cellpadding="0" align="center">
  19 <tr valign="top" align="left">
  20 <td width="75%">
  21 <div id="Container">
  22 <div id="Content">
  23 <h2 id="pageName"><%= page_heading %></h2>
23   <%= stylesheet_link_tag 'instiki' %>
24   <%= content_tag "style", @style_additions, :type => "text/css" %>
25   </head>
  25 <div class="navigation">
  26 <%= link_to_unless(@page && @page.title == "Home Page", "Documentation Home", home_url) { content_tag('b', "Documentation Home", 'class' => 'navOn') } %> |
  27 <%= link_to_unless(@title == "All Pages", "All Pages", pages_url) { content_tag('b', "All Pages", 'class' => 'navOn') } %> |
  28 <%= link_to_unless(@title == "Recently Revised", "Recently Revised", recent_url) { content_tag('b', "Recently Revised", 'class' => 'navOn') } %> |
  29 <%= link_to("Feed", feed_url) %>
  30 </div>
27   <body>
28   <div id="Container">
29   <div id="Content">
30   <h1 id="pageName"><%= page_heading %></h1>
  32 <p />
  33 <%= @content_for_layout %>
  34 </div>
  35 </div>
  36 </td>
32   <form class="navigation" id="navigationForm">
33   <%= link_to_unless(@page && @page.title == "Home Page", "Home Page", home_url) { content_tag('b', "Home Page", 'class' => 'navOn') } %> |
34   <%= link_to_unless(@title == "All Pages", "All Pages", pages_url) { content_tag('b', "All Pages", 'class' => 'navOn') } %> |
35   <%= link_to_unless(@title == "Recently Revised", "Recently Revised", recent_url) { content_tag('b', "Recently Revised", 'class' => 'navOn') } %> |
36   <%= link_to("Feed", feed_url) %>
37   </form>
  38 <td>&nbsp;&nbsp;</td>
  39 <td bgcolor="#bbbbbb" class="column_divider"><img src="/images/utilities/blank.gif" width="1" height="1" alt="." border="0" /></td>
  40 <td>&nbsp;&nbsp;</td>
39   <%= @content_for_layout %>
  42 <td width="25%">
  43 <div id="sidebar">
  44 <!-- Simple global search via Google -->
41   <div id="footer">
42   <p><a href="http://instiki.org/">i2</a> on <a href="http://rubyonrails.com/">Rails</a></p>
43   </div>
44   </div>
45   </div>
46   </body>
47   </html>
  46 <div class="sidebar-node">
  47 <h3>Search whole site</h3>
  48
  49 <p />
  50 <form action="http://www.google.com/search" method="get" class="searchform">
  51 <input type="hidden" name="num" value="10" />
  52 <input type="hidden" name="hl" value="en" />
  53 <input type="hidden" name="as_sitesearch" value="pond.org.uk/rails" />
  54 <input type="text" value="" maxlength="256" size="15" name="q" id="q" />
  55 <b><input type="submit" value="Go" name="btnG" /></b>
  56 </form>
  57 </div>
  58
  59 <%= render 'shared/fixed_sidebar' %>
  60
  61 <p >
  62 <div class="sidebar-node">
  63 <h3>Options</h3>
  64
  65 <p />
  66 <ul>
  67 <li><%= link_to_unless(@page && @page.title == "Home Page", "Documentation Home", home_url) { content_tag('b', "Documentation Home", 'class' => 'navOn') } %></li>
  68 <li><%= link_to_unless(@title == "All Pages", "All Pages", pages_url) { content_tag('b', "All Pages", 'class' => 'navOn') } %></li>
  69 <li><%= link_to_unless(@title == "Recently Revised", "Recently Revised", recent_url) { content_tag('b', "Recently Revised", 'class' => 'navOn') } %></li>
  70 <li><%= link_to("Feed", feed_url) %></li>
  71 </ul>
  72 </div>
  73 </div>
  74 </td>
  75 </tr>
  76 </table>
  77
  78 <%= render 'shared/fixed_footer' %>
  79 </body>
  80 </html>

rool/rails/i2/trunk/app/views/versions/_textile_help.rhtml:

prev.current 
1   <h3>Textile formatting tips (<a href="http://hobix.com/textile/quick.html" onClick="quickRedReference(); return false;">advanced</a>)</h3>
2   <table cellspacing="0" cellpadding="0" border="0">
3   <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
4   <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
5   <tr><td>%{color:red}hello%</td><td class="arrow">&rarr;</td><td><span style="color: red;">hello</span></td></tr>
6   <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
7   <tr><td># Numbered list<br /># Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
8   <tr><td>"linkname":URL</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
9   <tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">&rarr;</td><td>Table</td></tr>
10   <tr><td>http://url<br />email@address.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
11   <tr><td>!imageURL!</td><td class="arrow">&rarr;</td><td>Image</td></tr>
12   </table>
13  
  1 <h3>Formatting: Textile</h3>
  2 <p style="border-top: 1px dotted #ccc; margin-top: 0px">
  3 Text is formatted using the Textile markup syntax - find help
  4 <a href="http://hobix.com/textile/quick.html" target="_blank" onClick="quickRedReference(); return false;">here</a>.
  5
<script language="JavaScript">
function quickRedReference() {
16   window.open(
  8 window.open(
"http://hobix.com/textile/quick.html",
"redRef",
"height=600,width=550,channelmode=0,dependent=0," +
"directories=0,fullscreen=0,location=0,menubar=0," +
21   "resizable=0,scrollbars=1,status=1,toolbar=0"
  13 "resizable=0,scrollbars=1,status=1,toolbar=0"
);
}
</script>

rool/rails/i2/trunk/app/views/versions/new.rhtml:

prev.current 
1   <%
  1 <%
@title = "Creating '#{@page.title}'"
@content_width = 720
@hide_navigation = true
%>
7   <div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
8   <%= render :partial => "textile_help" %>
  7 <table border="0" cellspacing="0" cellpadding="0" width="100%">
  8 <tr valign="top">
  9 <td align="left">
  10 <%= form_tag({ :action => "create" }, :id => 'editForm') %>
  11 <%= hidden_field :page, :title %>
10   <h3>Wiki words</h3>
  13 <%= text_area :version, :body, :rows => 24, :cols => 48 %>
12   <p style="border-top: 1px dotted #ccc; margin-top: 0px">
13   Any phrase surrounded by double brackets is a wiki word.
14   </p>
15  
16   <p>
17   Wiki words: <i>[[C++]], [[Let's play again!]]</i><br/>
18   Not wiki words: <i>HomePage, ThreeWordsTogether, [IBM], School</i>
19   </p>
20   </div>
21  
22   <%= form_tag({ :action => "create" }, :id => 'editForm') %>
23   <%= hidden_field :page, :title %>
24  
25   <p><%= text_area :version, :body, :style => "width: 450px; height: 500px" %></p>
26  
27   <p>
28   <%= submit_tag "Save" %> as
29   <%= text_field_tag :author_name, @author_name,
  15 <p>
  16 <%= submit_tag "Save" %> as
  17 <%= text_field_tag :author_name, @author_name,
:onclick => "this.value == 'AnonymousCoward' ? this.value = '' : true" %>
31   or <%= link_to("Cancel", page_url(:page_title => @page)) %>
32   </p>
33   </form>
  19 or <%= link_to("Cancel", page_url(:page_title => @page)) %>
  20 </p>
  21 </td>
  22 <td align="left">
  23 <div id="MarkupHelp">
  24 <%= render :partial => 'textile_help' %>
  25 <%= render :partial => 'wiki_words_help' %>
  26 </div>
  27 </td>
  28 </tr>
  29 </table>

rool/rails/i2/trunk/app/views/versions/show.rhtml:

prev.current 
<% @title = "#{@page.title} (Version ##{@version.number})" %>
  2 <%= markup(@version.body) %>
3   <div id="contentWithoutChanges">
4   <%= markup(@version.body) %>
5   </div>
6  
7   <div id="contentWithChanges">
8   <%= markup(@version.body) %>
9   </div>
10  
<div class="byline">
Created on <%= @version.created_at.to_s(:long) %>
by <%= link_to_author(@version.author) %>
... ...
<%= link_to "Rollback", rollback_url(:page_title => @page, :version_number => @version.number) %>
<% if @version.newer_versions? && @version.newer_versions.size > 1 %>
20   | <%= nlink_to "Forward in time",
  13 | <%= nlink_to "Forward in time",
version_url(:page_title => @page.title, :version_number => @version.number + 1) %>
<small>(<%= @version.newer_versions.size %> more)</small>
... ...
<% end %>
<% if @version.older_versions? %>
31   | <%= nlink_to "Back in time",
  24 | <%= nlink_to "Back in time",
version_url(:page_title => @page, :version_number => @version.number - 1) %>
<small>(<%= @version.older_versions.size %> more)</small>
<% end %>

rool/rails/i2/trunk/public/stylesheets/instiki.css:

prev.current 
1   #Container {
2   float: none;
3   margin: 0 auto;
4   text-align: center;
5   }
  1 /* RISC OS Open Instiki stylesheet.
  2 *
  3 * Based on the Instiki default stylesheet.
  4 */
7   #Content {
8   margin: 0;
9   padding: 5px;
10   text-align: left;
11   border-top: none;
12   float: left;
13   }
  6 @import url("/css/risc_os_open.css");
15   body { background-color: #fff; color: #333; }
  8 /* Set the page heading spacing */
17   body, p, ol, ul, td {
18   font-family: verdana, arial, helvetica, sans-serif;
19   font-size: 13px;
20   line-height: 18px;
  10 H2#pageName
  11 {
  12 margin-bottom: 16px;
}
23   a { color: #000; }
24   a:visited { color: #666; }
25   a:hover {
26   color: #fff;
27   background-color:#000;
  15 DIV#Content H3
  16 {
  17 font: normal 125% Arial, Verdana, Helvetica, sans-serif;
  18 color: #989875;
}
30   .newWikiWord { background-color: #eee; }
31   .newWikiWord a:hover { background-color: white; }
  21 /* Put a thin green line under the byline (revision info),
  22 * above the links to edit the page, view changes etc.
  23 */
33   h1, h2, h3 { color: #333; font-family: georgia, verdana, sans-serif; }
34   h1 { font-size: 28px }
35   h2 { font-size: 19px }
36   h3 { font-size: 16px }
37  
38   h1#pageName {
39   margin: 5px 0 0;
40   padding: 0;
41   line-height: 28px;
  25 DIV.byline
  26 {
  27 margin-bottom: 10px;
  28 border-bottom: 1px solid #E5FFD4;
  29 padding-bottom: 10px;
}
44   h1#pageName small {
45   color: #444;
46   line-height: 10px;
47   font-size: 10px;
48   padding: 0;
49   }
  32 /* Text used in the navigation part of the sidebar for
  33 * the currently selected page.
  34 */
51   a.nav, a.nav:link, a.nav:visited { color: #000; }
52   a.nav:hover { color: #fff; background-color:#000; }
53  
54   li { margin-bottom: 7px }
55  
56   .navigation {
57   margin-top: 5px;
58   font-size : 12px;
59   color: #999;
  36 .sidebar-node .navOn
  37 {
  38 font-size: 90%
}
62   .navigation a:hover { color: #fff; background-color:#000; }
  41 /*
  42 #Container { float: none; margin: 0 15%; text-align: center; }
  43 #Content { margin: 0; padding: 0.3em; text-align: left; border-top: none; float: left; width: 100%; }
64   .navigation a {
65   font-size: 11px;
66   color: black;
67   font-weight: bold;
68   }
  45 table { border: double black; border-collapse: collapse; }
  46 td { border: thin solid grey; }
70   .navigation small a {
71   font-weight: normal;
72   font-size: 11px;
73   }
74  
75   .navOn{
76   font-size: 11px;
77   color: #444;
78   font-weight: bold;
79   text-decoration: none;
80   }
  48 li { margin-bottom: 0.5em; }
  49 */
82   .help {
83   font-family: verdana, arial, helvetica, sans-serif;
84   font-size: 11px;
85   }
  51 .newWikiWord { background-color: #BFBFBF; }
  52 .newWikiWord a:hover { background-color: white; }
87   .inputBox {
88   font-family: verdana, arial, helvetica, sans-serif;
89   font-size: 11px;
90   background-color: #eee;
91   padding: 5px;
92   margin-bottom: 20px;
93   }
  54 form#navigationSearchForm { display: inline; }
  55 form#navigationSearchForm input { font-size: 80%; }
95   blockquote {
96   display: block;
97   margin: 0px 0px 20px 0px;
98   padding: 0px 30px;
99   font-size:11px;
100   line-height:17px;
101   font-style: italic;
102   }
  57 .navigation { margin-top: 0.3em; font-size : 90%; color: #999; }
104   pre {
105   background-color: #eee;
106   padding: 10px;
107   font-size: 11px;
108   overflow: auto;
109   }
  59 .help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; }
111   ol.setup {
112   font-size: 19px;
113   font-family: georgia, verdana, sans-serif;
114   padding-left: 25px;
115   }
  61 .inputBox { font-family: verdana, arial, helvetica, sans-serif; font-size: 80%; background-color: #EEE; padding: 0.3em; margin-bottom: 1.5em; }
117   ol.setup li {
118   margin-bottom: 20px
119   }
  63 blockquote { display: block; font-size: 90%; margin: 0 0 1.5em 0; padding: 0 2.5em; line-height: 1.5em; font-style: italic; }
121   .byline {
122   font-size: 10px;
123   font-style: italic;
124   margin-bottom: 10px;
125   color: #999;
126   }
  65 pre { font-size: 90%; padding: 1em; overflow: auto; background-color: #DDD; }
128   .references {
129   font-size: 10px;
130   }
  67 ol.setup { font-size: 110%; font-family: georgia, verdana, sans-serif; padding-left: 1.5em; margin-top: 1em; }
132   .diffdel, del.diffmod {
133   background: pink;
134   }
  69 .byline { padding-top: 1em; font-size: 60%; font-style: italic; margin-bottom: 1em; color: #999; }
136   .diffins, ins.diffmod {
137   background: lightgreen;
138   }
  71 .diffdel, del.diffmod { background: #fcc; }
  72 .diffins, ins.diffmod { background: #cfc; }
140   #footer {
141   height: 14px;
142   padding: .25em 0;
143   }
  74 #footer { font-size: 60%; line-height: 1.2em; color: #999; font-style: italic; text-align: right; padding-top: 2em; }
145   #footer p {
146   font-size: 10px;
147   color: gray;
148   font-style: italic;
149   margin: 0;
150   float: right;
151   text-align: right;
152   }
  76 div.inputFieldWithPrompt { margin: 0.75em 0; }
154   #error {
155   color: #8b0000;
156   font-style: italic;
157   width: 600px;
158   }
  78 div.errorExplanation { color: #900; background-color: #FFA; font-style: italic; font-weight: bold; margin: 1.5em 0; padding: 1em; width: 100%; }
  79 div.errorExplanation h2 { display: none; }
  80 div.errorExplanation p { padding: 0; margin: 0; border: none; }
  81 div.errorExplanation ul { padding: 0; margin: 0.5em 0 0 2em; border: none; }
  82 div.errorExplanation li { padding: 0; margin: 0; border: none; }
  83 div.fieldWithErrors input { border: 1px solid #900; }
  84 div.info { color: #060; background-color: #BFBFBF; padding: 0.5em; margin-top: 0.5em; font-weight: bold; width: 100%; }
160   #info {
161   color: #006400;
162   font-style: italic;
163   width: 600px;
164   }
  86 /* div#MarkupHelp { float: right; width: 20%; } */
  87 div#MarkupHelp { margin-left: 10px; }
  88 div#MarkupHelp table { margin-bottom: 0; border-top: 3px solid #999; border-left: 3px solid #999;
  89 border-right: 3px solid #BBB; border-bottom: 3px solid #BBB}
  90 div#MarkupHelp td { font-size: 80%; padding: 0.2em; margin: 0; border: 1px solid #999; border-width: 1px 0 1px 0;
  91 vertical-align: top; white-space: nowrap; }
  92 div#MarkupHelp td.arrow { padding-right: 5px; padding: 0 0.75em; color: #999; }
  93 div#MarkupHelp h3 { font-size: 90%; font-weight: bold; font-weight: normal; margin: 0 0 5px 0; padding: 5px 0 0 0; }
  94 div#MarkupHelp p { font-size: 70%; }
166   #TextileHelp table {
167   margin-bottom: 0;
168   }
  96 div.rightHandSide { float: right; width: 25%; margin-left: 0.7em; padding-left: 1.5em; border-left: 1px dotted #ccc; font-size: 80%; }
170   #TextileHelp table+h3 {
171   margin-top: 11px;
172   }
  98 .newsList { margin-top: 1.5em; }
  99 .newsList p { margin-bottom: 2.5em; }
174   #TextileHelp table td {
175   font-size: 11px;
176   padding: 3px;
177   vertical-align: top;
178   border-top: 1px dotted #ccc;
179   }
180  
181   #TextileHelp table td.arrow {
182   padding-right: 5px;
183   padding-left: 10px;
184   color: #999;
185   }
186  
187   #TextileHelp table td.label {
188   font-weight: bold;
189   white-space: nowrap;
190   font-size: 10px;
191   padding-right: 15px;
192   color: #000;
193   }
194  
195   #TextileHelp h3 {
196   font-size: 11px;
197   font-weight: bold;
198   font-weight: normal;
199   margin: 0 0 5px 0;
200   padding: 5px 0 0 0;
201   }
202  
203   #TextileHelp p {
204   font-size: 10px;
205   }
206  
207   .rightHandSide {
208   float: right;
209   width: 147px;
210   margin-left: 10px;
211   padding-left: 20px;
212   border-left: 1px dotted #ccc;
213   }
214  
215   .rightHandSide p {
216   font-size: 10px;
217   }
218  
219   .newsList {
220   margin-top: 20px;
221   }
222  
223   .newsList p {
224   margin-bottom:30px
225   }
226  
227   td {border:thin solid grey;}
228   table {
229   border: double black;
230   border-collapse: collapse;
231   }
232  
233   .byline {
234   padding-top: 15px;
235   }
236  
/* Affects the display of "category: ..." */
238   .property {
239   color: grey;
240   font-size: 10px;
241   }
  102 .property { color: #999; font-size: 80%; }

Search tickets

Social

Follow us on and

ROOL Store

Buy RISC OS Open merchandise here, including SD cards for Raspberry Pi and more.

Donate! Why?

Help ROOL make things happen – please consider donating!

RISC OS IPR

RISC OS is an Open Source operating system owned by RISC OS Developments Ltd and licensed primarily under the Apache 2.0 license.

Options

  • Tickets
  • New ticket
  • Milestones
  • Subversion: Changesets
  • Subversion: Browse
  • CVS: Revisions
  • CVS: Browse
  • Search

RSS feeds Rss

  • Changesets
  • Everything!
  • More feeds...
Contact Us  |  About Us

The RISC OS Open Collaboa theme is distantly based on the Collaboa default layout
Site design © RISC OS Open Limited 2024 except where indicated

Hosted by Arachsys

Powered by Collaboa
This site runs on Rails