Changeset 2723

Show
Ignore:
Timestamp:
07/07/08 23:46:28 (5 months ago)
Author:
arvind
Message:

Fixes from bradc to display minified/regular static files as needed when built/checkedout

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/feature-no-make-me/lib/MT.pm

    r2702 r2723  
    9494<MT_TRANS phrase="http://www.sixapart.com/movabletype/"> 
    9595SLUG 
     96} 
     97 
     98sub build_id { 
     99    my $build_id = '__BUILD_ID__'; 
     100    $build_id = '' if $build_id eq '__BUILD_' . 'ID__'; 
     101    return $build_id; 
    96102} 
    97103 
    …… 
    20682074    $param->{language_tag} = substr($mt->current_language, 0, 2); 
    20692075    $param->{language_encoding} = $mt->charset; 
     2076    $param->{optimize_ui} = $mt->build_id && !$MT::DebugMode; 
    20702077    if ($mt->isa('MT::App')) { 
    20712078        if (my $author = $mt->user) { 

  • branches/feature-no-make-me/tmpl/cms/dialog/header.tmpl

    r2722 r2723  
    55<meta http-equiv="Content-Type" content="text/html; charset=<mt:var name="language_encoding">" /> 
    66<title><mt:loop name="page_titles"><mt:var name="bc_name" escape="html"> | </mt:loop><mt:var name="mt_product_name"></title> 
    7 <mt:if name="mt_debug"> 
     7<mt:unless name="optimize_ui"> 
    88    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    99<mt:else> 
    1010    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/main.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    11 </mt:if> 
     11</mt:unless> 
    1212<!--[if IE]> 
    1313<link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1414<![endif]--> 
    15 <mt:if name="mt_debug"> 
     15<mt:unless name="optimize_ui"> 
    1616<script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    1717<script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Timer.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    …… 
    3232<mt:else> 
    3333<script type="text/javascript" src="<$mt:var name="static_uri"$>js/mt_core_compact.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    34 </mt:if> 
     34</mt:unless> 
    3535<$mt:var name="html_head"$> 
    3636<script type="text/javascript" src="<mt:var name="static_uri">mt.js"></script> 

  • branches/feature-no-make-me/tmpl/cms/include/chromeless_header.tmpl

    r2722 r2723  
    88<mt:setvarblock name="html_head" prepend="1"> 
    99    <link rel="icon" href="<$mt:var name="static_uri"$>images/favicon.ico" type="image/ico" /> 
    10 <mt:if name="mt_debug"> 
     10<mt:unless name="optimize_ui"> 
    1111    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/reset.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1212    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/utilities.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    …… 
    1515<mt:else> 
    1616    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/simple.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    17 </mt:if> 
     17</mt:unless> 
    1818 
    1919    <!--[if IE]> 

  • branches/feature-no-make-me/tmpl/cms/include/header.tmpl

    r2722 r2723  
    1010    <link type="application/atom+xml" rel="alternate" <mt:if name="feed_name">title="<mt:var name="feed_name" escape="html">" </mt:if>href="<mt:var name="feed_url" escape="html">" /> 
    1111</mt:if> 
    12 <mt:if name="mt_debug"> 
     12<mt:unless name="optimize_ui"> 
    1313    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1414<mt:else> 
    1515    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/main.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    16 </mt:if> 
     16</mt:unless> 
    1717    <!--[if IE]> 
    1818    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    …… 
    2424    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles_<$mt:var name="local_lang_id"$>.css?v=<mt:var name="mt_version_id" escape="url">" /> 
    2525</mt:if> 
    26 <mt:if name="mt_debug"> 
     26<mt:unless name="optimize_ui"> 
    2727    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    2828    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/JSON.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    …… 
    4343<mt:else> 
    4444    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/mt_core_compact.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    45 </mt:if> 
     45</mt:unless> 
    4646    <script type="text/javascript"> 
    4747        /* <![CDATA[ */