Changeset 1085 for trunk/templates

Timestamp:

06/17/07 00:57:32 (18 months ago)

Author:

ilmari

Message:

Clean up fallout from prefs cleanup
- Make OpenGuides::Template->output pass the provided cookies to

OpenGuides::CGI->get_prefs_from_cookie, where this overrides any
browser-supplied cookie.

- Use the prefs hash explcitly where needed (fixes #216).

Targets to commit (you may delete items from it)

M /home/ilmari/src/openguides-trunk/lib/Changes.pm
M /home/ilmari/src/openguides-trunk/lib/OpenGuides/CGI.pm
M /home/ilmari/src/openguides-trunk/lib/OpenGuides/Template.pm
M /home/ilmari/src/openguides-trunk/preferences.cgi
M /home/ilmari/src/openguides-trunk/t/59_preferences.t
M /home/ilmari/src/openguides-trunk/templates/preferences.tt
M /home/ilmari/src/openguides-trunk/templates/navbar_tools.tt

Location:

trunk/templates

Files:

• navbar_tools.tt (modified) (1 diff)
• preferences.tt (modified) (4 diffs)

trunk/templates/navbar_tools.tt

@@ -6 +6 @@
     <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li>
     <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li>
-    [% IF geocache_link AND wgs84_lat AND wgs84_long %]
-      <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %];origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li>
+    [% IF prefs.include_geocache_link AND wgs84_lat AND wgs84_long %]
+      <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %]&amp;origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li>
     [% END %]
   </ul>

trunk/templates/preferences.tt

@@ -9 +9 @@
     <h1>Username</h1>
     <p><label for="username">How you wish to be identified in Recent Changes:</label></p>
-    <input type="text" size="20" id="username" name="username" value="[% username %]" />
+    <input type="text" size="20" id="username" name="username" value="[% prefs.username %]" />
 
     <h1>Preferences</h1>
@@ -118 +118 @@
   <h1>Username/preferences saved</h1>
 
-  <p>Username set to &#8220;[% username %]&#8221;.</p>
+  <p>Username set to &#8220;[% prefs.username %]&#8221;.</p>
 
   <p>Preview area shown
@@ -129 +129 @@
 
   <p>&#8220;Look for nearby geocaches&#8221; link
-    [% UNLESS include_geocache_link %] not [% END %]
+    [% UNLESS prefs.include_geocache_link %] not [% END %]
   included in navbar.</p>
 
@@ -150 +150 @@
 
   <p>Your visits to Recent Changes will
-    [% UNLESS track_recent_changes_views %] not [% END %]
+    [% UNLESS prefs.track_recent_changes_views %] not [% END %]
   be tracked.</p>