From 6250019914c4f53843b7614e7c66ecc996bc95ea Mon Sep 17 00:00:00 2001 From: flyskyko Date: Mon, 8 Oct 2012 02:40:27 +0000 Subject: [PATCH] Issue 2378: Admin UI Refactoring - Advanced - Easy Install git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11606 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/lang/lang.xml | 9 +- modules/autoinstall/tpl/category.html | 33 ++- modules/autoinstall/tpl/header.html | 5 +- modules/autoinstall/tpl/install.html | 68 +++--- modules/autoinstall/tpl/list.html | 306 ++++++++++++++++--------- modules/autoinstall/tpl/uninstall.html | 35 +-- 6 files changed, 280 insertions(+), 176 deletions(-) diff --git a/modules/autoinstall/lang/lang.xml b/modules/autoinstall/lang/lang.xml index 573850c06..0e965f4fd 100644 --- a/modules/autoinstall/lang/lang.xml +++ b/modules/autoinstall/lang/lang.xml @@ -328,7 +328,14 @@ + + + - XE core가 업데이트 됩니다.
core 업데이트 시 설치된 프로그램의 호환성을 반드시 점검하시기 바랍니다.]]> + + + + + diff --git a/modules/autoinstall/tpl/category.html b/modules/autoinstall/tpl/category.html index 5c5297a2c..d4b45e8ad 100644 --- a/modules/autoinstall/tpl/category.html +++ b/modules/autoinstall/tpl/category.html @@ -1,21 +1,14 @@ -
-
-

{$category->title}

- -
-

- All({$tCount}) - All({$tCount}) - | - Installed({$iCount}) - Installed({$iCount}) -

+ + +
+
+ diff --git a/modules/autoinstall/tpl/header.html b/modules/autoinstall/tpl/header.html index 5732b79b6..9170388eb 100644 --- a/modules/autoinstall/tpl/header.html +++ b/modules/autoinstall/tpl/header.html @@ -1 +1,4 @@ -

{$lang->autoinstall}

\ No newline at end of file + +
+

{$lang->autoinstall}

+
diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html index c9d5847c9..9f5b46cf2 100644 --- a/modules/autoinstall/tpl/install.html +++ b/modules/autoinstall/tpl/install.html @@ -1,38 +1,41 @@ -

{$package->title} ver. {$package->version}

-
+

{$package->title} ver. {$package->version}

+
+

{$lang->msg_update_core_title}

{$lang->msg_update_core}

-

{$lang->current_version}: {$package->cur_version} ({$lang->require_update})

-

{$lang->require_installation}

- -

{$lang->about_depending_programs}

-
    -
  • - {$dep->title} ver. {$dep->version} - - {$lang->current_version}: {$dep->cur_version} ({$lang->require_update}) - {$lang->require_installation} - - {$lang->cmd_download} ({$lang->path}: {$dep->path}) - -
    • -
- +
+

{$lang->current_version}: {$package->cur_version} ({$lang->require_update})

+

{$lang->require_installation}

+ +

{$lang->about_depending_programs}

+
    +
  • + {$dep->title} ver. {$dep->version} - + {$lang->current_version}: {$dep->cur_version} ({$lang->require_update}) + {$lang->require_installation} + + {$lang->cmd_download} ({$lang->path}: {$dep->path}) + +
    • +
+ +
- +

{$lang->description_download}. (FTP Setup)

{$lang->path}: {$package->path}

-

{$lang->cmd_download} - - -

{$lang->description_install}

-
+

{$lang->cmd_download} +

+
+

{$lang->description_install}

+

{$XE_VALIDATOR_MESSAGE}

-
+ @@ -40,12 +43,19 @@ -

-

{$lang->about_ftp_password}

+
+ +
+ + {$lang->about_ftp_password} +
+
-
- +
+
+ +
- +
diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html index 5a5eea016..c56d9461a 100644 --- a/modules/autoinstall/tpl/list.html +++ b/modules/autoinstall/tpl/list.html @@ -1,123 +1,205 @@ +
+
+ + {@$_newest_order_type = 'asc'}{@$_newest_order_type = 'desc'} + + {@$_newest_order_type = 'desc'} + + + {@$_download_order_type = 'asc'}{@$_download_order_type = 'desc'} + + {@$_download_order_type = 'desc'} + + + {@$_popular_order_type = 'asc'}{@$_popular_order_type = 'desc'} + + {@$_popular_order_type = 'desc'} + + {$lang->order_newest}{$_newest_order_type} + | + {$lang->order_download}{$_newest_order_type} + | + {$lang->order_popular}{$_newest_order_type} +
+
+ + +
+
-
- - - - - - - - - - - - - - - {@ $target_url = $original_site."?mid=download&package_srl=".$item->package_srl; } - - - - - - - - -
+
+ + {$current_category} + All + ({sprintf('%d', $page_navigation->total_count)}) + +
+ {@$c = 0} + + {@ $target_url = $original_site."?mid=download&package_srl=".$item->package_srl; } + {@$c++} +
+
+ +
+
+

{$item->category}

+

{htmlspecialchars($item->title)}

+

+ + package_voted/$item->package_voter*20)}%">{sprintf($lang->rate, $item->package_start)} + {sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}/{number_format($item->package_voter)} + + + 0 + 0/0 + +

+

+ {$lang->installed} + {$lang->install} + {$lang->cmd_delete} + {$lang->update} +

+
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + {@ $target_url = $original_site."?mid=download&package_srl=".$item->package_srl; } + + + + + + + + + - Sort by - {$lang->order_newest}▼▲ | - {$lang->order_download}▼▲ | - {$lang->order_popular}▼▲ +
+ {@ + $urlInfo = parse_url(getRequestUriByServerEnviroment()); + parse_str($urlInfo['query'], $param); + } + +
{$lang->category}{$lang->thumbnail}{$lang->name}{$lang->distribute_version}{$lang->current_version}{$lang->run}
{$item->category} -

{htmlspecialchars($item->title)}

-

{cut_str(htmlspecialchars($item->package_description),200)}

-

- - package_voted/$item->package_voter*20)}%">{sprintf($lang->rate, $item->package_start)} - {sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}/{number_format($item->package_voter)} | - - - 0 - 0/0 | - - {$lang->package_update} {zdate($item->item_regdate, "Y-m-d H:i")} | - {$lang->package_downloaded_count} : {number_format($item->package_downloaded)} -

-

{$lang->dependant_list}:

-
    -
  • {$installed[$package_srl]->title}
    • -
- 		{htmlspecialchars($item->item_version)}{htmlspecialchars($item->current_version)} - {$lang->install} - {$lang->cmd_delete} - {$lang->update} -
-
-
- - - - - - - - - - - « FIRST - - {@$isGoTo = true} - 1 - ... + - {@$last_page = $page_no} - {$page_no} - {$page_no} + {@$last_page = $page_no} +
  • {$page_no}
    • - - {@$isGoTo = true} - ... - {$page_navigation->last_page} + + {@$isGoTo = true} +
  • + ... + + + + +
    • - LAST » - - - - - -
    - - - - - - - - - -
    -
    +
  • {$lang->last_page} »
    • + + + +
    + + + + {$lang->cmd_cancel} +
    + + diff --git a/modules/autoinstall/tpl/uninstall.html b/modules/autoinstall/tpl/uninstall.html index 4ba502141..9dbe66834 100644 --- a/modules/autoinstall/tpl/uninstall.html +++ b/modules/autoinstall/tpl/uninstall.html @@ -1,18 +1,18 @@ -

    {$package->title}

    +

    {$package->title}

    {$package->type} ({$package->path})

    -
    +

    {$lang->description_uninstall}

    -
    +

    {$XE_VALIDATOR_MESSAGE}

    -
    + @@ -20,22 +20,31 @@ -

    -

    {$lang->about_ftp_password}

    +
    + +
    + + {$lang->about_ftp_password} +
    +
    -
    - +
    +
    + +
    -
    +

    {$lang->msg_dependency_package}

    {$lang->msg_does_not_support_delete}

    -

    {$lang->dependant_list}:

    -
      -
    • {$installed[$dep_package_srl]->title}
      • -
    +
    +

    {$lang->dependant_list}:

    +
      +
    • {$installed[$dep_package_srl]->title}
      • +
    +