Changeset 1423

Show
Ignore:
Timestamp:
02/28/08 21:39:16 (5 months ago)
Author:
bsmith
Message:

* Updates from development of MTDefautTemplateSets plugin: http://code.sixapart.com/svn/mtplugins/trunk/MTDefaultTemplateSet/

Including:

* Addition of RSD EditURI to Headers
* Conditioning of trackback data if pings are not accepted
* simplification to Comment Response template code
* modularization of MTEntries limit on Entry Listing
* removing page_layout definition from stylesheet at it is now set by the app
* adding html comments to code for readability
* removed RSS feed templates
* simplifying header module

bugzid:69142

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-30/default_templates/comment_preview.mtml

    r1139 r1423  
    22<MTSetVar name="body_onload" value="individualArchivesOnLoad(commenter_name)"> 
    33<MTSetVar name="system_template" value="1"> 
    4 <MTSetVar name="comment_preview_template" value="1"> 
    54<MTSetVar name="feedback_template" value="1"> 
    6 <MTSetVarBlock name="page_title"><__trans phrase="Comment on [_1]" params="<$MTEntryTitle$>"></MTSetVarBlock> 
     5<MTSetVarBlock name="page_title"><__trans phrase="Previewing your Comment"></MTSetVarBlock> 
    76<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock> 
    87<MTSetVarBlock name="html_head"> 
    …… 
    1211<$MTInclude module="<__trans phrase="Header">"$> 
    1312 
    14 <h1 id="page-title"><__trans phrase="Previewing your Comment"></h1> 
     13<h1 id="page-title"><$MTGetVar name="page_title"$></h1> 
    1514 
    1615<$MTInclude module="<__trans phrase="Comment Detail">"$> 

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

    r1139 r1423  
    11<MTSetVar name="system_template" value="1"> 
    2  
    32<MTIf name="body_class" eq="mt-comment-confirmation"> 
    4     <MTSetVarBlock name="page_title"><__trans phrase="Comment Submitted"></MTSetVarBlock> 
    5  
    6     <MTSetVar name="heading" value="<__trans phrase="Confirmation...">"> 
    7  
    8     <MTSetVarBlock name="message"> 
    9     <p><__trans phrase="Your comment has been submitted!"></p> 
    10     </MTSetVarBlock> 
     3    <MTSetVar name="page_title" value="<__trans phrase="Confirmation...">"> 
     4    <MTSetVar name="page_title" value="<__trans phrase="Confirmation...">"> 
     5    <MTSetVarBlock name="message"><__trans phrase="Your comment has been submitted!"></MTSetVarBlock> 
     6<MTElse name="body_class" eq="mt-comment-pending"> 
     7    <MTSetVarBlock name="page_title"><__trans phrase="Thank you for commenting."></MTSetVarBlock> 
     8    <MTSetVarBlock name="message"><__trans phrase="Your comment has been received and held for approval by the blog owner."></MTSetVarBlock> 
     9<MTElse name="body_class" eq="mt-comment-error"> 
     10    <MTSetVarBlock name="page_title"><__trans phrase="Comment Submission Error"></MTSetVarBlock> 
     11    <MTSetVarBlock name="message"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$MTErrorMessage$>"></MTSetVarBlock> 
    1112</MTIf> 
    12  
    13 <MTIf name="body_class" eq="mt-comment-pending"> 
    14     <MTSetVarBlock name="page_title"><__trans phrase="Comment Pending"></MTSetVarBlock> 
    15  
    16     <MTSetVar name="heading" value="<__trans phrase="Thank you for commenting.">"> 
    17  
    18     <MTSetVarBlock name="message"> 
    19     <p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p> 
    20     </MTSetVarBlock> 
    21  
    22 </MTIf> 
    23  
    24 <MTIf name="body_class" eq="mt-comment-error"> 
    25     <MTSetVarBlock name="page_title"><__trans phrase="Comment Submission Error"></MTSetVarBlock> 
    26  
    27     <MTSetVar name="heading" value="$page_title"> 
    28  
    29     <MTSetVarBlock name="message"> 
    30     <p><__trans phrase="Your comment submission failed for the following reasons:"></p> 
    31     <blockquote> 
    32         <$MTErrorMessage$> 
    33     </blockquote> 
    34     </MTSetVarBlock> 
    35 </MTIf> 
    36  
    3713<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock> 
    3814 
    3915<$MTInclude module="<__trans phrase="Header">"$> 
    4016 
    41 <h1 id="page-title"><$MTGetVar name="heading"$></h1> 
     17<h1 id="page-title"><$MTGetVar name="page_title"$></h1> 
    4218 
    4319<$MTGetVar name="message"$> 

  • branches/release-30/default_templates/entry_detail.mtml

    r1101 r1423  
    1717    </div> 
    1818    <div class="asset-footer"> 
    19         <MTIf name="entry_template"> 
    20                 <$MTInclude module="<__trans phrase="Categories">"$> 
    21         </MTIf> 
    22                 <$MTInclude module="<__trans phrase="Tags">"$> 
     19        <$MTInclude module="<__trans phrase="Categories">"$> 
     20        <$MTInclude module="<__trans phrase="Tags">"$> 
    2321    </div> 
    2422</div> 

  • branches/release-30/default_templates/entry_listing.mtml

    r1102 r1423  
    44<MTSetVarBlock name="page_title"><__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"></MTSetVarBlock> 
    55<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$>: <$MTGetVar name="page_title"$></MTSetVarBlock> 
     6<MTUnless name="datebased_archive"><$mt:setvar name="limit" value="auto"$></MTUnless> 
    67<MTIf name="datebased_archive"> 
    78    <MTSetVarBlock name="html_head"> 
    …… 
    1718    <MTIfArchiveType archive_type="Category"> 
    1819<__trans phrase="Recently in <em>[_1]</em> Category" params="<$MTArchiveTitle$>"> 
    19     </MTIfArchiveType> 
    20     <MTIfArchiveType archive_type="Author"> 
     20    <MTElse archive_type="Author"> 
    2121<__trans phrase="Recently by <em>[_1]</em>" params="<$MTArchiveTitle$>"> 
    2222    </MTIfArchiveType> 
    …… 
    2626</h1> 
    2727 
    28 <MTIf name="datebased_archive"> 
    29     <MTEntries> 
    30 <$MTEntryTrackbackData$> 
     28<MTEntries limit="$limit"> 
    3129<$MTInclude module="<__trans phrase="Entry Summary">"$> 
    32     </MTEntries> 
    33 <MTElse> 
    34     <MTEntries limit="auto"> 
    35 <$MTEntryTrackbackData$> 
    36 <$MTInclude module="<__trans phrase="Entry Summary">"$> 
    37     </MTEntries> 
    38 </MTIf> 
     30</MTEntries> 
    3931 
    4032<div class="content-nav"> 

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

    r1101 r1423  
     1<MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted> 
    12<div id="entry-<$MTEntryID$>" class="entry-asset asset hentry"> 
    23    <div class="asset-header"> 

  • branches/release-30/default_templates/header.mtml

    r1192 r1423  
    1 <mt:setvarblock name="html_head" prepend="1"> 
    2     <MTIf name="main_template"> 
    3 <link rel="alternate" type="application/atom+xml" title="Atom" href="<$MTLink template="atom"$>" /> 
    4 <link rel="alternate" type="application/rss+xml" title="RSS" href="<$MTLink template="rss"$>" /> 
    5         <MTUnless name="main_index"> 
    6 <link rel="start" href="<$MTBlogURL$>" title="Home" /> 
    7         </MTUnless> 
    8 <$MTCCLicenseRDF$> 
    9     </MTIf> 
    10 </mt:setvarblock> 
    111<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    122    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    133<html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard"> 
    144<head> 
     5    <title><$mt:var name="title"$></title> 
    156    <meta http-equiv="Content-Type" content="text/html; charset=<$MTPublishCharset$>" /> 
    16     <title><$mt:var name="title"$></title> 
    177    <meta name="generator" content="<$MTProductName version="1"$>" /> 
    188    <link rel="stylesheet" href="<$MTLink template="styles"$>" type="text/css" /> 
     9    <link rel="start" href="<$MTBlogURL$>" title="Home" /> 
     10    <link rel="alternate" type="application/atom+xml" title="Recent Entries" href="<$MTLink template="feed_recent"$>" /> 
     11    <$MTCCLicenseRDF$> 
    1912    <$mt:var name="html_head"$> 
    2013</head> 
    21 <body class="<MTIf name="body_class"><$MTGetVar name="body_class"$> </MTIf><$MTGetVar name="page_layout" default="layout-wtt"$>"<MTIf name="body_onload"> onload="<$MTGetVar name="body_onload"$>"</MTIf>> 
     14<body class="<MTIf name="body_class"><$MTGetVar name="body_class"$> </MTIf><$MTGetVar name="page_layout"$>"<MTIf name="body_onload"> onload="<$MTGetVar name="body_onload"$>"</MTIf>> 
    2215    <div id="container"> 
    2316        <div id="container-inner"> 

  • branches/release-30/default_templates/main_index.mtml

    r1104 r1423  
    33<MTSetVar name="main_index" value="1"> 
    44<MTSetVar name="sidebar" value="1"> 
     5<mt:setvarblock name="html_head"> 
     6    <link rel="EditURI" type="application/rsd+xml" title="RSD" href="<$MTLink template="rsd"$>" /> 
     7</mt:setvarblock> 
     8</MTIf> 
    59<MTSetVarBlock name="title"><$MTBlogName encode_html="1"$></MTSetVarBlock> 
    610 
    …… 
    812 
    913<MTEntries> 
    10     <$MTEntryTrackbackData$> 
    1114    <$MTInclude module="<__trans phrase="Entry Summary">"$> 
    1215</MTEntries> 

  • branches/release-30/default_templates/popup_image.mtml

    r1098 r1423  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
    2     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    32<html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard"> 
     3<head><title><$MTImageURL$></title></head> 
    44<body id="uploaded-image-popup" class="popup" style="margin: 0;padding: 0;"> 
    5 <div id="popup-container"> 
    6     <div id="popup-container"> 
    7         <img src="<$MTImageURL$>" width="<$MTImageWidth$>" height="<$MTImageHeight$>" style="margin: 0;padding: 0;border: 0;" /> 
    8     </div> 
    9 </div> 
     5    <img src="<$MTImageURL$>" width="<$MTImageWidth$>" height="<$MTImageHeight$>" alt="<$MTImageURL$>" style="margin: 0;padding: 0;border: 0;" /> 
    106</body> 
    117</html> 

  • branches/release-30/default_templates/styles.mtml

    r1101 r1423  
    1 /* Default Layout: <MTSetVar name="page_layout" value="layout-wtt"> */ 
    21@import url(<$MTStaticWebPath$>themes-base/blog.css); 
    32@import url(<$MTStaticWebPath$>themes/minimalist-red/screen.css); 

  • branches/release-30/default_templates/tags.mtml

    r1287 r1423  
    33    <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4> 
    44    <ul class="entry-tags-list"> 
    5         <mt:setvarblock name="blog_id"><$MTBlogID$></mt:setvarblock> 
    65        <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li> 
    76    </ul>