From a6b5287deeeae8483e099ccb73dda6c77df36941 Mon Sep 17 00:00:00 2001 From: minad Date: Wed, 28 Jul 2010 15:40:09 +0200 Subject: [PATCH] =?UTF-8?q?project=20renamed=20to=20=C5=8Clelo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.markdown | 5 ++--- Rakefile | 2 +- config/config.yml.default | 2 +- lib/wiki/helper.rb | 4 ++-- plugins/misc/changelog.rb | 6 +++--- static/themes/atlantis/constants.sass | 4 +++- static/themes/atlantis/iehacks.sass | 6 +++--- static/themes/atlantis/layout.sass | 8 ++++++-- static/themes/atlantis/menu.sass | 4 ++-- static/themes/atlantis/print.sass | 10 +++++----- static/themes/atlantis/screen.sass | 8 ++++---- static/themes/atlantis/style.css | 4 ++-- test/request_test.rb | 2 +- views/layout.haml | 9 +++++---- views/show.haml | 3 +-- 15 files changed, 41 insertions(+), 36 deletions(-) diff --git a/README.markdown b/README.markdown index f19acefc..da5e9321 100644 --- a/README.markdown +++ b/README.markdown @@ -1,8 +1,7 @@ README ====== -Git-Wiki is a wiki that stores pages in a [Git][] repository. - +Ōlelo is a wiki that stores pages in a [Git][] repository. See the demo installation at or . Features @@ -14,7 +13,7 @@ A lot of the features are implemented as plugins. - Support for hierarchical wikis (directory structure) - Upload files - History (also as RSS/Atom changelog) -- Plugin system +- Access control lists - Support for multiple text engines (Creole, Markdown, Textile, ...) - Section editing for creole markup - Embedded LaTeX/Graphviz graphics diff --git a/Rakefile b/Rakefile index c255dc64..a557f97f 100644 --- a/Rakefile +++ b/Rakefile @@ -75,7 +75,7 @@ end desc 'Generate documentation' task :doc => 'doc/api/index.html' file 'doc/api/index.html' => FileList['**/*.rb'] do |f| - sh "rdoc -o doc/api --title 'Git-Wiki Documentation' --inline-source --format=html #{f.prerequisites.join(' ')}" + sh "rdoc -o doc/api --title 'Ōlelo Source Documentation' --inline-source --format=html #{f.prerequisites.join(' ')}" end namespace :notes do diff --git a/config/config.yml.default b/config/config.yml.default index 5423f8d1..eaeafd0b 100644 --- a/config/config.yml.default +++ b/config/config.yml.default @@ -7,7 +7,7 @@ # Main configuration # Wiki title displayed at the top of the page -title: 'Git-Wiki' +title: 'Ōlelo' # Default locale # Examples: en, en_US, de_DE diff --git a/lib/wiki/helper.rb b/lib/wiki/helper.rb index 83c2e81c..67119d7f 100644 --- a/lib/wiki/helper.rb +++ b/lib/wiki/helper.rb @@ -9,8 +9,8 @@ def define_block(name, content = nil, &block) blocks[name] = block ? capture_haml(&block) : content end - def footnote(content = nil, &block); define_block(:footnote, content, &block); end - def title(content = nil, &block); define_block(:title, content, &block); end + def footer(content = nil, &block); define_block(:footer, content, &block); end + def title(content = nil, &block); define_block(:title, content, &block); end end module FlashHelper diff --git a/plugins/misc/changelog.rb b/plugins/misc/changelog.rb index b340f6ab..564ad4aa 100644 --- a/plugins/misc/changelog.rb +++ b/plugins/misc/changelog.rb @@ -22,13 +22,13 @@ class Wiki::Application prefix = request.scheme + '://' + request.host + ':' + request.port.to_s + '/' content = RSS::Maker.make(params[:format] == 'rss' ? '2.0' : 'atom') do |feed| - feed.channel.generator = 'Git-Wiki' + feed.channel.generator = 'Ōlelo' feed.channel.title = Config.title feed.channel.link = prefix + resource.path feed.channel.description = Config.title + ' Changelog' - feed.channel.id = prefix + resource.path # atom + feed.channel.id = prefix + resource.path feed.channel.updated = Time.now - feed.channel.author = 'Git-Wiki' + feed.channel.author = Config.title feed.items.do_sort = true resource.history.each do |version| i = feed.items.new_item diff --git a/static/themes/atlantis/constants.sass b/static/themes/atlantis/constants.sass index e07a97b2..a60577ca 100644 --- a/static/themes/atlantis/constants.sass +++ b/static/themes/atlantis/constants.sass @@ -1,9 +1,11 @@ -$border: 1px solid #BBB +$border_color: #BBB +$border: 1px solid $border_color $color1: #0B3E71 $main_bg: #FFF $light_bg: #EEF $sidebar_width: 155px $content_padding: 3.5em $dark_color: #333 +$light_color: #555 $header_bg: url(images/header_bg.jpg) $color1 $header_bg2: url(images/header_bg_gray.jpg) $dark_color diff --git a/static/themes/atlantis/iehacks.sass b/static/themes/atlantis/iehacks.sass index b43a90dc..0bf8b6ab 100644 --- a/static/themes/atlantis/iehacks.sass +++ b/static/themes/atlantis/iehacks.sass @@ -6,11 +6,11 @@ width: 100% padding: 0 background: transparent - border-bottom: 1px solid #999 + border-bottom: $border #sidebar margin: 0 - border-right: 1px solid #999 - border-bottom: 1px solid #999 + border-right: $border + border-bottom: $border #content width: 70% background: transparent diff --git a/static/themes/atlantis/layout.sass b/static/themes/atlantis/layout.sass index c337e168..8afb4ec3 100644 --- a/static/themes/atlantis/layout.sass +++ b/static/themes/atlantis/layout.sass @@ -8,7 +8,7 @@ h1 +reset-box-model border: none - color: #FFFFC2 + color: #FFF font-size: 200% font-variant: small-caps font-weight: bold @@ -83,10 +83,14 @@ html, body #footer clear: both position: relative - color: #555 + color: $light_color font-size: 90% background: url(images/footer_bg.png) top left repeat-x margin-top: -23px padding: 3em text-align: right z-index: 1 !important + .powered_by + margin-top: 1em + color: #AAA + font-size: 90% diff --git a/static/themes/atlantis/menu.sass b/static/themes/atlantis/menu.sass index 1232f724..9e552b6a 100644 --- a/static/themes/atlantis/menu.sass +++ b/static/themes/atlantis/menu.sass @@ -32,7 +32,6 @@ background: $light_bg &.noborder padding: 0 1em - color: #999 border: none &.breadcrumb border: none @@ -42,7 +41,7 @@ text-indent: -999px display: block width: 16px - background: url(images/actions/home.png) no-repeat 1em 0.2em + background: url(images/actions/home.png) no-repeat 1em 0.1em &.first a padding-left: 1em &.last @@ -54,6 +53,7 @@ text-decoration: none white-space: nowrap padding: 0 1em + height: 1.6em color: $dark_color cursor: pointer &.action-older:before diff --git a/static/themes/atlantis/print.sass b/static/themes/atlantis/print.sass index 3fcd1426..72e46c3d 100644 --- a/static/themes/atlantis/print.sass +++ b/static/themes/atlantis/print.sass @@ -14,7 +14,7 @@ body font-family: 'Georgia', 'Times New Roman', serif color: $color1 margin: 1em 0 0.5em 0 - border-bottom: 1px solid #999 + border-bottom: $border +headlines @@ -37,10 +37,10 @@ ul, ol table border-collapse: collapse border-spacing: 0 - border: 1px solid #999 + border: $border tr td, th - border: 1px solid #999 + border: $border padding: 0.2em 0.5em &.link padding: 0 @@ -58,7 +58,7 @@ a &.img background: transparent div.img & - border: 1px solid #999 + border: $border float: right text-align: center color: #000 @@ -71,7 +71,7 @@ img vertical-align: middle hr - background: #999 + background: $border_color border: none height: 1px diff --git a/static/themes/atlantis/screen.sass b/static/themes/atlantis/screen.sass index a144e89b..4d49d104 100644 --- a/static/themes/atlantis/screen.sass +++ b/static/themes/atlantis/screen.sass @@ -61,7 +61,7 @@ ul.pagination a display: block background: $main_bg - border: 1px outset #999 + border: 1px outset $border_color padding: 0em 0.5em line-height: 1.5em +rounded @@ -113,7 +113,7 @@ a .editlink font-size: 9pt - color: #999 + color: $light_color float: right margin-top: -1.8em font-variant: normal @@ -132,7 +132,7 @@ img vertical-align: middle hr - background: #999 + background: $border_color border: none height: 1px @@ -228,7 +228,7 @@ form float: left margin: 0.3em 0.5em 0.3em 0 padding: 2px - border: 1px outset #999 + border: 1px outset $border_color color: $dark_color &:focus border-style: dotted diff --git a/static/themes/atlantis/style.css b/static/themes/atlantis/style.css index 648e115d..f7501512 100644 --- a/static/themes/atlantis/style.css +++ b/static/themes/atlantis/style.css @@ -1,3 +1,3 @@ -@media screen{.changes{width:100%;border:1px solid #999;border-collapse:collapse;border-spacing:0}.changes tr td{padding:0.5em;border-top:1px solid #999;font-family:"Bitstream Vera Mono", monospace;white-space:pre-wrap}.changes tr td span.plus{background:#af9}.changes tr td span.minus{color:#777;text-decoration:line-through}.changes tr th{font-variant:normal;padding:0.2em 0.5em;border:1px solid #999}.changes tr th .left{float:left}.changes tr th .right{float:right}#header{background:url(images/header_bg.jpg) #0b3e71;padding-left:0.5em;clear:both;height:3em}#header h1{margin:0;padding:0;border:0;outline:0;border:none;color:#ffffc2;font-size:200%;font-variant:small-caps;font-weight:bold;float:left}#info{float:right;background:#eef;padding:0.3em;margin:0.65em 0.5em 0 0}#search{float:right;border:none}#search input{margin:0.65em 0.5em 0 0;width:10em;padding:0.2em;padding-left:20px;background:#fff url(images/search.png) no-repeat 0.2em 0.2em}html,body{height:100%}#container{min-height:520px;position:relative;display:block;overflow:hidden;padding-right:7em;padding-left:155px;background:url(images/container_bg.png) top left repeat-y;z-index:10}#content{position:relative;float:left;width:100%;padding:0 3.5em 3.5em 3.5em;background:url(images/content_bg.png) top left repeat-x}#sidebar{background:#eef;position:relative;width:155px;float:left;padding-bottom:3.5em;margin-left:-155px;font-variant:small-caps}#sidebar h1,#sidebar h2,#sidebar h3,#sidebar h4,#sidebar h5,#sidebar h6{font-size:140%;background:#fff;font-weight:normal;padding:0 5px;margin:1em 0 0 0;border-top:1px solid #85aaff;border-bottom:1px solid #85aaff;display:block}#sidebar ul{margin:0;padding:0;border:0;outline:0;list-style:none}#sidebar ul li{margin:0}#sidebar ul li a{padding:0 5px;display:block}#sidebar ul ul a{padding:0 20px}#sidebar ul ul ul a{padding:0 35px}#footer{clear:both;position:relative;color:#555;font-size:90%;background:url(images/footer_bg.png) top left repeat-x;margin-top:-23px;padding:3em;text-align:right;z-index:1 !important}#menu{height:1.6em;border-top:1px solid #bbb;border-bottom:1px solid #bbb;font-variant:small-caps}#menu ul{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:block;float:left;height:1.6em}#menu ul li{float:left}#menu ul.wiki{float:right}#menu ul.wiki li{border-left:1px solid #bbb;border-right:none}#menu ul li{margin:0;padding:0;border:0;outline:0;display:block;float:left;height:1.6em;line-height:1.6em;border-right:1px solid #bbb;color:#333}#menu ul li.selected a:before{content:"\2022\00a0"}#menu ul li.download{background:#eef}#menu ul li.noborder{padding:0 1em;color:#999;border:none}#menu ul li.breadcrumb{border:none}#menu ul li.breadcrumb a{padding:0 0.3em}#menu ul li.breadcrumb a.root{text-indent:-999px;display:block;width:16px;background:url(images/actions/home.png) no-repeat 1em 0.2em}#menu ul li.breadcrumb.first a{padding-left:1em}#menu ul li.breadcrumb.last{border-right:1px solid #bbb}#menu ul li.breadcrumb.last a{padding-right:1em}#menu ul li a{display:block;text-decoration:none;white-space:nowrap;padding:0 1em;color:#333;cursor:pointer}#menu ul li a.action-older:before{content:"\00ab\00a0"}#menu ul li a.action-newer:after{content:"\00a0\00bb"}#menu ul li a.action-new:before{content:url(images/actions/new.png) "\00a0"}#menu ul li a.action-edit:before{content:url(images/actions/edit.png) "\00a0"}#menu ul li a.action-history:before{content:url(images/actions/history.png) "\00a0"}#menu ul li a.action-delete:before{content:url(images/actions/delete.png) "\00a0"}#menu ul li a.action-move:before{content:url(images/actions/move.png) "\00a0"}#menu ul li a.action-metadata:before{content:url(images/actions/metadata.png) "\00a0"}#menu ul li a.action-discussion:before{content:url(images/actions/discussion.png) "\00a0"}#menu ul li a.action-page:before{content:url(images/actions/page.png) "\00a0"}#menu ul li a:hover,#menu ul li a:focus,#menu ul li a:active{text-shadow:#333 1px 1px 2px}#menu ul li ul{z-index:20;display:none;position:absolute;border-top:1px solid #bbb;margin-left:-1px}#menu ul li ul li{background:#fff;clear:both;border:1px solid #bbb !important;border-top:none !important;width:100%}#menu ul li:hover > ul{display:block}html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}*:focus{outline:0}body{line-height:1em;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:"" ""}q:before,q:after,blockquote:before,blockquote:after{content:""}img a{border:none}body{color:#111;background:#fff;font-family:"Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;font-size:10pt;line-height:1.2em}h1{font-size:170%}h2{font-size:160%}h3{font-size:150%}h4{font-size:140%}h5{font-size:130%}h6{font-size:120%}h1,h2,h3,h4,h5,h6{font-family:"Georgia", "Times New Roman", serif;color:#0b3e71;margin:1em 0 0.5em 0;border-bottom:1px solid #bbb;line-height:1.2em}strong{font-weight:bold}em{font-style:italic}ul,ol,p{margin:0.8em 0 0.8em 0}ul,ol ul,ol{margin:0}ul{list-style-type:disc}ol{list-style-type:decimal}ul,ol{list-style-position:outside;padding-left:1.5em}ul.pagination{list-style-type:none;margin:0;display:block;padding:0;width:100%;height:3em}ul.pagination li{float:left;padding:0;margin:0 0.5em 0.5em 0}ul.pagination li a{display:block;background:#fff;border:1px outset #999;padding:0em 0.5em;line-height:1.5em;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;color:#000}ul.pagination li a:active,ul.pagination li a.current,ul.pagination li a.loading{background:#ddf;border-style:inset}ul.pagination li a.loading{background:#ddf url(images/loading.gif) repeat}table{box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;border-collapse:collapse;border-spacing:0;border:1px solid #bbb;margin:0 0 1em 0}table tr{background:#fff}table tr td,table tr th{padding:0.2em 0.5em}table tr td.link,table tr th.link{padding:0}table tr td.link a,table tr th.link a{margin:0;padding:0.2em 0.5em;display:block}table tr th{background:#ccc;border-bottom:1px solid #bbb;font-variant:small-caps}table tr.even{background:#ddf}a,a:visited{color:#0b3e71;text-decoration:none}a.img{background:transparent}span.img a{border:1px solid #bbb;float:right;text-align:center;color:#000;background:#fff;padding:0.2em}span.img a img{display:block}.editlink{font-size:9pt;color:#999;float:right;margin-top:-1.8em;font-variant:normal;width:100%;text-align:right}sub{vertical-align:text-bottom;font-size:75%}sup{vertical-align:text-top;font-size:75%}img{vertical-align:middle}hr{background:#999;border:none;height:1px}.version,tt,pre,code,kbd{font-family:"Bitstream Vera Mono", monospace}pre{border:1px solid #bbb;padding:0.2em;min-width:60%;white-space:pre-wrap;display:block}table.full,#history-table,#tree-table{width:100%}table.full td,table.full th,#history-table td,#history-table th,#tree-table td,#tree-table th{white-space:nowrap}.history-draggable{background-color:#f99}#tree-table .actions{width:80px;padding:0px}#tree-table .action-edit{text-indent:-999px;background:url(images/actions/edit.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-history{text-indent:-999px;background:url(images/actions/history.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-delete{text-indent:-999px;background:url(images/actions/delete.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-move{text-indent:-999px;background:url(images/actions/move.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .page:before{content:url(images/page.png) "\00a0"}#tree-table .tree:before{content:url(images/tree.png) "\00a0"}#tree-table .file-type-7z:before{content:url(images/filetypes/7z.png) "\00a0"}#tree-table .file-type-bz2:before{content:url(images/filetypes/bz2.png) "\00a0"}#tree-table .file-type-doc:before{content:url(images/filetypes/doc.png) "\00a0"}#tree-table .file-type-flac:before{content:url(images/filetypes/flac.png) "\00a0"}#tree-table .file-type-gz:before{content:url(images/filetypes/gz.png) "\00a0"}#tree-table .file-type-html:before{content:url(images/filetypes/html.png) "\00a0"}#tree-table .file-type-java:before{content:url(images/filetypes/java.png) "\00a0"}#tree-table .file-type-jpg:before{content:url(images/filetypes/jpg.png) "\00a0"}#tree-table .file-type-midi:before{content:url(images/filetypes/midi.png) "\00a0"}#tree-table .file-type-mp3:before{content:url(images/filetypes/mp3.png) "\00a0"}#tree-table .file-type-ogg:before{content:url(images/filetypes/ogg.png) "\00a0"}#tree-table .file-type-pdf:before{content:url(images/filetypes/pdf.png) "\00a0"}#tree-table .file-type-php:before{content:url(images/filetypes/php.png) "\00a0"}#tree-table .file-type-png:before{content:url(images/filetypes/png.png) "\00a0"}#tree-table .file-type-ppt:before{content:url(images/filetypes/ppt.png) "\00a0"}#tree-table .file-type-psd:before{content:url(images/filetypes/psd.png) "\00a0"}#tree-table .file-type-rar:before{content:url(images/filetypes/rar.png) "\00a0"}#tree-table .file-type-rb:before{content:url(images/filetypes/rb.png) "\00a0"}#tree-table .file-type-sh:before{content:url(images/filetypes/sh.png) "\00a0"}#tree-table .file-type-tar:before{content:url(images/filetypes/tar.png) "\00a0"}#tree-table .file-type-txt:before{content:url(images/filetypes/txt.png) "\00a0"}#tree-table .file-type-wma:before{content:url(images/filetypes/wma.png) "\00a0"}#tree-table .file-type-xls:before{content:url(images/filetypes/xls.png) "\00a0"}#tree-table .file-type-zip:before{content:url(images/filetypes/zip.png) "\00a0"}.error{color:#a00}.ref{vertical-align:super;font-size:80%}form{display:inline}form select,form textarea,form pre,form input{float:left;margin:0.3em 0.5em 0.3em 0;padding:2px;border:1px solid #bbb;background:#fff;color:#333}form select:focus,form textarea:focus,form pre:focus,form input:focus{border-style:dotted}form button{border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;background:#ddd;float:left;margin:0.3em 0.5em 0.3em 0;padding:2px;border:1px outset #999;color:#333}form button:focus{border-style:dotted}form button:active{border-style:inset}form.inline *{float:none;display:inline;margin:0;padding:0}form.inline button{border:none;background:none}form label,form strong{float:left;margin:0;padding:0.4em 0.5em 0.4em 0;border:none;background:none;color:#333;white-space:nowrap}form .fieldset label{width:8em}form .fieldset label.inline{width:auto}form input[type=text],form textarea{font-family:"Bitstream Vera Mono", monospace;font-size:100%}form textarea{width:98%}form input[type=image],form input[type=image]:focus,form input[type=checkbox]{border:none;background:none}form input[type=hidden]{display:none}form br{clear:left}table input{margin:0}.preview{margin:0 0 1em 0;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;padding:1em;border:1px solid #bbb}.box,.fieldset{border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;clear:both;display:block;border:1px solid #bbb;padding:0.5em 1em;margin:1em 0;overflow:hidden}.box h1,.box h2,.box h3,.box h4,.box h5,.box h6,.fieldset h1,.fieldset h2,.fieldset h3,.fieldset h4,.fieldset h5,.fieldset h6{margin:0.2em 0}.js .tabs .tabs-hide{display:none}.js .tabs > ul{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:block;float:left;margin:0 0 1px 0;height:1.5em;width:100%;z-index:100;position:relative}.js .tabs > ul li{float:left}.js .tabs > ul > li{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;font-variant:small-caps;background:#ddf;float:left;padding:0;margin:0 0 0 4px;height:1.5em;line-height:1.5em;border:1px solid #bbb}.js .tabs > ul > li.tabs-selected > a{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;background:#fff;border-bottom:1px solid #fff}.js .tabs > ul > li > a{display:block;text-decoration:none;white-space:nowrap;padding:0 0.8em;color:#333}.js .tabs > ul > li > a:hover,.js .tabs > ul > li > a:active,.js .tabs > ul > li > a:focus{text-shadow:#333 1px 1px 2px}.no-js .tabs > ul{display:none}.hidden{display:none !important}.date{cursor:pointer}.toc{border:1px solid #bbb;padding:0.5em 2.5em;margin:1em 0}.toc ul{margin:0}.toc .toc1{font-weight:bold}.toc .toc1 .toc2{font-weight:normal}.files{margin:0 0 1em 0;padding:0;list-style-type:none}.files .deleted{background:url(images/minus.png) top left no-repeat;padding-left:20px}.files .new{background:url(images/plus.png) top left no-repeat;padding-left:20px}#themes{float:left}#themes .styleswitcher{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:inline}#themes .styleswitcher li{margin-right:0.5em;display:inline}.timemachine #header{background:url(images/header_bg_gray.jpg) #333}.timemachine #header h1{color:#eee}* html #container{width:100%;padding:0;background:transparent;border-bottom:1px solid #999}* html #sidebar{margin:0;border-right:1px solid #999;border-bottom:1px solid #999}* html #content{width:70%;background:transparent}* html #footer{background:transparent;margin-top:0;padding-top:0}*:first-child + html #container{padding-right:7.1em}*:first-child + html #menu ul li li{width:8em} -}@media print{.changes{width:100%;border:1px solid #999;border-collapse:collapse;border-spacing:0}.changes tr td{padding:0.5em;border-top:1px solid #999;font-family:"Bitstream Vera Mono", monospace;white-space:pre-wrap}.changes tr td span.plus{background:#af9}.changes tr td span.minus{color:#777;text-decoration:line-through}.changes tr th{font-variant:normal;padding:0.2em 0.5em;border:1px solid #999}.changes tr th .left{float:left}.changes tr th .right{float:right}body{color:#000;background:#fff;font-family:"Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;font-size:10pt;line-height:1.2em}h1{font-size:170%}h2{font-size:160%}h3{font-size:150%}h4{font-size:140%}h5{font-size:130%}h6{font-size:120%}h1,h2,h3,h4,h5,h6{font-family:"Georgia", "Times New Roman", serif;color:#0b3e71;margin:1em 0 0.5em 0;border-bottom:1px solid #999}ul,ol,p{margin:0.8em 0 0.8em 0}ul,ol ul,ol{margin:0}ul{list-style-type:disc}ol{list-style-type:decimal}ul,ol{list-style-position:outside;padding-left:1.5em}table{border-collapse:collapse;border-spacing:0;border:1px solid #999}table tr td,table tr th{border:1px solid #999;padding:0.2em 0.5em}table tr td.link,table tr th.link{padding:0}table tr td.link a,table tr th.link a{margin:0;padding:0.2em 0.5em;display:block}table tr th{font-variant:small-caps}a,a:visited{color:#0b3e71;text-decoration:none}a.img{background:transparent}div.img a{border:1px solid #999;float:right;text-align:center;color:#000;background:#fff;padding:0.2em}div.img a img{display:block}img{vertical-align:middle}hr{background:#999;border:none;height:1px}#header,#sidebar,#menu,.editlink,.backref,.hidden,.noprint{display:none !important}#footer{display:block;margin-top:1em}.ref,.ref:visited,.ref:active,.ref:hover{vertical-align:super;font-size:80%;color:#000}.date .ago{display:none !important}.date .full{display:inline !important}.toc{padding:0.5em 2em}.toc ul{margin:0}.toc .toc1{font-weight:bold}.toc .toc1 .toc2{font-weight:normal} +@media screen{.changes{width:100%;border:1px solid #999;border-collapse:collapse;border-spacing:0}.changes tr td{padding:0.5em;border-top:1px solid #999;font-family:"Bitstream Vera Mono", monospace;white-space:pre-wrap}.changes tr td span.plus{background:#af9}.changes tr td span.minus{color:#777;text-decoration:line-through}.changes tr th{font-variant:normal;padding:0.2em 0.5em;border:1px solid #999}.changes tr th .left{float:left}.changes tr th .right{float:right}#header{background:url(images/header_bg.jpg) #0b3e71;padding-left:0.5em;clear:both;height:3em}#header h1{margin:0;padding:0;border:0;outline:0;border:none;color:#fff;font-size:200%;font-variant:small-caps;font-weight:bold;float:left}#info{float:right;background:#eef;padding:0.3em;margin:0.65em 0.5em 0 0}#search{float:right;border:none}#search input{margin:0.65em 0.5em 0 0;width:10em;padding:0.2em;padding-left:20px;background:#fff url(images/search.png) no-repeat 0.2em 0.2em}html,body{height:100%}#container{min-height:520px;position:relative;display:block;overflow:hidden;padding-right:7em;padding-left:155px;background:url(images/container_bg.png) top left repeat-y;z-index:10}#content{position:relative;float:left;width:100%;padding:0 3.5em 3.5em 3.5em;background:url(images/content_bg.png) top left repeat-x}#sidebar{background:#eef;position:relative;width:155px;float:left;padding-bottom:3.5em;margin-left:-155px;font-variant:small-caps}#sidebar h1,#sidebar h2,#sidebar h3,#sidebar h4,#sidebar h5,#sidebar h6{font-size:140%;background:#fff;font-weight:normal;padding:0 5px;margin:1em 0 0 0;border-top:1px solid #85aaff;border-bottom:1px solid #85aaff;display:block}#sidebar ul{margin:0;padding:0;border:0;outline:0;list-style:none}#sidebar ul li{margin:0}#sidebar ul li a{padding:0 5px;display:block}#sidebar ul ul a{padding:0 20px}#sidebar ul ul ul a{padding:0 35px}#footer{clear:both;position:relative;color:#555;font-size:90%;background:url(images/footer_bg.png) top left repeat-x;margin-top:-23px;padding:3em;text-align:right;z-index:1 !important}#footer .powered_by{margin-top:1em;color:#aaa;font-size:90%}#menu{height:1.6em;border-top:1px solid #bbb;border-bottom:1px solid #bbb;font-variant:small-caps}#menu ul{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:block;float:left;height:1.6em}#menu ul li{float:left}#menu ul.wiki{float:right}#menu ul.wiki li{border-left:1px solid #bbb;border-right:none}#menu ul li{margin:0;padding:0;border:0;outline:0;display:block;float:left;height:1.6em;line-height:1.6em;border-right:1px solid #bbb;color:#333}#menu ul li.selected a:before{content:"\2022\00a0"}#menu ul li.download{background:#eef}#menu ul li.noborder{padding:0 1em;border:none}#menu ul li.breadcrumb{border:none}#menu ul li.breadcrumb a{padding:0 0.3em}#menu ul li.breadcrumb a.root{text-indent:-999px;display:block;width:16px;background:url(images/actions/home.png) no-repeat 1em 0.1em}#menu ul li.breadcrumb.first a{padding-left:1em}#menu ul li.breadcrumb.last{border-right:1px solid #bbb}#menu ul li.breadcrumb.last a{padding-right:1em}#menu ul li a{display:block;text-decoration:none;white-space:nowrap;padding:0 1em;height:1.6em;color:#333;cursor:pointer}#menu ul li a.action-older:before{content:"\00ab\00a0"}#menu ul li a.action-newer:after{content:"\00a0\00bb"}#menu ul li a.action-new:before{content:url(images/actions/new.png) "\00a0"}#menu ul li a.action-edit:before{content:url(images/actions/edit.png) "\00a0"}#menu ul li a.action-history:before{content:url(images/actions/history.png) "\00a0"}#menu ul li a.action-delete:before{content:url(images/actions/delete.png) "\00a0"}#menu ul li a.action-move:before{content:url(images/actions/move.png) "\00a0"}#menu ul li a.action-metadata:before{content:url(images/actions/metadata.png) "\00a0"}#menu ul li a.action-discussion:before{content:url(images/actions/discussion.png) "\00a0"}#menu ul li a.action-page:before{content:url(images/actions/page.png) "\00a0"}#menu ul li a:hover,#menu ul li a:focus,#menu ul li a:active{text-shadow:#333 1px 1px 2px}#menu ul li ul{z-index:20;display:none;position:absolute;border-top:1px solid #bbb;margin-left:-1px}#menu ul li ul li{background:#fff;clear:both;border:1px solid #bbb !important;border-top:none !important;width:100%}#menu ul li:hover > ul{display:block}html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}*:focus{outline:0}body{line-height:1em;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:"" ""}q:before,q:after,blockquote:before,blockquote:after{content:""}img a{border:none}body{color:#111;background:#fff;font-family:"Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;font-size:10pt;line-height:1.2em}h1{font-size:170%}h2{font-size:160%}h3{font-size:150%}h4{font-size:140%}h5{font-size:130%}h6{font-size:120%}h1,h2,h3,h4,h5,h6{font-family:"Georgia", "Times New Roman", serif;color:#0b3e71;margin:1em 0 0.5em 0;border-bottom:1px solid #bbb;line-height:1.2em}strong{font-weight:bold}em{font-style:italic}ul,ol,p{margin:0.8em 0 0.8em 0}ul,ol ul,ol{margin:0}ul{list-style-type:disc}ol{list-style-type:decimal}ul,ol{list-style-position:outside;padding-left:1.5em}ul.pagination{list-style-type:none;margin:0;display:block;padding:0;width:100%;height:3em}ul.pagination li{float:left;padding:0;margin:0 0.5em 0.5em 0}ul.pagination li a{display:block;background:#fff;border:1px outset #bbb;padding:0em 0.5em;line-height:1.5em;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;color:#000}ul.pagination li a:active,ul.pagination li a.current,ul.pagination li a.loading{background:#ddf;border-style:inset}ul.pagination li a.loading{background:#ddf url(images/loading.gif) repeat}table{box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;border-collapse:collapse;border-spacing:0;border:1px solid #bbb;margin:0 0 1em 0}table tr{background:#fff}table tr td,table tr th{padding:0.2em 0.5em}table tr td.link,table tr th.link{padding:0}table tr td.link a,table tr th.link a{margin:0;padding:0.2em 0.5em;display:block}table tr th{background:#ccc;border-bottom:1px solid #bbb;font-variant:small-caps}table tr.even{background:#ddf}a,a:visited{color:#0b3e71;text-decoration:none}a.img{background:transparent}span.img a{border:1px solid #bbb;float:right;text-align:center;color:#000;background:#fff;padding:0.2em}span.img a img{display:block}.editlink{font-size:9pt;color:#555;float:right;margin-top:-1.8em;font-variant:normal;width:100%;text-align:right}sub{vertical-align:text-bottom;font-size:75%}sup{vertical-align:text-top;font-size:75%}img{vertical-align:middle}hr{background:#bbb;border:none;height:1px}.version,tt,pre,code,kbd{font-family:"Bitstream Vera Mono", monospace}pre{border:1px solid #bbb;padding:0.2em;min-width:60%;white-space:pre-wrap;display:block}table.full,#history-table,#tree-table{width:100%}table.full td,table.full th,#history-table td,#history-table th,#tree-table td,#tree-table th{white-space:nowrap}.history-draggable{background-color:#f99}#tree-table .actions{width:80px;padding:0px}#tree-table .action-edit{text-indent:-999px;background:url(images/actions/edit.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-history{text-indent:-999px;background:url(images/actions/history.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-delete{text-indent:-999px;background:url(images/actions/delete.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .action-move{text-indent:-999px;background:url(images/actions/move.png) no-repeat top left;float:left;width:16px;height:16px;overflow:hidden}#tree-table .page:before{content:url(images/page.png) "\00a0"}#tree-table .tree:before{content:url(images/tree.png) "\00a0"}#tree-table .file-type-7z:before{content:url(images/filetypes/7z.png) "\00a0"}#tree-table .file-type-bz2:before{content:url(images/filetypes/bz2.png) "\00a0"}#tree-table .file-type-doc:before{content:url(images/filetypes/doc.png) "\00a0"}#tree-table .file-type-flac:before{content:url(images/filetypes/flac.png) "\00a0"}#tree-table .file-type-gz:before{content:url(images/filetypes/gz.png) "\00a0"}#tree-table .file-type-html:before{content:url(images/filetypes/html.png) "\00a0"}#tree-table .file-type-java:before{content:url(images/filetypes/java.png) "\00a0"}#tree-table .file-type-jpg:before{content:url(images/filetypes/jpg.png) "\00a0"}#tree-table .file-type-midi:before{content:url(images/filetypes/midi.png) "\00a0"}#tree-table .file-type-mp3:before{content:url(images/filetypes/mp3.png) "\00a0"}#tree-table .file-type-ogg:before{content:url(images/filetypes/ogg.png) "\00a0"}#tree-table .file-type-pdf:before{content:url(images/filetypes/pdf.png) "\00a0"}#tree-table .file-type-php:before{content:url(images/filetypes/php.png) "\00a0"}#tree-table .file-type-png:before{content:url(images/filetypes/png.png) "\00a0"}#tree-table .file-type-ppt:before{content:url(images/filetypes/ppt.png) "\00a0"}#tree-table .file-type-psd:before{content:url(images/filetypes/psd.png) "\00a0"}#tree-table .file-type-rar:before{content:url(images/filetypes/rar.png) "\00a0"}#tree-table .file-type-rb:before{content:url(images/filetypes/rb.png) "\00a0"}#tree-table .file-type-sh:before{content:url(images/filetypes/sh.png) "\00a0"}#tree-table .file-type-tar:before{content:url(images/filetypes/tar.png) "\00a0"}#tree-table .file-type-txt:before{content:url(images/filetypes/txt.png) "\00a0"}#tree-table .file-type-wma:before{content:url(images/filetypes/wma.png) "\00a0"}#tree-table .file-type-xls:before{content:url(images/filetypes/xls.png) "\00a0"}#tree-table .file-type-zip:before{content:url(images/filetypes/zip.png) "\00a0"}.error{color:#a00}.ref{vertical-align:super;font-size:80%}form{display:inline}form select,form textarea,form pre,form input{float:left;margin:0.3em 0.5em 0.3em 0;padding:2px;border:1px solid #bbb;background:#fff;color:#333}form select:focus,form textarea:focus,form pre:focus,form input:focus{border-style:dotted}form button{border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;background:#ddd;float:left;margin:0.3em 0.5em 0.3em 0;padding:2px;border:1px outset #bbb;color:#333}form button:focus{border-style:dotted}form button:active{border-style:inset}form.inline *{float:none;display:inline;margin:0;padding:0}form.inline button{border:none;background:none}form label,form strong{float:left;margin:0;padding:0.4em 0.5em 0.4em 0;border:none;background:none;color:#333;white-space:nowrap}form .fieldset label{width:8em}form .fieldset label.inline{width:auto}form input[type=text],form textarea{font-family:"Bitstream Vera Mono", monospace;font-size:100%}form textarea{width:98%}form input[type=image],form input[type=image]:focus,form input[type=checkbox]{border:none;background:none}form input[type=hidden]{display:none}form br{clear:left}table input{margin:0}.preview{margin:0 0 1em 0;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;padding:1em;border:1px solid #bbb}.box,.fieldset{border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;box-shadow:4px 4px 10px #555;-moz-box-shadow:4px 4px 10px #555;-webkit-box-shadow:4px 4px 10px #555;clear:both;display:block;border:1px solid #bbb;padding:0.5em 1em;margin:1em 0;overflow:hidden}.box h1,.box h2,.box h3,.box h4,.box h5,.box h6,.fieldset h1,.fieldset h2,.fieldset h3,.fieldset h4,.fieldset h5,.fieldset h6{margin:0.2em 0}.js .tabs .tabs-hide{display:none}.js .tabs > ul{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:block;float:left;margin:0 0 1px 0;height:1.5em;width:100%;z-index:100;position:relative}.js .tabs > ul li{float:left}.js .tabs > ul > li{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;font-variant:small-caps;background:#ddf;float:left;padding:0;margin:0 0 0 4px;height:1.5em;line-height:1.5em;border:1px solid #bbb}.js .tabs > ul > li.tabs-selected > a{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;background:#fff;border-bottom:1px solid #fff}.js .tabs > ul > li > a{display:block;text-decoration:none;white-space:nowrap;padding:0 0.8em;color:#333}.js .tabs > ul > li > a:hover,.js .tabs > ul > li > a:active,.js .tabs > ul > li > a:focus{text-shadow:#333 1px 1px 2px}.no-js .tabs > ul{display:none}.hidden{display:none !important}.date{cursor:pointer}.toc{border:1px solid #bbb;padding:0.5em 2.5em;margin:1em 0}.toc ul{margin:0}.toc .toc1{font-weight:bold}.toc .toc1 .toc2{font-weight:normal}.files{margin:0 0 1em 0;padding:0;list-style-type:none}.files .deleted{background:url(images/minus.png) top left no-repeat;padding-left:20px}.files .new{background:url(images/plus.png) top left no-repeat;padding-left:20px}#themes{float:left}#themes .styleswitcher{margin:0;padding:0;border:0;outline:0;list-style-type:none;margin-left:0px;display:inline}#themes .styleswitcher li{margin-right:0.5em;display:inline}.timemachine #header{background:url(images/header_bg_gray.jpg) #333}.timemachine #header h1{color:#eee}* html #container{width:100%;padding:0;background:transparent;border-bottom:1px solid #bbb}* html #sidebar{margin:0;border-right:1px solid #bbb;border-bottom:1px solid #bbb}* html #content{width:70%;background:transparent}* html #footer{background:transparent;margin-top:0;padding-top:0}*:first-child + html #container{padding-right:7.1em}*:first-child + html #menu ul li li{width:8em} +}@media print{.changes{width:100%;border:1px solid #999;border-collapse:collapse;border-spacing:0}.changes tr td{padding:0.5em;border-top:1px solid #999;font-family:"Bitstream Vera Mono", monospace;white-space:pre-wrap}.changes tr td span.plus{background:#af9}.changes tr td span.minus{color:#777;text-decoration:line-through}.changes tr th{font-variant:normal;padding:0.2em 0.5em;border:1px solid #999}.changes tr th .left{float:left}.changes tr th .right{float:right}body{color:#000;background:#fff;font-family:"Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;font-size:10pt;line-height:1.2em}h1{font-size:170%}h2{font-size:160%}h3{font-size:150%}h4{font-size:140%}h5{font-size:130%}h6{font-size:120%}h1,h2,h3,h4,h5,h6{font-family:"Georgia", "Times New Roman", serif;color:#0b3e71;margin:1em 0 0.5em 0;border-bottom:1px solid #bbb}ul,ol,p{margin:0.8em 0 0.8em 0}ul,ol ul,ol{margin:0}ul{list-style-type:disc}ol{list-style-type:decimal}ul,ol{list-style-position:outside;padding-left:1.5em}table{border-collapse:collapse;border-spacing:0;border:1px solid #bbb}table tr td,table tr th{border:1px solid #bbb;padding:0.2em 0.5em}table tr td.link,table tr th.link{padding:0}table tr td.link a,table tr th.link a{margin:0;padding:0.2em 0.5em;display:block}table tr th{font-variant:small-caps}a,a:visited{color:#0b3e71;text-decoration:none}a.img{background:transparent}div.img a{border:1px solid #bbb;float:right;text-align:center;color:#000;background:#fff;padding:0.2em}div.img a img{display:block}img{vertical-align:middle}hr{background:#bbb;border:none;height:1px}#header,#sidebar,#menu,.editlink,.backref,.hidden,.noprint{display:none !important}#footer{display:block;margin-top:1em}.ref,.ref:visited,.ref:active,.ref:hover{vertical-align:super;font-size:80%;color:#000}.date .ago{display:none !important}.date .full{display:inline !important}.toc{padding:0.5em 2em}.toc ul{margin:0}.toc .toc1{font-weight:bold}.toc .toc1 .toc2{font-weight:normal} } \ No newline at end of file diff --git a/test/request_test.rb b/test/request_test.rb index 049bf042..2696d405 100644 --- a/test/request_test.rb +++ b/test/request_test.rb @@ -16,7 +16,7 @@ class Bacon::Context @app_path = File.expand_path(File.join(File.dirname(__FILE__), '..')) default_config = { - :title => 'Git-Wiki', + :title => 'Ōlelo', :app_path => @app_path, :plugins_path => File.join(@app_path, 'plugins'), :config_path => File.join(@app_path, 'config'), diff --git a/views/layout.haml b/views/layout.haml index 5ebfc1fc..2de2fb0f 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -24,8 +24,9 @@ #page= yield #footer #themes.noprint - Powered by - %a{:href=>'http://github.com/minad/git-wiki/tree/master'} Git-Wiki - = blocks[:footnote] - %span.noprint= "| #{@timer.stop.elapsed_ms}ms" + = blocks[:footer] + .noprint.powered_by + Powered by + %a{:href=>'http://github.com/minad/git-wiki/tree/master'} Ōlelo + | #{@timer.stop.elapsed_ms}ms %script{:src=>'/static/script.js', :type=>'text/javascript'} diff --git a/views/show.haml b/views/show.haml index dac98162..98bd7118 100644 --- a/views/show.haml +++ b/views/show.haml @@ -1,6 +1,5 @@ - title @resource.title -- footnote do - | +- footer do %span.noprint %a{:href=> resource_path(@resource, :version => @resource.version) }= :permalink.t |