diff --git a/app/Helpers/Board_helper.php b/app/Helpers/Board_helper.php index 4d36e1f..7ba2d87 100644 --- a/app/Helpers/Board_helper.php +++ b/app/Helpers/Board_helper.php @@ -113,6 +113,10 @@ function getFieldIndex_Column_BoardHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -139,10 +143,10 @@ function getFieldIndex_Row_BoardHelper($field, $entity, array $viewDatas): strin $value, ["target" => "_self"] ); - return sprintf("%s%s %s", $depth, $reply, $view); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: - return sprintf("%s", getFieldView_BoardHelper($field, $entity, $viewDatas)); + return getFieldView_BoardHelper($field, $entity, $viewDatas); break; } } // @@ -168,7 +172,7 @@ function getFieldIndex_Row_BoardHelper_Admin($field, $entity, array $viewDatas): $value, ["target" => "_self"] ); - return sprintf("%s%s %s", $depth, $reply, $view); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: if (in_array($field, $viewDatas['fieldFilters'])) { @@ -179,7 +183,7 @@ function getFieldIndex_Row_BoardHelper_Admin($field, $entity, array $viewDatas): $field, $field ); - return sprintf("%s", getFieldForm_BoardHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_BoardHelper($field, $entity->$field, $viewDatas, $attributes); } return getFieldIndex_Row_BoardHelper($field, $entity, $viewDatas); break; diff --git a/app/Helpers/Card_helper.php b/app/Helpers/Card_helper.php index 5107270..e64dccb 100644 --- a/app/Helpers/Card_helper.php +++ b/app/Helpers/Card_helper.php @@ -97,7 +97,7 @@ function getFieldIndex_Row_CardHelper($field, $entity, array $viewDatas): string $value = $entity->$field ?: DEFAULTS['EMPTY']; switch ($field) { default: - return sprintf("%s", getFieldView_CardHelper($field, $entity, $viewDatas)); + return getFieldView_CardHelper($field, $entity, $viewDatas); break; } } // \ No newline at end of file diff --git a/app/Helpers/Category_helper.php b/app/Helpers/Category_helper.php index e63af87..3a67f6a 100644 --- a/app/Helpers/Category_helper.php +++ b/app/Helpers/Category_helper.php @@ -113,6 +113,10 @@ function getFieldIndex_Column_CategoryHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -124,7 +128,7 @@ function getFieldIndex_Row_CategoryHelper($field, $entity, array $viewDatas): st { switch ($field) { default: - return sprintf("%s", getFieldView_CategoryHelper($field, $entity, $viewDatas)); + return getFieldView_CategoryHelper($field, $entity, $viewDatas); break; } } // @@ -149,7 +153,7 @@ function getFieldIndex_Row_CategoryHelper_Admin($field, $entity, array $viewData $value, ["target" => "_self"] ); - return sprintf("%s%s %s", $depth, $reply, $view); + return sprintf("%s%s %s", $depth, $reply, $view); break; default: if (in_array($field, $viewDatas['fieldFilters'])) { @@ -160,7 +164,7 @@ function getFieldIndex_Row_CategoryHelper_Admin($field, $entity, array $viewData $field, $field ); - return sprintf("%s", getFieldForm_CategoryHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_CategoryHelper($field, $entity->$field, $viewDatas, $attributes); } return getFieldIndex_Row_CategoryHelper($field, $entity, $viewDatas); break; diff --git a/app/Helpers/Deposit_helper.php b/app/Helpers/Deposit_helper.php index 95c6892..beb40ab 100644 --- a/app/Helpers/Deposit_helper.php +++ b/app/Helpers/Deposit_helper.php @@ -56,6 +56,10 @@ function getFieldIndex_Column_DepositHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -67,7 +71,7 @@ function getFieldIndex_Row_DepositHelper($field, $entity, array $viewDatas): str { switch ($field) { default: - return sprintf("%s", getFieldView_DepositHelper($field, $entity, $viewDatas)); + return getFieldView_DepositHelper($field, $entity, $viewDatas); break; } } // \ No newline at end of file diff --git a/app/Helpers/Order_helper.php b/app/Helpers/Order_helper.php index 1136e39..cbd7628 100644 --- a/app/Helpers/Order_helper.php +++ b/app/Helpers/Order_helper.php @@ -110,6 +110,10 @@ function getFieldIndex_Column_OrderHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -123,19 +127,16 @@ function getFieldIndex_Row_OrderHelper($field, $entity, array $viewDatas): strin switch ($field) { case 'title': case 'name': - return sprintf( - "%s", - anchor( - current_url() . '/view/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), - $value, - ["target" => "_self"] - ) + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), + $value, + ["target" => "_self"] ); break; case 'status': if ($value == DEFAULTS['STATUS']) { return sprintf( - "
%s
%s
", + "
%s
%s
", anchor( URLS['paymentCard'] . '/' . $entity->getPrimaryKey(), "카 드 결 제", @@ -148,11 +149,11 @@ function getFieldIndex_Row_OrderHelper($field, $entity, array $viewDatas): strin ) ); } else { - return sprintf("%s", getFieldView_OrderHelper($field, $entity, $viewDatas)); + return getFieldView_OrderHelper($field, $entity, $viewDatas); } break; default: - return sprintf("%s", getFieldView_OrderHelper($field, $entity, $viewDatas)); + return getFieldView_OrderHelper($field, $entity, $viewDatas); break; } } // @@ -163,13 +164,10 @@ function getFieldIndex_Row_OrderHelper_Admin($field, $entity, array $viewDatas): switch ($field) { case 'title': case 'name': - return sprintf( - "%s", - anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), - $value, - ["target" => "_self"] - ) + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey(), + $value, + ["target" => "_self"] ); break; default: @@ -181,7 +179,7 @@ function getFieldIndex_Row_OrderHelper_Admin($field, $entity, array $viewDatas): $field, $field ); - return sprintf("%s", getFieldForm_OrderHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_OrderHelper($field, $entity->$field, $viewDatas, $attributes); } return getFieldIndex_Row_OrderHelper($field, $entity, $viewDatas); break; diff --git a/app/Helpers/Product_helper.php b/app/Helpers/Product_helper.php index 4825483..7d4c28b 100644 --- a/app/Helpers/Product_helper.php +++ b/app/Helpers/Product_helper.php @@ -125,6 +125,10 @@ function getFieldIndex_Column_ProductHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -158,7 +162,7 @@ function getFieldIndex_Row_ProductHelper_Admin($field, $entity, array $viewDatas case 'title': case 'name': return sprintf( - "%s
%s", + "%s
%s", $entity->getFileImage("middle", 'photo'), anchor( current_url() . '/view/' . $entity->getPrimaryKey(), @@ -176,10 +180,10 @@ function getFieldIndex_Row_ProductHelper_Admin($field, $entity, array $viewDatas $field, $field ); - return sprintf("%s", getFieldForm_ProductHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_ProductHelper($field, $entity->$field, $viewDatas, $attributes); } //front는 table을 사용하지 않는 점 주의 - return sprintf("%s", getFieldIndex_Row_ProductHelper($field, $entity, $viewDatas)); + return getFieldIndex_Row_ProductHelper($field, $entity, $viewDatas); break; } } // \ No newline at end of file diff --git a/app/Helpers/Sitepage_helper.php b/app/Helpers/Sitepage_helper.php index b8ace0e..c1fad61 100644 --- a/app/Helpers/Sitepage_helper.php +++ b/app/Helpers/Sitepage_helper.php @@ -113,6 +113,10 @@ function getFieldIndex_Column_SitepageHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -122,25 +126,13 @@ function getFieldIndex_Column_SitepageHelper($field, array $viewDatas) //Front용 function getFieldIndex_Row_SitepageHelper($field, $entity, array $viewDatas): string { - $value = $entity->$field ?: DEFAULTS['EMPTY']; + //front쪽은 table을 사용하지 않음 주의 switch ($field) { - case 'title': - case 'name': - return sprintf( - "%s", - anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), - $value, - ["target" => "_self"] - ) - ); - break; case 'content': - //front쪽은 table을 사용하지 않음 주의 return getFieldView_SitepageHelper($field, $entity, $viewDatas); break; default: - return sprintf("%s", getFieldView_SitepageHelper($field, $entity, $viewDatas)); + return getFieldView_SitepageHelper($field, $entity, $viewDatas); break; } } // @@ -148,7 +140,16 @@ function getFieldIndex_Row_SitepageHelper($field, $entity, array $viewDatas): st //Admin용 function getFieldIndex_Row_SitepageHelper_Admin($field, $entity, array $viewDatas): string { + $value = $entity->$field ?: DEFAULTS['EMPTY']; switch ($field) { + case 'title': + case 'name': + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey(), + $value, + ["target" => "_self"] + ); + break; default: if (in_array($field, $viewDatas['fieldFilters'])) { $attributes["onChange"] = sprintf( @@ -158,8 +159,9 @@ function getFieldIndex_Row_SitepageHelper_Admin($field, $entity, array $viewData $field, $field ); - return sprintf("%s", getFieldForm_SitepageHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_SitepageHelper($field, $entity->$field, $viewDatas, $attributes); } + //front쪽은 table을 사용하지 않음 주의 return getFieldIndex_Row_SitepageHelper($field, $entity, $viewDatas); break; } diff --git a/app/Helpers/UserSNS_helper.php b/app/Helpers/UserSNS_helper.php index f3e64d0..7696248 100644 --- a/app/Helpers/UserSNS_helper.php +++ b/app/Helpers/UserSNS_helper.php @@ -101,6 +101,10 @@ function getFieldIndex_Column_UserSNSHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -114,17 +118,14 @@ function getFieldIndex_Row_UserSNSHelper($field, $entity, array $viewDatas): str switch ($field) { case 'title': case 'name': - return sprintf( - "%s", - anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), - $value, - ["target" => "_self"] - ) + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey(), + $value, + ["target" => "_self"] ); break; default: - return sprintf("%s", getFieldView_UserSNSHelper($field, $entity, $viewDatas)); + return getFieldView_UserSNSHelper($field, $entity, $viewDatas); break; } } // @@ -141,7 +142,7 @@ function getFieldIndex_Row_UserSNSHelper_Admin($field, $entity, array $viewDatas $field, $field ); - return sprintf("%s", getFieldForm_UserSNSHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_UserSNSHelper($field, $entity->$field, $viewDatas, $attributes); } return getFieldIndex_Row_UserSNSHelper($field, $entity, $viewDatas); break; diff --git a/app/Helpers/User_helper.php b/app/Helpers/User_helper.php index 4637a91..ac6aa6f 100644 --- a/app/Helpers/User_helper.php +++ b/app/Helpers/User_helper.php @@ -117,6 +117,10 @@ function getFieldIndex_Column_UserHelper($field, array $viewDatas) $viewDatas['uri']->addQuery('order_value', $value); $columnData = anchor($viewDatas['uri'], $label); switch ($field) { + case 'title': + case 'name': + return sprintf("%s", $columnData); + break; default: return sprintf("%s", $columnData); break; @@ -130,17 +134,14 @@ function getFieldIndex_Row_UserHelper($field, $entity, array $viewDatas): string switch ($field) { case 'title': case 'name': - return sprintf( - "%s", - anchor( - current_url() . '/view/' . $entity->getPrimaryKey(), - $value, - ["target" => "_self"] - ) + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey(), + $value, + ["target" => "_self"] ); break; default: - return sprintf("%s", getFieldView_UserHelper($field, $entity, $viewDatas)); + return getFieldView_UserHelper($field, $entity, $viewDatas); break; } } // @@ -157,7 +158,7 @@ function getFieldIndex_Row_UserHelper_Admin($field, $entity, array $viewDatas): foreach ($viewDatas['fieldFormOptions'][$field] as $key => $label) { $checkboxs[] = form_checkbox("{$field}[]", $key, in_array($key, explode(DEFAULTS["DELIMITER_ROLE"], $value))) . $label; } - return sprintf("%s", implode(" ", $checkboxs)); + return implode(" ", $checkboxs); break; default: if (in_array($field, $viewDatas['fieldFilters'])) { @@ -168,7 +169,7 @@ function getFieldIndex_Row_UserHelper_Admin($field, $entity, array $viewDatas): $field, $field ); - return sprintf("%s", getFieldForm_UserHelper($field, $entity->$field, $viewDatas, $attributes)); + return getFieldForm_UserHelper($field, $entity->$field, $viewDatas, $attributes); } return getFieldIndex_Row_UserHelper($field, $entity, $viewDatas); break; diff --git a/app/Views/admin/board/index.php b/app/Views/admin/board/index.php index dadbc18..2b28781 100644 --- a/app/Views/admin/board/index.php +++ b/app/Views/admin/board/index.php @@ -12,9 +12,9 @@ - + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/category/index.php b/app/Views/admin/category/index.php index 71eb57a..44448ef 100644 --- a/app/Views/admin/category/index.php +++ b/app/Views/admin/category/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/order/index.php b/app/Views/admin/order/index.php index df907f8..1de04a0 100644 --- a/app/Views/admin/order/index.php +++ b/app/Views/admin/order/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/product/index.php b/app/Views/admin/product/index.php index b89bdb1..ff7406b 100644 --- a/app/Views/admin/product/index.php +++ b/app/Views/admin/product/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/sitepage/index.php b/app/Views/admin/sitepage/index.php index aaf7d97..816d95e 100644 --- a/app/Views/admin/sitepage/index.php +++ b/app/Views/admin/sitepage/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/user/index.php b/app/Views/admin/user/index.php index 42bfd48..15cf6b5 100644 --- a/app/Views/admin/user/index.php +++ b/app/Views/admin/user/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/admin/usersns/index.php b/app/Views/admin/usersns/index.php index a375301..630f1a2 100644 --- a/app/Views/admin/usersns/index.php +++ b/app/Views/admin/usersns/index.php @@ -12,9 +12,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,7 +26,7 @@ getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> - + diff --git a/app/Views/front/board/index.php b/app/Views/front/board/index.php index 76da1e8..43c94d0 100644 --- a/app/Views/front/board/index.php +++ b/app/Views/front/board/index.php @@ -8,9 +8,9 @@
번호# 작업@
getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?>
- + - + @@ -26,13 +26,9 @@ - +
번호# 작업@
- - - getPrimaryKey(), '입력', ["class" => "btn btn-sm btn-primary btn-circle", "target" => "_self"]) ?> - user_uid == $viewDatas['auth'][AUTH_FIELDS['ID']]) : ?> getPrimaryKey() . '?category=' . $viewDatas['category']->getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> @@ -44,6 +40,10 @@
+ + + getPrimaryKey(), '입력', ["class" => "btn btn-sm btn-primary btn-circle", "target" => "_self"]) ?> +
diff --git a/app/Views/front/order/index.php b/app/Views/front/order/index.php index 713fcd9..d66cffb 100644 --- a/app/Views/front/order/index.php +++ b/app/Views/front/order/index.php @@ -9,9 +9,9 @@ - + - + @@ -22,7 +22,7 @@ - +
번호# 작업@
status == DEFAULTS['STATUS']) : ?> diff --git a/app/Views/front/user/index.php b/app/Views/front/user/index.php index 20e8446..2b83e63 100644 --- a/app/Views/front/user/index.php +++ b/app/Views/front/user/index.php @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/public/css/admin.css b/public/css/admin.css index d56dc02..8080efb 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -8,7 +8,7 @@ margin:0px; padding:0px; border:0px; - font-size:12px; + font-size:14px; font: Arial; } diff --git a/public/css/admin/content.css b/public/css/admin/content.css index f89f2a0..71fa4f9 100644 --- a/public/css/admin/content.css +++ b/public/css/admin/content.css @@ -68,7 +68,6 @@ div#content table.product tr:first-child { div#content table thead th{ white-space: nowrap; - text-align:center; padding-top:15px; padding-bottom:15px; font-size: 16px; @@ -78,10 +77,6 @@ div#content table thead th{ background-color:#F5F5F5; /* border:1px solid silver; */ } -div#content table tbody td { - /* border:1px solid silver; */ - text-align:center; -} div#content div.bottom { padding-top:15px; diff --git a/public/css/front/content.css b/public/css/front/content.css index 377d3e1..6c6f850 100644 --- a/public/css/front/content.css +++ b/public/css/front/content.css @@ -69,7 +69,6 @@ div#content table.product tr:first-child { div#content table thead th{ white-space: nowrap; - text-align:center; padding-top:15px; padding-bottom:15px; font-size: 16px; @@ -79,10 +78,6 @@ div#content table thead th{ background-color:#F5F5F5; /* border:1px solid silver; */ } -div#content table tbody td { - /* border:1px solid silver; */ - text-align:center; -} div#content div.bottom { padding-top:15px;
번호#