Commit bbf23ac1f07e8859eccab3b91722ee12cdd352d2
Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge
Showing
3 changed files
with
25 additions
and
1 deletions
setup/wizard/path.php
| @@ -41,8 +41,10 @@ | @@ -41,8 +41,10 @@ | ||
| 41 | */ | 41 | */ |
| 42 | $browser = $_SERVER['HTTP_USER_AGENT']; | 42 | $browser = $_SERVER['HTTP_USER_AGENT']; |
| 43 | //MSIE 6.0 | 43 | //MSIE 6.0 |
| 44 | - if(preg_match("/MSIE 6.0/", $browser)) { | 44 | + if(preg_match("/MSIE 6\.\d/", $browser)) { |
| 45 | define('AGENT', 'IE6'); | 45 | define('AGENT', 'IE6'); |
| 46 | + } else if(preg_match("/MSIE 7\.\d/", $browser)) { | ||
| 47 | + define('AGENT', 'IE7'); | ||
| 46 | } else { | 48 | } else { |
| 47 | define('AGENT', 'OTHER'); | 49 | define('AGENT', 'OTHER'); |
| 48 | } | 50 | } |
setup/wizard/resources/css/ie7.css
0 → 100644
| 1 | +#logo { | ||
| 2 | + right:70%; | ||
| 3 | +} | ||
| 4 | + | ||
| 5 | +.onclick { | ||
| 6 | + cursor: pointer; | ||
| 7 | + color: #EC7725; | ||
| 8 | + /*width: 150px;*/width:350px;padding-top:12px;position:static; | ||
| 9 | +} | ||
| 10 | + | ||
| 11 | +.dependency_details { | ||
| 12 | + padding-top:12px; | ||
| 13 | + position:static; | ||
| 14 | + width:650px; | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +.dependencies { | ||
| 18 | + position:static; | ||
| 19 | + right:30%; | ||
| 20 | + width:640px; | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file |
setup/wizard/templates/wizard.tpl
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | <?php echo $html->js('wizard.js'); ?> | 10 | <?php echo $html->js('wizard.js'); ?> |
| 11 | <?php echo $html->css('wizard.css'); ?> | 11 | <?php echo $html->css('wizard.css'); ?> |
| 12 | <?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?> | 12 | <?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?> |
| 13 | + <?php if(AGENT == "IE7") echo $html->css('ie7.css'); ?> | ||
| 13 | <meta http-equiv=Content-Type content="text/html; charset=utf-8"> | 14 | <meta http-equiv=Content-Type content="text/html; charset=utf-8"> |
| 14 | </head> | 15 | </head> |
| 15 | <body onload=""> | 16 | <body onload=""> |