beef-pages 0.3.20 → 0.3.21

data/VERSION

@@ -1 +1 @@
-0.3.20
+0.3.21

data/app/controllers/pages_controller.rb

@@ -15,8 +15,9 @@ class PagesController < ApplicationController
   
   def preview
     @page = Page.new(session[:page_preview])
-    @images = Asset.images.all(:conditions => {:id => session[:page_preview][:asset_ids] })
-    @documents = Asset.documents.all(:conditions => {:id => session[:page_preview][:asset_ids] })
+    asset_ids = session[:page_preview][:asset_ids]
+    @images = Asset.images.all(:conditions => {:id => asset_ids }).sort{|x,y| asset_ids.index(y.id.to_s) <=> asset_ids.index(x.id.to_s) }.reverse
+    @documents = Asset.documents.all(:conditions => {:id => asset_ids }).sort{|x,y| asset_ids.index(y.id.to_s) <=> asset_ids.index(x.id.to_s) }.reverse
     
     @page.id = 0
     @page.published_at = Time.now

data/beef-pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-pages}
-  s.version = "0.3.20"
+  s.version = "0.3.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-04-15}
+  s.date = %q{2010-04-16}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/generators/page_template/templates/default.html.erb

@@ -7,11 +7,12 @@
 
   <%= @page.body %>
   
-  <h3 class="hidden">Document Download</h3>
-  <%= documents @documents %>
+  <% unless @documents.empty? %>
+    <h3 class="hidden">Document Download</h3>
+    <%= documents @documents %>
+  <% end -%>
 
-  <% if @images.empty? %>
-  <% else -%>
+  <% unless @images.empty? %>
     <h3 class="hidden">Gallery</h3>
     <div id="gallery">
       <div class="image-gallery">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +01:00
+date: 2010-04-16 00:00:00 +01:00
 default_executable: 
 dependencies: []