From 57d40c48e3b37769d08f5f72db445c73c454f875 Mon Sep 17 00:00:00 2001
From: Eston Bond <Eston Bond>
Date: Sat, 4 Dec 2010 16:20:49 -0800
Subject: [PATCH] Add has_sidebar/has_footer to editor Get data-markup-lang
 attribute working dynamically

---
 lib/gollum/frontend/templates/editor.mustache |  8 +++++---
 lib/gollum/frontend/templates/page.mustache   |  0
 lib/gollum/frontend/views/create.rb           | 15 +++++++++++++++
 lib/gollum/frontend/views/edit.rb             | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 lib/gollum/frontend/templates/page.mustache
 mode change 100644 => 100755 lib/gollum/frontend/views/create.rb
 mode change 100644 => 100755 lib/gollum/frontend/views/edit.rb

diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index 4e901a56..b5dd5d6d 100755
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -79,26 +79,28 @@
     <div id="gollum-editor-help-wrapper">
       <div id="gollum-editor-help-content">
       <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam et nibh a lacus egestas blandit. Maecenas felis tortor, mattis quis venenatis in, dictum ut diam. Sed nisi massa, accumsan vel sodales a, pharetra vel tellus. Integer quis metus at erat hendrerit egestas eget et sem. Donec elit nunc, accumsan sed fermentum eget, consectetur non enim. Duis ut risus odio. Pellentesque tristique augue iaculis libero interdum quis fermentum sapien cursus. Quisque justo sapien, molestie non convallis ut, convallis a massa. Nam congue ipsum at turpis semper non bibendum diam pellentesque. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Praesent euismod, ligula nec sagittis volutpat, ante dolor porttitor turpis, vel convallis velit elit et ipsum. Aenean sit amet purus odio. Fusce fermentum lorem sit amet tortor laoreet a sollicitudin nisl tempor. Maecenas tempus tortor eget libero varius ullamcorper. Donec a felis a sapien venenatis mattis. 
       </p>
       </div>
     </div>
   </div>
     <textarea id="gollum-editor-body"
-     data-markup-lang="markdown" name="content">{{content}}</textarea>
-     
+     data-markup-lang="{{format}}" name="content">{{content}}</textarea>
      
+    {{#has_footer}}
     <div id="gollum-editor-edit-footer" class="collapsed">
       <a href="#" class="button"><span>Expand/Collapse</span></a>
       <h4>Footer</h4>
       <textarea id="gollum-editor-footer" name="footer"></textarea>
     </div>
+    {{/has_footer}}
     
+    {{#has_sidebar}}
     <div id="gollum-editor-edit-sidebar" class="collapsed">
       <a href="#" class="button"><span>Expand/Collapse</span></a>
       <h4>Sidebar</h4>
       <textarea id="gollum-editor-sidebar" name="sidebar"></textarea>
     </div>
+    {{/has_sidebar}}
     
     <div id="gollum-editor-edit-summary" class="singleline">
       <label for="message" class="jaws">Edit message:</label>
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
old mode 100644
new mode 100755
diff --git a/lib/gollum/frontend/views/create.rb b/lib/gollum/frontend/views/create.rb
old mode 100644
new mode 100755
index 073cc5af..2b7dafbc
--- a/lib/gollum/frontend/views/create.rb
+++ b/lib/gollum/frontend/views/create.rb
@@ -16,6 +16,21 @@ module Precious
       def is_edit_page
         false
       end
+      
+      def format
+        @format = (@page.format || false) if @format.nil?
+        @format.to_s.downcase
+      end
+    
+      def has_footer 
+        @footer = (@page.footer || false) if @footer.nil?
+        !!@footer
+      end
+        
+      def has_sidebar
+        @sidebar = (@page.sidebar || false) if @sidebar.nil?
+        !!@sidebar
+      end
 
       def page_name
         @name.gsub('-', ' ')
diff --git a/lib/gollum/frontend/views/edit.rb b/lib/gollum/frontend/views/edit.rb
old mode 100644
new mode 100755
index bf789ed0..44392a22
--- a/lib/gollum/frontend/views/edit.rb
+++ b/lib/gollum/frontend/views/edit.rb
@@ -16,6 +16,21 @@ module Precious
       def is_edit_page
         true
       end
+        
+      def format
+        @format = (@page.format || false) if @format.nil?
+        @format.to_s.downcase
+      end
+    
+      def has_footer 
+        @footer = (@page.footer || false) if @footer.nil?
+        !!@footer
+      end
+        
+      def has_sidebar
+        @sidebar = (@page.sidebar || false) if @sidebar.nil?
+        !!@sidebar
+      end
 
       def title
         "#{@page.title}"