Merge branch 'sns'

Conflicts:
	skin/board/basic/style.css
	skin/member/basic/style.css
	skin/search/basic/style.css
This commit is contained in:
gnuboard
2013-05-28 15:23:17 +09:00
95 changed files with 10694 additions and 775 deletions

View File

@ -171,7 +171,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<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) ?>" id="stx" required class="frm_input required" size="15" maxlength="15">
<input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required class="frm_input required" size="15" maxlength="15">
<input type="submit" value="검색" class="btn_submit">
</form>
</fieldset>