aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-17 02:01:35 -0700
committerfriendica <info@friendica.com>2013-07-17 02:01:35 -0700
commitd6133c861cfdaa4ec6a6f5fbb3b2a9062ad4bc91 (patch)
treea2a7321d028dd86469c21f7a7d4fee32fa280259 /view/theme
parent4c30cddbfc105c0ea60f30594b760633e654cb0c (diff)
downloadvolse-hubzilla-d6133c861cfdaa4ec6a6f5fbb3b2a9062ad4bc91.tar.gz
volse-hubzilla-d6133c861cfdaa4ec6a6f5fbb3b2a9062ad4bc91.tar.bz2
volse-hubzilla-d6133c861cfdaa4ec6a6f5fbb3b2a9062ad4bc91.zip
configurable theme precedence rules, and passing the page owner to the pcss theme settings.
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/php/config.php3
-rw-r--r--view/theme/redbasic/php/style.php6
2 files changed, 6 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 5917b1e36..4e7363362 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -23,7 +23,7 @@ function theme_content(&$a) {
function theme_post(&$a) {
if(!local_user()) { return; }
-
+
if (isset($_POST['redbasic-settings-submit'])) {
set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']);
@@ -37,6 +37,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']);
set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
}
+
}
// We probably don't want these if we're having global settings, but we'll comment out for now, just in case
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index e42770d17..8643925d3 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -3,9 +3,11 @@
// the get_config bits, though this is untested.
// We also need to eventually. Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like.
- $uid = get_controlling_channel_id();
- load_pconfig($uid,'redbasic');
+ $uid = get_theme_uid();
+
+ if($uid)
+ load_pconfig($uid,'redbasic');
$line_height = false;
$redbasic_font_size = false;