Changesets can be listed by changeset number.
The Git repository is here.
Changeset 363
Change layout, views and stylesheet to integrate into wider ROOL site design.
- Comitted by: rool
- Date: Saturday March 19 22:04:34 2011 (over 13 years ago)
Affected files:
- rool/rails/instiki/trunk/app/views/search.rhtml
- rool/rails/instiki/trunk/app/views/layouts/default.rhtml (diff)
- rool/rails/instiki/trunk/app/views/navigation.rhtml (diff)
- rool/rails/instiki/trunk/app/views/shared/_powered.rhtml (diff)
- rool/rails/instiki/trunk/app/views/shared/_theme.rhtml (diff)
- rool/rails/instiki/trunk/public/stylesheets/instiki.css (diff)
rool/rails/instiki/trunk/app/views/layouts/default.rhtml:
prev. | current | |
1 | ||
2 | ||
3 | ||
4 | | |
5 | | |
6 | | |
7 | | |
8 | | |
9 | | |
10 | | |
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | |
2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |
3 | ||
4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | |
5 | <head> | |
6 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | |
7 | <meta name="robots" content="<%= @robots_metatag_value %>" /> | |
8 | <%= ( csrf_meta_tag || '' ).gsub( /^/, ' ' ) %> | |
9 | ||
10 | <title> | |
11 | <%- if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) -%> | |
12 | <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %> | |
13 | <%- elsif @web -%> | |
14 | <%= @title %> in <%= h @web.name %> | |
15 | <%- else -%> | |
16 | <%= @title %> | |
17 | <%- end -%> | |
18 | </title> | |
19 | ||
20 | <%= javascript_include_tag 'page_helper' %> | |
21 | <%= javascript_include_tag :defaults %> | |
22 | <%- if @web -%> | |
23 | <%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines'}, | |
24 | :title => 'Atom with headlines') %> | |
25 | <%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_content'}, | |
26 | :title => 'Atom with full content') %> | |
<%- end -%> | ||
12 | | |
28 | <link type="text/css" rel="stylesheet" href="/css/risc_os_open_2011.css" media="all" /> | |
29 | <%= stylesheet_link_tag 'instiki', :media => 'all' %> | |
30 | <%= stylesheet_link_tag 'syntax', :media => 'all' %> | |
31 | </head> | |
32 | <body> | |
33 | <%= render 'shared/fixed_header' %> | |
14 | | |
15 | | |
16 | | |
17 | | |
18 | | |
19 | | |
20 | | |
21 | | |
22 | | |
23 | | |
24 | | |
25 | | |
26 | | |
27 | | |
28 | | |
29 | | |
30 | | |
31 | | |
32 | | |
33 | | |
34 | | |
35 | | |
36 | | |
37 | | |
38 | | |
39 | | |
40 | | |
41 | | |
42 | ||
35 | <div id="template_main"> | |
44 | ||
37 | <!-- Main body content --> | |
46 | ||
47 | ||
48 | | |
49 | | |
50 | | |
51 | | |
52 | | |
53 | | |
54 | | |
55 | | |
56 | | |
57 | | |
58 | | |
39 | <div id="template_body"> | |
40 | <div id="template_body_content"> | |
41 | <div id="Container"> | |
42 | <div id="Content"> | |
43 | <%= hubssolib_flash_tags.html_safe -%> | |
44 | <% if @error -%> | |
60 | ||
46 | <div class="errorExplanation"><%= ( escape_preserving_linefeeds(@error) ).html_safe %></div> | |
47 | <% end -%> | |
62 | ||
63 | | |
64 | ||
49 | <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%> | |
50 | <h1 id="pageName"> | |
51 | <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %> | |
52 | </h1> | |
53 | <% elsif @web -%> | |
54 | <h1 id="pageName"> | |
55 | <span class="webName"><%= @web.name %></span> | |
56 | </h1> | |
57 | <% | |
58 | # The ROOL Wiki never showed page titles automatically so content tends to include its own. | |
59 | # Omitting them also helps with the fact that an Instiki Web's home page has to be called | |
60 | # "HomePage" and it shows that literally in the title, which is ugly. We could call the | |
61 | # WikiWords#separate method, but that's been disabled for the I2 converted Wiki since it | |
62 | # interferes with technical content too much (e.g. "FileCore" for unknown pages gets shown | |
63 | # as "File Core" when defining the page if the separator is left enabled). | |
66 | ||
67 | | |
68 | ||
65 | if false | |
66 | -%> | |
67 | <h2><%= @title %></h2> | |
68 | <% end -%> | |
69 | <% else -%> | |
70 | <h1 id="pageName"> | |
71 | <%= @title %> | |
72 | </h1> | |
73 | <% end -%> | |
<%= @content_for_layout %> | ||
72 | ||
73 | | |
74 | | |
75 | | |
76 | | |
77 | ||
77 | </div> <!-- Content --> | |
78 | </div> <!-- Container --> | |
79 | ||
80 | </div> | |
81 | </div> | |
81 | ||
83 | <!-- Sidebar --> | |
83 | ||
85 | <div id="template_sidebar"> | |
86 | <div id="template_sidebar_content"> | |
87 | <%- if params['action'] != 'published' then -%> | |
88 | <div class="template_sidebar_node"> | |
89 | <h3>Search the Wiki</h3> | |
90 | ||
91 | <p /> | |
92 | <%= render(:file => 'search') unless @web.nil? %> | |
93 | </div> | |
94 | <%- end -%> | |
95 | ||
96 | <%= render 'shared/fixed_sidebar' %> | |
97 | <%- unless @web.nil? || @hide_navigation -%> | |
98 | ||
99 | <p /> | |
100 | <div class="template_sidebar_node"> | |
101 | <h3>Navigation</h3> | |
102 | <%= render(:file => 'navigation') %> | |
103 | </div> | |
104 | <%- end -%> | |
105 | </div> | |
106 | </div> | |
107 | ||
108 | <div id="template_main_block_end"></div> | |
109 | </div> | |
110 | ||
111 | <%= render 'shared/fixed_footer' %> | |
112 | </body> | |
</html> |
rool/rails/instiki/trunk/app/views/navigation.rhtml:
prev. | current | |
%> | ||
<div class="navigation"> | ||
12 | | |
13 | ||
14 | | |
15 | | |
16 | | |
17 | | |
18 | | |
19 | | |
20 | | |
21 | | |
22 | | |
23 | | |
24 | | |
25 | | |
26 | ||
27 | | |
28 | | |
12 | <ul> | |
13 | <% if params['action'] != 'published' then -%> | |
14 | <li><%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Documentation home', 'H' %></li> | |
15 | <li><%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %></li> | |
16 | <li><%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %></li> | |
17 | <li><%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %></li> | |
18 | <li><%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %></li> | |
19 | <% if hubssolib_logged_in? && hubssolib_authorized?( :export, WikiController ) -%> | |
20 | <li><%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %></li> | |
21 | <% end -%> | |
22 | <% else -%> | |
23 | <li><%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Documentation home', 'H' %></li> | |
24 | <li><%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %></li> | |
<% end-%> | ||
30 | | |
31 | ||
26 | </ul> | |
27 | </div> | |
rool/rails/instiki/trunk/app/views/shared/_powered.rhtml:
prev. | current | |
1 | ||
1 | --><a href="http://golem.ph.utexas.edu/instiki/show/HomePage">Instiki <%= "#{Instiki::VERSION::STRING}" %></a><!-- | |
rool/rails/instiki/trunk/app/views/shared/_theme.rhtml:
prev. | current | |
1 | ||
1 | -->The RISC OS Open Instiki theme is based on Insitki's default layout<!-- | |
rool/rails/instiki/trunk/public/stylesheets/instiki.css:
prev. | current | |
1 | ||
2 | ||
3 | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 | ||
.skipNav { | ||
position:relative; | ||
left:-1000em; | ||
font-size:0em; | ||
5 | display: none; | |
} | ||
#Container { | ||
16 | ||
text-align:center; | ||
} | ||
#Content { | ||
21 | ||
22 | ||
23 | ||
text-align:left; | ||
25 | ||
26 | ||
} | ||
29 | ||
30 | ||
16 | #Content table { | |
17 | border-collapse:collapse; | |
18 | margin-bottom: 20px; | |
19 | border: 1px solid #888; | |
20 | width: 100%; | |
} | ||
33 | ||
34 | ||
35 | ||
23 | #Content th { | |
24 | border: 1px solid #555; | |
25 | background: #f0f0f0; | |
26 | font-weight: bold; | |
27 | padding: 4px; | |
} | ||
38 | ||
39 | ||
30 | #Content td { | |
31 | border: 1px solid #ccc; | |
32 | padding: 4px; | |
} | ||
42 | ||
43 | ||
35 | .newWikiWord { | |
36 | padding-left: 4px; | |
37 | padding-right: 4px; | |
38 | background-color: #ddd; | |
39 | border: 1px solid #ddd; | |
} | ||
46 | ||
47 | ||
42 | .newWikiWord a { | |
43 | margin-left: 4px; | |
44 | padding-left: 4px; | |
45 | padding-right: 4px; | |
46 | border: 1px dotted red; | |
47 | color: red; | |
} | ||
50 | ||
51 | ||
52 | ||
53 | ||
54 | ||
55 | ||
56 | ||
57 | ||
58 | ||
59 | ||
60 | ||
61 | ||
62 | ||
63 | ||
64 | ||
65 | ||
66 | ||
67 | ||
68 | ||
69 | ||
70 | ||
71 | ||
72 | ||
73 | ||
74 | ||
75 | ||
76 | ||
77 | ||
78 | ||
79 | ||
80 | ||
81 | ||
82 | ||
83 | ||
84 | ||
85 | ||
86 | ||
87 | ||
88 | ||
89 | ||
90 | ||
91 | ||
92 | ||
.newWikiWord a:hover { | ||
94 | ||
51 | color: white; | |
52 | background: red; | |
53 | border-color: white; | |
} | ||
.deleteWikiWord { | ||
... | ... | |
background-color:#F88; | ||
} | ||
107 | ||
108 | ||
109 | ||
110 | ||
111 | ||
112 | ||
113 | ||
114 | ||
115 | ||
116 | ||
117 | ||
118 | ||
119 | ||
120 | ||
121 | ||
122 | ||
123 | ||
124 | ||
125 | ||
126 | ||
127 | ||
128 | ||
129 | ||
130 | ||
131 | ||
132 | ||
133 | ||
134 | ||
135 | ||
136 | ||
137 | ||
.navOn { | ||
color:#444; | ||
font-weight:bold; | ||
... | ... | |
} | ||
pre { | ||
167 | ||
168 | ||
overflow:auto; | ||
170 | ||
} | ||
ol.setup { | ||
174 | ||
font-size:110%; | ||
margin-top:1em; | ||
padding-left:1.5em; | ||
... | ... | |
font-size:.85em; | ||
} | ||
195 | ||
196 | ||
197 | ||
198 | ||
span.views, span.linked { | ||
font-size:.85em; | ||
} | ||
... | ... | |
border: 2px solid #FE0; | ||
} | ||
246 | ||
247 | ||
248 | ||
249 | ||
250 | ||
251 | ||
252 | ||
253 | ||
254 | ||
255 | ||
256 | ||
257 | ||
258 | ||
259 | ||
260 | ||
261 | ||
262 | ||
div.web_normal { | ||
padding:4px; | ||
} | ||
... | ... | |
margin:0.75em 0; | ||
} | ||
276 | ||
277 | ||
278 | ||
279 | ||
280 | ||
281 | ||
282 | ||
283 | ||
284 | ||
285 | ||
286 | ||
287 | ||
288 | ||
289 | ||
290 | ||
291 | ||
292 | ||
293 | ||
294 | ||
295 | ||
296 | ||
297 | ||
298 | ||
299 | ||
300 | ||
301 | ||
302 | ||
303 | ||
304 | ||
305 | ||
306 | ||
307 | ||
div#editFormButtons { | ||
margin:0.5em 0 0; | ||
} | ||
... | ... | |
font-size:80%; | ||
} | ||
382 | ||
383 | ||
384 | ||
385 | ||
386 | ||
387 | ||
388 | ||
389 | ||
390 | ||
391 | ||
392 | ||
393 | ||
394 | ||
395 | ||
396 | ||
397 | ||
398 | ||
399 | ||
400 | ||
401 | ||
402 | ||
403 | ||
404 | ||
405 | ||
406 | ||
407 | ||
408 | ||
409 | ||
410 | ||
411 | ||
412 | ||
413 | ||
414 | ||
415 | ||
416 | ||
417 | ||
textarea#content { | ||
font-size: 1em; | ||
line-height: 1.125; | ||
... | ... | |
.maruku-eq-number {float:right} | ||
.maruku-equation {text-align:center} | ||
.blockquotesource {margin-left:1em;} | ||
440 | ||
span.keyboard { | ||
background: #CCC; | ||
color: #000; |