Changeset 942

Timestamp:

03/17/07 16:39:51 (21 months ago)

Author:

kake

Message:

Split out "modules" from navbar.tt into separate templates - navbar_*.tt - to make it easier for people to change their order in a custom template.

Location:

trunk

Files:

• Build.PL (modified) (1 diff)
• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• README.CSS (modified) (5 diffs)
• templates/navbar.tt (modified) (1 diff)
• templates/navbar_help.tt (added)
• templates/navbar_home_link.tt (added)
• templates/navbar_options.tt (added)
• templates/navbar_revision_info.tt (added)
• templates/navbar_search.tt (added)
• templates/navbar_this_page.tt (added)
• templates/navbar_tools.tt (added)

trunk/Build.PL

@@ -337 +337 @@
                       "moderate_password_wrong.tt",
                       "navbar.tt",
+                      "navbar_help.tt",
+                      "navbar_home_link.tt",
+                      "navbar_options.tt",
+                      "navbar_revision_info.tt",
+                      "navbar_search.tt",
+                      "navbar_this_page.tt",
+                      "navbar_tools.tt",
                       "needing_moderation.tt",
                       "newpage.tt",

trunk/Changes

@@ -14 +14 @@
           URL for node images (#179).
         Add config option to omit recent changes from home page.
+        Split out "modules" from navbar.tt into separate templates navbar_*.tt
+          to make it easier for people to change the order in a custom template
         Write tests for and fix:
           #48 (Edit conflict page erroneously converts lat/lon to os_x, os_y).

trunk/MANIFEST

@@ -49 +49 @@
 templates/moderate_password_wrong.tt
 templates/navbar.tt
+templates/navbar_help.tt
+templates/navbar_home_link.tt
+templates/navbar_options.tt
+templates/navbar_revision_info.tt
+templates/navbar_search.tt
+templates/navbar_this_page.tt
+templates/navbar_tools.tt
 templates/needing_moderation.tt
 templates/newpage.tt

trunk/README.CSS

@@ -9 +9 @@
     Purpose: Link to the home page of the site, in the search results page
 
-div.edit_page_link
-    Used in: navbar.tt
+a.edit_page_link
+    Used in: navbar_this_page.tt
     Purpose: Link to the edit page function, in the navbar
 
 div.navbar_group
-    Used in: navbar.tt
+    Used in: navbar_*.tt
     Purpose: Defines a related set of navigation bar functions
 
 div.navbar_group_title
-    Used in: navbar.tt
+    Used in: navbar_*.tt
     Purpose: Titles a related set of navigation bar functions
 
 div.navbar_item
-    Used in: navbar.tt
+    Used in: navbar_*.tt
     Purpose: Defines an item in the navigation bar
 
@@ -30 +30 @@
 
 input.form_button
-    Used in: differences.tt, edit_form.tt, footer.tt, navbar.tt, newpage.tt,
-             node.tt, preferences.tt, search.tt
+    Used in: differences.tt, edit_form.tt, footer.tt, navbar_search.tt,
+             newpage.tt, node.tt, preferences.tt, search.tt
     Purpose: A standard form button
 
 label.hidden
-    Used in: navbar.tt
+    Used in: navbar_search.tt
     Purpose: A label for the search box that will be hidden for users with
              a CSS-conforming user agent
@@ -54 +54 @@
     Purpose: Displays the node name
 
-span.hidden
-    Used in: navbar.tt
+input.hidden
+    Used in: navbar_search.tt
     Purpose: Defines content that will be hidden for users with a
              CSS-conforming user agent
@@ -131 +131 @@
     Purpose: The navigation bar
 
+div#navbar_current_version_link
+    Used in: navbar_revision_info.tt
+    Purpose: Display a link to the current version when showing a historical
+    version of an editable node.
+
+div#navbar_last_edited
+    Used in: navbar_revision_info.tt
+    Purpose: Display the last edited time when showing the current version of
+    an editable node.
+
+div#navbar_this_revision_info
+    Used in: navbar_revision_info.tt
+    Purpose: Display the version number and edit time when showing a historical
+    version of an editable node.
+
+div#navbar_version
+    Used in: navbar_revision_info.tt
+    Purpose: Display the version number when showing the current version of
+    an editable node.
+
 div#rdf_link
     Used in: node.tt
@@ -239 +259 @@
 
 input#nav_search
-    Used in: navbar.tt
+    Used in: navbar_search.tt
     Purpose: The search input portion of the navigation bar
 

trunk/templates/navbar.tt

@@ -1 +1 @@
 <div id="navbar">
 
-  [% UNLESS node_param == 'Home' %]
-  <div class="navbar_site_name"><a href="[% full_cgi_url %]">[% site_name %]</a></div>
-  [% END %]
-
-  <div class="navbar_group_title">Tools:</div>
-
-  <ul>
-    <li><a href="[% full_cgi_url %]?action=rc">Recent Changes</a></li>
-    <li><a href="newpage.cgi">Create New Page</a></li>
-    <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 latitude AND longitude %]
-      <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></li>
-    [% END %]
-  </ul>
-
-  [% UNLESS omit_help_links %]
-
-  <div class="navbar_group_title">Help:</div>
-
-  <ul>
-    <li><a href="[% full_cgi_url %]?FAQ">FAQ</a></li>
-    <li><a href="[% full_cgi_url %]?How_To_Get_Started">How To Get Started</a></li>
-    [% IF formatting_rules_link %]
-      <li><a href="[% formatting_rules_link %]">[% formatting_rules_node %]</a></li>
-    [% END %]
-    <li><a href="[% full_cgi_url %]?Wiki_Etiquette">Wiki Etiquette</a></li>
-  </ul>
-
-  [% END %]
-
-  <div class="navbar_group_title">Options:</div>
-
-  <ul>
-    <li><a href="preferences.cgi">Set username/prefs</a></li>
-  </ul>
-
-  <div class="navbar_group_title">Search:</div>
-
-  <ul>
-    <li>
-      <form method="post" action="search.cgi" enctype="application/x-www-form-urlencoded">
-        <input type="hidden" name="action" value="search" />
-        <input type="text" size="15" name="search" id="nav_search" value="Search text" onfocus="this.value=''" /> <label for="nav_search" class="hidden">Search text</label>
-        <input type="submit" value="Go" class="form_button" />
-      </form>
-    </li>
-    <li><a href="search.cgi">Advanced Search</a></li>
-  </ul>
-
-  [% UNLESS not_editable %]
-    <div class="navbar_group_title">This page:</div>
-
-    <ul>
-      <li><a class="edit_page_link" href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li>
-      <li><a href="[% cgi_url %]?action=show_backlinks;id=[% node_param %]">Show pages linking here</a></li>
-      [% IF version AND version > 1 %]
-        <li><a href="[% cgi_url %]?action=list_all_versions;id=[% node_param %]">List all revisions</a></li> 
-      [% END %]
-        <li><a href="[% cgi_url %]?id=[% node_param %];format=rdf">RDF/XML version</a></li>
-      [% IF enable_page_deletion %]
-        <li><a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete (admin only)</a></li>
-      [% END %]
-    </ul>
-
-    <div class="navbar_revision">
-      [% IF current %]
-        Revision [% version %]. Last edited [% last_modified %].
-      [% ELSE %]
-        This is revision [% version %] (as of [% last_modified %]).<br />
-        <a href="[% cgi_url %]?[% node_param %]">View current version.</a>
-      [% END %]
-    </div>
-  [% END %]
+  [% INCLUDE navbar_home_link.tt %]
+  [% INCLUDE navbar_tools.tt %]
+  [% INCLUDE navbar_help.tt %]
+  [% INCLUDE navbar_options.tt %]
+  [% INCLUDE navbar_search.tt %]
+  [% INCLUDE navbar_this_page.tt %]
+  [% INCLUDE navbar_revision_info.tt %]
 
 </div>