removed _node and _fields partials (which were overwriting radiants) …

…and moved all helpers to lib/page_roles

app/views/admin/pages/_page_roles_select.html.haml

@@ -0,0 +1,4 @@
+- if admin? or designer?
+  %p
+    = f.label :role, t('required_role')
+    = f.select :role, available_roles(@page.parent.required_role)

lib/page_roles/application_helper_extensions.rb

@@ -0,0 +1,30 @@
+module PageRoles::ApplicationHelperExtensions
+
+  def self.included(base)
+    base.module_eval do
+
+      def verify_roles(role)
+        case 
+          when role == 'admin' && admin? : true
+          when role == 'designer' && (admin? || designer?) : true
+          when role == 'all' : true
+        else
+          false
+        end
+      end
+
+      def available_roles(role)
+        case 
+          when role == 'admin' && admin? : [[t('select.inherit'), ''], [t('admin'),'admin']]
+          # when role == 'designer' && admin? : [[t('select.inherit'), ''], [t('designer'),'designer'], [t('admin'),'admin']]
+          when designer? && !admin? : [[t('select.inherit'), ''], [t('designer'),'designer']]
+          when admin? : [[t('select.inherit'), ''], [t('designer'),'designer'], [t('admin'),'admin']]
+        else
+          [[t('select.inherit'), '']]
+        end
+      end
+
+    end
+  end
+
+end

lib/page_roles/node_helper_extensions.rb

@@ -0,0 +1,18 @@
+module PageRoles::NodeHelperExtensions
+  include PageRoles::ApplicationHelperExtensions
+
+  def self.included(base)
+    base.module_eval do
+
+      def render_node(page, locals = {})
+        @current_node = page
+        if verify_roles(page.required_role)
+          locals.reverse_merge!(:level => 0, :simple => false).merge!(:page => page)
+          render :partial => 'node', :locals =>  locals
+        end
+      end
+
+    end
+  end
+
+end

page_roles_extension.rb

@@ -21,10 +21,11 @@ class PageRolesExtension < Radiant::Extension
 
   def activate
     Page.send :include, PageRoles::PageExtensions
-    ApplicationHelper.send :include, PageRolesHelper
+    ApplicationHelper.send :include, PageRoles::ApplicationHelperExtensions
+    Admin::NodeHelper.send :include, PageRoles::NodeHelperExtensions
     Admin::PagesController.send :include, PageRoles::PagesControllerExtensions 
 
-    # admin.pages.edit.add :layout_row, "admin/pages/page_roles"
+    admin.pages.edit.add :layout_row, "admin/pages/page_roles_select"
     admin.page.index.add :sitemap_head, 'admin/pages/roles_th', :after => 'status_column_header'
     admin.page.index.add :node, 'admin/pages/roles_td', :after => 'status_column'