diff --git a/trunk/module/install/control.php b/trunk/module/install/control.php index a73374c7ba..667a0a867f 100644 --- a/trunk/module/install/control.php +++ b/trunk/module/install/control.php @@ -34,7 +34,20 @@ class install extends control public function index() { if(!isset($this->config->installed) or !$this->config->installed) $this->session->set('installing', true); + $this->view->header->title = $this->lang->install->welcome; + + /* 获得官方网站最新的版本。*/ + $snoopy = $this->app->loadClass('snoopy'); + if($snoopy->fetchText('http://www.zentaoms.cn/misc-getlatestrelease.json')) + { + $result = json_decode($snoopy->results); + if(isset($result->release) and $this->config->version != $result->release->version) + { + $this->view->latestRelease = $result->release; + } + } + $this->display(); } diff --git a/trunk/module/install/lang/zh-cn.php b/trunk/module/install/lang/zh-cn.php index f7b2180aa0..f6858ce47e 100644 --- a/trunk/module/install/lang/zh-cn.php +++ b/trunk/module/install/lang/zh-cn.php @@ -27,14 +27,20 @@ $lang->install->pre = '返回'; $lang->install->reload = '刷新'; $lang->install->error = '错误 '; -$lang->install->start = '开始安装'; -$lang->install->welcome = '欢迎使用禅道项目管理软件!'; -$lang->install->desc = <<install->start = '开始安装'; +$lang->install->keepInstalling = '继续安装当前版本'; +$lang->install->seeLatestRelease = '看看最新的版本'; +$lang->install->welcome = '欢迎使用禅道项目管理软件!'; +$lang->install->desc = <<%s。 EOT; +$lang->install->newReleased= "提示:官网网站已有最新版本,为%s, 发布日期于 %s。"; +$lang->install->choice = '您可以选择:'; $lang->install->checking = '系统检查'; $lang->install->ok = '检查通过(√)'; $lang->install->fail = '检查失败(×)'; diff --git a/trunk/module/install/view/header.html.php b/trunk/module/install/view/header.html.php index 2d20b868ce..4d331855a8 100644 --- a/trunk/module/install/view/header.html.php +++ b/trunk/module/install/view/header.html.php @@ -18,6 +18,7 @@ $themeRoot = $webRoot . "theme/"; diff --git a/trunk/module/install/view/index.html.php b/trunk/module/install/view/index.html.php index 0718a806f0..510ea7bd43 100644 --- a/trunk/module/install/view/index.html.php +++ b/trunk/module/install/view/index.html.php @@ -25,8 +25,21 @@
- - + +
install->welcome;?>
install->desc);?>

createLink('install', 'step1'), $lang->install->start);?>

install->desc, $config->version));?>
+ +

createLink('install', 'step1'), $lang->install->start);?>

+ + install->newReleased, $latestRelease);?> +

+ install->choice; + echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank'); + echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling); + ?> +

+ +