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

g4s 머지 후 충돌 코드 수정

Browse Source
This commit is contained in:
chicpro
2013-04-26 16:06:30 +09:00
parent da91511e5f da3c09523c
commit 9fece6bcd3
16 changed files with 180 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
head.sub.php
View File

@ -40,7 +40,7 @@ if (G4_IS_MOBILE) {
}
?>
<title><?php echo $g4_head_title; ?></title>
<?php
<?php
if (defined('G4_IS_ADMIN')) {
echo '<link rel="stylesheet" href="'.G4_CSS_URL.'/admin.css">'.PHP_EOL;
} else {
@ -64,21 +64,21 @@ var g4_is_mobile = "<?php echo G4_IS_MOBILE ?>";
var g4_bo_table = "<?php echo isset($bo_table)?$bo_table:''; ?>";
var g4_sca = "<?php echo isset($sca)?$sca:''; ?>";
var g4_cookie_domain = "<?php echo G4_COOKIE_DOMAIN ?>";
<?php
<?php
if ($is_admin) {
echo 'var g4_admin_url = "'.G4_ADMIN_URL.'";'.PHP_EOL;
}
echo 'var g4_admin_url = "'.G4_ADMIN_URL.'";'.PHP_EOL;
}
?>
</script>
<script src="<?php echo G4_JS_URL ?>/jquery-1.8.3.min.js"></script>
<script src="<?php echo G4_JS_URL ?>/jquery.menu.js"></script>
<script src="<?php echo G4_JS_URL ?>/common.js"></script>
<script src="<?php echo G4_JS_URL ?>/wrest.js"></script>
<?php
<?php
if(G4_IS_MOBILE) {
echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
}
echo $config['cf_add_script'];
echo $config['cf_add_script'];
?>
</head>
<body>