Changeset 1086

Timestamp:

06/17/07 03:15:31 (16 months ago)

Author:

ilmari

Message:

r22807@vesla: ilmari | 2007-06-17 02:04:48 +0100
Move the common categories/locales navbar display decision into the templates (fixes #214)

Location:

trunk

Files:

• . (modified) (1 prop)
• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (2 diffs)
• newpage.cgi (modified) (1 diff)
• t/58_navbar_common_locales_categories.t (added)
• t/58_recent_changes_navbar.t (deleted)
• templates/navbar_categories.tt (modified) (2 diffs)
• templates/navbar_locales.tt (modified) (1 diff)

trunk/Changes

@@ -23 +23 @@
         The "Look for nearby geocaches" preference and link now actually work
           (#216).
+        Move the common categories/locales navbar display decision into the
+          templates (#214).
 
 0.60    13 May 2007

trunk/lib/OpenGuides.pm

@@ -259 +259 @@
            && $self->get_cookie( "display_google_maps" ) ) {
         $tt_vars{display_google_maps} = 1;
-    }
-
-    # Should we include a standard list of categories or locales?
-    if ($config->enable_common_categories || $config->enable_common_locales) {
-        $tt_vars{common_catloc} = 1;
-        $tt_vars{common_categories} = $config->enable_common_categories;
-        $tt_vars{common_locales} = $config->enable_common_locales;
-        $tt_vars{catloc_link} = $config->script_url . $config->script_name
-                                . "?id=";
     }
 
@@ -671 +662 @@
     }
     $tt_vars{not_editable} = 1;
-    if ($config->enable_common_categories || $config->enable_common_locales) {
-        $tt_vars{common_catloc} = 1;
-        $tt_vars{common_categories} = $config->enable_common_categories;
-        $tt_vars{common_locales} = $config->enable_common_locales;
-        $tt_vars{catloc_link} = $config->script_url . $config->script_name
-                                . "?id=";
-    }
     $tt_vars{recent_changes} = \%recent_changes;
     my %processing_args = (

trunk/newpage.cgi

@@ -31 +31 @@
 
 sub show_form {
-    my %tt_vars = (
-                    not_editable     => 1,
-                    not_deletable    => 1,
-                    deter_robots     => 1,
-                    disallowed_chars => \@badchars,
-                    pagename         => $pagename,
-                  );
-    if ($config->enable_common_categories || $config->enable_common_locales) {
-        $tt_vars{common_catloc} = 1;
-        $tt_vars{common_categories} = $config->enable_common_categories;
-        $tt_vars{common_locales} = $config->enable_common_locales;
-        $tt_vars{catloc_link} = $config->script_url . $config->script_name
-                                . "?id=";
-    }
     print OpenGuides::Template->output( wiki     => $wiki,
                                         config   => $config,
                                         template => "newpage.tt",
-                                        vars     => \%tt_vars,
+                                        vars     => {
+                                            not_editable     => 1,
+                                            not_deletable    => 1,
+                                            deter_robots     => 1,
+                                            disallowed_chars => \@badchars,
+                                            pagename         => $pagename }
     );
 }

trunk/templates/navbar_categories.tt

@@ -1 @@
-[% IF common_categories %]
+[% IF config.enable_common_categories %]
   <div id="navbar_categories">
     <div class="navbar_group_title">Categories:</div>
@@ -5 +5 @@
       [% FOREACH cat = [ 'Cafes', 'Coffee Shops', 'Pubs', 'Restaurants',
                          'Supermarkets', 'Cinemas', 'Theatres' ] %]
-        <li><a href="[% catloc_link %]Category_[% cat %]">[% cat %]</a></li>
+        <li><a href="[% config.script_url _ config.script_name %]?id=Category_[% cat %]">[% cat %]</a></li>
       [% END %]
     </ul>

trunk/templates/navbar_locales.tt

@@ -1 @@
-[% IF common_locales %]
+[% IF config.enable_common_locales %]
   <div id="navbar_locales">
     <div class="navbar_group_title">Locales:</div>
     <ul class="navbar_group">
       [% FOREACH loc = [ 'North', 'South', 'East', 'West', 'Central' ] %]
-        <li><a href="[% catloc_link %]Locale_[% loc %]">[% loc %]</a></li>
+        <li><a href="[% config.script_url _ config.script_name %]?id=Locale_[% loc %]">[% loc %]</a></li>
       [% END %]
     </ul>