Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/models/wiki_reference.rb

@@ -80,7 +80,17 @@ class WikiReference < ActiveRecord::Base
     row = connection.select_one(sanitize_sql([query, page_name]))
     row['name'].as_utf8 if row
   end
-  
+
+  def self.page_categories(web, page_name)
+    query =
+      "SELECT referenced_name FROM wiki_references JOIN pages " +
+      "ON wiki_references.page_id = pages.id " +
+      "WHERE pages.name = ? " +
+      "AND wiki_references.link_type = '#{CATEGORY}' " +
+      "AND pages.web_id = '#{web.id}'"
+    names = connection.select_all(sanitize_sql([query, page_name])).map { |row| row['referenced_name'].as_utf8 }
+  end
+
   def self.pages_in_category(web, category)
     query = 
       "SELECT name FROM pages JOIN wiki_references " +

app/views/wiki/edit.rhtml

@@ -69,5 +69,9 @@ function cleanAuthorName() {
 }
 
 document.forms["editForm"].elements["content"].focus();
+<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) and 
+    !WikiReference.page_categories(@web, @page.name).include?('S5-slideshow') -%>
+addS5button('<%= CGI.escapeHTML(@page.name) %>');
+<%- end -%>
 //--><!]]>
 </script>

app/views/wiki/new.rhtml

@@ -31,4 +31,7 @@ function cleanAuthorName() {
   }
 }
 document.forms["editForm"].elements["content"].focus();
+<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) -%>
+addS5button('<%= CGI.escapeHTML(@page_name) %>');
+<%- end -%>
 </script>