Oops, these files got left out of r18525.

3 files changed, 7 insertions, 2 deletions

diff --git a/core/controllers/album.php b/core/controllers/album.php
index 2b1ad067..abe9039a 100644
--- a/core/controllers/album.php
+++ b/core/controllers/album.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Album_Controller extends Template_Controller {
-  public $template = "album.html";
+  public $template = "page.html";
 
   public function View($id) {
     $item = ORM::factory("item")->where("id", $id)->find();
@@ -26,6 +26,8 @@ class Album_Controller extends Template_Controller {
       return Kohana::show_404();
     }
 
+    $this->template->content = new View("album.html");
+
     $this->template->set_global('item', $item);
     $this->template->set_global('children', $item->children());
     $this->template->set_global('parents', $item->parents());
diff --git a/core/controllers/photo.php b/core/controllers/photo.php
index 4c0ab975..6f746e65 100644
--- a/core/controllers/photo.php
+++ b/core/controllers/photo.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Photo_Controller extends Template_Controller {
-  public $template = "photo.html";
+  public $template = "page.html";
 
   public function View($id) {
     $item = ORM::factory("item")->where("id", $id)->find();
@@ -26,6 +26,8 @@ class Photo_Controller extends Template_Controller {
       return Kohana::show_404();
     }
 
+    $this->template->content = new View("photo.html");
+
     $this->template->set_global('item', $item);
     $this->template->set_global('children', $item->children());
     $this->template->set_global('parents', $item->parents());
diff --git a/themes/default/css/styles.css b/themes/default/css/styles.css
index 45729fcd..0f12b789 100644
--- a/themes/default/css/styles.css
+++ b/themes/default/css/styles.css
@@ -78,6 +78,7 @@ textarea {
  */
 
 /* ~~~~~ View Container ??? ~~~~~~ */
+.gView,
 .gAlbumView,
 .gItemView {
   background-color: #fff;