Changeset 951

Timestamp:

03/19/07 20:34:51 (20 months ago)

Author:

kake

Message:

Move common categories/locales into navbar.

Location:

trunk

Files:

• Build.PL (modified) (2 diffs)
• Changes (modified) (1 diff)
• MANIFEST (modified) (2 diffs)
• README.CSS (modified) (2 diffs)
• templates/common_categories.tt (deleted)
• templates/common_locales.tt (deleted)
• templates/navbar.tt (modified) (1 diff)
• templates/navbar_categories.tt (added)
• templates/navbar_locales.tt (added)
• templates/node.tt (modified) (1 diff)

trunk/Build.PL

@@ -320 +320 @@
                       "backlink_results.tt",
                       "banner.tt",
-                      "common_categories.tt",
-                      "common_locales.tt",
                       "delete_confirm.tt",
                       "delete_done.tt",
@@ -337 +335 @@
                       "moderate_password_wrong.tt",
                       "navbar.tt",
+                      "navbar_categories.tt",
                       "navbar_help.tt",
                       "navbar_home_link.tt",
+                      "navbar_locales.tt",
                       "navbar_options.tt",
                       "navbar_revision_info.tt",

trunk/Changes

@@ -16 +16 @@
         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
+        Move common categories/locales into navbar.
         Write tests for and fix:
           #48 (Edit conflict page erroneously converts lat/lon to os_x, os_y).

trunk/MANIFEST

@@ -32 +32 @@
 templates/backlink_results.tt
 templates/banner.tt
-templates/common_categories.tt
-templates/common_locales.tt
 templates/delete_confirm.tt
 templates/delete_done.tt
@@ -49 +47 @@
 templates/moderate_password_wrong.tt
 templates/navbar.tt
+templates/navbar_categories.tt
 templates/navbar_help.tt
 templates/navbar_home_link.tt
+templates/navbar_locales.tt
 templates/navbar_options.tt
 templates/navbar_revision_info.tt

trunk/README.CSS

@@ -136 +136 @@
     Purpose: The navigation bar
 
+div#navbar_categories
+    Used in: navbar_categories.tt
+    Purpose: Display the common categories, if enabled.
+div#navbar_locales
+    Used in: navbar_locales.tt
+    Purpose: Display the common locales, if enabled.
+
 div#navbar_current_version_link
     Used in: navbar_revision_info.tt
@@ -193 +200 @@
              optionally a link to the licence we're using it under.
 
-div#common_navigation
-    Used in: node.tt
-    Purpose: Hold the common locales and categories, if enabled
-
-div#common_categories
-    Used in: common_categories.tt
-    Purpose: Hold the common categories, if enabled
-h3#common_categories_title
-    Used in: common_categories.tt
-    Purpose: Title for the common categories
-ul#common_categories_list
-    Used in: common_categories.tt
-    Purpose: Parent list for the common categories
-li.common_category
-    Used in: common_categories.tt
-    Purpose: A common category
-a.common_category_link
-    Used in: common_categories.tt
-    Purpose: A link to a common category
-
-div#common_locales
-    Used in: common_locales.tt
-    Purpose: Hold the common locales, if enabled
-h3#common_locales_title
-    Used in: common_locales.tt
-    Purpose: Title for the common locales
-ul#common_locales_list
-    Used in: common_locales.tt
-    Purpose: Parent list for the common locales
-li.common_locale
-    Used in: common_locales.tt
-    Purpose: A common locale
-a.common_locale_link
-    Used in: common_locales.tt
-    Purpose: A link to a common locale
-
 input#address
     Used in: edit_form.tt

trunk/templates/navbar.tt

@@ -7 +7 @@
   [% INCLUDE navbar_search.tt %]
   [% INCLUDE navbar_this_page.tt %]
+  [% INCLUDE navbar_categories.tt %]
+  [% INCLUDE navbar_locales.tt %]
   [% INCLUDE navbar_revision_info.tt %]
 

trunk/templates/node.tt

@@ -144 +144 @@
 </div>
 
-[% IF common_catloc %]
-<div id="common_navigation">
-  [% IF common_categories %]
-    [% INCLUDE common_categories.tt %]
-  [% END %]
-  [% IF common_locales %]
-    [% INCLUDE common_locales.tt %]
-  [% END %]
-</div>
-[% END %]
-
 [% INCLUDE footer.tt %]