Show
Ignore:
Timestamp:
12/03/08 07:58:25 (12 months ago)
Author:
fumiakiy
Message:

Merging the latest of fireball branch to trunk. svn merge -r3095:3215 http://code.sixapart.com/svn/movabletype/branches/fireball . (two conflicts resolved; MT.pm, mt.php and mt-check.cgi merged manually.)

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/tmpl/cms/include/template_table.tmpl

    r3082 r3219  
    3131    <mt:else if name="template_type" eq="archive"> 
    3232        <a href="javascript:void(0)" 
    33             onclick="doForMarkedInThisWindow(getByID('<$mt:var name="template_type" default="template"$>-listing-form'), '<__trans phrase="template" escape="js">', '<__trans phrase="templates" escape="js">', 'id', 'publish_archive_templates', {}, '<__trans phrase="to publish" escape="js">'); return false;" 
     33            onclick="doForMarkedInThisWindow(getByID('<$mt:var name="template_type" default="template" escape="html"$>-listing-form'), '<__trans phrase="template" escape="js">', '<__trans phrase="templates" escape="js">', 'id', 'publish_archive_templates', {}, '<__trans phrase="to publish" escape="js">'); return false;" 
    3434            accesskey="a" 
    3535            title="<__trans phrase="Publish selected templates (a)">" 
    … …  
    7474        <tbody> 
    7575    </mt:if> 
    76             <tr class="<mt:if name="__odd__">odd<mt:else>even</mt:if> template-<$mt:var name="template_type" default="template"$>"> 
     76            <tr class="<mt:if name="__odd__">odd<mt:else>even</mt:if> template-<$mt:var name="template_type" default="template" escape="html"$>"> 
    7777                <td class="cb"><input type="checkbox" name="id" class="select" value="<mt:var name="id">" /></td> 
    7878                <td class="template-name"><a href="<mt:var name="script_url">?__mode=view&amp;_type=template&amp;id=<mt:var name="id">&amp;blog_id=<mt:var name="blog_id">"><mt:var name="name" escape="html"></a></td> 
    … …  
    139139<mt:else> 
    140140    <mt:if name="blog_id"> 
    141     <div id="<$mt:var name="template_type" default="template"$>-listing" class="listing zero-state-listing zero-state"> 
     141    <div id="<$mt:var name="template_type" default="template" escape="html"$>-listing" class="listing zero-state-listing zero-state"> 
    142142        <div class="listing-header"> 
    143143            <$mt:var name="listing_header"$>