Changeset 972

Timestamp:

03/24/07 16:56:12 (20 months ago)

Author:

dom

Message:

Revert common category/locale stuff for the time being pending
discussion (see #195)

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 (added)
• templates/common_locales.tt (added)
• templates/navbar.tt (modified) (1 diff)
• templates/navbar_categories.tt (deleted)
• templates/navbar_locales.tt (deleted)
• templates/node.tt (modified) (1 diff)

trunk/Build.PL

@@ -322 +322 @@
                       "backlink_results.tt",
                       "banner.tt",
+                      "common_categories.tt",
+                      "common_locales.tt",
                       "delete_confirm.tt",
                       "delete_done.tt",
@@ -337 +339 @@
                       "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.
         Add a new div to wrap the entire body; also, use header.tt in
           home_node.tt instead of copy/paste.

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
@@ -47 +49 @@
 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

@@ -140 +140 @@
     Purpose: The navigation bar
 
-div#navbar_categories
-    Used in: navbar_categories.tt
-    Purpose: Display the common categories, if enabled.
 div#navbar_help
     Used in: navbar_help.tt
     Purpose: Display help links, if user has them turned on.
-div#navbar_locales
-    Used in: navbar_locales.tt
-    Purpose: Display the common locales, if enabled.
 div#navbar_options
     Used in: navbar_options.tt
@@ -224 +218 @@
              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

@@ -150 +150 @@
 [% END %]
 
+[% 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 %]