Changeset 2604

Show
Ignore:
Timestamp:
06/19/08 01:29:47 (20 months ago)
Author:
bsmith
Message:

bugzid:79938 - Normalizing Template Tags - converting ifnonzero & ifnonempty to if, setvar & getvar to var, etc

Location:
branches/release-40/default_templates
Files:
14 modified

Legend:

Unmodified
Added
Removed

  • branches/release-40/default_templates/archive_index.mtml

    r2603 r2604  
    5555                                    <ul class="archive-list"> 
    5656        </mt:SubCatIsFirst> 
    57         <mt:IfNonZero tag="MTCategoryCount"> 
     57        <mt:If tag="CategoryCount"> 
    5858                                        <li class="archive-list-item"><a href="<$mt:CategoryArchiveLink$>" title="<$mt:CategoryDescription$>"><$mt:CategoryLabel$></a> 
    5959        <mt:Else> 
    6060                                        <li class="archive-list-item"><$mt:CategoryLabel$> 
    61         </mt:IfNonZero> 
     61        </mt:If> 
    6262        <$mt:SubCatsRecurse$> 
    6363                                        </li> 

  • branches/release-40/default_templates/category_archive_list.mtml

    r2052 r2604  
    77        <ul class="widget-list"> 
    88        </mt:SubCatIsFirst> 
    9         <mt:IfNonZero tag="mt:CategoryCount"> 
    10             <li class="widget-list-item"><a href="<$mt:CategoryArchiveLink$>"<mt:IfNonEmpty tag="mt:CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:IfNonEmpty>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a> 
     9        <mt:If tag="CategoryCount"> 
     10            <li class="widget-list-item"><a href="<$mt:CategoryArchiveLink$>"<mt:If tag="CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:If>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a> 
    1111        <mt:Else> 
    1212            <li class="widget-list-item"><$mt:CategoryLabel$> 
    13         </mt:IfNonZero> 
     13        </mt:If> 
    1414        <$mt:SubCatsRecurse$> 
    1515            </li> 

  • branches/release-40/default_templates/category_entry_listing.mtml

    r2603 r2604  
    3737 
    3838<mt:Ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:Ignore> 
    39 <mt:Unless name="datebased_archive"><$mt:SetVar name="limit" value="auto"$></mt:Unless> 
     39<mt:Unless name="datebased_archive"><$mt:Var name="limit" value="auto"$></mt:Unless> 
    4040<mt:Entries limit="$limit"> 
    4141                            <mt:Ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:Ignore> 

  • branches/release-40/default_templates/comment_response.mtml

    r2603 r2604  
    77<mt:If name="comment_confirmation"> 
    88    <mt:Ignore><!-- Success message when comment has been submitted --></mt:Ignore> 
    9     <$mt:SetVar name="page_title" value="<__trans phrase="Confirmation...">"$> 
    10     <$mt:SetVar name="message" value="<p><__trans phrase="Your comment has been submitted!"></p>"$> 
     9    <$mt:Var name="page_title" value="<__trans phrase="Confirmation...">"$> 
     10    <$mt:Var name="message" value="<p><__trans phrase="Your comment has been submitted!"></p>"$> 
    1111<mt:Else name="comment_pending"> 
    1212    <mt:Ignore><!-- Pending message when comment is being held for review --></mt:Ignore> 
    13     <$mt:SetVar name="page_title" value="<__trans phrase="Thank you for commenting.">"$> 
    14     <$mt:SetVar name="message" value="<p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p>"$> 
     13    <$mt:Var name="page_title" value="<__trans phrase="Thank you for commenting.">"$> 
     14    <$mt:Var name="message" value="<p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p>"$> 
    1515<mt:Else name="comment_error"> 
    1616    <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore> 
    17     <$mt:SetVar name="page_title" value="<__trans phrase="Comment Submission Error">"$> 
     17    <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> 
    1818    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock> 
    1919</mt:If> 

  • branches/release-40/default_templates/commenter_confirm.mtml

    r2603 r2604  
    1212 
    1313<__trans phrase="Sincerely,"> 
    14 <mt:IfNonEmpty tag="AuthorDisplayName"><$mt:AuthorDisplayName$><mt:Else>Movable Type</mt:IfNonEmpty> 
     14<mt:If tag="AuthorDisplayName"><$mt:AuthorDisplayName$><mt:Else>Movable Type</mt:If> 
    1515 
    1616<$mt:Include module="<__trans phrase="Mail Footer">"$> 

  • branches/release-40/default_templates/entry.mtml

    r2603 r2604  
    3030                                    <div class="asset-meta"> 
    3131                                        <span class="byline"> 
    32 <mt:IfNonEmpty tag="EntryAuthorDisplayName"> 
     32<mt:If tag="EntryAuthorDisplayName"> 
    3333                                            <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$mt:EntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>"> 
    3434<mt:Else> 
    3535                                            <abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr> 
    36 </mt:IfNonEmpty> 
     36</mt:If> 
    3737                                        </span> 
    3838<mt:IfCommentsActive> 
    … …  
    4545                                </div> 
    4646                                <div class="asset-content entry-content"> 
    47 <mt:IfNonEmpty tag="EntryBody"> 
     47<mt:If tag="EntryBody"> 
    4848                                    <div class="asset-body"> 
    4949                                        <$mt:EntryBody$> 
    5050                                    </div> 
    51 </mt:IfNonEmpty> 
    52 <mt:IfNonEmpty tag="EntryMore" convert_breaks="0"> 
     51</mt:If> 
     52<mt:If tag="EntryMore" convert_breaks="0"> 
    5353                                    <div id="more" class="asset-more"> 
    5454                                        <$mt:EntryMore$> 
    5555                                    </div> 
    56 </mt:IfNonEmpty> 
     56</mt:If> 
    5757                                </div> 
    5858                                <div class="asset-footer"> 
    5959<mt:IfArchiveTypeEnabled archive_type="Category"> 
    60     <mt:If tag="MTEntryCategories"> 
     60    <mt:If tag="EntryCategories"> 
    6161                                    <div class="entry-categories"> 
    6262                                        <h4 class="entry-categories-header"><__trans phrase="Categories"><span class="delimiter">:</span></h4> 

  • branches/release-40/default_templates/entry_summary.mtml

    r2603 r2604  
    55        <div class="asset-meta"> 
    66            <span class="byline"> 
    7     <mt:IfNonEmpty tag="EntryAuthorDisplayName"> 
     7    <mt:If tag="EntryAuthorDisplayName"> 
    88                <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$mt:EntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>"> 
    99    <mt:Else> 
    1010                <abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr> 
    11     </mt:IfNonEmpty> 
     11    </mt:If> 
    1212            </span> 
    1313<mt:Unless name="hide_counts" eq="1"> 
    … …  
    1818    </div> 
    1919    <div class="asset-content entry-content"> 
    20 <mt:IfNonEmpty tag="EntryBody"> 
     20<mt:If tag="EntryBody"> 
    2121        <div class="asset-body"> 
    2222            <$mt:EntryBody$> 
    2323        </div> 
    24 </mt:IfNonEmpty> 
     24</mt:If> 
    2525<mt:If name="entry_archive"> 
    2626    <mt:EntryIfTagged> 
    … …  
    3333    </mt:EntryIfTagged> 
    3434</mt:If> 
    35 <mt:IfNonEmpty tag="EntryMore" convert_breaks="0"> 
     35<mt:If tag="EntryMore" convert_breaks="0"> 
    3636        <div class="asset-more-link"> 
    3737            <__trans phrase="Continue reading <a href="[_1]" rel="bookmark">[_2]</a>." params="<$mt:EntryPermalink$>#more%%<$mt:EntryTitle$>"> 
    3838        </div> 
    39 </mt:IfNonEmpty> 
     39</mt:If> 
    4040    </div> 
    4141    <div class="asset-footer"></div> 

  • branches/release-40/default_templates/feed_recent.mtml

    r2603 r2604  
    66    <id>tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:TemplateCreatedOn format="%Y-%m-%d"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$></id> 
    77    <updated><mt:Entries lastn="1"><$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></mt:Entries></updated> 
    8     <mt:IfNonEmpty tag="MTBlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:IfNonEmpty> 
     8    <mt:If tag="BlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:If> 
    99    <generator uri="http://www.sixapart.com/movabletype/"><$mt:ProductName version="1"$></generator> 
    1010<mt:Entries lastn="15"> 
    … …  
    2020    <author> 
    2121        <name><$mt:EntryAuthorDisplayName encode_xml="1"$></name> 
    22         <mt:IfNonEmpty tag="MTEntryAuthorURL"><uri><$mt:EntryAuthorURL encode_xml="1"$></uri></mt:IfNonEmpty> 
     22        <mt:If tag="EntryAuthorURL"><uri><$mt:EntryAuthorURL encode_xml="1"$></uri></mt:If> 
    2323    </author> 
    2424    <mt:EntryCategories> 

  • branches/release-40/default_templates/monthly_entry_listing.mtml

    r2603 r2604  
    3333 
    3434<mt:Ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:Ignore> 
    35 <mt:Unless name="datebased_archive"><$mt:SetVar name="limit" value="auto"$></mt:Unless> 
     35<mt:Unless name="datebased_archive"><$mt:Var name="limit" value="auto"$></mt:Unless> 
    3636<mt:Entries limit="$limit"> 
    3737                            <mt:Ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:Ignore> 

  • branches/release-40/default_templates/new-ping.mtml

    r2603 r2604  
    1212  <<$mt:Var name="approve_url"$>> 
    1313</mt:If></mt:If> 
    14 <mt:If name="entry"><mt:IfNonEmpty tag="EntryPermalink"><__trans phrase="View TrackBack">:  
     14<mt:If name="entry"><mt:If tag="EntryPermalink"><__trans phrase="View TrackBack">:  
    1515  <<$mt:EntryPermalink$>> 
    16 </mt:IfNonEmpty></mt:If> 
     16</mt:If></mt:If> 
    1717<mt:If name="state_editable"><__trans phrase="Report TrackBack as spam">:  
    1818  <<$mt:Var name="spam_url"$>> 

  • branches/release-40/default_templates/recent_assets.mtml

    r2052 r2604  
    1 <mt:IfNonZero tag="AssetCount"> 
     1<mt:If tag="AssetCount"> 
    22    <mt:Assets type="image" lastn="10"> 
    33        <mt:AssetsHeader> 
    … …  
    1414        </mt:AssetsFooter> 
    1515    </mt:Assets> 
    16 </mt:IfNonZero> 
     16</mt:If> 

  • branches/release-40/default_templates/recent_comments.mtml

    r2450 r2604  
    1 <mt:IfNonZero tag="mt:BlogCommentCount"> 
     1<mt:If tag="BlogCommentCount"> 
    22    <mt:Comments lastn="10" sort_order="descend"> 
    33        <mt:CommentsHeader> 
    … …  
    1414        </mt:CommentsFooter> 
    1515    </mt:Comments> 
    16 </mt:IfNonZero> 
     16</mt:If> 

  • branches/release-40/default_templates/recent_entries.mtml

    r2052 r2604  
    1 <mt:IfNonZero tag="BlogEntryCount"> 
     1<mt:If tag="BlogEntryCount"> 
    22    <mt:Entries lastn="10"> 
    33        <mt:EntriesHeader> 
    … …  
    1414        </mt:EntriesFooter> 
    1515    </mt:Entries> 
    16 </mt:IfNonZero> 
     16</mt:If> 

  • branches/release-40/default_templates/syndication.mtml

    r2603 r2604  
    44            <li class="blog feed"><img src="<$mt:StaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$mt:Link template="feed_recent"$>"><__trans phrase="Subscribe to this blog's feed"></a></li> 
    55<mt:If name="search_results"> 
    6     <mt:IfNonEmpty tag="mt:SearchString"> 
     6    <mt:If tag="SearchString"> 
    77            <li class="search-results-feed"><img src="<$mt:StaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$mt:CGIPath$><$mt:SearchScript$>?<mt:IfTagSearch>tag<mt:Else>search</mt:IfTagSearch>=<$mt:SearchString encode_url="1"$>&amp;Template=feed&amp;IncludeBlogs=<$mt:SearchIncludeBlogs$>&amp;limit=<$mt:SearchMaxResults$>" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching &ldquo;<$mt:SearchString$>&rdquo;"></a></li> 
    8     </mt:IfNonEmpty> 
     8    </mt:If> 
    99</mt:If> 
    1010        </ul>