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

Merge branch 'g4s'

Browse Source 
Conflicts:
	css/admin.css
This commit is contained in:
chicpro
2013-05-03 18:01:15 +09:00
parent 99fa180d11 1f672c0b4c
commit 4d727c6231
25 changed files with 339 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/board/basic/list.skin.php
View File

@ -174,7 +174,7 @@ if ($is_nogood) $colspan++;
<option value="wr_name,0"<?php echo get_selected($sfl, 'wr_name,0'); ?>>글쓴이(코)</option>
</select>
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required class="frm_input required" size="15" maxlength="15">
<input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" id="stx" required class="frm_input required" size="15" maxlength="15">
<input type="submit" value="검색" class="btn_submit">
</form>
</fieldset>

52
skin/board/basic/view.skin.php
View File

@ -217,6 +217,35 @@ $(window).load(function() {
view_image_resize();
});
var now = new Date();
var timeout = false;
var millisec = 200;
var tid;
$(window).resize(function() {
now = new Date();
if (timeout === false) {
timeout = true;
if(tid != null)
clearTimeout(tid);
tid = setTimeout(resize_check, millisec);
}
});
function resize_check() {
if (new Date() - now < millisec) {
if(tid != null)
clearTimeout(tid);
tid = setTimeout(resize_check, millisec);
} else {
timeout = false;
view_image_resize();
}
}
$(function() {
$("a.view_image").click(function() {
window.open(this.href, "large_image", "location=yes,links=no,toolbar=no,top=10,left=10,width=10,height=10,resizable=yes,scrollbars=no,status=no");
@ -240,14 +269,27 @@ function view_image_resize()
{
var $img = $("#bo_v_atc img");
var img_wrap = $("#bo_v_atc").width();
var win_width = $(window).width() - 35;
var res_width = 0;
if(img_wrap < win_width)
res_width = img_wrap;
else
res_width = win_width;
$img.each(function() {
var img_width = $(this).width();
$(this).data("width", img_width); // 원래 이미지 사이즈
if (img_width > img_wrap) {
$(this).addClass("img_fix");
} else if (img_width <= img_wrap && img_width >= $(this).data("width")) {
$(this).removeClass("img_fix");
var this_width = $(this).data("width");
if(this_width == undefined) {
$(this).data("width", img_width); // 원래 이미지 사이즈
this_width = img_width;
}
if(this_width > res_width) {
$(this).width(res_width);
} else {
$(this).width(this_width);
}
});
}