radiant-concurrent_draft-extension 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/app/views/admin/_draft_controls.html.haml

@@ -8,50 +8,50 @@
         %td.label Draft Controls >
         %td.actions
           - if @controller.model.has_draft_promotion_scheduled?
-            = link_to t('scheduled') + ' ' + @controller.model.draft_promotion_scheduled_at.strftime('%m/%d/%y %I:%M%p'), "#draft_options", :class => "action dropdown"
+            = link_to t('concurrent_draft.scheduled') + ' ' + @controller.model.draft_promotion_scheduled_at.strftime('%m/%d/%y %I:%M%p'), "#draft_options", :class => "action dropdown"
           - elsif @controller.model.publishable? && ! @controller.model.published?
-            %em= link_to t('unpublished'), "#draft_options", :class => "action dropdown"
+            %em= link_to t('concurrent_draft.unpublished'), "#draft_options", :class => "action dropdown"
           - else
-            %em= link_to t('draft_promotion_unscheduled'), "#draft_options", :class => "action dropdown"
+            %em= link_to t('concurrent_draft.draft_promotion_unscheduled'), "#draft_options", :class => "action dropdown"
           %ul.menu{:id => "draft_options"}
             - if @controller.authorized_user?
-              %li.schedule_draft= link_to image('clock') + ' ' + t('schedule_promotion'), '#schedule-draft-popup', :class => 'popup'
+              %li.schedule_draft= link_to image('clock') + ' ' + t('concurrent_draft.schedule_promotion'), '#schedule-draft-popup', :class => 'popup'
               %li.publish
                 - form_for @controller.model, :url => {:action => 'schedule_draft_promotion', :commit => @controller.model_class.promote_now_text}, :html => {:method => :post} do |f|
-                  = link_to_function image('tick') + ' ' + t('promote_now'), "$(this).up('form').submit();showStatus('Promoting #{resource}', true)"
+                  = link_to_function image('tick') + ' ' + t('concurrent_draft.promote_now'), "$(this).up('form').submit();showStatus('" + t('concurrent_draft.promoting', :resource => resource) + "', true)"
               - if @controller.model.has_draft_promotion_scheduled?
                 %li.cancel
                   - form_for @controller.model, :url => {:action => 'schedule_draft_promotion', :commit => @controller.model_class.cancel_promotion_text}, :html => {:method => :post} do |f|
-                    = link_to_function image('cancel') + ' ' + t('cancel_promotion'), "$(this).up('form').submit();showStatus('Canceling scheduled promotion of #{resource}', true)"
+                    = link_to_function image('cancel') + ' ' + t('concurrent_draft.cancel_promotion'), "$(this).up('form').submit();showStatus('" + t('concurrent_draft.canceling', :resource => resource) + "', true)"
               - if @controller.model.publishable? && @controller.model.published?
                 %li.unpublish
                   - form_for @controller.model, :url => {:action => 'unpublish', :method => :post} do |f|
-                    = link_to_function image('page_delete') + ' ' + t('unpublish'), "$(this).up('form').submit();showStatus('Unpublishing #{resource}', true)"
+                    = link_to_function image('page_delete') + ' ' + t('concurrent_draft.unpublish'), "$(this).up('form').submit();showStatus('" + t('concurrent_draft.unpublishing', :resource => resource) + "', true)"
               - if @controller.model.has_draft_promoted?
-                %li.revert= link_to image('page_refresh') + ' ' + t('revert_draft'), '#revert-draft-popup', :class => 'popup'
+                %li.revert= link_to image('page_refresh') + ' ' + t('concurrent_draft.revert_draft'), '#revert-draft-popup', :class => 'popup'
 
 - content_for :popups do
   - if @controller.authorized_user?
     .popup#schedule-draft-popup{:style => 'display:none'}
       .popup_title
         = image('clock')
-        = t('schedule_promotion')
-      - form_for @controller.model, :url => {:action => 'schedule_draft_promotion'}, :html => {:method => :post, 'data-onsubmit_status' => "Scheduling promotion of #{resource}"} do |f|
+        = t('concurrent_draft.schedule_promotion')
+      - form_for @controller.model, :url => {:action => 'schedule_draft_promotion'}, :html => {:method => :post, 'data-onsubmit_status' => t('concurrent_draft.scheduling', :resource => resource)} do |f|
         %div
           = f.datetime_select :draft_promotion_scheduled_at, :start_year => Date.today.year, :minute_step => 15, :twelve_hour => true
           = hidden_field_tag :commit, @controller.model_class.schedule_promotion_text
         %p{:style => 'text-align: right'}
-          %button{:type => 'submit'}= t('schedule')
+          %button{:type => 'submit'}= t('concurrent_draft.schedule')
           = t('or')
           = link_to_function t('cancel'), "$(this).closePopup();"
 
   .popup#revert-draft-popup{:style => 'display:none'}
     %p.revert
       = image('page_refresh')
-      The draft has been replaced with the live content.  
+      = t('concurrent_draft.revert_draft_message')
       %br/
       %br/
-      %em You must save the page for this to take effect.
+      %em= t('concurrent_draft.revert_draft_save_msg')
       %span{:style => 'padding-left:8px'}= link_to_function 'OK', "$(this).closePopup();"
 
 - content_for :page_css do

data/app/views/admin/_edit_buttons.html.haml

@@ -1,10 +1,21 @@
 - if @controller.model.is_a?(Page)
   - @buttons_partials.each do |partial|
-    = render :partial => partial
-%p.buttons
-  = save_model_and_continue_editing_button(@controller.model)
+    = render :partial => partial, :locals => {:f => fields}
+%p.buttons{:style=>"clear: left"}
   = save_model_button(@controller.model)
+  = save_model_and_continue_editing_button(@controller.model)
   - if @controller.authorized_user?
     = save_model_and_promote_button(@controller.model)
-  or
-  = link_to t('cancel'), :action => 'index'
+  - if @controller.model.is_a?(Page)
+    = submit_tag(t('preview', :default => 'Preview'), :class => 'button', :id => 'show-preview')
+  = t('or')
+  = link_to t('cancel'), :action => 'index'
+  - if @controller.model.is_a?(Page)
+    #preview_panel.fullcover.grey_out{:style => 'display: none;'}
+      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src => '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
+      .preview_tools
+        =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
+        =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')
+        %span.info
+          = t('or')
+          =link_to(t('edit_page'),{}, :class => 'cancel')

data/concurrent_draft_extension.rb

@@ -21,8 +21,8 @@ class ConcurrentDraftExtension < Radiant::Extension
     SiteController.send :include, ConcurrentDraft::SiteControllerExtensions
     %w{page snippet layout}.each do |view|
       admin.send(view).edit.add :main, "admin/draft_controls", :before => "edit_header"
-      # admin.send(view).edit.form_bottom.delete 'edit_buttons'
-      # admin.send(view).edit.add :form_bottom, 'admin/edit_buttons'
+      admin.send(view).edit.form_bottom.delete 'edit_buttons'
+      admin.send(view).edit.add :form_bottom, 'admin/edit_buttons'
     end
     # admin.page.edit.add :extended_metadata, 'published_meta'
     Time::DATE_FORMATS[:long_civilian] = lambda {|time| time.strftime("%B %d, %Y %I:%M%p").gsub(/(\s+)0(\d+)/, '\1\2') }

data/config/locales/en.yml

@@ -1,11 +1,18 @@
 ---
 en:
-  cancel_promotion: "Cancel promotion"
-  draft_promotion_unscheduled: "Draft promotion unscheduled"
-  promote_now: "Promote now"
-  revert_draft: "Revert draft"
-  schedule: "Schedule"
-  scheduled: "Scheduled"
-  schedule_promotion: "Schedule promotion"
-  unpublish: "Unpublish"
-  unpublished: "Unpublished"
+  concurrent_draft:
+    cancel_promotion: "Cancel promotion"
+    canceling: "Canceling scheduled promotion of %{resource}"
+    draft_promotion_unscheduled: "Draft promotion unscheduled"
+    promote_now: "Promote now"
+    promoting: "Promoting %{resource}"
+    revert_draft: "Revert draft"
+    revert_draft_message: "The draft has been replaced with the live content."
+    revert_draft_save_message: "You must save the page for this to take effect."
+    schedule: "Schedule"
+    scheduled: "Scheduled"
+    schedule_promotion: "Schedule promotion"
+    scheduling: "Scheduling promotion of %{resource}"
+    unpublish: "Unpublish"
+    unpublished: "Unpublished"
+    unpublishing: "Unpublishing %{resource}"

data/lib/concurrent_draft/helper_extensions.rb

@@ -32,8 +32,8 @@ module ConcurrentDraft::HelperExtensions
   #   submit_tag label, :name => 'continue', :class => 'button' 
   # end
   # 
-  # def save_model_and_promote_button(_model)
-  #   label = _model.new_record? ? "Create" : "Save"
-  #   submit_tag "#{label} and Promote Now", :name => 'promote', :class => 'button'
-  # end
+  def save_model_and_promote_button(_model)
+    label = _model.new_record? ? "Create" : "Save"
+    submit_tag "#{label} and Promote Now", :name => 'promote', :class => 'button'
+  end
 end

data/radiant-concurrent_draft-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-concurrent_draft-extension}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-14}
   s.description = %q{Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.}
   s.email = %q{avonderluft@avlux.net}
   s.extra_rdoc_files = [
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     "lib/concurrent_draft/site_controller_extensions.rb",
     "lib/concurrent_draft/tags.rb",
     "lib/tasks/concurrent_draft_extension_tasks.rake",
-    "pkg/radiant-concurrent_draft-extension-1.0.1.gem",
+    "pkg/radiant-concurrent_draft-extension-1.0.2.gem",
     "public/images/admin/cancel.png",
     "public/images/admin/clock.png",
     "public/images/admin/page_delete.png",
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/avonderluft/radiant-concurrent_draft-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Concurrent Draft Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin_controller_extensions_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-concurrent_draft-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Andrew vonderLuft
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ files:
 - lib/concurrent_draft/site_controller_extensions.rb
 - lib/concurrent_draft/tags.rb
 - lib/tasks/concurrent_draft_extension_tasks.rake
-- pkg/radiant-concurrent_draft-extension-1.0.1.gem
+- pkg/radiant-concurrent_draft-extension-1.0.2.gem
 - public/images/admin/cancel.png
 - public/images/admin/clock.png
 - public/images/admin/page_delete.png
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Concurrent Draft Extension for Radiant CMS