diff --git a/lib/gollum/frontend/views/create.rb b/lib/gollum/frontend/views/create.rb index 2b7dafbc..93e88987 100755 --- a/lib/gollum/frontend/views/create.rb +++ b/lib/gollum/frontend/views/create.rb @@ -18,17 +18,17 @@ module Precious end def format - @format = (@page.format || false) if @format.nil? + @format = (@page.format || false) if @format.nil? && @page @format.to_s.downcase end - - def has_footer - @footer = (@page.footer || false) if @footer.nil? + + def has_footer + @footer = (@page.footer || false) if @footer.nil? && @page !!@footer end - + def has_sidebar - @sidebar = (@page.sidebar || false) if @sidebar.nil? + @sidebar = (@page.sidebar || false) if @sidebar.nil? && @page !!@sidebar end diff --git a/test/static/default/Bilbo-Baggins.html b/test/static/default/Bilbo-Baggins.html deleted file mode 100644 index 9dd2c777..00000000 --- a/test/static/default/Bilbo-Baggins.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - Bilbo Baggins - - - -
-
-
-
-
-

Bilbo Baggins

- -

Bilbo Baggins is the protagonist of The Hobbit and also makes a few -appearances in The Lord of the Rings, two of the most well-known of J. R. R. -Tolkien's fantasy writings. The story of The Hobbit featuring Bilbo is also -retold from a different perspective in the Chapter The Quest of Erebor in -Unfinished Tales.

- -

In Tolkien's narrative conceit, in which all the writings of Middle-earth are -'really' translations from the fictitious volume of The Red Book of Westmarch, -Bilbo is the author of The Hobbit and translator of The Silmarillion.

- -

From http://en.wikipedia.org/wiki/Bilbo_Baggins.

-
-
-
- -
- -
- - - - diff --git a/test/static/default/Eye-Of-Sauron.html b/test/static/default/Eye-Of-Sauron.html deleted file mode 100644 index 6619be30..00000000 --- a/test/static/default/Eye-Of-Sauron.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - Eye Of Sauron - - - -
-
-
-
-
-

Eye Of Sauron

- -

Here are some pictures of the Eye of Sauron!

- -

Just the photo.

- -

- -

With alt.

- -

Eye of Sauron

- -

With frame and caption.

- -

Eye of SauronEye of Sauron

- -

Align left.

- -

- -

Alight center.

- -

- -

Alight right.

- -

- -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas interdum velit eu justo rutrum vitae semper urna porttitor. Sed viverra bibendum tincidunt. Curabitur vel mi sed nisl vestibulum lobortis eu ac nisl. Morbi fringilla adipiscing felis. Mauris luctus interdum accumsan. Integer leo mauris, dapibus a sollicitudin non, varius non erat. Donec eu dictum orci. Morbi viverra eleifend felis, et adipiscing neque consequat a. Vestibulum accumsan ligula suscipit mi rhoncus ac gravida lectus tincidunt. Donec interdum, FIRE FIRE FIREFIRE FIRE FIRE lorem sed interdum molestie, est ipsum pharetra est, sit amet eleifend purus eros at ligula. Aliquam erat volutpat. Sed dignissim interdum ipsum, et pulvinar lectus faucibus et. Ut at lacus risus, non lobortis erat. Proin malesuada sagittis mauris, in posuere turpis tincidunt eu. Nunc accumsan, ligula ut rutrum aliquet, neque metus suscipit ligula, in aliquam augue velit vel orci. Aliquam diam lectus, posuere id faucibus sed, aliquam vel erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas interdum velit eu justo rutrum vitae semper urna porttitor. Sed viverra bibendum tincidunt. Curabitur vel mi sed nisl vestibulum lobortis eu ac nisl. Morbi fringilla adipiscing felis. Mauris luctus interdum accumsan. Integer leo mauris, dapibus a sollicitudin non, varius non erat. Donec eu dictum orci. Morbi viverra eleifend felis, et adipiscing neque consequat a. Vestibulum accumsan ligula suscipit mi rhoncus ac gravida lectus tincidunt. Donec interdum, lorem sed interdum molestie, est ipsum pharetra est, sit amet eleifend purus eros at ligula. Aliquam erat volutpat. Sed dignissim interdum ipsum, et pulvinar lectus faucibus et. Ut at lacus risus, non lobortis erat. Proin malesuada sagittis mauris, in posuere turpis tincidunt eu. Nunc accumsan, ligula ut rutrum aliquet, neque metus suscipit ligula, in aliquam augue velit vel orci. Aliquam diam lectus, posuere id faucibus sed, aliquam vel erat.

- -

Smaller width.

- -

- -

Smaller height.

- -

-
-
-
- -
- -
- - - - diff --git a/test/static/default/My-Precious.html b/test/static/default/My-Precious.html deleted file mode 100644 index 588bc404..00000000 --- a/test/static/default/My-Precious.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - My Precious - - - -
-
-
-
-
-

One ring to rule them all!

-
-
-
- -
- -
- - - - diff --git a/test/static/default/css/gollum.css b/test/static/default/css/gollum.css deleted file mode 100644 index 627d98ef..00000000 --- a/test/static/default/css/gollum.css +++ /dev/null @@ -1,408 +0,0 @@ -/* - gollum.css - A basic stylesheet for Gollum -*/ - -/* @section core */ -body, html { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 10px; /* -> 1em */ - margin: 0; - padding: 0; -} - -#wiki-wrapper { - margin: 0 auto; - overflow: visible; - width: 80%; -} - -a:link { - color: #4183c4; - text-decoration: none; -} - -a:hover, a:visited { - text-decoration: underline; -} - - -/* @section head */ -#head { - border-bottom: 1px solid #ccc; - margin: 4.5em 0 0.5em; - padding: 0.5em 0; - overflow: hidden; -} - - #head h1 { - font-size: 3.3em; - float: left; - line-height: normal; - margin: 0; - padding: 0.08em 0 0 0; - } - - #head ul.actions { - float: right; - } - - -/* @section content */ -#wiki-content { - height: 1%; - overflow: visible; -} - - #wiki-content .wrap { - height: 1%; - overflow: auto; - } - - /* @section comments */ - #wiki-body #inline-comment { - display: none; /* todo */ - } - - /* @section body */ - #wiki-body { - float: left; - margin-right: 3%; - width: 70%; - } - - /* @section rightbar */ - #wiki-rightbar { - float: right; - width: 27%; - } - - #wiki-rightbar #nav { - background-color: #f7f7f7; - border: 1px solid #ddd; - margin-top: 1.5em; - padding: 1em; - - border-radius: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - } - - #wiki-rightbar #nav { - font-size: 1.2em; - line-height: 1.5em; - } - - #wiki-rightbar #nav p.parent { - border-bottom: 1px solid #bbb; - font-weight: bold; - margin: 0 0 0.5em 0; - padding: 0 0 0.5em 0; - text-shadow: 0 1px 0 #fff; - } - - /* Back arrow */ - #wiki-rightbar #nav p.parent:before { - color: #666; - content: "← "; - } - - #wiki-rightbar #nav h3 { - font-size: 1.2em; - color: #333; - margin: 1.2em 0 0; - padding: 0; - text-shadow: 0 1px 0 #fff; - } - - #wiki-rightbar #nav ul { - margin: 0.5em 0 1em; - padding: 0; - } - - #wiki-rightbar #nav ul li { - color: #bbb; - list-style-position: outside; - list-style-type: none; - margin: 0 0 0 1em; - padding: 0; - line-height: 1.75em; - } - - #wiki-rightbar #nav ul li:hover { - list-style-type: square; - } - - #wiki-rightbar #nav ul li a { - font-weight: bold; - text-shadow: 0 1px 0 #fff; - } - - /* @section footer */ - #wiki-footer { - clear: both; - margin: 2em 0 5em; - } - - .has-rightbar #wiki-footer { - width: 70%; - } - - #wiki-footer #footer-content { - background-color: #f7f7f7; - border: 1px solid #ddd; - font-size: 1.2em; - line-height: 1.5em; - margin-top: 1.5em; - padding: 1em; - - border-radius: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - } - - #wiki-footer #footer-content h3 { - font-size: 1.2em; - color: #333; - margin: 0; - padding: 0 0 0.2em; - text-shadow: 0 1px 0 #fff; - } - - #wiki-footer #footer-content p { - margin: 0.5em 0 0; - padding: 0; - } - - #wiki-footer #footer-content ul.links { - margin: 0.5em 0 0; - overflow: hidden; - padding: 0; - } - - #wiki-footer #footer-content ul.links li { - color: #999; - float: left; - list-style-position: inside; - list-style-type: square; - padding: 0; - margin-left: 0.75em; - } - - #wiki-footer #footer-content ul.links li a { - font-weight: bold; - text-shadow: 0 1px 0 #fff; - } - - #wiki-footer #footer-content ul.links li:first-child { - list-style-type: none; - margin: 0; - } - - .ff #wiki-footer #footer-content ul.links li:first-child { - margin: 0 -0.75em 0 0; - } - - /* @section page-footer */ - .page #footer { - border-top: 1px solid #ccc; - margin: 1em 0 7em; - } - - #footer p#last-edit { - font-size: 1.2em; - line-height: 1.6em; - color: #999; - margin: 0.9em 0; - } - - #footer p#last-edit span.username { - font-weight: bold; - } - - -/* @section history */ -.history h1 { - color: #999; - font-weight: normal; -} - - .history h1 strong { - color: #000; - font-weight: bold; - } - -#wiki-history { - margin-top: 3em; -} - - #wiki-history fieldset { - border: 0; - margin: 2em 0; - padding: 0; - } - - #wiki-history table, #wiki-history tbody { - border-collapse: collapse; - padding: 0; - margin: 0; - width: 100%; - } - - #wiki-history table tr { - padding: 0; - margin: 0; - } - - #wiki-history table tr { - background-color: #ebf2f6; - } - - #wiki-history table tr td { - border: 1px solid #c0dce9; - font-size: 1.2em; - line-height: 1.6em; - margin: 0; - padding: 0.3em 0.7em; - } - - #wiki-history table tr td.checkbox { - padding: 0.3em; - } - - #wiki-history table tr td.checkbox input { - cursor: pointer; - display: block; - padding-right: 0; - padding-top: 0.4em; - margin-right: -0.2em; - } - - #wiki-history table tr:nth-child(2n), - #wiki-history table tr.alt-row { - background-color: #f3f7fa; - } - - #wiki-history table tr.selected { - background-color: #ffffea !important; - z-index: 100; - } - - #wiki-history table tr td.commit-name { - border-right: none; - } - - #wiki-history table tr td.commit-name span.time-elapsed { - color: #999; - } - - #wiki-history table tr td.author { - width: 20%; - } - - #wiki-history table tr td.author a { - color: #000; - font-weight: bold; - } - - #wiki-history table tr td.author a span.username { - display: block; - padding-top: 3px; - } - - #wiki-history table tr td img { - background-color: #fff; - border: 1px solid #999; - display: block; - float: left; - height: 18px; - overflow: hidden; - margin: 0 0.5em 0 0; - width: 18px; - padding: 2px; - } - - #wiki-history table tr td.commit-name a { - font-size: 0.9em; - font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; - padding: 0 0.2em; - } - - #wiki-history table tr td.revert-action { - border-left: 0; - text-align: right; - } - - #wiki-history table tr td.revert-action a { - font-weight: bold; - } - - #wiki-history table tr td.revert-action a span { - font-size: 0.9em; - font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; - } - -.history #wiki-history ul.actions li, -.history #footer ul.actions li { - margin: 0 0.6em 0 0; -} - - -/* @section edit */ -.edit h1 { - color: #999; - font-weight: normal; -} - - .edit h1 strong { - color: #000; - font-weight: bold; - } - - - -/* @control minibutton */ -ul.actions { - display: block; - list-style-type: none; - overflow: hidden; - padding: 0; - } - - ul.actions li { - float: left; - font-size: 1.2em; - margin-left: 0.6em; - } - -.minibutton a { - background-color: #f7f7f7; - border: 1px solid #d4d4d4; - color: #333; - display: block; - font-weight: bold; - margin: 0; - padding: 0.4em 1em; - - text-shadow: 0 1px 0 #fff; - - filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec'); - background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec)); - background: -moz-linear-gradient(top, #f4f4f4, #ececec); - - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - -.minibutton a:hover { - background: #3072b3; - border-color: #518cc6 #518cc6 #2a65a0; - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - text-decoration: none; - - filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3'); - background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3)); - background: -moz-linear-gradient(top, #599bdc, #3072b3); -} \ No newline at end of file diff --git a/test/static/default/css/template.css b/test/static/default/css/template.css deleted file mode 100644 index 882877ff..00000000 --- a/test/static/default/css/template.css +++ /dev/null @@ -1,146 +0,0 @@ -/* - template.css - Wiki content formatting - Keeping this file separate so it can be easily swapped out if you - want to format your wiki content differently from the default. -*/ - -#template { - margin-bottom: 4em; /* Give it some breathing room */ -} - -.has-footer #template { - margin: 0; -} - -#template p { - font-size: 1.4em; - line-height: 1.6em; -} - - /* See http://webtypography.net/Rhythm_and_Proportion/ */ - #template p + p { - margin: -0.75em 0 0; - text-indent: 1em; - } - - /* Everybody loves type ornaments */ - #template p:last-child:after { - color: #999; - content: " ❈"; - font-size: 0.8em; - } - - #template blockquote p:last-child:after { - content: none; - } - -#template a:link { - color: #4183c4; - text-decoration: none; -} - -#template a:hover, #template a:visited { - text-decoration: underline; -} - -#template ul, #template ol { - margin: 1.0em 0 0 2.0em; - list-style-position: outside; - padding: 0; - -} - -#template p + ul, #template p + ol, -#template ul li > ul, #template ol li > ol { - margin-top: 0; -} - -#template ul li > ul, #template ol li > ol { - margin-left: 0; -} - - #template ul { - list-style-type: square; - } - - #template ol li > ol li { - font-size: 1.0em !important; - list-style-type: lower-roman; - list-style-position: inside; - } - - #template ol li > ol li > ol li { - list-style-type: lower-alpha; - } - - #template ol li > ol li > ol li > ol li { - list-style-type: lower-greek; - } - -#template ul li, #template ol li { - font-size: 1.4em; - line-height: 1.6em; - padding-top: 0.1em; /* Line up ordinals */ -} - -#template blockquote { - margin: 0 4.0em 0 2.0em; - padding: 0; -} - - #template blockquote p { - color: #888; - font-style: italic; - } - - -/* Headings */ -#template h1, #template h2, #template h3, -#template h4, #template h5, #template h6 { - margin: 0; - padding: 0.5em 0 0; -} - -#template h1 { - font-size: 2.6em; - font-weight: bold; -} - -#template h2 { - font-size: 2.2em; - font-weight: bold; -} - -#template h3 { - font-size: 2.0em; - font-weight: bold; -} - -#template h4 { - font-size: 1.8em; - font-weight: bold; -} - -#template h5 { - font-size: 1.6em; - font-weight: bold; - -} - -#template h6 { - font-size: 1.4em; - font-weight: bold; - margin-top: 1.0em; - text-transform: uppercase; /* all caps */ -} - - -/* Code-related */ -#template p code { - background-color: #f7f7f7; - border: 1px solid #ddd; - color: #222; /* This is a little heavy when #000 */ - font-family: Consolas, Monaco, "Courier New", monospace; - padding: 0.15em 0.3em; -} \ No newline at end of file diff --git a/test/static/default/index.html b/test/static/default/index.html deleted file mode 100644 index 58d42871..00000000 --- a/test/static/default/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - The LOTR Wiki - - - -
-
-
-
-
-

The LOTR Wiki

-

This wiki is awesome. You can learn about Bilbo Baggins or some evil stuff.

-
-
-
- -
- -
- - - -