summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-15 22:13:35 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-15 22:13:35 -0700
commitef99f83963ba598b1e52224ce80a7d8a8e84a96f (patch)
treec107a91a1e49a844c9871113d50b6e7ac59fb490
parent44343986c31b20158ef07438f85a6bf35b93a3ab (diff)
Output custom stylesheets on design sub-Actions
-rw-r--r--classes/Design.php2
-rw-r--r--lib/currentuserdesignaction.php16
-rw-r--r--lib/ownerdesignaction.php13
3 files changed, 30 insertions, 1 deletions
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
@@ -53,6 +53,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
*
* if the user attribute has been set, returns that user's