From eaac0f8e58774a67fd9257ee0cd46c786cb5718b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 23 May 2009 23:09:33 -0400
Subject: add an action base class for actions that show the owner's design

---
 lib/ownerdesignaction.php | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 lib/ownerdesignaction.php

(limited to 'lib/ownerdesignaction.php')

diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
new file mode 100644
index 000000000..c47633bdb
--- /dev/null
+++ b/lib/ownerdesignaction.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for actions that use the page owner's design
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for actions that use the page owner's design
+ *
+ * Some pages have a clear "owner" -- like the profile page, subscriptions
+ * pages, etc. This superclass uses that owner's chosen design for the page
+ * design.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ */
+
+class OwnerDesignAction extends Action {
+
+    /** The user for this page. */
+
+    var $user = null;
+
+    /**
+     * A design for this action
+     *
+     * if the user attribute has been set, returns that user's
+     * design.
+     *
+     * @return Design a design object to use
+     */
+
+    function getDesign()
+    {
+        if (empty($this->user)) {
+            return null;
+        }
+
+        return $this->user->getDesign();
+    }
+}
-- 
cgit v1.2.3-54-g00ecf


From ef99f83963ba598b1e52224ce80a7d8a8e84a96f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 15 Jun 2009 22:13:35 -0700
Subject: Output custom stylesheets on design sub-Actions

---
 classes/Design.php              |  2 +-
 lib/currentuserdesignaction.php | 16 ++++++++++++++++
 lib/ownerdesignaction.php       | 13 +++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'lib/ownerdesignaction.php')

diff --git a/classes/Design.php b/classes/Design.php
index bb1e917e3..4f6b2a844 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -47,7 +47,7 @@ class Design extends Memcached_DataObject
 
     function showCSS($out)
     {
-        $out->element('stylesheet', array('type' => 'text/css'),
+        $out->element('style', array('type' => 'text/css'),
                       'body { background-color: #' . dechex($this->backgroundcolor) . '} '."\n".
                       '#content { background-color #' . dechex($this->contentcolor) . '} '."\n".
                       '#aside_primary { background-color #'. dechex($this->sidebarcolor) .'} '."\n".
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 297525655..40502bc77 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -47,6 +47,20 @@ if (!defined('LACONICA')) {
 
 class CurrentUserDesignAction extends Action
 {
+
+    /**
+      * Show the user's design stylesheet
+      *
+      * @return nothing
+      */
+     function showStylesheets()
+     {
+         parent::showStylesheets();
+
+         $design = $this->getDesign();
+         $design->showCSS($this);
+     }
+
     /**
      * A design for this action
      *
@@ -66,4 +80,6 @@ class CurrentUserDesignAction extends Action
 
         return $cur->getDesign();
     }
+
+
 }
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index c47633bdb..b6b30a606 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -52,6 +52,19 @@ class OwnerDesignAction extends Action {
 
     var $user = null;
 
+    /**
+      * Show the owner's design stylesheet
+      *
+      * @return nothing
+      */
+     function showStylesheets()
+     {
+         parent::showStylesheets();
+
+         $design = $this->getDesign();
+         $design->showCSS($this);
+     }
+
     /**
      * A design for this action
      *
-- 
cgit v1.2.3-54-g00ecf


From c3c30aa0eafd42cf6544cb32614ffe164bfd9ca2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 15 Jun 2009 23:18:54 -0700
Subject: Check to make sure a design exists before trying to display it

---
 lib/currentuserdesignaction.php | 5 ++++-
 lib/ownerdesignaction.php       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/ownerdesignaction.php')

diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 40502bc77..7c2520cf6 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -58,7 +58,10 @@ class CurrentUserDesignAction extends Action
          parent::showStylesheets();
 
          $design = $this->getDesign();
-         $design->showCSS($this);
+
+         if (!empty($design)) {
+             $design->showCSS($this);
+         }
      }
 
     /**
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index b6b30a606..424474f42 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -62,7 +62,10 @@ class OwnerDesignAction extends Action {
          parent::showStylesheets();
 
          $design = $this->getDesign();
-         $design->showCSS($this);
+
+         if (!empty($design)) {
+             $design->showCSS($this);
+        }
      }
 
     /**
-- 
cgit v1.2.3-54-g00ecf