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
2012-05-07 14:10:38 -07:00
parent 218c894b5a 7fa6708483
commit 9d4d6ccca5
16 changed files with 66 additions and 7 deletions
@@ -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>