From 02e41e1fc1766e3665fb584041f8c9817e0e4ee3 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 16 May 2018 13:06:35 +0800 Subject: [PATCH 01/14] * finish task #3975. --- module/product/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 8ac20f5431..6a37c1b3d4 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -596,7 +596,7 @@ class productModel extends model foreach($plans as $plan) { - if($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) continue; + if(($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) or $plan->end == '2030-01-01') continue; $year = substr($plan->end, 0, 4); $roadmap[$year][$plan->branch][] = $plan; } From d7c643853b65d096379fc1e2fa2a827907f83b70 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 16 May 2018 13:50:04 +0800 Subject: [PATCH 02/14] * improve UI of about dialog and admin/index links view. --- module/admin/css/index.css | 20 ++-------------- module/admin/view/index.html.php | 18 +++++++------- module/misc/css/about.css | 23 ++++-------------- module/misc/view/about.html.php | 40 ++++++++++++++++++-------------- module/misc/view/links.html.php | 23 +++++++++++------- www/theme/zui/css/min.css | 2 +- 6 files changed, 52 insertions(+), 74 deletions(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 8da6c963c6..f64b44d4c0 100644 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,18 +1,2 @@ -.cards {margin: 5% auto;} -.cards > .col-sm-6 {width: 25%; padding: 0 10px} -.card {height: 250px; position: relative; padding-top: 50px; border-radius: 0; margin: 0} -.card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;} -.card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;} -.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;} -.card:hover > .media {background: #F8FAFE} -.card:hover > .media > .icon {color: #ccc} -.card .card-content {padding: 20px; border:1px solid #f1f1f1;} -.card-content > ul {padding-left: 20px;} -.card-content > ul > li {margin-bottom: 5px;} -.card a, .card:hover a {color: #444} -.card a:hover {color: #000;} - -#notice {margin: -20px -20px 20px} -#titlebar {margin-top: -20px; border-top: none} -#notice + #titlebar {margin-top: 0; border-top: 1px solid #e5e5e5} -#proversion, #zentaotrain{color:#D2322D} +#notice {margin: -20px -20px 20px; padding: 20px;} +#zentaoLinks {margin-top: 20px;} \ No newline at end of file diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 2b3d62c789..e0e96516a0 100644 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -14,21 +14,19 @@
- ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?> + ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?>
-
- - admin->info->version, $config->version); - if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); - echo $lang->admin->info->links; - ?> - -
+

+ admin->info->version, $config->version); + if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); + echo $lang->admin->info->links; + ?> +

diff --git a/module/misc/css/about.css b/module/misc/css/about.css index 791ffad935..5b36dfa561 100644 --- a/module/misc/css/about.css +++ b/module/misc/css/about.css @@ -1,19 +1,4 @@ -.cards {padding-bottom: 0;} -.cards > .col-sm-6 {width: 25%; padding: 0 10px} -.card {height: 225px; position: relative; padding-top: 50px; margin: 0} -.card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;} -.card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;} -.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;} -.card:hover > .media {background: #e5e5e5} -.card:hover > .media > .icon {color: #ccc} -.card .card-content {padding: 10px 20px} -.card-content > ul {padding-left: 8px;} -.card-content > ul > li {margin-bottom: 5px;} -.card a, .card:hover a {color: #444} -.card a:hover {color: #000;} - -body {padding: 20px; font-size: 12px} -.modal-dialog.hide-header .modal-header .close {top: 5px; right: 20px} -.copyright {padding: 0 10px 20px} - -#proversion, #zentaotrain{color:#D2322D} +#mainContent {padding-top: 50px;} +#mainContent .main-header {display: none;} +#mainContent .copyright {line-height: 20px;} +#mainContent .copyright a {vertical-align: baseline;} \ No newline at end of file diff --git a/module/misc/view/about.html.php b/module/misc/view/about.html.php index 13af17a2bc..17d06a9bfc 100644 --- a/module/misc/view/about.html.php +++ b/module/misc/view/about.html.php @@ -1,21 +1,25 @@ -
-
-

misc->zentao->labels['about'];?>

+
+
+
+
+

misc->zentao->labels['about'];?>

+
+ + + + + + + + +
+ +

misc->zentao->version, $config->version);?>

+
+ misc->copyright;?> +
+
- - - - - - - - -
- -

misc->zentao->version, $config->version);?>

-
-
misc->copyright;?>
-
-
+ diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index 0daa4c0db7..0c58149f95 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -1,15 +1,14 @@ -
-
+