@@ -1,2 +1,3 @@ * Don't make a new version if all that changed was the status. - (or do we want this? it would mess up git SHAs if we ever added a git interface) \ No newline at end of file + (or do we want this? it would mess up git SHAs if we ever added a git interface) +* Limit the number of versions visible in the timeline \ No newline at end of file TODO @@ -3,24 +3,42 @@ module Admin::TimelineHelper versions = page.versions content_tag(:div, :id=>"timeline") do content_tag(:ol) do + this_version_node + page.versions.collect do |version| - version_id = "version-#{version.number}" - content_tag(:li, :id => version_id) do - tags = [] - tags << tag(:img, :id=>"#{version_id}-icon", :src=>"/images/admin/#{version.instance.status.name.downcase}.png") - if (version.instance.status_id < Status[:published].id) && version.current? - tags << tag(:img, :class=>"marker", :id=>"dev-marker", :src=>"/images/admin/dev.png") - else - if version.current? - tags << tag(:img, :class=>"marker", :id=>"dev-and-live-marker", :src=>"/images/admin/dev-and-live.png") - elsif version.current_live? - tags << tag(:img, :class=>"marker", :id=>"live-marker", :src=>"/images/admin/live.png") - end - end - tags.join - end + version_node(version) end.join end end end + + def version_node(version) + content_tag(:li, :id => "version-#{version.number}") do + tags = [ version_icon(version) ] + case + when version.only_visible_in_dev_mode? && version.current? + tags << marker(:dev) + when version.current? + tags << marker("dev-and-live") + when version.current_live? + tags << marker(:live) + end + tags.join + end + + end + + def marker(type) + type = type.to_s + tag(:img, :class=>"marker", :id=>"#{type}-marker", :src=>"/images/admin/#{type}.png") + end + + def version_icon(version) + tag(:img, :id=>"version-#{version.number}-icon", :src=>"/images/admin/#{version.instance.status.name.downcase}.png") + end + + def this_version_node + content_tag(:li, :id => "this") do + tag(:img, :id=>"this-icon", :src=>"/images/admin/this.png") + end + end end app/helpers/admin/timeline_helper.rb @@ -1,12 +1,3 @@ - <%= timeline(@page) %> <script type="text/javascript"> new HelpBalloon({ app/views/admin/_timeline.html.erb @@ -22,4 +22,8 @@ module Chronicle::VersionExtensions current_live = versionable.versions.find(:first, :conditions => "status_id >= #{Status[:published].id}", :order => 'number DESC') current_live && (current_live.number == self.number) end + + def only_visible_in_dev_mode? + status_id < Status[:published].id + end end \ No newline at end of file lib/chronicle/version_extensions.rb @@ -25,6 +25,9 @@ width: 40px; background-image: url(/images/admin/line-beginning.png); } +#timeline li#version-1 { + background-image: none; +} #timeline li .marker { position: absolute; right: -8px; public/stylesheets/admin/chronicle.css @@ -8,6 +8,11 @@ describe Admin::TimelineHelper do included_modules.should include(Admin::TimelineHelper) end + it "should have a node for the version I am currently editing" do + page = pages(:draft) + helper.timeline(page).should have_selector("li", :id=>"this") + end + it "should produce a dev flag on a first-version draft" do page = pages(:draft) helper.timeline(page).should have_version(1).as(:draft) do |li| @@ -64,6 +69,10 @@ describe Admin::TimelineHelper do end end + it "should make the line fade out when the timeline does not begin with version 1" do + pending # timeline limit is not implemented yet, but class="beginning" on the LI will make the line fade + end + def have_marker(type=nil) opts = {:class=>"marker"} if type spec/helpers/admin/timeline_helper_spec.rb @@ -2,9 +2,9 @@ module Webrat module Matchers class TimelineTags < HaveSelector - def initialize(version_number = nil, &block) + def initialize(version_number = nil, options = {}, &block) @expected = "li" - @options = {:id=>"version-#{version_number.to_s}"} + @options = options.merge(:id=>"version-#{version_number.to_s}") @block = block @version_number = version_number end @@ -32,8 +32,8 @@ module Webrat # timeline.should have_version(version_number) # timeline.should have_version(version_number).as(status) - def have_version(version_number) - TimelineTags.new(version_number) + def have_version(version_number, options={}) + TimelineTags.new(version_number, options) end end spec/matchers/timeline_matcher.rb @@ -3,6 +3,16 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Version do dataset :versions + it "should be only visible in dev mode when status is draft" do + version = pages(:draft).versions.current + version.should be_only_visible_in_dev_mode + end + + it "should be only visible in dev mode when status is reviewed" do + version = pages(:reviewed).versions.current + version.should be_only_visible_in_dev_mode + end + it "should respond to #instance" do version = pages(:page_with_draft).versions.current version.instance.should be_a(Page) spec/models/version_spec.rb 3faa62b8ef874e8817e26dc454e373d8017c8fbe Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/ab08b3e529175623bdf0e620e079383e96b449cb ab08b3e529175623bdf0e620e079383e96b449cb

2009-04-15T14:56:49-07:00

Refactored the timeline helper and added the "this" (current working version) node to the timeline. a5ec6bea1b6d79a1b97a10b6ed7d96ae7c15d0ad Jason Garber jg@jasongarber.com