diff --git a/module/block/control.php b/module/block/control.php index 6a76319fff..c6d52df56a 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -332,7 +332,14 @@ class block extends control $html = ''; if($block->block == 'html') { - $html = "
" . htmlspecialchars_decode($block->params->html) .'
'; + if (empty($block->params->html)) + { + $html = "
" . $this->lang->block->emptyTip . "
"; + } + else + { + $html = "
" . htmlspecialchars_decode($block->params->html) .'
'; + } } elseif($block->source != '') { diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 9616e22104..58e91635cd 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -42,6 +42,7 @@ $lang->block->myProject = 'My ' . $lang->projectCommon; $lang->block->myProduct = 'My ' . $lang->productCommon; $lang->block->delayed = 'Delayed'; $lang->block->noData = 'There is no data in this type of reports.'; +$lang->block->emptyTip = 'No Information'; $lang->block->params = new stdclass(); $lang->block->params->name = 'Name'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index acdb37f325..da14df07cb 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -42,6 +42,7 @@ $lang->block->myProject = '进行中的' . $lang->projectCommon; $lang->block->myProduct = '未关闭的' . $lang->productCommon; $lang->block->delayed = '已延期'; $lang->block->noData = '当前统计类型下暂无数据'; +$lang->block->emptyTip = '暂无信息'; $lang->block->params = new stdclass(); $lang->block->params->name = '参数名称'; diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index dac3ec7a15..91e906ff5a 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -10,6 +10,9 @@ * @link http://www.ranzhi.org */ ?> + +
block->emptyTip;?>
+ @@ -47,3 +50,4 @@ + diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index ccc30cca35..f8901654f8 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -10,6 +10,9 @@ * @link http://www.zentao.net */ ?> + +
" . $lang->project->create, '', "class='btn btn-primary'")?>
+
@@ -65,3 +68,4 @@
+ diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index 14bc3a6131..9db4c9ccbf 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -10,6 +10,9 @@ * @link http://www.ranzhi.org */ ?> + +
block->emptyTip;?>
+
@@ -53,3 +56,4 @@
+ diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index fef6bd6249..12f8307528 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -10,6 +10,9 @@ * @link http://www.ranzhi.org */ ?> + +
block->emptyTip;?>
+