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
This commit is contained in:
whitedot
2013-03-25 15:02:17 +09:00
parent e940feb37e 51cca33444
commit ec014d83ea
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
head.sub.php
View File

@ -45,18 +45,20 @@ header("Pragma: no-cache"); // HTTP/1.0
<link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=(G4_IS_MOBILE?'mobile':'default')?>.css?=<?=date("md")?>"> <link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=(G4_IS_MOBILE?'mobile':'default')?>.css?=<?=date("md")?>">
<?}?> <?}?>
<? // 스킨의 style sheet 불러옴 <? // 스킨의 style sheet 불러옴
if(isset($board_skin_path)) if (!defined('G4_IS_ADMIN')) {
echo get_skin_stylesheet($board_skin_path); if(isset($board_skin_path))
if(isset($member_skin_path)) echo get_skin_stylesheet($board_skin_path);
echo get_skin_stylesheet($member_skin_path); if(isset($member_skin_path))
if(isset($new_skin_path)) echo get_skin_stylesheet($member_skin_path);
echo get_skin_stylesheet($new_skin_path); if(isset($new_skin_path))
if(isset($search_skin_path)) echo get_skin_stylesheet($new_skin_path);
echo get_skin_stylesheet($search_skin_path); if(isset($search_skin_path))
if(isset($connect_skin_path)) echo get_skin_stylesheet($search_skin_path);
echo get_skin_stylesheet($connect_skin_path); if(isset($connect_skin_path))
if(isset($poll_skin_path)) echo get_skin_stylesheet($connect_skin_path);
echo get_skin_stylesheet($poll_skin_path); if(isset($poll_skin_path))
echo get_skin_stylesheet($poll_skin_path);
}
?> ?>
<!--[if lte IE 8]> <!--[if lte IE 8]>
<script src="<?=G4_JS_URL?>/html5.js"></script> <script src="<?=G4_JS_URL?>/html5.js"></script>

1
lib/common.lib.php
View File

@ -751,6 +751,7 @@ function subject_sort_link($col, $query_string='', $flag='asc')
} }
$arr_query = array(); $arr_query = array();
$arr_query[] = $query_string;
$arr_query[] = $q1; $arr_query[] = $q1;
$arr_query[] = $q2; $arr_query[] = $q2;
$arr_query[] = 'sfl='.$sfl; $arr_query[] = 'sfl='.$sfl;

6
mobile/skin/poll/basic/poll.skin.php
View File

@ -2,7 +2,7 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?> ?>
<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post"> <form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
<input type="hidden" name="po_id" value="<?=$po_id?>"> <input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>"> <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<section id="poll"> <section id="poll">
@ -44,7 +44,9 @@ function fpoll_submit(f)
return false; return false;
} }
win_poll(f.action); var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes");
f.target = "win_poll";
return true; return true;
} }

6
skin/poll/basic/poll.skin.php
View File

@ -2,7 +2,7 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?> ?>
<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post"> <form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
<input type="hidden" name="po_id" value="<?=$po_id?>"> <input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>"> <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<section id="poll"> <section id="poll">
@ -44,7 +44,9 @@ function fpoll_submit(f)
return false; return false;
} }
win_poll(f.action); var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes");
f.target = "win_poll";
return true; return true;
} }