* change for block.

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;}

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();
     });
 }
 

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()
 {

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 <em>%s</em> %s <a href='%s'>%s</a>.";
 
 $lang->block->default['product']['1']['title'] = $lang->productCommon . ' list';

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 <em>%s</em> %s <a href='%s'>%s</a>。";
 
 $lang->block->default['product']['1']['title'] = '未关闭的' . $lang->productCommon;

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();
     }

module/block/view/dashboard.html.php

@@ -15,12 +15,11 @@ $jsRoot    = $webRoot . "js/";
 $themeRoot = $webRoot . "theme/";
 if(isset($pageCSS)) css::internal($pageCSS);
 ?>
-<?php include '../../common/view/sparkline.html.php';?>
 <div class='dashboard dashboard-draggable' id='dashboard' data-confirm-remove-block='<?php  echo $lang->block->confirmRemoveBlock;?>'>
-  <div class='dashboard-actions'><a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='600' data-title='<?php echo $lang->block->createBlock?>'><i class='icon icon-plus' title='<?php echo $lang->block->createBlock?>' data-toggle='tooltip' data-placement='left'></i></a></div>
+  <div class='dashboard-actions'><a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='700' data-title='<?php echo $lang->block->createBlock?>'><i class='icon icon-plus' title='<?php echo $lang->block->createBlock?>' data-toggle='tooltip' data-placement='left'></i></a></div>
   <div class='dashboard-empty-message hide'>
     <h5 class='text-success'><?php echo $lang->block->emptyMessage ?></h5>
-    <a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='600' class='btn btn-primary'><i class='icon icon-plus'></i> <?php echo $lang->block->createBlock?></a>
+    <a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='700' class='btn btn-primary'><i class='icon icon-plus'></i> <?php echo $lang->block->createBlock?></a>
   </div>
   <div class='row'>
     <?php foreach($blocks as $index => $block):?>
@@ -37,6 +36,9 @@ if(isset($pageCSS)) css::internal($pageCSS);
                 <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh ?></a></li>
                 <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module"); ?>" class='edit-block' data-title='<?php echo $block->title; ?>' data-icon='icon-pencil'><i class='icon-pencil'></i> <?php echo $lang->edit; ?></a></li>
                 <li><a href='javascript:;' class='remove-panel'><i class='icon-remove'></i> <?php echo $lang->delete; ?></a></li>
+                <?php if(!$block->source and $block->block == 'html'):?>
+                <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><i class='icon-eye-close'></i><?php echo $lang->block->hidden; ?></a></li>
+                <?php endif;?>
               </ul>
             </div>
           </div>