diff --git a/.gitignore b/.gitignore index 7904fcf..0017aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,16 @@ writable/HPILO/* writable/Excel/* !writable/Excel/index.html +#mapurl 결과물 +public/mapurl/index.html + +#upload 파일 +public/uploads/* +public/upload_images/* + +#leftmenu 파일 +layouts/front/left_menu/* + #------------------------- # User Guide Temp Files #------------------------- @@ -129,11 +139,4 @@ nb-configuration.xml /results/ /phpunit*.xml -/.phpunit.*.cache - -#mapurl 결과물 -public/mapurl/index.html - -#upload 파일 -public/uploads/* -public/upload_images/* \ No newline at end of file +/.phpunit.*.cache \ No newline at end of file diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 34080df..f84a8fb 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -219,7 +219,7 @@ define('CLASS_ICONS', [ 'PRODUCT' => '', 'CART' => '', 'ORDER' => '', - 'BILLING' => '', + 'PAYMENT' => '', ]); define('AUDIOS', [ 'Alram_GetEmail' => '', diff --git a/app/Config/Routes.php b/app/Config/Routes.php index da230c7..5d449c3 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -132,9 +132,9 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au }); $routes->group('front', ['namespace' => 'App\Controllers\Front'], function ($routes) { $routes->group('user', ['namespace' => 'App\Controllers\Front', 'filter' => 'authFilter:user'], static function ($routes) { - $routes->get('update/(:uuid)', 'UserController::update_form/$1'); - $routes->post('update/(:uuid)', 'UserController::update/R1'); - $routes->get('view/(:uuid)', 'UserController::view/$1'); + $routes->get('', 'UserController::index'); + $routes->get('update', 'UserController::update_form'); + $routes->post('update', 'UserController::update'); }); $routes->group('board', static function ($routes) { $routes->get('', 'BoardController::index'); diff --git a/app/Controllers/Admin/CategoryController.php b/app/Controllers/Admin/CategoryController.php index 26ece7f..a3e7901 100644 --- a/app/Controllers/Admin/CategoryController.php +++ b/app/Controllers/Admin/CategoryController.php @@ -67,7 +67,7 @@ class CategoryController extends AdminController private function build_leftmenu() { - foreach ($this->_model->getEntitys(['grpdepth' => 1, 'status' => DEFAULTS['STATUS']]) as $entity) { + foreach ($this->_model->getEntitys(['grpdepth' => 2, 'status' => DEFAULTS['STATUS']]) as $entity) { $categorys = $this->_model->getSiblingEntitys($entity); $viewDatas = [ 'className' => $this->_model->getClassName(), diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 72bbd54..90f4044 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -17,14 +17,14 @@ class UserController extends AdminController } public function getFields(string $action = ""): array { - $fields = ["id", "passwd", 'name', "email", "role", "status"]; + $fields = ["id", "passwd", 'name', "email", "email", "phone", "role", "status"]; switch ($action) { case "index": case "excel": - return ["id", 'name', "email", "role", "status", 'created_at']; + return ["id", 'name', "email", "email", "phone", "role", "status", 'created_at']; break; case "view": - return ["id", 'name', "email", "role", "status", 'updated_at', 'created_at']; + return ["id", 'name', "email", "email", "phone", "role", "status", 'updated_at', 'created_at']; break; default: return $fields; diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 903cfd3..1697d7e 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -526,6 +526,7 @@ abstract class BaseController extends Controller //모델 처리 $this->_viewDatas['entitys'] = $this->index_getEntitys(); // echo $this->_model->getLastQuery(); + // exit; // log_message("debug", __METHOD__ . "에서 findAll 호출:" . $this->_model->getLastQuery()); //setting return_url to session flashdata helper(['form']); diff --git a/app/Controllers/Front/BoardController.php b/app/Controllers/Front/BoardController.php index fbf5434..f545880 100644 --- a/app/Controllers/Front/BoardController.php +++ b/app/Controllers/Front/BoardController.php @@ -39,6 +39,7 @@ class BoardController extends FrontController { return parent::getFieldBatchFilters(); } + //Insert관련 protected function insert_form_process() { @@ -60,25 +61,36 @@ class BoardController extends FrontController protected function update_form_process($entity) { //본인이 작성한글인지 최종확인용 정상접속이 아닌 위회해서 수정을 시도방지용 - if (!$this->_viewDatas[SESSION_NAMES['ISLOGIN']] || $entity->user_uid == $this->_viewDatas['auth'][AUTH_FIELDS['ID']]) { + if (!$this->_viewDatas[SESSION_NAMES['ISLOGIN']] || $entity->user_uid != $this->_viewDatas['auth'][AUTH_FIELDS['ID']]) { throw new \Exception("작성자 본인글인지 여부가 확인되지 않습니다."); } - return parent::update_form_process($entity); + //권한체크 + $this->isRole('update'); + $entity = parent::update_form_process($entity); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category' => $this->_category + ]]; + return $entity; } protected function update_process($entity) { //본인이 작성한글인지 최종확인용 정상접속이 아닌 위회해서 수정을 시도방지용 - if (!$this->_viewDatas[SESSION_NAMES['ISLOGIN']] || $entity->user_uid == $this->_viewDatas['auth'][AUTH_FIELDS['ID']]) { + if (!$this->_viewDatas[SESSION_NAMES['ISLOGIN']] || $entity->user_uid != $this->_viewDatas['auth'][AUTH_FIELDS['ID']]) { throw new \Exception("작성자 본인글인지 여부가 확인되지 않습니다."); } return parent::update_process($entity); } - //Reply관련 + //Reply관련($entity는 부모의것임을 주의) protected function reply_form_process($entity) { //권한체크 - $this->isRole('reply', $entity); - return parent::reply_form_process($entity); + $this->isRole('reply'); + $entity = parent::reply_form_process($entity); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category_uid' => $entity->category_uid, + 'category' => $this->_category + ]]; + return $entity; } //Delete 관련 protected function delete_process($entity) @@ -93,17 +105,24 @@ class BoardController extends FrontController protected function view_process($entity) { //권한체크 - $this->isRole('view', $entity); + $this->isRole('view'); //조회수 올리기 $entity = $this->_model->addViewCount($entity); - return parent::view_process($entity); + $entity = parent::view_process($entity); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category' => $this->_category + ]]; + return $entity; } //Index관련 protected function index_process() { //권한체크 $this->isRole('index'); - return parent::index_process(); + parent::index_process(); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category' => $this->_category + ]]; } //Category 및 Status 조건추가 protected function index_setCondition() diff --git a/app/Controllers/Front/FrontController.php b/app/Controllers/Front/FrontController.php index d32f669..9edc87f 100644 --- a/app/Controllers/Front/FrontController.php +++ b/app/Controllers/Front/FrontController.php @@ -26,12 +26,9 @@ abstract class FrontController extends BaseController } //권한체크 - final protected function isRole($action, $entity = null) + protected function isRole($action) { - $this->_category = $this->request->getVar('category'); - if (is_null($this->_category)) { - $this->_category = !is_null($entity) ? $entity->category_uid : throw new \Exception("분류를 지정하지 않으셨습니다."); - } + $this->_category = $this->request->getVar('category') ?: throw new \Exception("분류를 지정하지 않으셨습니다."); $this->_viewDatas['category'] = $this->getCategoryModel()->getEntity([$this->getCategoryModel()->getPrimaryKey() => $this->_category]); $this->_viewDatas['parent_category'] = $this->getCategoryModel()->getEntity([$this->getCategoryModel()->getPrimaryKey() => $this->_viewDatas['category']->getHierarchy_ParentUID()]); switch ($action) { diff --git a/app/Controllers/Front/UserController.php b/app/Controllers/Front/UserController.php index a49e403..a07f42b 100644 --- a/app/Controllers/Front/UserController.php +++ b/app/Controllers/Front/UserController.php @@ -33,14 +33,14 @@ class UserController extends FrontController public function getFields(string $action = ""): array { - $fields = ["id", "passwd", 'name', "email", "role", "status"]; + $fields = ["id", "passwd", 'name', "email", "phone", "mobile",]; switch ($action) { case "index": case "excel": - return ["id", 'name', "email", "role", "status", 'created_at']; + return ["id", 'name', "email", "phone", "mobile", 'created_at']; break; case "view": - return ["id", 'name', "email", "role", "status", 'updated_at', 'created_at']; + return ["id", 'name', "email", "phone", "mobile", 'updated_at', 'created_at']; break; default: return $fields; @@ -49,34 +49,43 @@ class UserController extends FrontController } public function getFieldFilters(): array { - return ["role", "status"]; + return []; } public function getFieldBatchFilters(): array { return parent::getFieldBatchFilters(); } - - protected function insert_validate() + //권한체크 + protected function isRole($action, $entity = null) { - $rules = []; - foreach ($this->_viewDatas['fieldRules'] as $field => $rule) { - switch ($field) { - case 'role': - $rules[$field . '.*'] = $rule; - break; - default: - $rules[$field] = $rule; - break; - } - } - //fieldData Rule 검사 - if (!$this->validate($rules)) { - throw new \Exception("{$this->_viewDatas['title']}의 검증 오류발생\n" . implode("\n", $this->validator->getErrors())); - } - //fieldData 적용 - $this->_viewDatas['fieldDatas'] = array(); - foreach ($this->_viewDatas['fields'] as $field) { - $this->_viewDatas['fieldDatas'] = $this->getFieldFormData($field); - } + $this->_category = $this->request->getVar('category') ?: $entity->category_uid; + parent::isRole($action, $entity); + } + //Update관련 + protected function update_form_process($entity) + { + //권한체크 + $this->isRole('update'); + $entity = parent::update_form_process($entity); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category' => $this->_category + ]]; + return $entity; + } + //Index관련 + protected function index_process() + { + //권한체크 + $this->isRole('index'); + parent::index_process(); + $this->_viewDatas['forms'] = ['attributes' => ['method' => "post",], 'hiddens' => [ + 'category' => $this->_category + ]]; + } + //사용자 UID 조건추가 + protected function index_setCondition() + { + $this->_model->where("uid", $this->_viewDatas['auth'][AUTH_FIELDS['ID']]); + parent::index_setCondition(); } } diff --git a/app/Database/base.sql b/app/Database/base.sql index d7ceac2..7887b29 100644 --- a/app/Database/base.sql +++ b/app/Database/base.sql @@ -7,6 +7,8 @@ CREATE TABLE baseproject.tw_user ( passwd varchar(100) NOT NULL, name varchar(20) NOT NULL COMMENT "사용자명", email varchar(50) NOT NULL, + phone varchar(20) NULL COMMENT '연락처', + mobile varchar(20) NULL COMMENT '핸드폰', role varchar(255) NOT NULL DEFAULT 'user' COMMENT '사용자등급', status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 사용,unuse: 사용않함', updated_at timestamp NULL DEFAULT NULL, diff --git a/app/Database/shoppingmall.sql b/app/Database/shoppingmall.sql index 5e07d9e..b72766a 100644 --- a/app/Database/shoppingmall.sql +++ b/app/Database/shoppingmall.sql @@ -6,6 +6,8 @@ CREATE TABLE shoppingmall.tw_user ( passwd varchar(100) NOT NULL, name varchar(20) NOT NULL COMMENT "사용자명", email varchar(50) NOT NULL, + phone varchar(20) NULL COMMENT '연락처', + mobile varchar(20) NULL COMMENT '핸드폰', role varchar(255) NOT NULL DEFAULT 'user' COMMENT '사용자등급', status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 사용,unuse: 사용않함', updated_at timestamp NULL DEFAULT NULL, diff --git a/app/Helpers/Board_helper.php b/app/Helpers/Board_helper.php index a16dfed..93bd55a 100644 --- a/app/Helpers/Board_helper.php +++ b/app/Helpers/Board_helper.php @@ -118,12 +118,12 @@ function getFieldIndex_Row_BoardHelper($field, $entity, array $viewDatas): strin case 'title': case 'name': $reply = anchor( - current_url() . '/reply/' . $entity->getPrimaryKey(), + current_url() . '/reply/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), ICONS['REPLY'], ["target" => "_self"] ); $view = anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), + current_url() . '/view/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), $value, ["target" => "_self"] ); diff --git a/app/Helpers/User_helper.php b/app/Helpers/User_helper.php index 6d636de..9faf488 100644 --- a/app/Helpers/User_helper.php +++ b/app/Helpers/User_helper.php @@ -122,7 +122,7 @@ function getFieldIndex_Row_UserHelper($field, $entity, array $viewDatas): string case 'title': case 'name': return anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), + current_url() . '/view/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), $value, ["target" => "_self"] ); diff --git a/app/Language/ko/Order.php b/app/Language/ko/Order.php index f7ad1b5..ba218d2 100644 --- a/app/Language/ko/Order.php +++ b/app/Language/ko/Order.php @@ -13,5 +13,5 @@ return [ 'updated_at' => "수정일", 'created_at' => "작성일" ], - "STATUS" => ["use" => "장바구니", "unuse" => "주문취소", "confirm" => "주문완료",] + "STATUS" => ["use" => "장바구니", "unuse" => "주문취소", "confirm" => "주문완료", "paid" => "결제완료"] ]; diff --git a/app/Language/ko/User.php b/app/Language/ko/User.php index 330593c..aeb616a 100644 --- a/app/Language/ko/User.php +++ b/app/Language/ko/User.php @@ -11,6 +11,8 @@ return [ 'passwd' => '암호', 'confirmpassword' => '암호확인', 'email' => '메일', + 'phone' => '연락처', + 'mobile' => '핸드폰', 'role' => '권한', 'name' => '이름', 'status' => '상태', diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php index 9990dd1..6f2077f 100644 --- a/app/Models/UserModel.php +++ b/app/Models/UserModel.php @@ -92,8 +92,10 @@ class UserModel extends BaseModel //Index관련 public function setIndexWordFilter(string $word) { - parent::setIndexWordFilter($word); - $this->orLike($this->getTitleField(), $word, "both"); //befor , after , both - $this->orLike("id", $word, "both"); + if ($word !== DEFAULTS['EMPTY']) { + parent::setIndexWordFilter($word); + $this->orLike($this->getTitleField(), $word, "both"); //befor , after , both + $this->orLike("id", $word, "both"); + } } } diff --git a/app/Views/front/board/index.php b/app/Views/front/board/index.php index ac86f94..0adde20 100644 --- a/app/Views/front/board/index.php +++ b/app/Views/front/board/index.php @@ -20,7 +20,7 @@ user_uid == $viewDatas['auth'][AUTH_FIELDS['ID']]) : ?> - getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> + getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> @@ -29,9 +29,13 @@ + + + getPrimaryKey(), '입력', ["class" => "btn btn-sm btn-primary btn-circle", "target" => "_self"]) ?> + user_uid == $viewDatas['auth'][AUTH_FIELDS['ID']]) : ?> - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> + getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> @@ -40,12 +44,6 @@
-
diff --git a/app/Views/front/order/view.php b/app/Views/front/order/view.php index 1da17c3..cc92a5c 100644 --- a/app/Views/front/order/view.php +++ b/app/Views/front/order/view.php @@ -1,7 +1,6 @@ extend('layouts/front') ?> section('content') ?> -
head) ?>
diff --git a/app/Views/front/user/index.php b/app/Views/front/user/index.php new file mode 100644 index 0000000..24402d8 --- /dev/null +++ b/app/Views/front/user/index.php @@ -0,0 +1,41 @@ +extend('layouts/front') ?> +section('content') ?> + +
+
head) ?>
+
include('templates/front/index_head') ?>
+ +
+ + + + + + + + + + status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> + + + + + + + + +
번호
+ + getPrimaryKey() == $viewDatas['auth'][AUTH_FIELDS['ID']]) : ?> + getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> + + + +
+
+ +
+ +
tail) ?>
+
+endSection() ?> \ No newline at end of file diff --git a/app/Views/front/user/update.php b/app/Views/front/user/update.php index 95465be..18a6a30 100644 --- a/app/Views/front/user/update.php +++ b/app/Views/front/user/update.php @@ -14,9 +14,6 @@ - - "btn btn-outline btn-primary")); ?> -
head) ?>
diff --git a/app/Views/layouts/admin/left_menu/shoppingmall.php b/app/Views/layouts/admin/left_menu/shoppingmall.php index 2b1a947..b5a7ae2 100644 --- a/app/Views/layouts/admin/left_menu/shoppingmall.php +++ b/app/Views/layouts/admin/left_menu/shoppingmall.php @@ -10,7 +10,7 @@

주문 관리

-

결제 관리

+

결제 관리

\ No newline at end of file diff --git a/app/Views/layouts/front/left_menu.php b/app/Views/layouts/front/left_menu.php index 0c74bb4..d441f54 100644 --- a/app/Views/layouts/front/left_menu.php +++ b/app/Views/layouts/front/left_menu.php @@ -1,6 +1,6 @@
- include($viewDatas['layout']['path'] . "/left_menu/leftmenu_{$viewDatas['category']->getHierarchy_ParentUID()}"); ?> + include($viewDatas['layout']['path'] . "/left_menu/leftmenu_{$viewDatas['category']->getPrimaryKey()}"); ?>
\ No newline at end of file diff --git a/app/Views/layouts/front/left_menu/leftmenu_11.php b/app/Views/layouts/front/left_menu/leftmenu_11.php new file mode 100644 index 0000000..45d1f26 --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_11.php @@ -0,0 +1,13 @@ + +
+
-
+
개인정보
+
+
+ 주문정보 +
+
+ 사용자정보 +
+ + diff --git a/app/Views/layouts/front/left_menu/leftmenu_12.php b/app/Views/layouts/front/left_menu/leftmenu_12.php new file mode 100644 index 0000000..7d9c325 --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_12.php @@ -0,0 +1,13 @@ + +
+
-
+
개인정보
+
+
+ 주문정보 +
+
+ 사용자정보 +
+ + diff --git a/app/Views/layouts/front/left_menu/leftmenu_10.php b/app/Views/layouts/front/left_menu/leftmenu_14.php similarity index 68% rename from app/Views/layouts/front/left_menu/leftmenu_10.php rename to app/Views/layouts/front/left_menu/leftmenu_14.php index 52de5ce..ade6d56 100644 --- a/app/Views/layouts/front/left_menu/leftmenu_10.php +++ b/app/Views/layouts/front/left_menu/leftmenu_14.php @@ -1,13 +1,13 @@
-
-
AboutUS
+
사이트페이지
-
- 회사소개 +
+ 인사말
- 인사말 + 회사소개
diff --git a/app/Views/layouts/front/left_menu/leftmenu_15.php b/app/Views/layouts/front/left_menu/leftmenu_15.php new file mode 100644 index 0000000..dc54aef --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_15.php @@ -0,0 +1,13 @@ + +
+
-
+
사이트페이지
+
+
+ 인사말 +
+
+ 회사소개 +
+ + diff --git a/app/Views/layouts/front/left_menu/leftmenu_1.php b/app/Views/layouts/front/left_menu/leftmenu_3.php similarity index 58% rename from app/Views/layouts/front/left_menu/leftmenu_1.php rename to app/Views/layouts/front/left_menu/leftmenu_3.php index 3f1697a..49aa1f5 100644 --- a/app/Views/layouts/front/left_menu/leftmenu_1.php +++ b/app/Views/layouts/front/left_menu/leftmenu_3.php @@ -1,13 +1,13 @@ - +
-
-
게시판
+
Support
-
- 공지사항 +
+ 공지사항
- FAQ + FAQ
- + diff --git a/app/Views/layouts/front/left_menu/leftmenu_4.php b/app/Views/layouts/front/left_menu/leftmenu_4.php index 1349c76..4818308 100644 --- a/app/Views/layouts/front/left_menu/leftmenu_4.php +++ b/app/Views/layouts/front/left_menu/leftmenu_4.php @@ -1,13 +1,13 @@ - +
-
-
네트워크
+
Support
- 판매 + 공지사항
-
- 월이용권 +
+ FAQ
- + diff --git a/app/Views/layouts/front/left_menu/leftmenu_5.php b/app/Views/layouts/front/left_menu/leftmenu_5.php new file mode 100644 index 0000000..e4f68a2 --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_5.php @@ -0,0 +1,13 @@ + +
+
-
+
네트워크
+
+
+ 월이용권 +
+
+ 판매 +
+ + diff --git a/app/Views/layouts/front/left_menu/leftmenu_6.php b/app/Views/layouts/front/left_menu/leftmenu_6.php new file mode 100644 index 0000000..c8616ce --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_6.php @@ -0,0 +1,13 @@ + +
+
-
+
네트워크
+
+
+ 월이용권 +
+
+ 판매 +
+ + diff --git a/app/Views/layouts/front/left_menu/leftmenu_7.php b/app/Views/layouts/front/left_menu/leftmenu_8.php similarity index 74% rename from app/Views/layouts/front/left_menu/leftmenu_7.php rename to app/Views/layouts/front/left_menu/leftmenu_8.php index 70f42c9..a6d9ee3 100644 --- a/app/Views/layouts/front/left_menu/leftmenu_7.php +++ b/app/Views/layouts/front/left_menu/leftmenu_8.php @@ -1,13 +1,13 @@ - +
-
서버
-
- 판매 +
+ 월이용권
- 월이용권 + 판매
- + diff --git a/app/Views/layouts/front/left_menu/leftmenu_9.php b/app/Views/layouts/front/left_menu/leftmenu_9.php new file mode 100644 index 0000000..cb1820f --- /dev/null +++ b/app/Views/layouts/front/left_menu/leftmenu_9.php @@ -0,0 +1,13 @@ + +
+
-
+
서버
+
+
+ 월이용권 +
+
+ 판매 +
+ + diff --git a/app/Views/templates/front/header.php b/app/Views/templates/front/header.php index 233d898..ecb1d7e 100644 --- a/app/Views/templates/front/header.php +++ b/app/Views/templates/front/header.php @@ -1,13 +1,11 @@ \ No newline at end of file diff --git a/public/css/front.css b/public/css/front.css index 3d71245..ccf6396 100644 --- a/public/css/front.css +++ b/public/css/front.css @@ -4,9 +4,7 @@ * Created : 2016/9/11 Tri-aBility by Junheum,Choi * Updated : ------------------------------------------------------------ */ -body { - background-color: white;; -} + /* #head{ border:1px solid blue; } */ @@ -30,12 +28,12 @@ body { margin-left:30px; border-bottom:1px solid silver; } -#layout #body nav.header nav h4{ +#layout #body nav.header nav h4.title{ font-size:26px; font-weight:bold; } -#layout #body nav.header ul li.nav-item{ - color: silver; +#layout #body nav.header nav span.flow{ + color: gray; } #layout #body div.footer /*content 하단라인*/{ diff --git a/public/css/front/content.css b/public/css/front/content.css index d8d1c85..9f24466 100644 --- a/public/css/front/content.css +++ b/public/css/front/content.css @@ -61,19 +61,15 @@ div#content table thead th{ background-color:#F5F5F5; /* border:1px solid silver; */ } -div#content table thead th a{ - color:black; - /* border:1px solid silver; */ -} +/* div#content table thead th a{ + border:1px solid silver; +} */ div#content table tbody td { - color: black; - color:gray; font-weight:bold; /* border:1px solid silver; */ text-align:center; } div#content table tbody td a{ - color:gray; text-decoration: none; /* border:1px solid silver; */ }