Show
Ignore:
Timestamp:
04/02/08 06:38:21 (19 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/entry_summary.mtml

    r1423 r1709  
    1 <MTIfPingsAccepted><$MTEntryTrackbackData$></MTIfPingsAccepted> 
     1<$MTEntryTrackbackData$> 
    22<div id="entry-<$MTEntryID$>" class="entry-asset asset hentry"> 
    33    <div class="asset-header"> 
    44        <h2 class="asset-name entry-title"><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></h2> 
    5         <$MTInclude module="<__trans phrase="Entry Metadata">"$> 
     5        <div class="asset-meta"> 
     6            <span class="byline"> 
     7<MTIfNonEmpty tag="EntryAuthorDisplayName"> 
     8                <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>"> 
     9<MTElse> 
     10                <abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr> 
     11</MTIfNonEmpty> 
     12            </span> 
     13            <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a> 
     14<MTUnless name="hide_counts" eq="1"> 
     15            <MTIfCommentsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a></MTIfCommentsActive> 
     16            <MTIfPingsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a></MTIfPingsActive> 
     17</MTUnless> 
     18        </div> 
    619    </div> 
    720    <div class="asset-content entry-content"> 
    … …  
    1124        </div> 
    1225</MTIfNonEmpty> 
    13 <MTIfTagSearch> 
    14         <$MTInclude module="<__trans phrase="Tags">"$> 
    15 </MTIfTagSearch> 
     26<mt:if name="entry_archive"> 
     27    <MTEntryIfTagged> 
     28        <div class="entry-tags"> 
     29            <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4> 
     30            <ul class="entry-tags-list"> 
     31                <mt:setvarblock name="blog_id"><$MTBlogID$></mt:setvarblock> 
     32                <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li> 
     33            </ul> 
     34        </div> 
     35    </MTEntryIfTagged> 
     36</mt:if> 
    1637<MTIfNonEmpty tag="EntryMore" convert_breaks="0"> 
    1738        <div class="asset-more-link">