diff --git a/wheeparam/application/controllers/Board.php b/wheeparam/application/controllers/Board.php index 1e25f31..3302eb0 100644 --- a/wheeparam/application/controllers/Board.php +++ b/wheeparam/application/controllers/Board.php @@ -95,7 +95,8 @@ class Board extends WB_Controller { $this->site->meta_image = $this->data['view']['post_thumbnail']; // 이 페이지에서 표시할 대표이미지 // 댓글 입력폼 - $write_skin_path = DIR_SKIN . "/board/" . $this->data['board']['brd_skin'] . "/comment_write"; + + $write_skin_path = DIR_SKIN . "/board/comment/" . $this->data['board']['brd_skin_c'] . "/c_write"; $comment_hidden = array("reurl"=>current_full_url(),"cmt_idx"=>"","cmt_parent"=>""); $comment_action_url = base_url( "board/{$brd_key}/comment/{$post_idx}", SSL_VERFIY ? 'https':'http' ); $tmp['comment_view'] = array(); @@ -104,7 +105,7 @@ class Board extends WB_Controller { $this->data['comment_write'] = $this->data['board']['brd_use_comment'] == 'Y' && $this->data['board']['auth']['comment'] ? $this->load->view($write_skin_path, $tmp, TRUE) : NULL; // 댓글 목록 - $list_skin_path = DIR_SKIN . "/board/" . $this->data['board']['brd_skin'] . "/comment_list"; + $list_skin_path = DIR_SKIN . "/board/comment/" . $this->data['board']['brd_skin_c'] . "/c_list"; if( $this->data['board']['brd_use_comment'] == 'Y' ) { $mem_userid = ($this->member->is_login()) ? $this->member->info('userid') : ''; @@ -129,6 +130,8 @@ class Board extends WB_Controller { $this->data['comment_list'] = $this->data['board']['brd_use_comment'] == 'Y' ? $this->load->view($list_skin_path, $tmp2, TRUE) : NULL; $this->view = "view"; + $this->skin_type = "board/view"; + $this->skin = $this->data['board']['brd_skin_w']; } /** @@ -147,6 +150,9 @@ class Board extends WB_Controller { // 레이아웃 & 뷰파일 설정 $this->view = "list"; + + $this->skin_type = "board/list"; + $this->skin = $this->data['board']['brd_skin_l']; } /** @@ -380,7 +386,9 @@ class Board extends WB_Controller { $this->data['is_reply'] = FALSE; $this->theme_file = "popup"; - $this->view = "comment_write"; + $this->skin_type = "board/comment"; + $this->skin = $this->data['board']['brd_skin_c']; + $this->view = "c_write"; } /** @@ -476,6 +484,8 @@ class Board extends WB_Controller { $this->data['form_close']= form_close(); $this->view = "password"; + $this->skin_type = "board/view"; + $this->skin = $this->data['board']['brd_skin_v']; } else { @@ -859,6 +869,9 @@ class Board extends WB_Controller { // 레이아웃 & 뷰파일 설정 $this->view = "write"; + + $this->skin_type = "board/write"; + $this->skin = $this->data['board']['brd_skin_w']; } } @@ -1055,7 +1068,10 @@ class Board extends WB_Controller { $this->data['use_attach'] = ($this->data['board']['brd_use_attach'] == 'Y' && $this->data['board']['auth']['upload']); // 접속한 기기에 따라 설정을 바꾼다. - $this->data['board']['brd_skin'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_skin_m'] : $this->data['board']['brd_skin']; + $this->data['board']['brd_skin_l'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_skin_l_m'] : $this->data['board']['brd_skin_l']; + $this->data['board']['brd_skin_w'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_skin_w_m'] : $this->data['board']['brd_skin_w']; + $this->data['board']['brd_skin_c'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_skin_c_m'] : $this->data['board']['brd_skin_c']; + $this->data['board']['brd_skin_v'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_skin_v_m'] : $this->data['board']['brd_skin_v']; $this->data['board']['brd_title'] = ($this->site->viewmode == DEVICE_MOBILE) ? ($this->data['board']['brd_title_m']?$this->data['board']['brd_title_m']:$this->data['board']['brd_title']) : $this->data['board']['brd_title']; $this->data['board']['brd_page_rows'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_page_rows_m'] : $this->data['board']['brd_page_rows']; $this->data['board']['brd_fixed_num'] = ($this->site->viewmode == DEVICE_MOBILE) ? $this->data['board']['brd_fixed_num_m'] : $this->data['board']['brd_fixed_num']; @@ -1117,7 +1133,6 @@ class Board extends WB_Controller { // 레이아웃 정의 $this->theme = $this->site->get_layout(); $this->skin_type = "board"; - $this->skin = $this->data['board']['brd_skin']; $this->active = "/board/".$this->data['board']['brd_key']; } diff --git a/wheeparam/application/controllers/admin/Board.php b/wheeparam/application/controllers/admin/Board.php index 944dacf..8ae3838 100644 --- a/wheeparam/application/controllers/admin/Board.php +++ b/wheeparam/application/controllers/admin/Board.php @@ -39,8 +39,14 @@ class Board extends WB_Controller $data['brd_title_m'] = $this->input->post('brd_title_m', TRUE); $data['brd_keywords'] = $this->input->post('brd_keywords', TRUE); $data['brd_description'] = $this->input->post('brd_description', TRUE); - $data['brd_skin'] = $this->input->post('brd_skin', TRUE); - $data['brd_skin_m'] = $this->input->post('brd_skin_m', TRUE); + $data['brd_skin_l'] = $this->input->post('brd_skin_l', TRUE); + $data['brd_skin_l_m'] = $this->input->post('brd_skin_l_m', TRUE); + $data['brd_skin_w'] = $this->input->post('brd_skin_w', TRUE); + $data['brd_skin_w_m'] = $this->input->post('brd_skin_w_m', TRUE); + $data['brd_skin_v'] = $this->input->post('brd_skin_v', TRUE); + $data['brd_skin_v_m'] = $this->input->post('brd_skin_v_m', TRUE); + $data['brd_skin_c'] = $this->input->post('brd_skin_c', TRUE); + $data['brd_skin_c_m'] = $this->input->post('brd_skin_c_m', TRUE); $data['brd_search'] = $this->input->post('brd_search', TRUE, "N"); $data['brd_sort'] = $this->input->post('brd_sort', TRUE); $data['brd_use_category'] = $this->input->post('brd_use_category', TRUE, "N"); @@ -110,7 +116,10 @@ class Board extends WB_Controller { $this->data['view'] = (empty($brd_key)) ? array() : $this->board_model->get_board($brd_key, TRUE); $this->data['brd_key'] = $brd_key; - $this->data['skin_list'] = get_skin_list('board'); + $this->data['skin_list_l'] = get_skin_list('board/list'); + $this->data['skin_list_w'] = get_skin_list('board/write'); + $this->data['skin_list_v'] = get_skin_list('board/view'); + $this->data['skin_list_c'] = get_skin_list('board/comment'); // 메타태그 설정 $this->site->meta_title = "게시판 관리"; diff --git a/wheeparam/application/controllers/admin/Setting.php b/wheeparam/application/controllers/admin/Setting.php index 806d722..5ee9f8d 100644 --- a/wheeparam/application/controllers/admin/Setting.php +++ b/wheeparam/application/controllers/admin/Setting.php @@ -108,7 +108,7 @@ class Setting extends WB_Controller { $this->data['active'] = $param; // 탭리스트 - $query = $this->db->query('SELECT SUBSTRING_INDEX(loc_key,"/",1) AS `keys` FROM wb_localize GROUP BY SUBSTRING_INDEX(loc_key,"/",1)'); + $query = $this->db->query('SELECT SUBSTRING_INDEX(loc_key,"/",1) AS `keys` FROM wbk_localize GROUP BY SUBSTRING_INDEX(loc_key,"/",1)'); $this->data['tab_list'] = $query->result_array(); // 메타태그 설정 diff --git a/wheeparam/config/wheeparam.sql b/wheeparam/config/wheeparam.sql index b35ecdc..e79308d 100644 --- a/wheeparam/config/wheeparam.sql +++ b/wheeparam/config/wheeparam.sql @@ -51,8 +51,14 @@ CREATE TABLE `wb_board` ( `brd_key` varchar(20) NOT NULL DEFAULT '', `brd_title` varchar(30) NOT NULL DEFAULT '', `brd_title_m` varchar(20) NOT NULL DEFAULT '', - `brd_skin` varchar(100) NOT NULL DEFAULT '', - `brd_skin_m` varchar(100) NOT NULL DEFAULT '', + `brd_skin_l` varchar(100) NOT NULL DEFAULT '', + `brd_skin_l_m` varchar(100) NOT NULL DEFAULT '', + `brd_skin_v` varchar(100) NOT NULL DEFAULT '', + `brd_skin_v_m` varchar(100) NOT NULL DEFAULT '', + `brd_skin_w` varchar(100) NOT NULL DEFAULT '', + `brd_skin_w_m` varchar(100) NOT NULL DEFAULT '', + `brd_skin_c` varchar(100) NOT NULL DEFAULT '', + `brd_skin_c_m` varchar(100) NOT NULL DEFAULT '', `brd_sort` int(10) unsigned NOT NULL DEFAULT '0', `brd_search` enum('Y','N') NOT NULL DEFAULT 'Y', `brd_lv_list` tinyint(3) unsigned NOT NULL DEFAULT '0', diff --git a/wheeparam/views/skins/board/basic/comment_list.php b/wheeparam/views/skins/board/comment/basic/c_list.php similarity index 100% rename from wheeparam/views/skins/board/basic/comment_list.php rename to wheeparam/views/skins/board/comment/basic/c_list.php diff --git a/wheeparam/views/skins/board/basic/comment_modify.php b/wheeparam/views/skins/board/comment/basic/c_modify.php similarity index 100% rename from wheeparam/views/skins/board/basic/comment_modify.php rename to wheeparam/views/skins/board/comment/basic/c_modify.php diff --git a/wheeparam/views/skins/board/basic/comment_write.php b/wheeparam/views/skins/board/comment/basic/c_write.php similarity index 100% rename from wheeparam/views/skins/board/basic/comment_write.php rename to wheeparam/views/skins/board/comment/basic/c_write.php diff --git a/wheeparam/views/skins/board/basic/list.php b/wheeparam/views/skins/board/list/basic/list.php similarity index 100% rename from wheeparam/views/skins/board/basic/list.php rename to wheeparam/views/skins/board/list/basic/list.php diff --git a/wheeparam/views/skins/board/basic/password.php b/wheeparam/views/skins/board/view/basic/password.php similarity index 100% rename from wheeparam/views/skins/board/basic/password.php rename to wheeparam/views/skins/board/view/basic/password.php diff --git a/wheeparam/views/skins/board/basic/view.php b/wheeparam/views/skins/board/view/basic/view.php similarity index 100% rename from wheeparam/views/skins/board/basic/view.php rename to wheeparam/views/skins/board/view/basic/view.php diff --git a/wheeparam/views/skins/board/basic/write.php b/wheeparam/views/skins/board/write/basic/write.php similarity index 100% rename from wheeparam/views/skins/board/basic/write.php rename to wheeparam/views/skins/board/write/basic/write.php diff --git a/wheeparam/views/themes/admin/board/form.php b/wheeparam/views/themes/admin/board/form.php index 7b1ccdf..58b93a7 100644 --- a/wheeparam/views/themes/admin/board/form.php +++ b/wheeparam/views/themes/admin/board/form.php @@ -56,43 +56,109 @@