Move the "status messages" section into its own block.

3 files changed, 42 insertions, 11 deletions

diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index 7f0bb50a..b5f7ccf4 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -35,7 +35,15 @@ class core_block_Core {
     $block->id = "gWelcome";
     $block->title = _("Welcome to Gallery3");
     $block->content = new View("admin_block_welcome.html");
-    return $block;
+    $blocks[] = $block;
+
+    $block = new Block();
+    $block->id = "gMessages";
+    $block->title = _("Status Messages");
+    $block->content = new View("admin_block_messages.html");
+    $blocks[] = $block;
+
+    return implode("\n", $blocks);
   }
 
   public static function admin_sidebar_blocks($theme) {
diff --git a/core/views/admin_block_messages.html.php b/core/views/admin_block_messages.html.php
new file mode 100644
index 00000000..ee97c2c1
--- /dev/null
+++ b/core/views/admin_block_messages.html.php
@@ -0,0 +1,33 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<ul>
+  <li class="gWarning">
+    <a href="#" title="">
+      Gallery 3.1 is available, you're running Gallery 3.0. Update now!
+    </a>
+  </li>
+  <li class="gError">
+    <a href="#" title="">
+      Unable to write to /home/username/gallery3/var
+    </a>
+  </li>
+  <li class="gSuccess">
+    <a href="#" title="">
+      Permissions issues fixed
+    </a>
+  </li>
+  <li class="gInfo">
+    <a href="#" title="">
+      Just a plain information message
+    </a>
+  </li>
+  <li class="gHelp">
+    <a href="#" title="">
+      Contextual help or tip<br/>
+      And here's a second line
+    </a>
+  </li>
+</ul>
+
+
+
+
diff --git a/core/views/admin_dashboard.html.php b/core/views/admin_dashboard.html.php
index 4603a8bf..0bf62359 100644
--- a/core/views/admin_dashboard.html.php
+++ b/core/views/admin_dashboard.html.php
@@ -1,15 +1,5 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <?= $theme->dashboard_blocks(); ?>
-<div class="gBlock">
-  <h2>Status Messages</h2>
-  <ul class="gBlockContent gMessages">
-    <li class="gWarning"><a href="#" title="">Gallery 3.1 is available, you're running Gallery 3.0. Update now!</a></li>
-    <li class="gError"><a href="#" title="">Unable to write to /home/username/gallery3/var</a></li>
-    <li class="gSuccess"><a href="#" title="">Permissions issues fixed</a></li>
-    <li class="gInfo"><a href="#" title="">Just a plain information message</a></li>
-    <li class="gHelp"><a href="#" title="">Contextual help or tip<br/>And here's a second line</a></li>
-  </ul>
-</div>
 
 <div id="gPhotoStream" class="gBlock">
   <h2>Photo Stream</h2>