Changeset 951


Ignore:
Timestamp:
Mar 19, 2007, 8:34:51 PM (15 years ago)
Author:
kake
Message:

Move common categories/locales into navbar.

Location:
trunk
Files:
2 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Build.PL

    r942 r951  
    320320                      "backlink_results.tt",
    321321                      "banner.tt",
    322                       "common_categories.tt",
    323                       "common_locales.tt",
    324322                      "delete_confirm.tt",
    325323                      "delete_done.tt",
     
    337335                      "moderate_password_wrong.tt",
    338336                      "navbar.tt",
     337                      "navbar_categories.tt",
    339338                      "navbar_help.tt",
    340339                      "navbar_home_link.tt",
     340                      "navbar_locales.tt",
    341341                      "navbar_options.tt",
    342342                      "navbar_revision_info.tt",
  • trunk/Changes

    r942 r951  
    1616        Split out "modules" from navbar.tt into separate templates navbar_*.tt
    1717          to make it easier for people to change the order in a custom template
     18        Move common categories/locales into navbar.
    1819        Write tests for and fix:
    1920          #48 (Edit conflict page erroneously converts lat/lon to os_x, os_y).
  • trunk/MANIFEST

    r942 r951  
    3232templates/backlink_results.tt
    3333templates/banner.tt
    34 templates/common_categories.tt
    35 templates/common_locales.tt
    3634templates/delete_confirm.tt
    3735templates/delete_done.tt
     
    4947templates/moderate_password_wrong.tt
    5048templates/navbar.tt
     49templates/navbar_categories.tt
    5150templates/navbar_help.tt
    5251templates/navbar_home_link.tt
     52templates/navbar_locales.tt
    5353templates/navbar_options.tt
    5454templates/navbar_revision_info.tt
  • trunk/README.CSS

    r950 r951  
    136136    Purpose: The navigation bar
    137137
     138div#navbar_categories
     139    Used in: navbar_categories.tt
     140    Purpose: Display the common categories, if enabled.
     141div#navbar_locales
     142    Used in: navbar_locales.tt
     143    Purpose: Display the common locales, if enabled.
     144
    138145div#navbar_current_version_link
    139146    Used in: navbar_revision_info.tt
     
    193200             optionally a link to the licence we're using it under.
    194201
    195 div#common_navigation
    196     Used in: node.tt
    197     Purpose: Hold the common locales and categories, if enabled
    198 
    199 div#common_categories
    200     Used in: common_categories.tt
    201     Purpose: Hold the common categories, if enabled
    202 h3#common_categories_title
    203     Used in: common_categories.tt
    204     Purpose: Title for the common categories
    205 ul#common_categories_list
    206     Used in: common_categories.tt
    207     Purpose: Parent list for the common categories
    208 li.common_category
    209     Used in: common_categories.tt
    210     Purpose: A common category
    211 a.common_category_link
    212     Used in: common_categories.tt
    213     Purpose: A link to a common category
    214 
    215 div#common_locales
    216     Used in: common_locales.tt
    217     Purpose: Hold the common locales, if enabled
    218 h3#common_locales_title
    219     Used in: common_locales.tt
    220     Purpose: Title for the common locales
    221 ul#common_locales_list
    222     Used in: common_locales.tt
    223     Purpose: Parent list for the common locales
    224 li.common_locale
    225     Used in: common_locales.tt
    226     Purpose: A common locale
    227 a.common_locale_link
    228     Used in: common_locales.tt
    229     Purpose: A link to a common locale
    230 
    231202input#address
    232203    Used in: edit_form.tt
  • trunk/templates/navbar.tt

    r942 r951  
    77  [% INCLUDE navbar_search.tt %]
    88  [% INCLUDE navbar_this_page.tt %]
     9  [% INCLUDE navbar_categories.tt %]
     10  [% INCLUDE navbar_locales.tt %]
    911  [% INCLUDE navbar_revision_info.tt %]
    1012
  • trunk/templates/node.tt

    r867 r951  
    144144</div>
    145145
    146 [% IF common_catloc %]
    147 <div id="common_navigation">
    148   [% IF common_categories %]
    149     [% INCLUDE common_categories.tt %]
    150   [% END %]
    151   [% IF common_locales %]
    152     [% INCLUDE common_locales.tt %]
    153   [% END %]
    154 </div>
    155 [% END %]
    156 
    157146[% INCLUDE footer.tt %]
Note: See TracChangeset for help on using the changeset viewer.