Changeset 1236

Timestamp:

10/19/08 16:24:04 (3 months ago)

Author:

dom

Message:

Add an admin navbar, to be displayed if the user requests (fixes #261)

Location:

trunk

Files:

• Build.PL (modified) (1 diff)
• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/OpenGuides/CGI.pm (modified) (5 diffs)
• lib/OpenGuides/Template.pm (modified) (2 diffs)
• preferences.cgi (modified) (2 diffs)
• t/13_cookies.t (modified) (6 diffs)
• templates/navbar.tt (modified) (1 diff)
• templates/navbar_admin.tt (added)
• templates/preferences.tt (modified) (2 diffs)

trunk/Build.PL

@@ -363 +363 @@
                       "navbar_locales.tt",
                       "navbar_help.tt",
+                      "navbar_admin.tt",
                       "navbar_home_link.tt",
                       "navbar_options.tt",

trunk/Changes

@@ -14 +14 @@
         Set content charset correctly in RDF (#260)
         Display geodata ellipsoid to user in edit from (#230)
+        Add an admin navbar, to be displayed if the user requests (#261)
 
 0.63    16 August 2008

trunk/MANIFEST

@@ -48 +48 @@
 templates/moderate_password_wrong.tt
 templates/navbar.tt
+templates/navbar_admin.tt
 templates/navbar_categories.tt
 templates/navbar_help.tt

trunk/lib/OpenGuides/CGI.pm

@@ -39 +39 @@
       cookie_expires             => "never",
       track_recent_changes_views => 1,
-      display_google_maps        => 1
+      display_google_maps        => 1,
+      is_admin                   => 1
   );
 
@@ -84 +85 @@
       cookie_expires             => "never",
       track_recent_changes_views => 1,
-      display_google_maps        => 1
+      display_google_maps        => 1,
+      is_admin                   => 1
   );
 
@@ -127 +129 @@
                     exp        => $args{cookie_expires},
                     trackrc    => $args{track_recent_changes_views} || 0,
-                    gmaps      => $args{display_google_maps} || 0
+                    gmaps      => $args{display_google_maps} || 0,
+                    admin      => $args{is_admin} || 0
                   },
         -expires => $expires,
@@ -181 +184 @@
                        trackrc    => "track_recent_changes_views",
                        gmaps      => "display_google_maps",
+                       admin      => "is_admin",
                      );
     my %long_data = map { $long_forms{$_} => $data{$_} } keys %long_forms;
@@ -200 +204 @@
                      track_recent_changes_views => 0,
                      display_google_maps        => 1,
+                     is_admin                   => 0,
                    );
     my %return;

trunk/lib/OpenGuides/Template.pm

@@ -156 +156 @@
         $enable_page_deletion = 1;
     }
+    my $is_admin = 0;
+    if ( $cookie_data{is_admin} ) {
+        $is_admin = 1;
+    } 
 
     my $tt_vars = {
@@ -170 +174 @@
         navbar_on_home_page   => $config->navbar_on_home_page,
         omit_help_links       => $omit_help_links,
+        is_admin              => $is_admin,
         formatting_rules_link => $formatting_rules_link,
         formatting_rules_node => $formatting_rules_node,

trunk/preferences.cgi

@@ -46 +46 @@
         vars     => {
                       not_editable => 1,
+                      not_deletable => 1,
                     }
     );
@@ -56 +57 @@
         template => "preferences.tt",
         vars     => { 
-                      not_editable => 1,
-                      show_form    => 1
+                      not_editable  => 1,
+                      show_form     => 1,
+                      not_deletable => 1,
                     }
     );

trunk/t/13_cookies.t

@@ -4 +4 @@
 use Time::Piece;
 use Time::Seconds;
-use Test::More tests => 27;
+use Test::More tests => 29;
 
 eval { OpenGuides::CGI->make_prefs_cookie; };
@@ -31 +31 @@
     track_recent_changes_views => "rc_pref",
     display_google_maps        => "gm_pref",
+    is_admin                   => "admin_pref",
 );
 isa_ok( $cookie, "CGI::Cookie", "->make_prefs_cookie returns a cookie" );
@@ -69 +70 @@
 is( $prefs{display_google_maps}, "gm_pref",
                                      "...and Google Maps display preference" );
-
+is( $prefs{is_admin}, "admin_pref",
+                                     "...and admin preference" );
 # Now make sure that true/false preferences are taken account of when
 # they're false.
@@ -81 +83 @@
     track_recent_changes_views => 0,
     display_google_maps        => 0,
+    is_admin                   => 0,
 );
 
@@ -93 +96 @@
 ok( !$prefs{track_recent_changes_views}, "...and recent changes prefs" );
 ok( !$prefs{display_google_maps}, "...and Google Maps prefs" );
+ok( !$prefs{is_admin}, "...and admin prefs" );
 
 # Check that cookie parsing fails nicely if no cookie set.
@@ -98 +102 @@
 %prefs = eval { OpenGuides::CGI->get_prefs_from_cookie( config => $config ); };
 is( $@, "", "->get_prefs_from_cookie doesn't die if no cookie set" );
-is( keys %prefs, 10, "...and returns ten default values" );
+is( keys %prefs, 11, "...and returns ten default values" );

trunk/templates/navbar.tt

@@ -5 +5 @@
   [% INCLUDE navbar_tools.tt %]
   [% INCLUDE navbar_help.tt %]
+  [% INCLUDE navbar_admin.tt %]
   [% INCLUDE navbar_options.tt %]
   [% INCLUDE navbar_search.tt %]

trunk/templates/preferences.tt

@@ -56 +56 @@
     [% END %]
     <label for="show_minor">Include &#8220;minor edits&#8221; in Recent Changes.</label>
+    </p>
+
+    <p>
+    [% IF prefs.is_admin %]
+      <input type="checkbox" id="is_admin" name="is_admin" value="1" checked />
+    [% ELSE %]
+      <input type="checkbox" id="is_admin" name="is_admin" value="1" />
+    [% END %]
+    <label for="show_minor">Show admin related links</label>
     </p>
 
@@ -145 +154 @@
   </p>
 
+  <p>Admin links will
+    [% UNLESS prefs.is_admin %] not [% END %]
+    be included in navbar.
+  </p>
   <p>Minor edits
     [% UNLESS show_minor_edits_in_rc %] not [% END %]