diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php index 65b569266..7bb56d636 100644 --- a/modules/page/page.admin.view.php +++ b/modules/page/page.admin.view.php @@ -53,11 +53,10 @@ $args->page_count = 10; $args->s_module_category_srl = Context::get('module_category_srl'); - $s_mid = Context::get('s_mid'); - if($s_mid) $args->s_mid = $s_mid; - - $s_browser_title = Context::get('s_browser_title'); - if($s_browser_title) $args->s_browser_title = $s_browser_title; + $search_target_list = array('s_mid','s_browser_title'); + $search_target = Context::get('search_target'); + $search_keyword = Context::get('search_keyword'); + if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword; $output = executeQuery('page.getPageList', $args); $oModuleModel = &getModel('module'); diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html index 1916b5f47..df8e039a1 100644 --- a/modules/page/tpl/header.html +++ b/modules/page/tpl/header.html @@ -1,31 +1,30 @@ -

{$lang->page_management}

- -

{nl2br($lang->about_page)}

- +
+

{$lang->page_management}

+

{nl2br($lang->about_page)}

+
- -

- {$module_info->mid}({$lang->is_default}) - | - {$lang->view} -

- -

- {$lang->cmd_list} - {$lang->cmd_back} - - {$lang->module_info} - {$lang->cmd_addition_setup} - {$lang->cmd_manage_grant} - - {$lang->cmd_manage_skin} - {$lang->cmd_manage_mobile_skin} +

+

+ {$module_info->mid}({$lang->is_default}) + |{$lang->view} +

+
+ diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index f41e81cc7..f416937fb 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -2,42 +2,37 @@ -
+ - -
- {$lang->mid} - {$lang->browser_title} - - {$lang->cmd_cancel} -
+ + + +
-
+ - + - + @@ -76,26 +71,56 @@
Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}
{$lang->no} - - - - - {$lang->module_category} {$lang->page_type} {$lang->mid} {$lang->browser_title}
- -
-
- {$lang->cmd_setup} - {$lang->cmd_manage_grant} -
- {$lang->cmd_page_create} +
+
+ {$lang->cmd_setup} + {$lang->cmd_manage_grant} +
+
+ {$lang->cmd_make} +
- + {@$last_page = $page_no} +
  • {$page_no}
    • + + + + {@$isGoTo = true} +
  • + ... + + + + +
    • + +     + +
  • {$lang->last_page} »
    • + + + diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js index d250f2940..7ac0bc7ea 100644 --- a/modules/page/tpl/js/page_admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -94,16 +94,6 @@ function completeDeletePage(ret_obj) { location.href = url; } -/* 카테고리 이동 */ -function doChangeCategory(fo_obj) { - var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value; - if(module_category_srl==-1) { - location.href = current_url.setQuery('act','dispModuleAdminCategory'); - return false; - } - return true; -} - /* 위젯 재컴파일 */ function doRemoveWidgetCache(module_srl) { var params = new Array(); diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index 0d0fd5bee..3cedda14b 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -9,8 +9,10 @@ -

    {$lang->confirm_delete}

    -

    {$lang->page_delete_warning}

    +
    +

    {$lang->confirm_delete}

    +

    {$lang->page_delete_warning}

    +
    @@ -21,9 +23,11 @@
    {$lang->module_name}{$module_info->module}
    -
    - - {$lang->cmd_back} +
    +
    + + {$lang->cmd_back} +
    diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html index 1192c49d4..1bfd9b22e 100644 --- a/modules/page/tpl/page_info.html +++ b/modules/page/tpl/page_info.html @@ -2,12 +2,23 @@

    {$XE_VALIDATOR_MESSAGE}

    -
    +
    + +
    + +
    + +

    {$lang->about_mid}

    +
    +
    + +
    +
    diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index 90a4ad861..12d5bc366 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -1,144 +1,143 @@ -

    {$XE_VALIDATOR_MESSAGE}

    - + +
    + -
    {$lang->page_type}
    - - - - - - - - - - + +
    + +
    + + +

    {$lang->about_page_type}

    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$lang->page_type}
    {$lang->page_type} - -

    {$lang->about_page_type}

    -
    {$lang->mid} - -

    {$lang->about_mid}

    -
    {$lang->module_category} - -

    {$lang->about_module_category}

    -
    {$lang->browser_title} - - {$lang->cmd_find_langcode} -

    {$lang->about_browser_title}

    -
    {$lang->layout} - -

    {$lang->about_layout}

    -
    {$lang->mobile_view} + + + + + +
    + +
    + +

    {$lang->about_mid}

    +
    +
    + +
    + +
    + +

    {$lang->about_module_category}

    +
    +
    +
    + +
    + + {$lang->cmd_find_langcode} +

    {$lang->about_browser_title}

    +
    +
    +
    + +
    + +

    {$lang->about_layout}

    +
    +
    +
    + +
    use_mobile == "Y")-->checked="checked" /> -
    {$lang->mobile_layout} - -

    {$lang->about_layout}

    -
    {$lang->page_caching_interval} - {$lang->unit_min} -

    {$lang->about_page_caching_interval}

    -
    {$lang->skin} - -

    {$lang->about_skin}

    -
    {$lang->mobile_skin} - -

    {$lang->about_skin}

    -
    {$lang->opage_path} - -

    {$lang->about_opage_path}{realpath("./")}

    -
    {$lang->opage_mobile_path} - -

    {$lang->about_opage_mobile_path}{realpath("./")}

    -
    -
    - +
    - +
    + +
    + +

    {$lang->about_layout}

    +
    +
    +
    + +
    + {$lang->unit_min} +

    {$lang->about_page_caching_interval}

    +
    +
    +
    + +
    + +

    {$lang->about_skin}

    +
    +
    +
    + +
    + +

    {$lang->about_skin}

    +
    +
    +
    + +
    + +

    {$lang->about_opage_path}{realpath("./")}

    +
    +
    +
    + +
    + +

    {$lang->about_opage_mobile_path}{realpath("./")}

    +
    +
    +
    +
    + +
    +
    + + +