diff --git a/module/block/css/admin.css b/module/block/css/admin.css index 0768b6323a..af8261c052 100644 --- a/module/block/css/admin.css +++ b/module/block/css/admin.css @@ -3,3 +3,4 @@ .dropdown-menu.colors {padding: 5px; width: 205px} .dropdown-menu.buttons {padding: 5px; padding-bottom: 0; padding-right: 0;} .dropdown-menu.buttons > li {margin-bottom: 5px; display: block; float: left; width: 33.333333%; padding-right: 5px} +.table.table-form{margin-bottom:0px;} diff --git a/module/block/js/admin.js b/module/block/js/admin.js index 883c36a2ae..27ff73441b 100644 --- a/module/block/js/admin.js +++ b/module/block/js/admin.js @@ -15,12 +15,12 @@ function getBlocks(moduleID) if(moduleID.indexOf('hiddenBlock') != -1) { - getRssAndHtmlParams('html', moduleID.replace('hiddenBlock', '')); + getNotSourceParams('html', moduleID.replace('hiddenBlock', '')); return true; } if(moduleID == 'html' || moduleID == 'dynamic' || moduleID == 'flowchart') { - getRssAndHtmlParams(moduleID); + getNotSourceParams(moduleID); return true; } @@ -28,6 +28,7 @@ function getBlocks(moduleID) { $(moduleBlock).html(data); $(moduleBlock).show(); + $.ajustModalPosition(); }) } @@ -38,11 +39,13 @@ function getBlocks(moduleID) * @access public * @return void */ -function getRssAndHtmlParams(type) +function getNotSourceParams(type, blockID) { + blockID = typeof(blockID) == 'undefined' ? 0 : blockID; $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type), function(data) { $('#blockParam').html(data); + $.ajustModalPosition(); }); } @@ -60,6 +63,7 @@ function getBlockParams(type, moduleID) $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type + '&source=' + moduleID), function(data) { $('#blockParam').html(data); + $.ajustModalPosition(); }); } diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 8ff63ed654..344389b3a0 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -14,7 +14,8 @@ function deleteBlock(index) alert(data.message); return false; } - else {checkEmpty();} + + checkEmpty(); }) } @@ -103,6 +104,26 @@ function checkRefreshProgress($dashboard, doneCallback) if($dashboard.find('.panel-loading').length) setTimeout(function() {checkRefreshProgress($dashboard, doneCallback);}, 500); else doneCallback(); } +/** + * Hidden block. + * + * @param index $index + * @access public + * @return void + */ +function hiddenBlock(index) +{ + $.getJSON(createLink('block', 'delete', 'index=' + index + '&module=' + module + '&type=hidden'), function(data) + { + if(data.result != 'success') + { + alert(data.message); + return false; + } + + $('#dashboard #block' + index).addClass('hidden'); + }) +} $(function() { diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 5c7fb617aa..3e8bdde95e 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -33,6 +33,7 @@ $lang->block->ordersSaved = 'Sort have been saved'; $lang->block->confirmRemoveBlock = 'Are you sure remove block [{0}] ?'; $lang->block->emptyMessage = 'Nothing here, custom it now!'; $lang->block->refresh = 'Refresh'; +$lang->block->hidden = 'Hidden'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; $lang->block->default['product']['1']['title'] = $lang->productCommon . ' list'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 3c702230ef..cc2be9d763 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -33,6 +33,7 @@ $lang->block->ordersSaved = '排序已保存'; $lang->block->confirmRemoveBlock = '确定移除区块【{0}】吗?'; $lang->block->emptyMessage = '这里什么也没有。快来定制你的页面!'; $lang->block->refresh = '刷新'; +$lang->block->hidden = '隐藏'; $lang->block->dynamicInfo = "%s, %s %s %s %s。"; $lang->block->default['product']['1']['title'] = '未关闭的' . $lang->productCommon; diff --git a/module/block/model.php b/module/block/model.php index d0c9790190..c1998bbf2c 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -36,6 +36,12 @@ class blockModel extends model ->setDefault('params', array()) ->get(); + if($type == 'html') + { + $data->params['html'] = $data->html; + unset($data->html); + } + $data->params = helper::jsonEncode($data->params); $this->dao->replace(TABLE_BLOCK)->data($data)->exec(); } diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 13fc6eb98b..88b257f526 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -15,12 +15,11 @@ $jsRoot = $webRoot . "js/"; $themeRoot = $webRoot . "theme/"; if(isset($pageCSS)) css::internal($pageCSS); ?> -