[Jifty-commit] r6413 - in jifty/trunk: lib/Jifty/Plugin lib/Jifty/Plugin/OnlineDocs share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs

[Jifty commits]

Author: alexmv
Date: Wed Feb 25 00:24:47 2009
New Revision: 6413

Removed:
   jifty/trunk/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/autohandler
Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/OnlineDocs.pm
   jifty/trunk/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm

Log:
 r42560 at kohr-ah:  chmrr | 2009-02-24 23:51:07 -0500
 Cleanup and dispatcher-ize OnlineDocs


Modified: jifty/trunk/lib/Jifty/Plugin/OnlineDocs.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OnlineDocs.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OnlineDocs.pm	Wed Feb 25 00:24:47 2009
@@ -4,16 +4,14 @@
 package Jifty::Plugin::OnlineDocs;
 use base qw/Jifty::Plugin/;
 
-# Your plugin goes here.  If takes any configuration or arguments, you
-# probably want to override L<Jifty::Plugin/init>.
-
 =head1 NAME
 
 Jifty::Plugin::OnlineDocs - Online documentation for Jifty in current application
 
 =head1 DESCRIPTION
 
-This plugin provides superusers with online documentation for Jifty and your application's API. It's included by default when using Jifty. (That's a bug).
+This plugin provides superusers with online documentation for Jifty
+and your application's API, if AdminMode is enabled.
 
 =cut
 

Modified: jifty/trunk/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm	Wed Feb 25 00:24:47 2009
@@ -13,23 +13,25 @@
 
 =cut
 
-
 use Jifty::Dispatcher -base;
     
-
 on '*' => run {
-    if ( Jifty->config->framework('AdminMode') ) {
-        my $top = Jifty->web->navigation;
-        $top->child(
-            OnlineDocs =>
-              url      => "/__jifty/online_docs/",
-            label      => _('Online docs'),
-            sort_order => 999
-        );
-    }
-    return ();
+    return unless Jifty->config->framework('AdminMode');
+
+    my $top = Jifty->web->navigation;
+    $top->child(
+        "OnlineDocs",
+        url        => "/__jifty/online_docs/",
+        label      => _('Online docs'),
+        sort_order => 999
+    );
 };
 
+under '/__jifty/online_docs' => run {
+    return unless Jifty->config->framework('AdminMode');
+    warn "Attempt to access /__jifty/online_docs; either enable AdminMode, or remove the OnlineDocs plugin";
+    redirect('/__jifty/error/permission_denied');
+};
 
 1;