firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source 
Conflicts:
	head.sub.php
This commit is contained in:
gnuboard
2013-01-14 13:16:34 +09:00
parent c0ecb1cdec 0ce3006c13
commit e8b23b29e9
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
head.sub.php
View File

@ -48,11 +48,17 @@ header("Pragma: no-cache"); // HTTP/1.0
<head>
<meta charset="<?=$g4['charset']?>">
<title><?=$g4['title']?></title>
<meta http-equiv='X-UA-Compatible' content='IE=Edge' />
<!-- <meta http-equiv='X-UA-Compatible' content='IE=Edge' /> -->
<? if (isset($administrator)) { ?>
<<<<<<< HEAD
<link rel="stylesheet" href="<?=$g4['path']?>/adm.css?=<?=date("md")?>">
<? } else { ?>
<link rel="stylesheet" href="<?=$g4['path']?>/def.css?=<?=date("md")?>">
=======
<link rel="stylesheet" href="<?=$g4['url']?>/css/adm.css?=<?=date("md")?>">
<? } else { ?>
<link rel="stylesheet" href="<?=$g4['url']?>/css/default.css?=<?=date("md")?>">
>>>>>>> 0ce3006c134433544fcc652714d529d7c49c7f4b
<?}?>
<!--[if lte IE 8]>
<script src="<?=$g4['url']?>/js/html5.js"></script>