Show
Ignore:
Timestamp:
04/02/08 06:38:21 (20 months ago)
Author:
fumiakiy
Message:

Merged the latest checkins to release-32 branch to the current dev branch. svn merge -r1669:1708 http://code.sixapart.com/svn/movabletype/branches/release-32 .

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/release-33/default_templates/sidebar.mtml

    r1195 r1709  
     1<mt:ignore><!--  
     2# 
     3#  The sidebar is made up of one or two columns. 
     4#  For 2-column designs, just beta. 
     5#  For 3-column designs, beta and gamma. 
     6# 
     7--></mt:ignore> 
     8 
     9 
    110<div id="beta"> 
    211    <div id="beta-inner"> 
     12 
    313<mt:if name="page_columns" eq="2"> 
     14    <mt:ignore><!-- Use the 2-column layout Sidebar if page layout is layout-wt or layout-tw. --></mt:ignore> 
    415    <$mt:WidgetSet name="<__trans phrase="2-column layout - Sidebar">"$> 
    516<mt:else name="page_columns" eq="3"> 
     17    <mt:ignore><!-- Use the 3-column layout Primary Sidebar if page layout is layout-wtt or layout-twt. --></mt:ignore> 
    618    <$mt:WidgetSet name="<__trans phrase="3-column layout - Primary Sidebar">"$> 
    719</mt:if> 
     20 
    821    </div> 
    922</div> 
     23 
     24 
    1025<mt:if name="page_columns" eq="3"> 
     26    <mt:ignore><!-- Use the 3-column layout Secondary Sidebar if page layout is layout-wtt or layout-twt. --></mt:ignore> 
    1127<div id="gamma"> 
    1228    <div id="gamma-inner">