Merge branch 'g4s'

Conflicts:
	css/admin.css
This commit is contained in:
chicpro
2013-05-03 18:01:15 +09:00
25 changed files with 339 additions and 227 deletions

View File

@ -11,17 +11,9 @@
#bo_cate a:active {text-decoration:none}
#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
.bo_list table {margin-bottom:1.5em;width:100%;border-collapse:collapse;border-spacing:0}
.bo_list th {}
.bo_list th a {color:#fff;text-decoration:none}
.bo_list td {border-bottom:1px solid #ddd}
.bo_list img {margin-right:4px}
.bo_list img:nth-last-of-type(1) {margin-right:0}
/* 관리자일 때 */
#bo_list_admin th label {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_list_admin th:nth-of-type(1) {width:40px}
#bo_list_admin th:nth-of-type(3) {width:100px}

View File

@ -115,7 +115,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
</nav>
<article id="bo_v_atc">
<article id="bo_v_atc" class="img_resize">
<header>
<h1>본문</h1>
</header>
@ -182,8 +182,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</div>
<script>
<?php if ($board['bo_download_point'] < 0) { ?>
$(function() {
@ -237,8 +235,8 @@ $(function() {
function view_image_resize()
{
var $img = $("#bo_v_atc img");
var img_wrap = $("#bo_v_atc").width();
var $img = $(".img_resize img");
var img_wrap = $(".img_resize").width();
$img.each(function() {
var img_width = $(this).width();

View File

@ -30,8 +30,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<footer id="ft">
<h1><?php echo $config['cf_title'] ?> 정보</h1>
<?php echo popular('basic'); // 인기검색어 ?>
<?php echo visit("basic"); // 방문자수 ?>
<div id="ft_catch"><a href="<?php echo $g4['url'] ?>/"><img src="<?php echo G4_IMG_URL ?>/ft_catch.jpg" alt="Sharing All Possibilities"></a></div>
<?php echo visit('basic'); // 방문자수 ?>
<div id="ft_catch"><a href="<?php echo G4_URL; ?>/"><img src="<?php echo G4_IMG_URL; ?>/ft_catch.jpg" alt="Sharing All Possibilities"></a></div>
<div id="ft_copy">
<p>
Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>
@ -40,7 +40,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</div>
</footer>
<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>
<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.str_replace("&", "&amp;", $_SERVER['QUERY_STRING']).'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>
<?php
include_once(G4_PATH."/tail.sub.php");