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

Sync with latest trunk

Browse source
This commit is contained in:
Jason Blevins 2007-09-19 13:53:22 -04:00
parent ee22cdf75e c54a78c026
commit 8d48dd88fe
12 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/wiki_controller.rb
View file

@ -209,6 +209,7 @@ class WikiController < ApplicationController
@page_name ||= 'HomePage' @page_name ||= 'HomePage'
@page ||= wiki.read_page(@web_name, @page_name) @page ||= wiki.read_page(@web_name, @page_name)
@link_mode ||= :publish
render(:text => "Page '#{@page_name}' not found", :status => 404) and return unless @page render(:text => "Page '#{@page_name}' not found", :status => 404) and return unless @page
@renderer = PageRenderer.new(@page.revisions.last) @renderer = PageRenderer.new(@page.revisions.last)

3
lib/chunks/engines.rb
View file

@ -52,8 +52,9 @@ module Engines
@content.options[:renderer].s5_theme = my_content.s5_theme @content.options[:renderer].s5_theme = my_content.s5_theme
sanitize_xhtml(my_content.to_s5) sanitize_xhtml(my_content.to_s5)
else else
sanitize_rexml(Maruku.new(@content.delete("\r"), html = sanitize_rexml(Maruku.new(@content.delete("\r"),
{:math_enabled => false}).to_html_tree) {:math_enabled => false}).to_html_tree)
html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
end end
end end

2
public/s5/themes/blue/pretty.css
View file

@ -64,6 +64,7 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
#controls #navLinks a {padding: 0; margin: 0 0.5em; #controls #navLinks a {padding: 0; margin: 0 0.5em;
border: none; color: #779; border: none; color: #779;
cursor: pointer;} cursor: pointer;}
#controls #navList {height:1.25em}
#controls #navList #jumplist {background: #DDD; color: #227;} #controls #navList #jumplist {background: #DDD; color: #227;}
@ -93,6 +94,7 @@ img.incremental {visibility:hidden}
.slide .current {color:#B02} .slide .current {color:#B02}
.flushtop {margin-top:0px} .flushtop {margin-top:0px}
.slide .plaintable td {border:1px solid #FFF!important} .slide .plaintable td {border:1px solid #FFF!important}
.slide .noborder td, .slide .noborder th {border:0!important}
/* diagnostics /* diagnostics
li:after {content:" [" attr(class) "]";color:#F88} li:after {content:" [" attr(class) "]";color:#F88}

17
public/s5/themes/flower/pretty.css
View file

@ -40,16 +40,17 @@ div#header, div#footer {width:100%;top:0px;left:0px}
div#header, div#footer {color:#BA9384;font-family:Verdana,Helvetica,sans-serif} div#header, div#footer {color:#BA9384;font-family:Verdana,Helvetica,sans-serif}
div#header {background:transparent;height:10px} div#header {background:transparent;height:10px}
div#footer {background:#fff0cf;top:auto;bottom:0px; div#footer {background:#fff0cf;top:auto;bottom:0px;
font-size:0.5em;font-weight:bold;padding:.75em 0;border-top:1px solid #999} font-size:0.5em;font-weight:bold;padding:.75em 0;
height:2em;border-top:1px solid #999}
#footer h1, #footer h2 {display:block;padding:0 1em} #footer h1, #footer h2 {display:block;padding:0 1em}
#footer h2 {font-style:italic} #footer h2 {font-style:italic}
div.slide {top:0px;left:0px;padding:48px 4% 4%;height:100%;width:92%; div.slide {top:0px;left:0px;padding:40px 4% 4% 76px;width:88%;
background:transparent url(rightbg.jpg) right top no-repeat;overflow:visible; background:transparent url(rightbg.jpg) right top no-repeat;overflow:visible;
font-family:georgia,times,'Times New Roman',serif} font-family:georgia,times,'Times New Roman',serif}
div.slide h1 {position:absolute;z-index:1;background:transparent; div.slide h1 {position:absolute;z-index:1;background:transparent;
margin:0;padding:0.3em 0 0 50px;white-space:nowrap; margin:0;padding:5px 0 0 64px;white-space:nowrap;
text-transform:capitalize;top:0;left:60px;color:#4A040A; text-transform:capitalize;top:0;left:64px;color:#4A040A;
font:150%/1em georgia, times, 'Times New Roman', serif} font:150%/1em georgia, times, 'Times New Roman', serif}
div.slide h3 {font-size:130%} div.slide h3 {font-size:130%}
div.long {font-size:0.75em} div.long {font-size:0.75em}
@ -58,20 +59,22 @@ div.long {font-size:0.75em}
#controls :focus {outline:1px dotted #227} #controls :focus {outline:1px dotted #227}
div#controls {position: absolute; left: 60%; bottom: 0; div#controls {position: absolute; left: 60%; bottom: 0;
width: 40%; width: 40%;
text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;} text-align: right; font: bold 0.8em Verdana, Helvetica, sans-serif;}
html>body div#controls {position: fixed; padding: 0; top: auto;} html>body div#controls {position: fixed; padding: 0; top: auto;}
#controls :active {color:#88A !important} #controls :active {color:#88A !important}
#controls :focus {outline:1px dotted #227} #controls :focus {outline:1px dotted #227}
#controls #navList {padding:0lmargin:0;lineheight: 0.5em}
#controls #navLinks a {padding: 0; margin: 0 0.5em; #controls #navLinks a {padding: 0; margin: 0 0.5em;
border: none; color: #BA9384; border: none; color: #BA9384;
cursor: pointer;} cursor: pointer;}
#controls #navList {height:1.25em}
#controls #navList #jumplist {background: #DDD; color: #227;} #controls #navList #jumplist {background: #DDD; color: #227;}
#currentSlide {text-align:center;font-size:0.5em; #currentSlide {text-align:center;font-size:0.5em;
color:#646587;font-family:Verdana,Helvetica,sans-serif;font-weight:bold} color:#646587;font-family:Verdana,Helvetica,sans-serif;font-weight:bold}
#slide0 {padding-top:3.5em;font-size:90%} #slide0 {padding:96px 128px;font-size:90%}
#slide0 h1 {position:static;margin:1em 0 1.33em;padding:0; #slide0 h1 {position:static;margin:16px 0 24px;padding:0;
white-space:normal;color:#000;background:transparent; white-space:normal;color:#000;background:transparent;
font:2em georgia, times, 'Times New Roman', serif} font:2em georgia, times, 'Times New Roman', serif}
#slide0 h3 {margin-top:0.5em;font-size:1.5em} #slide0 h3 {margin-top:0.5em;font-size:1.5em}

15
public/s5/themes/i18n/pretty.css
View file

@ -1,7 +1,7 @@
/* Following is i18n theme -- edit away! */ /* Following is i18n theme -- edit away! */
html {background:#95A7D4 url(bodybg.jpg) no-repeat;} html {background:#95A7D4 url(bodybg.jpg) no-repeat;}
body {color:#210;font:25px Arial, sans-serif} body {color:#210;font-family: Arial, sans-serifi;font-size: 1.5em}
a {text-decoration:none;color:#336;border-bottom:1px dotted} a {text-decoration:none;color:#336;border-bottom:1px dotted}
:link, :visited {text-decoration:none;color:#00C} :link, :visited {text-decoration:none;color:#00C}
html, body {margin:0;padding:0} html, body {margin:0;padding:0}
@ -30,7 +30,7 @@ sup {font-size:0.75em;font-weight:normal;vertical-align:0.5em;line-height:1px}
.slide code.old {color:silver} .slide code.old {color:silver}
.slide pre {padding:0;margin:0.25em 0 0.5em 0.5em;color:#533;font-size:90%} .slide pre {padding:0;margin:0.25em 0 0.5em 0.5em;color:#533;font-size:90%}
.slide pre code {display:block} .slide pre code {display:block}
.slide ul {margin-left:5%;margin-right:7%;list-style:disc} .slide ul {margin-left:5%;margin-right:5%;list-style:disc}
.slide li {margin-top:0.75em;margin-right:0} .slide li {margin-top:0.75em;margin-right:0}
.slide ul ul {line-height:1} .slide ul ul {line-height:1}
.slide ul ul li {margin:.2em;font-size:85%;list-style:square} .slide ul ul li {margin:.2em;font-size:85%;list-style:square}
@ -38,8 +38,8 @@ sup {font-size:0.75em;font-weight:normal;vertical-align:0.5em;line-height:1px}
div#header, div#footer, div.slide {width:100%;top:0px;left:0px} div#header, div#footer, div.slide {width:100%;top:0px;left:0px}
div#header, div#footer {color:#AAB;font-size:0.5em} div#header, div#footer {color:#AAB;font-size:0.5em}
div#header {background:#666;color:#BBB;height:1em;padding-bottom:.5em} div#header {background:#666;color:#BBB;height:.25em;padding-bottom:.5em}
div#footer {background:#666;color:#BBB;height:3.25em;top:auto;bottom:0px;} div#footer {background:#666;height:3.5em;color:#BBB;top:auto;bottom:0px;}
#footer h1, #footer h2 {display:block;padding:0.5em 0.75em; #footer h1, #footer h2 {display:block;padding:0.5em 0.75em;
font-weight:normal;font-style:italic} font-weight:normal;font-style:italic}
#footer h1 {left:0;font-size:1em;letter-spacing:1px} #footer h1 {left:0;font-size:1em;letter-spacing:1px}
@ -47,7 +47,7 @@ div#footer {background:#666;color:#BBB;height:3.25em;top:auto;bottom:0px;}
div.slide {top:0px;width:92%;padding:.5em 4% 4%} div.slide {top:0px;width:92%;padding:.5em 4% 4%}
div.slide h1 {font-size:1.66em;line-height:1;letter-spacing:-1px; div.slide h1 {font-size:1.66em;line-height:1;letter-spacing:-1px;
margin:0px;padding:0.25em 0px;border-bottom:2px solid rgb(90,94,120)} margin:0px;padding:0.125em 0px;border-bottom:2px solid rgb(90,94,120)}
div.slide h3 {font-size:130%} div.slide h3 {font-size:130%}
div.long {font-size:0.75em} div.long {font-size:0.75em}
@ -60,9 +60,8 @@ div#controls form {position:absolute;bottom:0;right:0;width:100%;
margin:0;padding:0} margin:0;padding:0}
#controls #navLinks a {padding:0;margin:0 0.5em 0;background:#666; #controls #navLinks a {padding:0;margin:0 0.5em 0;background:#666;
border:none;color:#AAC;cursor:pointer} border:none;color:#AAC;cursor:pointer}
#controls #navList {height:1em} #controls #navList {height:1.25em}
#controls #navList #jumplist {position:absolute;bottom:0;right:0; #controls #navList #jumplist {background:#DDD;color:#227}
background:#DDD;color:#227}
#currentSlide {font-size:0.5em} #currentSlide {font-size:0.5em}
#currentSlide span {font-size:13px;color:#fff} #currentSlide span {font-size:13px;color:#fff}

3
public/s5/themes/nautilus/pretty.css
View file

@ -45,7 +45,7 @@ div#footer {background:#005;height:2.5em;top:auto;bottom:0px;
#footer h2 {font-style:italic} #footer h2 {font-style:italic}
div.slide {top:0px;width:92%;padding:2.5em 4% 4%} div.slide {top:0px;width:92%;padding:2.5em 4% 4%}
div.slide h1 {position:absolute;top:0;left:135px;z-index:1;color:#DDE; div.slide h1 {position:absolute;top:0;left:145px;z-index:1;color:#DDE;
text-align:left;white-space:nowrap;text-transform:capitalize; text-align:left;white-space:nowrap;text-transform:capitalize;
margin:0px;padding:0.3em 0 0 50px;font:bold 150%/1em Helvetica,sans-serif} margin:0px;padding:0.3em 0 0 50px;font:bold 150%/1em Helvetica,sans-serif}
div.slide h3 {font-size:130%} div.slide h3 {font-size:130%}
@ -60,6 +60,7 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
#controls #navLinks a {padding: 0; margin: 0 0.5em; #controls #navLinks a {padding: 0; margin: 0 0.5em;
border: none; color: #779; border: none; color: #779;
cursor: pointer;} cursor: pointer;}
#controls #navList {height:1.25em}
#controls #navList #jumplist {background: #DDD; color: #227;} #controls #navList #jumplist {background: #DDD; color: #227;}
#currentSlide {text-align:center;font-size:0.5em; #currentSlide {text-align:center;font-size:0.5em;

15
public/s5/themes/pixel/pretty.css
View file

@ -44,7 +44,7 @@ div#footer {background:#fff;font-size:0.5em;font-weight:bold;padding:.5em 0;
#footer h1, #footer h2 {display:block;padding:0 1em} #footer h1, #footer h2 {display:block;padding:0 1em}
#footer h2 {font-style:italic} #footer h2 {font-style:italic}
div.slide {top:0px;width:92%;padding:48px 4% 4%; div.slide {top:0px;width:88%;padding:48px 4% 4% 72px;
font-family:Verdana, Helvetica, Arial, sans-serif} font-family:Verdana, Helvetica, Arial, sans-serif}
div.slide h1 {position:absolute;top:24px;left:64px;z-index:1;color:#FFF; div.slide h1 {position:absolute;top:24px;left:64px;z-index:1;color:#FFF;
background:transparent;margin:0px;padding:0 0 0 50px;white-space:nowrap; background:transparent;margin:0px;padding:0 0 0 50px;white-space:nowrap;
@ -54,14 +54,13 @@ div.long {font-size:0.75em}
/* /*
#controls :active {color:#88A !important} #controls :active {color:#88A !important}
#controls :focus {outline:1px dotted #227} #controls :focus {outline:1px dotted #227}
div#controls {left:50%;bottom:0;z-index:1;width:50%;text-align:right; div#controls {position:absolute;left:50%;bottom:0;width:50%;text-align:right;
height:100%} font-size:0.7em;}
html>body div#controls {position:fixed;padding:0 0 1em 0;top:auto} html>body div#controls {position:fixed;padding:0 0 1em 0;top:auto}
div#controls form {position:absolute;bottom:0;right:0;width:100%; div#controls form {position:absolute;bottom:0;right:0;width:100%;
margin:0;padding:0} margin:0;padding:0}
div#controls #navLinks a {padding:0;margin:0 0.5em;color:#779; div#controls #navLinks a {padding:0;margin:0 0.5em;color:#779;
border:none;cursor:pointer} border:none;cursor:pointer}
div#controls #navList {height:1em}
div#controls #navList #jumplist {position:absolute;bottom:0;right:0; div#controls #navList #jumplist {position:absolute;bottom:0;right:0;
background:#DDD;color:#227} background:#DDD;color:#227}
div#controls select {visibility:hidden;background:#DDD;color:#227} div#controls select {visibility:hidden;background:#DDD;color:#227}
@ -76,6 +75,7 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
#controls #navLinks a {padding: 0; margin: 0 0.5em; #controls #navLinks a {padding: 0; margin: 0 0.5em;
border: none; color: #779; border: none; color: #779;
cursor: pointer;} cursor: pointer;}
#controls #navList {height:1.25em}
#controls #navList #jumplist {background: #DDD; color: #227;} #controls #navList #jumplist {background: #DDD; color: #227;}
#currentSlide {color:#646587;text-align:center;font-size:0.5em; #currentSlide {color:#646587;text-align:center;font-size:0.5em;
@ -86,11 +86,12 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
#currentSlide #csHere:before {content:"#";font-weight:normal} #currentSlide #csHere:before {content:"#";font-weight:normal}
#currentSlide #csTotal:before {content:" of "} #currentSlide #csTotal:before {content:" of "}
#slide0 {padding-top:3.5em;font-size:90%} #slide0 {padding-top:64px;font-size:90%; width:96%}
#slide0 h1 {position:static;white-space:normal; #slide0 h1 {position:static;white-space:normal;
margin:0;padding:60px 60px 0 150px;text-align:right; margin:0;padding:128px 60px 0 60px;text-align:right;
font:bold 2em Helvetica,sans-serif;white-space:normal;height:281px; font:bold 2em Helvetica,sans-serif;white-space:normal;height:200px;
color:#fff;background:transparent url(slide0bg.gif) no-repeat} color:#fff;background:transparent url(slide0bg.gif) no-repeat}
#slide0 h2 {font-size:1em;padding:0;margin:0.25em;}
#slide0 h3 {margin-bottom:20px;margin-top:0.5em;font-size:1.5em} #slide0 h3 {margin-bottom:20px;margin-top:0.5em;font-size:1.5em}
#slide0 h4 {margin-bottom:4px;margin-top:0;font-size:1em} #slide0 h4 {margin-bottom:4px;margin-top:0;font-size:1em}

1
public/s5/ui/core/notes.css
View file

@ -1,5 +1,6 @@
/* Following are the note styles -- edit away! */ /* Following are the note styles -- edit away! */
html { background: #333; color: #FFF; }
body { body {
margin: 0; margin: 0;
padding: 1.0em; padding: 1.0em;

6
public/s5/ui/core/slides.js
View file

@ -631,7 +631,11 @@ function createNotesWindow() { // creates a window for our notes
if (!s5NotesWindow || s5NotesWindow.closed) { // Create the window if it doesn't exist if (!s5NotesWindow || s5NotesWindow.closed) { // Create the window if it doesn't exist
s5NotesWindowLoaded = false; s5NotesWindowLoaded = false;
// Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr. // Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr.
s5NotesWindow = window.open('/s5/ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto'); if (isIE) {
s5NotesWindow = window.open('/s5/ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
} else {
s5NotesWindow = window.open('/s5/ui/s5-notes.xhtml', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
}
} }
if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded
loadNote(); loadNote();

2
public/s5/ui/s5-notes.html
View file

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Notes</title> <title>Notes</title>
<link rel="stylesheet" href="default/notes.css" type="text/css" /> <link rel="stylesheet" href="core/notes.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
document.onkeyup = opener.keys; document.onkeyup = opener.keys;

2
public/s5/ui/s5-notes.xhtml
View file

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Notes</title> <title>Notes</title>
<link rel="stylesheet" href="default/notes.css" type="text/css" /> <link rel="stylesheet" href="core/notes.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
document.onkeyup = opener.keys; document.onkeyup = opener.keys;

1
script/server
View file

@ -18,6 +18,7 @@ OPTIONS = {
'svg' => 'application/svg+xml', 'svg' => 'application/svg+xml',
'tar' => 'application/x-tar', 'tar' => 'application/x-tar',
'tex' => 'application/x-tex', 'tex' => 'application/x-tex',
'xhtml' => 'application/xhtml+xml',
'xml' => 'application/xml', 'xml' => 'application/xml',
'xslt' => 'application/xslt+xml' 'xslt' => 'application/xslt+xml'
}) })