Makeover views; add a stylesheet

Author: decklin

git-wiki.rb

@@ -7,9 +7,11 @@
 
 module GitWiki
   class << self
-    attr_accessor :root_page, :extension, :repository, :link_pattern
+    attr_accessor :root_page, :extension, :link_pattern
+    attr_reader :wiki_name, :repository
   end
-  @repository = Grit::Repo.new(ARGV[0] || File.expand_path('~/wiki'))
+  @wiki_name = File.basename(File.expand_path(ARGV[0] || '~/wiki'))
+  @repository = Grit::Repo.new(File.expand_path(ARGV[0] || '~/wiki'))
   @extension = ARGV[1] || '.markdown'
   @root_page = ARGV[2] || 'index'
   @link_pattern = /\[\[(.*?)\]\]/
@@ -39,12 +41,8 @@ def initialize(blob)
     @blob = blob
   end
 
-  def to_html
-    Page.wikify(RDiscount.new(content).to_html)
-  end
-
   def to_s
-    name
+    @blob.name.sub(/#{GitWiki.extension}$/, '')
   end
 
   def url
@@ -59,14 +57,14 @@ def css_class
     @blob.id ? 'existing' : 'new'
   end
 
-  def name
-    @blob.name.gsub(/#{File.extname(@blob.name)}$/, '')
-  end
-
   def content
     @blob.data
   end
 
+  def to_html
+    Page.wikify(RDiscount.new(content).to_html)
+  end
+
   def save!(data)
     Dir.chdir(GitWiki.repository.working_dir) do
       File.open(@blob.name, 'w') {|f| f.puts(data.gsub("\r\n", "\n")) }

public/wiki.css

@@ -0,0 +1,41 @@
+body {
+  margin: 0;
+  padding: 0;
+  color: #000000;
+  background: #ffffff;
+  font: serif;
+}
+#title {
+  margin: 0;
+  padding: 0.2em 0.4em;
+  background: #ecedf8;
+  border: 1px solid #d6d7e1;
+  font: normal 200% sans-serif;
+}
+#content {
+  margin: 1em;
+}
+#actions {
+  float: right;
+  margin: -1.75em 0.4em 0 0;
+  font: normal 140% sans-serif;
+}
+#actions li {
+  display: inline;
+  padding: 0.2em;
+}
+dt {
+  font-weight: bold;
+}
+a:link {
+  color: #0a0ac2;
+}
+a:visited {
+  color: #572b80;
+}
+a.new:link {
+  color: #0ac20a;
+}
+a.new:visited {
+  color: #57802b;
+}

views/edit.haml

@@ -1,9 +1,5 @@
-- title "Editing #{@page.name}"
-%h1= title
 %form{:method => 'POST', :action => @page.edit_url}
   %p
-    %textarea{:name => 'body', :rows => 30, :style => "width: 100%"}= @page.content
+    %textarea{:name => 'body', :rows => 25, :cols => 80}~ @page.content
   %p
-    %input.submit{:type => :submit, :value => "Save as the newest version"}
-    or
-    %a.cancel{:href=>@page.url} cancel
+    %input{:type => :submit, :value => "Save Changes"}

views/layout.haml

@@ -1,11 +1,18 @@
 !!!
 %html
   %head
-    %title= title
+    %title= @page || GitWiki::wiki_name
+    %link{:rel => 'stylesheet', :type => 'text/css', :href => '/wiki.css'}
   %body
-    %ul
+    %h1#title<
+      %a.home{:href => '/'}>= GitWiki::wiki_name
+      - if @page and @page.url != '/'
+        \:
+        %a{:href => @page.url}= @page
+    %ul#actions
+      - if @page
+        %li
+          %a.edit{:href => @page.edit_url}> edit
       %li
-        %a{ :href => "/" } Home
-      %li
-        %a{ :href => "/pages/" } All pages
+        %a.list{:href => '/pages/'}> list
     #content= yield

views/list.haml

@@ -1,8 +1,4 @@
-- title "Listing pages"
-%h1 All pages
-- if @pages.empty?
-  %p No pages found.
-- else
-  %ul#list
-    - @pages.each do |page|
-      %li= list_item(page)
+%ul#list
+  - @pages.each do |p|
+    %li
+      %a.page.existing{:href => p.url}= p

views/show.haml

@@ -1,6 +1 @@
-- title @page.name
-#edit
-  %a{:href => @page.edit_url} Edit this page
-%h1= title
-#content
-  ~"#{@page.to_html}"
+~ @page.to_html