Merge remote-tracking branch 'bootstraponline/gollum2'

/cc @kristi is the css behaving on this? we had minor markup conflicts

Conflicts:
	lib/gollum/frontend/templates/page.mustache

lib/gollum/frontend/app.rb

@@ -64,6 +64,7 @@ module Precious
 
       update_wiki_page(wiki, page, params[:content], commit, name,
         params[:format])
+      update_wiki_page(wiki, page.header,  params[:header],  commit) if params[:header]
       update_wiki_page(wiki, page.footer,  params[:footer],  commit) if params[:footer]
       update_wiki_page(wiki, page.sidebar, params[:sidebar], commit) if params[:sidebar]
       committer.commit

lib/gollum/frontend/templates/page.mustache

@@ -20,6 +20,13 @@
 <div id="wiki-content">
 <div class="wrap {{#has_footer}} has-footer {{/has_footer}} {{#has_sidebar}}  has-rightbar{{/has_sidebar}}">
   <div id="wiki-body" class="gollum-{{format}}-content">
+    {{#has_header}}
+    <div id="wiki-header" class="gollum-{{header_format}}-content">
+      <div id="header-content">
+        {{{header_content}}}
+      </div>
+    </div>
+    {{/has_header}}
     <div class="markdown-body">
       {{{content}}}
     </div>

lib/gollum/frontend/views/create.rb

@@ -27,6 +27,11 @@ module Precious
         !!@footer
       end
 
+      def has_header
+        @header = (@page.header || false) if @header.nil? && @page
+        !!@header
+      end
+
       def has_sidebar
         @sidebar = (@page.sidebar || false) if @sidebar.nil? && @page
         !!@sidebar

lib/gollum/frontend/views/edit.rb

@@ -13,6 +13,17 @@ module Precious
         @name.gsub('-', ' ')
       end
 
+      def header
+        if @header.nil?
+          if page = @page.header
+            @header = page.raw_data
+          else
+            @header = false
+          end
+        end
+        @header
+      end
+
       def footer
         if @footer.nil?
           if page = @page.footer

lib/gollum/frontend/views/page.rb

@@ -1,7 +1,7 @@
 module Precious
   module Views
     class Page < Layout
-      attr_reader :content, :page, :footer
+      attr_reader :content, :page, :header, :footer
       DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
       DEFAULT_AUTHOR = 'you'
 
@@ -27,6 +27,19 @@ module Precious
         @editable
       end
 
+      def has_header
+        @header = (@page.header || false) if @header.nil?
+        !!@header
+      end
+
+      def header_content
+        has_header && @header.formatted_data
+      end
+
+      def header_format
+        has_header && @header.format.to_s
+      end
+
       def has_footer
         @footer = (@page.footer || false) if @footer.nil?
         !!@footer

lib/gollum/page.rb

@@ -99,7 +99,7 @@ module Gollum
     # Returns a newly initialized Gollum::Page.
     def initialize(wiki)
       @wiki = wiki
-      @blob = @footer = @sidebar = nil
+      @blob = @header = @footer = @sidebar = nil
     end
 
     # Public: The on-disk filename of the page including extension.
@@ -209,6 +209,13 @@ module Gollum
       end
     end
 
+    # Public: The header Page.
+    #
+    # Returns the header Page or nil if none exists.
+    def header
+      @header ||= find_sub_page(:header)
+    end
+
     # Public: The footer Page.
     #
     # Returns the footer Page or nil if none exists.