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

This commit is contained in:
gnuboard
2013-02-20 17:35:56 +09:00
10 changed files with 146 additions and 38 deletions

View File

@ -186,18 +186,25 @@ $(window).load(function() {
view_image_resize();
});
$(function() {
$("a.view_image").click(function() {
window.open(this.href, "large_image", "top=10,left=10,width=10,height=10,resizable=yes,scrollbars=no,status=no");
return false;
});
});
function view_image_resize()
{
var $img = $('#bo_v_atc img');
var img_wrap = $('#bo_v_atc').width();
var $img = $("#bo_v_atc img");
var img_wrap = $("#bo_v_atc").width();
$img.each(function() {
var img_width = $(this).width();
$(this).data("width", img_width); // 원래 이미지 사이즈
if (img_width > img_wrap) {
$(this).addClass('img_fix');
$(this).addClass("img_fix");
} else if (img_width <= img_wrap && img_width >= $(this).data("width")) {
$(this).removeClass('img_fix');
$(this).removeClass("img_fix");
}
});
}

View File

@ -8,7 +8,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<? for ($i=0; $i<count($list); $i++) { ?>
<li>
<?
echo $list[$i]['icon_reply']." ";
//echo $list[$i]['icon_reply']." ";
echo "<a href=\"".$list[$i]['href']."\" title=\"".$list[$i]['wr_subject']."\">";
if ($list[$i]['is_notice'])
echo "<strong>".$list[$i]['subject']."</strong>";

View File

@ -5,9 +5,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<header id="ol_after_hd">
<h2>내 회원정보</h2>
<strong><?=$nick?></strong>님
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" id="ol_admin">관리자</a><? } ?>
<h2><?=$nick?>님</h2>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" class="btn_admin">관리자 모드</a><? } ?>
</header>
<ul id="ol_after_private">
<li>

View File

@ -19,7 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<section id="poll">
<header>
<h2>설문조사</h2>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>" class="btn_admin">설문조사 관리</a><? } ?>
<p><?=$po['po_subject']?></p>
</header>
<ul>