diff --git a/app/Config/Constants.php b/app/Config/Constants.php index d76c3e3..5903b6a 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -247,7 +247,6 @@ define('DEFAULTS', [ 'STATUS' => getenv('default.status') ?: "use", 'EMPTY' => getenv('default.empty') ?: "", 'PERPAGE' => getenv('default.perpage') ?: 20, - 'HIERARCHY_GRPDEPTH' => getenv('default.hierarchy_grpdepth') ?: 20, 'DELIMITER_FILE' => getenv('default.delimiter.file') ?: "||", 'DELIMITER_ROLE' => getenv('default.delimiter.role') ?: ",", ]); diff --git a/app/Helpers/Board_helper.php b/app/Helpers/Board_helper.php index e47730f..e61a8e2 100644 --- a/app/Helpers/Board_helper.php +++ b/app/Helpers/Board_helper.php @@ -115,7 +115,7 @@ function getFieldIndex_Column_BoardHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); @@ -129,6 +129,10 @@ function getFieldIndex_Row_BoardHelper($field, $entity, array $viewDatas): strin switch ($field) { case 'title': case 'name': + $depth = " "; + for ($i = 1; $i < $entity->getHierarchy_Depth(); $i++) { + $depth .= "    "; + } $reply = anchor( current_url() . '/reply/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), ICONS['REPLY'], @@ -139,12 +143,7 @@ function getFieldIndex_Row_BoardHelper($field, $entity, array $viewDatas): strin $value, ["target" => "_self"] ); - return sprintf( - "
%s %s
", - $entity->getHierarchy_Depth() * DEFAULTS['HIERARCHY_GRPDEPTH'], - $reply, - $view - ); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: return getFieldView_BoardHelper($field, $entity, $viewDatas); @@ -159,6 +158,10 @@ function getFieldIndex_Row_BoardHelper_Admin($field, $entity, array $viewDatas): switch ($field) { case 'title': case 'name': + $depth = " "; + for ($i = 1; $i < $entity->getHierarchy_Depth(); $i++) { + $depth .= "    "; + } $reply = anchor( current_url() . '/reply/' . $entity->getPrimaryKey(), ICONS['REPLY'], @@ -169,12 +172,7 @@ function getFieldIndex_Row_BoardHelper_Admin($field, $entity, array $viewDatas): $value, ["target" => "_self"] ); - return sprintf( - "
%s %s
", - $entity->getHierarchy_Depth() * DEFAULTS['HIERARCHY_GRPDEPTH'], - $reply, - $view - ); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: if (in_array($field, $viewDatas['fieldFilters'])) { diff --git a/app/Helpers/Category_helper.php b/app/Helpers/Category_helper.php index db7099c..95bd575 100644 --- a/app/Helpers/Category_helper.php +++ b/app/Helpers/Category_helper.php @@ -115,7 +115,7 @@ function getFieldIndex_Column_CategoryHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); @@ -138,14 +138,14 @@ function getFieldIndex_Row_CategoryHelper_Admin($field, $entity, array $viewData $value = $entity->$field ?: DEFAULTS['EMPTY']; switch ($field) { case 'linkurl': - return sprintf( - "
%s
%s
", - $entity->getFileImage('middle', 'photo'), - $value - ); + return $entity->getFileImage('middle', 'photo') . "
" . $value; break; case 'title': case 'name': + $depth = " "; + for ($i = 1; $i < $entity->getHierarchy_Depth(); $i++) { + $depth .= "    "; + } $reply = anchor( current_url() . '/reply/' . $entity->getPrimaryKey(), ICONS['REPLY'], @@ -156,12 +156,7 @@ function getFieldIndex_Row_CategoryHelper_Admin($field, $entity, array $viewData $value, ["target" => "_self"] ); - return sprintf( - "
%s %s
", - $entity->getHierarchy_Depth() * DEFAULTS['HIERARCHY_GRPDEPTH'], - $reply, - $view - ); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: if (in_array($field, $viewDatas['fieldFilters'])) { diff --git a/app/Helpers/Order_helper.php b/app/Helpers/Order_helper.php index 44e6f95..ebd8457 100644 --- a/app/Helpers/Order_helper.php +++ b/app/Helpers/Order_helper.php @@ -109,7 +109,7 @@ function getFieldIndex_Column_OrderHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Helpers/Payment_helper.php b/app/Helpers/Payment_helper.php index 0e6ad43..fe05be2 100644 --- a/app/Helpers/Payment_helper.php +++ b/app/Helpers/Payment_helper.php @@ -145,7 +145,7 @@ function getFieldIndex_Column_PaymentHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Helpers/Product_helper.php b/app/Helpers/Product_helper.php index 8425e88..7e79760 100644 --- a/app/Helpers/Product_helper.php +++ b/app/Helpers/Product_helper.php @@ -114,7 +114,7 @@ function getFieldFilter_ProductHelper($field, $value, array $viewDatas) return form_dropdown($field, $viewDatas['fieldFormOptions'][$field], $value, ['class' => "select-field"]); } // -function getFieldIndex_Column_Productelper($field, array $viewDatas) +function getFieldIndex_Column_ProductHelper($field, array $viewDatas) { $label = lang("{$viewDatas['className']}.label.{$field}"); if ($field == $viewDatas['order_field']) { @@ -127,7 +127,7 @@ function getFieldIndex_Column_Productelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Helpers/Sitepage_helper.php b/app/Helpers/Sitepage_helper.php index 5b2c99e..e7644a5 100644 --- a/app/Helpers/Sitepage_helper.php +++ b/app/Helpers/Sitepage_helper.php @@ -115,7 +115,7 @@ function getFieldIndex_Column_SitepageHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Helpers/UserSNS_helper.php b/app/Helpers/UserSNS_helper.php index a4c90d2..1c0fd41 100644 --- a/app/Helpers/UserSNS_helper.php +++ b/app/Helpers/UserSNS_helper.php @@ -103,7 +103,7 @@ function getFieldIndex_Column_UserSNSHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Helpers/User_helper.php b/app/Helpers/User_helper.php index 9d7ef82..a87f59b 100644 --- a/app/Helpers/User_helper.php +++ b/app/Helpers/User_helper.php @@ -119,7 +119,7 @@ function getFieldIndex_Column_UserHelper($field, array $viewDatas) switch ($field) { case 'title': case 'name': - return sprintf("%s", $columnData); + return sprintf("%s", $columnData); break; default: return sprintf("%s", $columnData); diff --git a/app/Views/admin/board/index.php b/app/Views/admin/board/index.php index 2aabaec..e24f695 100644 --- a/app/Views/admin/board/index.php +++ b/app/Views/admin/board/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + "> getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/category/index.php b/app/Views/admin/category/index.php index 85e1f10..0449718 100644 --- a/app/Views/admin/category/index.php +++ b/app/Views/admin/category/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + "> getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/order/index.php b/app/Views/admin/order/index.php index 8c68aed..d597af3 100644 --- a/app/Views/admin/order/index.php +++ b/app/Views/admin/order/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/product/index.php b/app/Views/admin/product/index.php index 146020d..e85a838 100644 --- a/app/Views/admin/product/index.php +++ b/app/Views/admin/product/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/sitepage/index.php b/app/Views/admin/sitepage/index.php index 13f90b7..6746a6f 100644 --- a/app/Views/admin/sitepage/index.php +++ b/app/Views/admin/sitepage/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/user/index.php b/app/Views/admin/user/index.php index a17459c..d3d87b2 100644 --- a/app/Views/admin/user/index.php +++ b/app/Views/admin/user/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 @@ -21,12 +21,12 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - + "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> diff --git a/app/Views/admin/usersns/index.php b/app/Views/admin/usersns/index.php index b6d1332..039c61a 100644 --- a/app/Views/admin/usersns/index.php +++ b/app/Views/admin/usersns/index.php @@ -13,7 +13,7 @@ 번호 - + 작업 diff --git a/app/Views/front/board/index.php b/app/Views/front/board/index.php index 0adde20..a1a95c3 100644 --- a/app/Views/front/board/index.php +++ b/app/Views/front/board/index.php @@ -9,7 +9,7 @@ 번호 - + 작업 @@ -26,7 +26,7 @@ - + diff --git a/app/Views/front/product/index.php b/app/Views/front/product/index.php index af54f97..52272c5 100644 --- a/app/Views/front/product/index.php +++ b/app/Views/front/product/index.php @@ -8,7 +8,7 @@ - +
diff --git a/public/css/admin/content.css b/public/css/admin/content.css index e8a4af7..82251df 100644 --- a/public/css/admin/content.css +++ b/public/css/admin/content.css @@ -1,4 +1,5 @@ div#content{ + color:black; padding-top:20px; margin-bottom:20px; /* border-left:1px solid silver; @@ -8,20 +9,6 @@ div#content{ border:1px solid red; } */ -/* Form Page 관련 전용*/ -div#content table.form td.label{ - width:10%; - text-align:right; - padding-right:20px; - background-color:#e8ebe9; -} -div#content table.form td.column{ - height:27px; - text-align:left; - padding-left:20px; -} -/* Form Page 관련 전용*/ - /*페이지정보*/ div#content div.top nav span.pageinfo{ font-weight:bold; @@ -49,29 +36,45 @@ div#content div.top nav a{ border-radius:0px !important; /* border:1px solid red; */ } -/* index block 전용 */ -div#content table#block tr:first-child { - border-top:2px solid black; - border-bottom:1px solid silver; -} -div#content table#block tr td{ - text-align:left; -} -/* index block 전용 */ + +/* Table 부분 */ div#content table { - white-space: nowrap; + width:100%; /* overflow-x: auto; padding-top:5px; padding-bottom:5px; */ } + +/* insert,update,reply,view Form Page 관련 전용*/ +div#content table form td.label{ + width:10%; + text-align:right; + padding-right:20px; + background-color:#e8ebe9; +} +div#content table form td.column{ + height:27px; + text-align:left; + padding-left:20px; +} +/* insert,update,reply,view Form Page 관련 전용*/ + +/* 상품 리스트 전용 */ +div#content table.product tr:first-child { + border-top:2px solid black; + border-bottom:1px solid silver; +} +div#content table th.title,td.title{ + width:150px; + border:1px solid silver; +} div#content table thead th{ + white-space: nowrap; text-align:center; padding-top:15px; padding-bottom:15px; font-size: 16px; font-weight:bold; - border-top:2px solid black; - border-bottom:1px solid silver; background-color:#F5F5F5; /* border:1px solid silver; */ } @@ -79,6 +82,10 @@ div#content table tbody td { /* border:1px solid silver; */ text-align:center; } +div#content table tbody td.hierarchy { + /* border:1px solid silver; */ + text-align:left; +} div#content div.bottom { padding-top:15px; text-align:center; @@ -88,11 +95,12 @@ div#content div.bottom ul.pagination { margin-top:20px; } div#content div.bottom ul.pagination li.page-item a{ + color:black; border:0px; border-radius:0px !important; background-color:#e8ebe9; - text-decoration: none; } div#content div.bottom ul.pagination li.active a{ + color:black; background-color:gray; } \ No newline at end of file diff --git a/public/css/front/content.css b/public/css/front/content.css index 426deae..7408ae1 100644 --- a/public/css/front/content.css +++ b/public/css/front/content.css @@ -1,4 +1,5 @@ div#content{ + color:black; padding-top:40px; padding-left:30px; margin-bottom:20px; @@ -9,20 +10,6 @@ div#content{ border:1px solid red; } */ -/* Form Page 관련 전용*/ -div#content table.form td.label{ - width:10%; - text-align:right; - padding-right:20px; - background-color:#e8ebe9; -} -div#content table.form td.column{ - height:27px; - text-align:left; - padding-left:20px; -} -/* Form Page 관련 전용*/ - /*페이지정보*/ div#content div.top nav span.pageinfo{ font-weight:bold; @@ -50,34 +37,49 @@ div#content div.top nav a{ border-radius:0px !important; /* border:1px solid red; */ } -/* index block 전용 */ -div#content table#block tr:first-child { - border-top:2px solid black; - border-bottom:1px solid silver; -} -div#content table#block tr td{ - text-align:left; -} -/* index block 전용 */ + +/* Table 부분 */ div#content table { - white-space: nowrap; + width:100%; /* overflow-x: auto; padding-top:5px; padding-bottom:5px; */ } + +/* insert,update,reply,view Form Page 관련 전용*/ +div#content table form td.label{ + width:10%; + text-align:right; + padding-right:20px; + background-color:#e8ebe9; +} +div#content table form td.column{ + height:27px; + text-align:left; + padding-left:20px; +} +/* insert,update,reply,view Form Page 관련 전용*/ + +/* 상품 리스트 전용 */ +div#content table.product tr:first-child { + border-top:2px solid black; + border-bottom:1px solid silver; +} div#content table thead th{ + white-space: nowrap; text-align:center; padding-top:15px; padding-bottom:15px; font-size: 16px; font-weight:bold; - border-top:2px solid black; - border-bottom:1px solid silver; background-color:#F5F5F5; /* border:1px solid silver; */ } +div#content table thead th.title{ + width:300px; + /* border:1px solid silver; */ +} div#content table thead th a{ - color:black; /* border:1px solid silver; */ } div#content table tbody td { @@ -85,8 +87,6 @@ div#content table tbody td { text-align:center; } div#content table tbody td a{ - color:black; - /* text-decoration: none; */ /* border:1px solid silver; */ } div#content div.bottom { @@ -102,7 +102,6 @@ div#content div.bottom ul.pagination li.page-item a{ border:0px; border-radius:0px !important; background-color:#e8ebe9; - text-decoration: none; } div#content div.bottom ul.pagination li.active a{ color:black; diff --git a/public/css/style.css b/public/css/style.css index c9dc689..5aa35c2 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -38,6 +38,4 @@ select,textarea,button { a:link { text-decoration: none; } a:visited { text-decoration: none; } a:hover { text-decoration: underline; } -a:active { text-decoration: underline; } - -div.location-left { text-align:left; } \ No newline at end of file +a:active { text-decoration: underline; } \ No newline at end of file
getFileImage('middle') ?>