project renamed to Ōlelo

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 <http://git.awiki.org/> or <http://git-wiki.kicks-ass.org/>.
 
 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

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

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

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

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

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

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

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%

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

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
 

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

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'),

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'}

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
     |