Implement deleting dashboard blocks.

* Refactor blocks so that they have a separate id vs css_id.  This way
  we can have a unique identifier for each visual block.

* Store blocks with a random id as their unique identifier

* Add Admin_Dashboard::remove_block() and modify
  themes/admin_default/views/block.html.php to call it when you click the
  remove box.

2 files changed, 12 insertions, 12 deletions

diff --git a/core/helpers/core_dashboard.php b/core/helpers/core_dashboard.php
index d27ed01b..2e017351 100644
--- a/core/helpers/core_dashboard.php
+++ b/core/helpers/core_dashboard.php
@@ -32,13 +32,13 @@ class core_dashboard_Core {
     $block = new Block();
     switch($block_id) {
     case "welcome":
-      $block->id = "gWelcome";
+      $block->css_id = "gWelcome";
       $block->title = t("Welcome to Gallery3");
       $block->content = new View("admin_block_welcome.html");
       break;
 
     case "photo_stream":
-      $block->id = "gPhotoStream";
+      $block->css_id = "gPhotoStream";
       $block->title = t("Photo Stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
@@ -46,14 +46,14 @@ class core_dashboard_Core {
       break;
 
     case "log_entries":
-      $block->id = "gLogEntries";
+      $block->css_id = "gLogEntries";
       $block->title = t("Log Entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")->orderby("timestamp", "desc")->find_all(5);
         break;
 
     case "stats":
-      $block->id = "gStats";
+      $block->css_id = "gStats";
       $block->title = t("Gallery Stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count = ORM::factory("item")->where("type", "album")->count_all();
@@ -61,13 +61,13 @@ class core_dashboard_Core {
       break;
 
     case "platform_info":
-      $block->id = "gPlatform";
+      $block->css_id = "gPlatform";
       $block->title = t("Platform Information");
       $block->content = new View("admin_block_platform.html");
       break;
 
     case "project_news":
-      $block->id = "gProjectNews";
+      $block->css_id = "gProjectNews";
       $block->title = t("Gallery Project News");
       $block->content = new View("admin_block_news.html");
       $block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3);
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index 0da8bc3e..e809d687 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -236,12 +236,12 @@ class core_installer {
 
       module::set_var(
         "core", "dashboard_blocks", serialize(
-          array("sidebar" => array(array("core", "stats"),
-                                   array("core", "platform_info"),
-                                   array("core", "project_news")),
-                "main" => array(array("core", "welcome"),
-                                array("core", "photo_stream"),
-                                array("core", "log_entries")))));
+          array("sidebar" => array(rand() => array("core", "stats"),
+                                   rand() => array("core", "platform_info"),
+                                   rand() => array("core", "project_news")),
+                "main" => array(rand() => array("core", "welcome"),
+                                rand() => array("core", "photo_stream"),
+                                rand() => array("core", "log_entries")))));
 
       module::set_version("core", 1);
       module::set_var("core", "version", "3.0");