wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into server-side-tex

Browse Source
This commit is contained in:
Joshua Peek
2011-11-28 13:21:46 -06:00
parent 7a4e57a49d 5ce3886651
commit 3cba98fee6
4 changed files with 146 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/public/css/gollum.css
+10 -9
View File
@@ -1,3 +1,10 @@
#wiki-wrapper #template blockquote {
margin: 1em 0;
border-left: 4px solid #ddd;
padding-left: .8em;
color: #555;
}
/* /*
gollum.css gollum.css
A basic stylesheet for Gollum A basic stylesheet for Gollum
@@ -6,7 +13,7 @@
/* @section core */ /* @section core */
body, html { body, html {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 10px; /* -> 1em */ font-size: 10px;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@@ -30,18 +37,13 @@ a:hover, a:visited {
/* @section head */ /* @section head */
#head { #head {
border-bottom: 1px solid #ccc;
margin: 4.5em 0 0.5em; margin: 4.5em 0 0.5em;
padding: 0.5em 0; padding: 0.5em 0;
overflow: hidden; overflow: hidden;
} }
#head h1 { #head h1 {
font-size: 3.3em; display: none;
float: left;
line-height: normal;
margin: 0;
padding: 0.08em 0 0 0;
} }
#head ul.actions { #head ul.actions {
@@ -206,12 +208,11 @@ a:hover, a:visited {
/* @section page-footer */ /* @section page-footer */
.page #footer { .page #footer {
border-top: 1px solid #ccc;
margin: 1em 0 7em; margin: 1em 0 7em;
} }
#footer p#last-edit { #footer p#last-edit {
font-size: 1.2em; font-size: .9em;
line-height: 1.6em; line-height: 1.6em;
color: #999; color: #999;
margin: 0.9em 0; margin: 0.9em 0;
lib/gollum/frontend/public/css/template.css
+103 -38
View File
@@ -2,9 +2,29 @@
Gollum v3 Template Gollum v3 Template
*/ */
/* margin & padding reset*/
* {
margin: 0;
padding: 0;
}
html, body {
color: black;
}
body {
font: 13.34px helvetica,arial,freesans,clean,sans-serif;
line-height: 1.4;
}
img {
border: 0;
}
#template { #template {
font-size: 13px; font-size: 14px;
line-height: 23px; line-height: 1.4;
margin-bottom: 40px; margin-bottom: 40px;
} }
@@ -15,7 +35,7 @@ a.absent {
/* Primary Body Copy */ /* Primary Body Copy */
#template p { #template p {
margin: 16px 0 0; margin: 1em 0;
padding: 0; padding: 0;
} }
@@ -32,15 +52,14 @@ a.absent {
} }
#template h1 { #template h1 {
border-top: 4px solid #ccc; border-bottom: 1px solid #ccc;
font-size: 32px; font-size: 33px; /* was 32, GH is 33px */
line-height: normal; line-height: normal;
padding: 10px 0 0; padding: .08em 0 0 0;
margin: 30px 0 0; margin: 0;
} }
#template h2 { #template h2 {
border-top: 4px solid #ccc;
font-size: 22px; font-size: 22px;
line-height: normal; line-height: normal;
margin: 22px 0 0; margin: 22px 0 0;
@@ -91,7 +110,6 @@ a.absent {
/* Border Reset for headers with horizontal rules */ /* Border Reset for headers with horizontal rules */
#template > h2:first-child, #template > h2:first-child,
#template > h1:first-child { #template > h1:first-child {
border: 0;
margin: 12px 0 0; margin: 12px 0 0;
padding: 10px 0 0; padding: 10px 0 0;
} }
@@ -100,19 +118,21 @@ a.absent {
/* Lists, Blockquotes & Such */ /* Lists, Blockquotes & Such */
#template ul, #template ul,
#template ol { #template ol {
margin: 0; margin-top: 1.5em;
padding: 20px 0 0; margin-left: 2.6em;
list-style-position: inside;
} }
/* Nested Lists */ /* Nested Lists */
#template ul li,
#template ol li,
#template ul li ul, #template ul li ul,
#template ol li ol, #template ol li ol,
#template ul li ol, #template ul li ol,
#template ol li ul, #template ol li ul,
#template ul ul, #template ul ul,
#template ol ol { #template ol ol {
padding: 0 0 0 14px; padding: 0;
margin: .5em 0;
} }
#template dl { #template dl {
@@ -266,7 +286,7 @@ a.absent {
background-color: #f8f8f8; background-color: #f8f8f8;
border: 1px solid #dedede; border: 1px solid #dedede;
font-size: 13px; font-size: 13px;
padding: 1px 5px; padding: 0;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
@@ -279,38 +299,83 @@ a.absent {
font-size: 13px; font-size: 13px;
line-height: 19px; line-height: 19px;
overflow: auto; overflow: auto;
padding: 6px; padding: 6px 10px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
pre, code {
font: 12px 'Bitstream Vera Sans Mono','Courier',monospace
}
#template pre code, #template pre tt { #template pre code, #template pre tt {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
#template .highlight { background: #ffffff; } /*
#template .highlight .c { color: #999988; font-style: italic } Highlight rules from pull req 191
#template .highlight .err { color: #a61717; background-color: #e3d2d2 } https://github.com/eboto/gollum/commit/5df09477abf4a04c82c7fcaa2bd7ee2a85e7ec82
#template .highlight .k { font-weight: bold } */
#template .highlight .o { font-weight: bold } #template .highlight { background:#fff; }
#template .highlight .cm { color: #999988; font-style: italic } #template .highlight .c { color:#998;font-style:italic; }
#template .highlight .cp { color: #999999; font-weight: bold } #template .highlight .err { color:#a61717;background-color:#e3d2d2; }
#template .highlight .c1 { color: #999988; font-style: italic } #template .highlight .k { font-weight:bold; }
#template .highlight .cs { color: #999999; font-weight: bold; font-style: italic } #template .highlight .o { font-weight:bold; }
#template .highlight .gd { color: #000000; background-color: #ffdddd } #template .highlight .cm { color:#998;font-style:italic; }
#template .highlight .gd .x { color: #000000; background-color: #ffaaaa } #template .highlight .cp { color:#999;font-weight:bold; }
#template .highlight .ge { font-style: italic } #template .highlight .c1 { color:#998;font-style:italic; }
#template .highlight .gr { color: #aa0000 } #template .highlight .cs { color:#999;font-weight:bold;font-style:italic; }
#template .highlight .gh { color: #999999 } #template .highlight .gd { color:#000;background-color:#fdd; }
#template .highlight .gi { color: #000000; background-color: #ddffdd } #template .highlight .gd .x { color:#000;background-color:#faa; }
#template .highlight .gi .x { color: #000000; background-color: #aaffaa } #template .highlight .ge { font-style:italic; }
#template .highlight .gc { color: #999; background-color: #EAF2F5 } #template .highlight .gr { color:#a00; }
#template .highlight .go { color: #888888 } #template .highlight .gh { color:#999; }
#template .highlight .gp { color: #555555 } #template .highlight .gi { color:#000;background-color:#dfd; }
#template .highlight .gs { font-weight: bold } #template .highlight .gi .x { color:#000;background-color:#afa; }
#template .highlight .gu { color: #aaaaaa } #template .highlight .go { color:#888; }
#template .highlight .gt { color: #aa0000 } #template .highlight .gp { color:#555; }
#template .highlight .gs { font-weight:bold; }
#template .highlight .gu { color:#800080;font-weight:bold; }
#template .highlight .gt { color:#a00; }
#template .highlight .kc { font-weight:bold; }
#template .highlight .kd { font-weight:bold; }
#template .highlight .kp { font-weight:bold; }
#template .highlight .kr { font-weight:bold; }
#template .highlight .kt { color:#458;font-weight:bold; }
#template .highlight .m { color:#099; }
#template .highlight .s { color:#d14; }
#template .highlight .na { color:#008080; }
#template .highlight .nb { color:#0086B3; }
#template .highlight .nc { color:#458;font-weight:bold; }
#template .highlight .no { color:#008080; }
#template .highlight .ni { color:#800080; }
#template .highlight .ne { color:#900;font-weight:bold; }
#template .highlight .nf { color:#900;font-weight:bold; }
#template .highlight .nn { color:#555; }
#template .highlight .nt { color:#000080; }
#template .highlight .nv { color:#008080; }
#template .highlight .ow { font-weight:bold; }
#template .highlight .w { color:#bbb; }
#template .highlight .mf { color:#099; }
#template .highlight .mh { color:#099; }
#template .highlight .mi { color:#099; }
#template .highlight .mo { color:#099; }
#template .highlight .sb { color:#d14; }
#template .highlight .sc { color:#d14; }
#template .highlight .sd { color:#d14; }
#template .highlight .s2 { color:#d14; }
#template .highlight .se { color:#d14; }
#template .highlight .sh { color:#d14; }
#template .highlight .si { color:#d14; }
#template .highlight .sx { color:#d14; }
#template .highlight .sr { color:#009926; }
#template .highlight .s1 { color:#d14; }
#template .highlight .ss { color:#990073; }
#template .highlight .bp { color:#999; }
#template .highlight .vc { color:#008080; }
#template .highlight .vg { color:#008080; }
#template .highlight .vi { color:#008080; }
#template .highlight .il { color:#099; }
lib/gollum/sanitization.rb
+6 -6
View File
@@ -58,7 +58,7 @@ module Gollum
# Default transformers to force @id attributes with 'wiki-' prefix # Default transformers to force @id attributes with 'wiki-' prefix
TRANSFORMERS = [ TRANSFORMERS = [
lambda do |env| lambda do |env|
node = env[:node] node = env[:node]
return if env[:is_whitelisted] || !node.element? return if env[:is_whitelisted] || !node.element?
prefix = env[:config][:id_prefix] prefix = env[:config][:id_prefix]
found_attrs = %w(id name).select do |key| found_attrs = %w(id name).select do |key|
@@ -68,7 +68,7 @@ module Gollum
end end
if found_attrs.size > 0 if found_attrs.size > 0
ADD_ATTRIBUTES.call(env, node) ADD_ATTRIBUTES.call(env, node)
{:node_whitelist => [node]} {}
end end
end, end,
lambda do |env| lambda do |env|
@@ -77,7 +77,7 @@ module Gollum
prefix = env[:config][:id_prefix] prefix = env[:config][:id_prefix]
node['href'] = value.gsub(/\A\#(#{prefix})?/, '#'+prefix) node['href'] = value.gsub(/\A\#(#{prefix})?/, '#'+prefix)
ADD_ATTRIBUTES.call(env, node) ADD_ATTRIBUTES.call(env, node)
{:node_whitelist => [node]} {}
end end
].freeze ].freeze
@@ -88,11 +88,11 @@ module Gollum
# elements. Default: ATTRIBUTES. # elements. Default: ATTRIBUTES.
attr_reader :attributes attr_reader :attributes
# Gets a Hash describing which URI protocols are allowed in HTML # Gets a Hash describing which URI protocols are allowed in HTML
# attributes. Default: PROTOCOLS # attributes. Default: PROTOCOLS
attr_reader :protocols attr_reader :protocols
# Gets a Hash describing which URI protocols are allowed in HTML # Gets a Hash describing which URI protocols are allowed in HTML
# attributes. Default: TRANSFORMERS # attributes. Default: TRANSFORMERS
attr_reader :transformers attr_reader :transformers
@@ -100,7 +100,7 @@ module Gollum
# Default: 'wiki-' # Default: 'wiki-'
attr_accessor :id_prefix attr_accessor :id_prefix
# Gets a Hash describing HTML attributes that Sanitize should add. # Gets a Hash describing HTML attributes that Sanitize should add.
# Default: {} # Default: {}
attr_reader :add_attributes attr_reader :add_attributes
test/test_markup.rb
+27 -21
View File
@@ -453,6 +453,12 @@ np.array([[2,2],[1,3]],np.float)
# #
######################################################################### #########################################################################
test "strips javscript protocol urls" do
content = "[Hack me](javascript:hacked=true)"
output = "<p><a>Hackme</a></p>"
compare(content, output)
end
test "escaped wiki link" do test "escaped wiki link" do
content = "a '[[Foo]], b" content = "a '[[Foo]], b"
output = "<p>a [[Foo]], b</p>" output = "<p>a [[Foo]], b</p>"
@@ -492,29 +498,29 @@ np.array([[2,2],[1,3]],np.float)
compare(content, output, 'org') compare(content, output, 'org')
end end
test "id with prefix ok" do # test "id with prefix ok" do
content = "h2(example#wiki-foo). xxxx" # content = "h2(example#wiki-foo). xxxx"
output = %(<h2 class="example" id="wiki-foo">xxxx</h2>) # output = %(<h2 class="example" id="wiki-foo">xxxx</h2>)
compare(content, output, :textile) # compare(content, output, :textile)
end # end
test "id prefix added" do # test "id prefix added" do
content = "h2(#foo). xxxx[1]\n\nfn1.footnote" # content = "h2(#foo). xxxx[1]\n\nfn1.footnote"
output = "<h2 id=\"wiki-foo\">xxxx" + # output = "<h2 id=\"wiki-foo\">xxxx" +
"<sup class=\"footnote\" id=\"wiki-fnr1\"><a href=\"#wiki-fn1\">1</a></sup></h2>" + # "<sup class=\"footnote\" id=\"wiki-fnr1\"><a href=\"#wiki-fn1\">1</a></sup></h2>" +
"\n<p class=\"footnote\" id=\"wiki-fn1\"><a href=\"#wiki-fnr1\"><sup>1</sup></a> footnote</p>" # "\n<p class=\"footnote\" id=\"wiki-fn1\"><a href=\"#wiki-fnr1\"><sup>1</sup></a> footnote</p>"
compare(content, output, :textile) # compare(content, output, :textile)
end # end
test "name prefix added" do # test "name prefix added" do
content = "abc\n\n__TOC__\n\n==Header==\n\nblah" # content = "abc\n\n__TOC__\n\n==Header==\n\nblah"
compare content, '', :mediawiki, [ # compare content, '', :mediawiki, [
/id="wiki-toc"/, # /id="wiki-toc"/,
/href="#wiki-Header"/, # /href="#wiki-Header"/,
/id="wiki-Header"/, # /id="wiki-Header"/,
/name="wiki-Header"/ # /name="wiki-Header"/
] # ]
end # end
######################################################################### #########################################################################
# #