Changeset 2704

Show
Ignore:
Timestamp:
07/03/08 23:32:25 (20 months ago)
Author:
bsmith
Message:

bugzid:80449 - fixing IE javascript issues in Wizard

Location:
branches/release-41
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • branches/release-41/Makefile

    r2573 r2704  
    4141 
    4242simple_css = mt-static/css/reset.css \ 
     43        mt-static/css/messaging.css \ 
    4344        mt-static/css/chromeless.css \ 
    44         mt-static/css/messaging.css \ 
    4545        mt-static/css/utilities.css 
    4646 

  • branches/release-41/mt-static/css/chromeless.css

    r2516 r2704  
    6464#db_hint { 
    6565    margin-top: -10px; 
     66    margin-bottom: 10px; 
     67} 
     68#db_hint p { 
     69    margin-bottom: 3px; 
    6670} 
    6771#error_more { 
    … …  
    353357.full-width { 
    354358    width: 100%; 
     359} 
     360 
     361.action-buttons { 
     362    height: 1%;  /*IE6 Hack*/ 
    355363} 
    356364 
    … …  
    548556    overflow-x: auto; 
    549557    overflow-y: hidden; 
    550     height: 2.75em 
     558    height: 2.75em; 
     559    font-weight:bold; 
    551560} 
    552561 

  • branches/release-41/tmpl/cms/include/chromeless_header.tmpl

    r2543 r2704  
    22<html> 
    33<head> 
    4  
    5 <meta http-equiv="Content-Type" content="text/html; charset=<$mt:var name="language_encoding"$>" /> 
     4    <meta http-equiv="Content-Type" content="text/html; charset=<$mt:var name="language_encoding"$>" /> 
    65    <title><mt:if name="html_title"><mt:var name="html_title"><mt:else><mt:var name="page_title"></mt:if> | <$mt:var name="mt_product_name"$></title> 
    7  
    86<mt:setvarblock name="html_head" prepend="1"> 
     7    <mt:unless name="cfg_exists"> 
    98    <link rel="icon" href="<$mt:var name="static_uri"$>images/favicon.ico" type="image/ico" /> 
    10 <mt:if name="mt_debug"> 
     9        <mt:if name="mt_debug"> 
    1110    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/reset.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1211    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/utilities.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1312    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/messaging.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1413    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/chromeless.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    15 <mt:else> 
     14        <mt:else> 
    1615    <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> 
    18  
     16        </mt:if> 
    1917    <!--[if IE]> 
    2018    <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" /> 
    2119    <![endif]--> 
    22 <mt:if name="local_lang_id" ne="en-us"> 
     20        <mt:if name="local_lang_id" ne="en-us"> 
    2321    <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">" /> 
    24 </mt:if> 
    25  
    26 <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
     22        </mt:if> 
     23    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    2724    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/tc.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
     25    </mt:unless> 
    2826</mt:setvarblock> 
    2927<$mt:var name="html_head"$> 
     28<mt:unless name="cfg_exists"> 
    3029<script type="text/javascript" src="<$mt:var name="static_uri"$>mt.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    31 <mt:if name="local_lang_id" ne="en-us"> 
     30    <mt:if name="local_lang_id" ne="en-us"> 
    3231<script type="text/javascript" src="<$mt:var name="static_uri"$>mt_<$mt:var name="local_lang_id"$>.js?v=<mt:var name="mt_version_id" escape="URL">" charset="utf-8"></script> 
    33 </mt:if> 
    34  
     32    </mt:if> 
    3533<script language="javascript" type="text/javascript"> 
    3634/* <![CDATA[ */ 
    … …  
    4543/* ]]> */ 
    4644</script> 
     45</mt:unless> 
    4746<$mt:var name="js_include"$> 
    4847</head> 

  • branches/release-41/tmpl/wizard/blog.tmpl

    r1309 r2704  
    6262    </mtapp:setting> 
    6363 
    64 <div id="continue"> 
     64<div id="continue" class="action-buttons"> 
    6565<div class="left"> 
    6666<input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="needValidate = false; this.form.reset(); go('previous_step');" /> 

  • branches/release-41/tmpl/wizard/cfg_dir.tmpl

    r1309 r2704  
    7878</div> 
    7979 
    80 <div id="submit" <mt:if name="success">style="display: none"</mt:if>> 
     80<div id="submit" class="action-buttons" <mt:if name="success">style="display: none"</mt:if>> 
    8181<div class="left"> 
    8282<input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="this.form.reset(); go('previous_step')" /> 

  • branches/release-41/tmpl/wizard/complete.tmpl

    r1461 r2704  
    1212function toggleConfig() { 
    1313    var manually = getByID('manually'); 
    14     var retry = getByID('retry'); 
    15     var automatic = getByID('automatic'); 
     14    var retry = getByID('retry-buttons'); 
     15    var automatic = getByID('automatic-buttons'); 
    1616    if (manually) { 
    1717        if (manually.checked == true) { 
     18            retry.style.display = 'none'; 
     19            automatic.style.display = 'block'; 
     20        } else { 
    1821            retry.style.display = 'block'; 
    1922            automatic.style.display = 'none'; 
    20         } else { 
    21             retry.style.display = 'none'; 
    22             automatic.style.display = 'block'; 
    2323        } 
    2424    } 
    … …  
    7474<mt:unless name="config_created"> 
    7575<p> 
    76     <input id="manually" class="cb" type="checkbox" name="manually" value="1" onclick="toggleConfig()" <mt:if name="manually">checked="checked"</mt:if>> <label for="manually"><__trans phrase="I will create the mt-config.cgi file manually."></label> 
     76    <input id="manually" class="cb" type="checkbox" name="manually" value="1" onclick="toggleConfig()" <mt:if name="manually">checked="checked"</mt:if>> <label for="manually"><__trans phrase="The mt-config.cgi file has been created manually."></label> 
    7777</p> 
    7878</mt:unless> 
    7979 
    80 <p> 
    81     <div id="automatic" <mt:if name="FILE_NOT_FOUND">style="display:none;"</mt:if>> 
    82         <div class="left"> 
    83             <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('previous_step')" /> 
    84         </div> 
    85         <div class="right"> 
    86 <mt:unless name=CONFIG_CREATED> 
    87             <input name="retry" type="submit" class="sb" value="<__trans phrase="Retry">" onclick="go('retry')" /> 
     80<div id="retry-buttons" class="action-buttons" <mt:if name="file_not_found">style="display:none;"</mt:if>> 
     81    <div class="left"> 
     82        <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('previous_step')" /> 
     83    </div> 
     84    <div class="right"> 
     85<mt:unless name="config_created"> 
     86        <input name="retry" type="submit" class="sb" value="<__trans phrase="Retry">" onclick="go('retry')" /> 
    8887<mt:else> 
    89             <input name="continue" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="document.location.href='<mt:var name="mt_script">'; return false" /> 
     88        <input name="continue" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="document.location.href='<mt:var name="mt_script">'; return false" /> 
    9089</mt:unless> 
    91         </div> 
    9290    </div> 
    93     <div id="retry" <mt:unless name="file_not_found">style="display:none;"</mt:unless>> 
    94         <div class="left"> 
    95             <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('retry')" /> 
    96         </div> 
    97         <div class="right"> 
    98             <input name="retry" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="go('retry')" /> 
    99         </div> 
     91</div> 
     92<div id="automatic-buttons" class="action-buttons" <mt:unless name="file_not_found">style="display:none;"</mt:unless>> 
     93    <div class="left"> 
     94        <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('retry')" /> 
    10095    </div> 
    101 </p> 
     96    <div class="right"> 
     97        <input name="retry" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="go('retry')" /> 
     98    </div> 
     99</div> 
    102100 
    103101</form> 

  • branches/release-41/tmpl/wizard/configure.tmpl

    r2616 r2704  
    163163<mt:unless name="success"> 
    164164<mt:setvarblock name="db_setup_url"><__trans phrase="http://www.movabletype.org/documentation/[_1]" params="installation/setting-up-your-database.html"></mt:setvarblock> 
    165 <p id="db_hint" class="hint"><__trans phrase="If your database type is not listed in the menu above, then you need to <a target="help" href="[_1]">install the Perl module necessary to connect to your database</a>.  If this is the case, please check your installation and <a href="javascript:void(0)" onclick="[_2]">re-test your installation</a>." params="<mt:var name="db_setup_url">%%reTest();"></p> 
     165    <div id="db_hint"> 
     166        <p class="hint"><__trans phrase="Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary." params="mt-check.cgi"></p> 
     167        <p class="hint"><__trans phrase="Once installed, <a href="javascript:void(0)" onclick="[_2]">click here refresh this screen</a>." params="reTest();"></p> 
     168        <p class="hint"><__trans phrase="Read more: <a href="[_1]" target="_blank">Setting Up Your Database</a>" params="<mt:var name="db_setup_url">"></p> 
     169    </div> 
     170     
    166171</mt:unless> 
    167172 
    … …  
    262267 
    263268<mt:unless name="success"> 
    264 <div id="submit" <mt:unless name="dbtype">style="display: none"</mt:unless>> 
     269<div id="submit" class="action-buttons" <mt:unless name="dbtype">style="display: none"</mt:unless>> 
    265270<div class="right"> 
    266271<input name="test" type="submit" class="sb" value="<__trans phrase="Test Connection">" onclick="go('test');" /> 
    … …  
    279284 
    280285<mt:if name="success"> 
    281 <div id="continue"> 
     286<div id="continue" class="action-buttons"> 
    282287<div class="right"> 
    283288<input name="test" type="submit" class="sb" value="<__trans phrase="Test Connection">" onclick="go('test');" /> 

  • branches/release-41/tmpl/wizard/optional.tmpl

    r2484 r2704  
    141141</div> 
    142142 
    143 <div id="submit" <mt:unless name=mail_transfer>style="display: none"</mt:unless>> 
     143<div id="submit" class="action-buttons" <mt:unless name=mail_transfer>style="display: none"</mt:unless>> 
    144144<div class="left"> 
    145145<input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="this.form.reset(); go('previous_step')" /> 

  • branches/release-41/tmpl/wizard/start.tmpl

    r2484 r2704  
    1 <mt:unless name="cfg_exists"> 
    2     <mt:setvarblock name="page_title"><__trans phrase="Welcome to Movable Type"></mt:setvarblock> 
    3 <mt:else> 
    4     <mt:setvarblock name="page_title"><__trans phrase="Configuration File Exists"></mt:setvarblock> 
    5 </mt:unless> 
    6 <mt:unless name="valid_static_path"> 
    7     <mt:setvarblock name="html_head" append="1"> 
    8         <style type="text/css" media="screen"> 
     1<mt:setvarblock name="inline_styles"> 
     2    <style type="text/css" media="screen"> 
    93        body { 
    104            font-family: Candara, "Helvetica Neue", Arial, sans-serif; 
    … …  
    7670            padding: 10px; 
    7771            margin-bottom: 1em; 
     72            height: 1%;  /*IE6 Hack*/ 
    7873        } 
    7974        .no-static-path h3 { 
    … …  
    9792        .msg { 
    9893            margin: 0 0 10px 0; 
    99             padding: 16px 10px 16px 46px; 
     94            padding: 16px 10px; 
    10095        } 
    10196        .msg-error { 
    10297            background-color: #FF9; 
    10398        } 
     99        .msg, .no-static-path, fieldset { 
     100            height: 1%;  /* IE6 Hack */ 
     101        } 
    104102        </style> 
    105103 
    106         <script type="text/javascript"> 
     104    <script type="text/javascript"> 
    107105        /* <![CDATA[ */ 
    108106        function getByID(n, d) { 
    … …  
    114112        } 
    115113        /* ]]> */ 
     114    </script> 
     115</mt:setvarblock> 
     116<mt:unless name="cfg_exists"> 
     117    <mt:setvarblock name="page_title"><__trans phrase="Welcome to Movable Type"></mt:setvarblock> 
     118    <mt:unless name="valid_static_path"> 
     119        <mt:unless name="file_invalid"> 
     120            <mt:setvarblock name="html_head" append="1"> 
     121                <$mt:var name="inline_styles"$> 
     122            </mt:setvarblock> 
     123        </mt:unless> 
     124    <mt:else> 
     125        <mt:setvarblock name="js_include" append="1"> 
     126        <style type="text/css"> 
     127            .msg { 
     128                margin: 0 0 10px 0; 
     129                padding: 16px 10px 16px 10px; 
     130            } 
     131            .msg-error { 
     132                background-color: #FF9; 
     133            } 
     134            #container  div.no-static-path, 
     135            #container #static_webpath_config { 
     136                display: none; 
     137            } 
     138            #container.bad-static-path div.no-static-path, 
     139            #container.bad-static-path #static_webpath_config { 
     140                display: block; 
     141            } 
     142            </style> 
     143            <script type="text/javascript"> 
     144            /* <![CDATA[ */ 
     145            function js_check() { 
     146                if (! openManual ) { 
     147                    // mt.js not loading properly; static path incorrect 
     148                    var c = getByID("container"); 
     149                    c.className = "bad-static-path"; 
     150                } 
     151            } 
     152            window.onload = js_check; 
     153            /* ]]> */ 
    116154        </script> 
    117     </mt:setvarblock> 
     155        </mt:setvarblock> 
     156    </mt:unless> 
    118157<mt:else> 
    119     <mt:setvarblock name="js_include" append="1"> 
    120         <style type="text/css"> 
    121         .msg { 
    122             margin: 0 0 10px 0; 
    123             padding: 16px 10px 16px 10px; 
    124         } 
    125         .msg-error { 
    126             background-color: #FF9; 
    127         } 
    128         #container  div.no-static-path, 
    129         #container #static_webpath_config { 
    130             display: none; 
    131         } 
    132         #container.bad-static-path div.no-static-path, 
    133         #container.bad-static-path #static_webpath_config { 
    134             display: block; 
    135         } 
    136         </style> 
    137         <script type="text/javascript"> 
    138         /* <![CDATA[ */ 
    139         function js_check() { 
    140             if (! openManual ) { 
    141                 // mt.js not loading properly; static path incorrect 
    142                 var c = getByID("container"); 
    143                 c.className = "bad-static-path"; 
    144             } 
    145         } 
    146         window.onload = js_check; 
    147         /* ]]> */ 
    148         </script> 
    149     </mt:setvarblock> 
     158    <mt:setvarblock name="page_title"><__trans phrase="Configuration File Exists"></mt:setvarblock> 
     159    <$mt:var name="inline_styles"$> 
    150160</mt:unless> 
    151161 
    … …  
    227237        </fieldset> 
    228238    </div> 
    229  
    230     <div class="right"><input type="submit" class="sb" value="<__trans phrase="Begin">" /></div> 
    231  
     239    <div class="action-buttons"> 
     240        <div class="right"><input type="submit" class="sb" value="<__trans phrase="Begin">" /></div> 
     241    </div> 
    232242</form> 
    233243