qcms 1.3.10 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.3.10
+2.0.0

data/app/controllers/documents_controller.rb

@@ -59,26 +59,12 @@ class DocumentsController < ApplicationController
 
   # public facing creation of documents
   def create
+    render :template => '/pages/bot_detected' and return unless params[:javascript_enabled] == 'true'
+    
     @document = Document.public.find(params[:id])
-
-    begin
-      do_human_test
-    rescue
-      flash.now[:notice] = 'You did not add up the numbers correctly, please try again.'
-
-      new_document = Document.new
-      new_document.body = params[:document][:body]
-
-      eval("@new_#{params[:label]} = new_document")
-
-      setup_view_environment
-      render :template => view_for
-      return
-    end
-
+    
     params[:document][:state] = nil # prevent auto approval hack (FIXME: use attr_protected)
 
-
     if @document.meta_definition_for(params[:label]).allowed? current_user, 'create'
 
       new_document = Document.new(params[:document])
@@ -131,9 +117,6 @@ class DocumentsController < ApplicationController
     end
   end
 
-  def do_human_test
-    raise 'Human Test Failed' unless params[:human_test][:answer].crypt('humAn5') == params[:human_test][:crypted_answer]
-  end
 
   def setup_view_environment
     # create children vars such as @comments

data/app/views/pages/bot_detected.html.erb

@@ -0,0 +1,3 @@
+<p>Sorry, your request was not successful.</p>
+<p>In order to submit this form you need Javascript enabled, we do this in order to prevent spam.</p>
+

data/app/views/pages/contact.html.erb

@@ -15,6 +15,7 @@
 <!-- <input type="hidden" name="meta[message]" value="Thank you!" /> -->
 <input type="hidden" name="meta[show_page]" value="thank_you" />
 
+<input id="javascript_enabled" type="hidden" name="javascript_enabled" value="false" />
 
 <input type="submit" name="submit" value="Send" />
 </form>
@@ -28,6 +29,7 @@
 <script>
   $(document).ready(function() {
     $('form').validate();
+	$('#javascript_enabled').attr('value'', 'true');
   });
 
     $('#message').blur(function(){

data/app/views/pages/shared/_archive.erb

@@ -0,0 +1,18 @@
+<%
+document ||= @document
+skip_empty_months ||= true
+-%>
+<% document.archive.each do | year, posts_by_month | -%>
+<ul class="submenu">
+    <h4><%= year %></h4>
+      <ul>
+        <% (1..12).each do | month | -%>
+          <% next if skip_empty_months && posts_by_month[month].empty? %>
+          <li>
+              <a href="<%= document_archive_path(document, month_name(month), year) %>"><%= month_name(month) %></a>
+              <span>(<%= posts_by_month[month].size %>)</span><label></label>
+          </li>
+          <% end -%>
+      </ul>
+</ul>
+<% end -%>

data/app/views/pages/shared/_related_pages.html.erb

@@ -1,13 +1,10 @@
 <%
-# Settings
-heading ||= 'Related Pages'
-page ||= @document
+document ||= @document
 -%>
-<% unless page.siblings.empty? %>
-  <h3><%= heading %></h3>
+<% unless document.siblings.empty? -%>
   <ol id="related_pages">
-    <% page.siblings.each do |p| -%>
-      <li><a href="<%= document_path(p) %>"><%= p.title %></a></li>
+    <% Document.ordered_siblings_for(document).each do | doc | -%>
+      <li><a href="<%= document_path(doc) %>"><%= doc.title %></a></li>
     <% end -%>
   </ol>
-<% end %>
+<% end -%>

data/app/views/pages/shared/_section_menu.html.erb

@@ -0,0 +1,17 @@
+<%
+document ||= @document.root
+id ||= document.root? ? 'section_menu' : ''
+order ||= 'title ASC'
+
+-%>
+
+
+
+
+  <ul id="<%= id %>">
+	<% document.children.public.order_by(order).each do | child_document | %>
+	<li><a href="<%= document_path(child_document) %>"><%= child_document.title %></a>
+		<%= render :partial => 'pages/shared/section_menu', :locals => { :document => child_document } unless document.children.empty? %>
+	</li>
+	<% end %>	
+  </ul>

data/app/views/pages/shared/_sitemap.html.erb

@@ -0,0 +1,7 @@
+<%
+  order = document.meta_definition.children.by_label(label).first.sort_by || Settings.documents._sort_by
+  documents = document.children.by_label(label).order_by(order).public
+-%>
+<% documents.each do |d| -%>
+<li><a href='<%= document_path(d) %>'><%= d.title %></a>
+<% end -%>

data/qcms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qcms}
-  s.version = "1.3.10"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kris Leech"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-11-15}
   s.description = %q{Key CMS features: extended template pathing, sitemap.yml, simple configurable, deeply nestable content}
   s.email = %q{kris.leech@interkonect.com}
   s.extra_rdoc_files = [
@@ -47,13 +47,17 @@ Gem::Specification.new do |s|
      "app/views/layouts/application.html.erb",
      "app/views/layouts/system.html.erb",
      "app/views/pages/404.html.erb",
+     "app/views/pages/bot_detected.html.erb",
      "app/views/pages/contact.html.erb",
      "app/views/pages/default.html.erb",
      "app/views/pages/feed.rss.builder",
      "app/views/pages/home.html.erb",
      "app/views/pages/search.html.erb",
+     "app/views/pages/shared/_archive.erb",
      "app/views/pages/shared/_archived_pages.erb",
      "app/views/pages/shared/_related_pages.html.erb",
+     "app/views/pages/shared/_section_menu.html.erb",
+     "app/views/pages/shared/_sitemap.html.erb",
      "app/views/pages/sitemap.html.erb",
      "app/views/pages/template.erb",
      "app/views/pages/thank_you.html.erb",

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 10
-  version: 1.3.10
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Kris Leech
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +01:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -59,13 +59,17 @@ files:
 - app/views/layouts/application.html.erb
 - app/views/layouts/system.html.erb
 - app/views/pages/404.html.erb
+- app/views/pages/bot_detected.html.erb
 - app/views/pages/contact.html.erb
 - app/views/pages/default.html.erb
 - app/views/pages/feed.rss.builder
 - app/views/pages/home.html.erb
 - app/views/pages/search.html.erb
+- app/views/pages/shared/_archive.erb
 - app/views/pages/shared/_archived_pages.erb
 - app/views/pages/shared/_related_pages.html.erb
+- app/views/pages/shared/_section_menu.html.erb
+- app/views/pages/shared/_sitemap.html.erb
 - app/views/pages/sitemap.html.erb
 - app/views/pages/template.erb
 - app/views/pages/thank_you.html.erb