diff --git a/module/index/css/index.css b/module/index/css/index.css index d89ad10446..83387211dc 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -93,17 +93,19 @@ body.menu-hide {padding-left: 0;} #searchbox .dropdown-menu>li.active>a, #searchbox .dropdown-menu>li.selected>a {position: relative; color: #fff; background-color: #16a8f8;} #searchbox .dropdown-menu>li.selected>a:after {position: absolute; top: 2px; right: 4px; display: block; font-family: ZentaoIcon; font-size: 18px; font-size: 14px; font-style: normal; font-weight: 400; font-variant: normal; line-height: 1; line-height: 20px; text-transform: none; content: "\e5ca"; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;} -#upgradeContent {display: none; position: absolute; right: 10px; top: -290px; height: 282px; background-color: #fff; left: 0px; padding: 5px 0; border: 1px solid rgba(0,0,0,.15); border-color: rgba(0,0,0,.1); opacity: 1; border-radius: 4px; box-shadow: 0 6px 12px rgba(0,0,0,.12), 0 1px 3px rgba(0,0,0,.1);} -#latestVersionList {height: 190px; overflow: auto;} -#empty-tip {top: 1px; position: relative;} +#upgradeContent {display: none; position: absolute; top: -330px; right: 10px; width: 65%; height: 322px; background-color: #fff; padding: 5px 0; border: 1px solid rgba(0,0,0,.15); border-color: rgba(0,0,0,.1); opacity: 1; border-radius: 4px; box-shadow: 0 6px 12px rgba(0,0,0,.12), 0 1px 3px rgba(0,0,0,.1);} +#latestVersionList {height: 270px; overflow: auto;} -.version-name {width: 20%;} -.version-date {width: 15%; color: #8a8a8a;} -.version-explain {width: 45%; color: #8a8a8a;} -.version-actions {width: 20%;} +.version-upgrade {width: 14px; height: 16px; float: left; background-repeat: no-repeat; background-position: center ; background-size: cover; display: block;} +.version-content {padding: 10px 15px;} +.version-footer {padding-top: 5px;} +.version-detail {color: #8a8a8a;} +.upgrade-now {float: right;} +.color-primary {color: #3280fc;} @media screen and (max-height: 768px) { + #upgradeContent{width: 85%;} .version-name {width: 25%; text-overflow: ellipsis; white-space: nowrap;} .version-date {width: 20%; color: #8a8a8a;} .version-explain {width: 25%; color: #8a8a8a; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} diff --git a/module/index/lang/zh-cn.php b/module/index/lang/zh-cn.php index f324e1c1ea..3317dc56e9 100644 --- a/module/index/lang/zh-cn.php +++ b/module/index/lang/zh-cn.php @@ -8,13 +8,8 @@ $lang->index->app->open = '打开'; $lang->index->app->reload = '刷新'; $lang->index->app->close = '关闭'; -$lang->index->upgradeVersion = '禅道新版本'; -$lang->index->currentVersion = '当前版本'; -$lang->index->versionName = '版本名称'; -$lang->index->releaseDate = '发布日期'; -$lang->index->explain = '更新说明'; -$lang->index->actions = '操作'; -$lang->index->upgrade = '升级'; -$lang->index->log = '日志'; +$lang->index->upgradeVersion = '可升级版本'; +$lang->index->upgrade = '现在升级'; +$lang->index->log = '查看版本更新日志 >'; $lang->index->detailed = '详情'; $lang->index->website = '请访问官网'; diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index a1f3ebe7e1..26e66ce1c9 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -19,9 +19,19 @@ js::set('appsLang', $lang->index->app); js::set('appsMenuItems', commonModel::getMainNavList($app->rawModule)); js::set('defaultOpen', $open); ?> + +#searchbox .dropdown-menu.show-quick-go.with-active {top: -468px; max-height: 465px;} + + +#upgradeContent {top: -272px; height: 262px;} +#latestVersionList {height: 200px;} + +
+

index->upgradeVersion;?> - index->currentVersion . ': ' . $lang->zentaoPMS . $config->version;?>

- - - - - - - - - -
index->versionName;?>index->releaseDate;?>index->explain;?>index->actions;?>
-
-
- noData;?> - - index->website . ': '. $lang->website;?> - -
+ - - - - - - - - - - - -
zentaoPMS . $version->name;?>date;?>explain;?> - index->upgrade;?> - index->log;?> -
+
+ +
+
+ +

name;?>

+
+
explain;?>
+ +
+
+ +
diff --git a/www/theme/default/images/main/version-new.svg b/www/theme/default/images/main/version-new.svg new file mode 100644 index 0000000000..b81edbd2d3 --- /dev/null +++ b/www/theme/default/images/main/version-new.svg @@ -0,0 +1,13 @@ + + + 新 + + + + + + + + + + \ No newline at end of file diff --git a/www/theme/default/images/main/version-upgrade.svg b/www/theme/default/images/main/version-upgrade.svg new file mode 100644 index 0000000000..16c0435052 --- /dev/null +++ b/www/theme/default/images/main/version-upgrade.svg @@ -0,0 +1,19 @@ + + + 升级 + + + + + + + + + + + + + + + + \ No newline at end of file