radiant-vapor-extension 2.1.0 → 2.1.1

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/app/helpers/admin/flow_meters_helper.rb

@@ -0,0 +1,2 @@
+module Admin::FlowMetersHelper
+end

data/app/helpers/admin/page_node_alterations_helper.rb

@@ -0,0 +1,11 @@
+module Admin::PageNodeAlterationsHelper
+  def page_type
+    result = ''
+    unless @current_node.class.display_name == 'Page'
+      result = %{<span class="info">(#{ h(display_name) })</span>}
+    end
+    if flow_meter = @current_node.flow_meter
+      result << %{ <span class="info">Redirects to #{link_to flow_meter.redirect_url_for_display, flow_meter.redirect_url_for_display}</span>}
+    end
+  end
+end

data/app/views/admin/pages/_vapor_details.html.haml

@@ -4,6 +4,8 @@
     = link_to flow_meter.redirect_url_for_display, flow_meter.local_or_external_redirect_url
     - if admin?
       - unless config['vapor.use_regexp']
-        = link_to "Remove this", admin_flow_meter_path(flow_meter), :method => :delete
+        You may 
+        = link_to "remove", admin_flow_meter_path(flow_meter), :method => :delete
+        this redirect.
       - else
         = link_to "Manage your traffic flow...", admin_flow_meters_path

data/vapor_extension.rb

@@ -28,6 +28,10 @@ class VaporExtension < Radiant::Extension
     if admin.respond_to? :help
       admin.help.index.add :page_details, 'slug_redirect', :after => 'slug'
     end
+    
+    Admin::PagesController.class_eval {
+      helper Admin::PageNodeAlterationsHelper
+    }
   end
   
   def deactivate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-vapor-extension
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Jim Gay
@@ -40,12 +40,12 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/admin/flow_meters_controller.rb
-- app/helpers/flow_meters_helper.rb
+- app/helpers/admin/flow_meters_helper.rb
+- app/helpers/admin/page_node_alterations_helper.rb
 - app/metal/vapor_flow.rb
 - app/models/flow_meter.rb
 - app/views/admin/flow_meters/index.html.haml
 - app/views/admin/help/_slug_redirect.html.haml
-- app/views/admin/pages/_node.html.haml
 - app/views/admin/pages/_vapor_details.html.haml
 - db/migrate/001_create_flow_meters.rb
 - lib/page_vapor.rb
@@ -58,7 +58,6 @@ files:
 - spec/models/page_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- test/radiant-vapor_test.rb
 - test/test_helper.rb
 - vapor_extension.rb
 has_rdoc: true
@@ -95,5 +94,4 @@ test_files:
 - spec/models/flow_meter_spec.rb
 - spec/models/page_spec.rb
 - spec/spec_helper.rb
-- test/radiant-vapor_test.rb
 - test/test_helper.rb

data/app/helpers/flow_meters_helper.rb

@@ -1,2 +0,0 @@
-module FlowMetersHelper
-end

data/app/views/admin/pages/_node.html.haml

@@ -1,30 +0,0 @@
-%tr.node{:id => "page-#{page.id}", :class =>"level-#{level}#{children_class}#{virtual_class}"}
-  - render_region :node, :locals => {:page => page, :level => level, :simple => simple} do |node|
-    - node.title_column do
-      %td.page{:style => "padding-left: #{padding_left(level)}px"}
-        %span.w1
-          - if simple
-            = icon
-            = node_title
-          - else
-            = expander + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url)
-            = page_type
-            = spinner
-          - flow_meter = page.flow_meter
-          - if flow_meter
-            %small.info
-              Redirects to
-              = link_to flow_meter.redirect_url_for_display, flow_meter.redirect_url_for_display
-    - node.status_column do
-      - unless simple
-        %td.status{:class => "#{page.status.name.downcase}-status"}= page.status.name
-    - node.add_child_column do
-      - unless simple
-        %td.add-child= link_to image('add-child', :alt => 'add child'), new_admin_page_child_url(page)
-    - node.remove_column do
-      - unless simple
-        %td.remove= link_to image('remove', :alt => 'remove page'), remove_admin_page_url(page)
-
-- if expanded
-  - page.children.each do |child|
-    = render_node child, :level => level + 1, :simple => simple

data/test/radiant-vapor_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class RadiantVaporTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end