aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-03-11 01:12:13 +0000
committerThomas Willingham <founder@kakste.com>2013-03-11 01:12:13 +0000
commit9834df13c96caa975a4e2de93452828db2a8c76b (patch)
treeffb45298553b504daaa6b3665718f7dc7a9ea4fb /view
parentf96125117649036279cfd2b66a4b64f3ca3a724e (diff)
downloadvolse-hubzilla-9834df13c96caa975a4e2de93452828db2a8c76b.tar.gz
volse-hubzilla-9834df13c96caa975a4e2de93452828db2a8c76b.tar.bz2
volse-hubzilla-9834df13c96caa975a4e2de93452828db2a8c76b.zip
Make idiot mode colour schemes work.
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/php/config.php6
-rw-r--r--view/theme/redbasic/php/style.php8
2 files changed, 11 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 73d993d6c..21399945c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -15,7 +15,8 @@ function theme_content(&$a) {
$linkcolour = get_pconfig(local_user(), 'redbasic', 'linkcolour');
$iconset = get_pconfig(local_user(), 'redbasic', 'iconset');
$shiny = get_pconfig(local_user(), 'redbasic', 'shiny');
- return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny);
+ $colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme');
+ return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme);
}
function theme_post(&$a) {
@@ -31,6 +32,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'linkcolour', $_POST['redbasic_linkcolour']);
set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']);
set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']);
+ set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']);
}
}
@@ -65,7 +67,7 @@ function theme_post(&$a) {
//}
// These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode.
-function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny) {
+function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme) {
$line_heights = array(
"1.3" => "1.3",
"---" => "---",
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index dcc63106a..6e8bd8a18 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -34,8 +34,14 @@
$displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle");
$linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour");
$shiny = get_pconfig(local_user(), "redbasic", "shiny");
+ if (! feature_enabled(local_user(),'expert')) {$colour_scheme = get_pconfig(local_user(), "redbasic", "colour_scheme");}
}
+ // In non-expert mode, we just let them choose font size, line height, and a colour scheme. A colour scheme is just a pre-defined set of the above variables.
+ // But only apply these settings in non-expert mode to prevent confusion when turning expert mode on and off.
+ if(! feature_enabled(local_user(),'expert')) {
+ if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $shadows = true; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";}
+}
// This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings.
// eg, if ($redbasic_font_size === false) {$redbasic_font_size = get_pconfig(local_user(), "global", "font_size"); If it's not set, we'll just use the CSS with no changes.
@@ -64,7 +70,7 @@
}
echo "\r\n";
-// use $colour_scheme (not yet implemented) for idiot mode.
+// use $colour_scheme for idiot mode.
if($colour === "dark") {if (file_exists('view/theme/' . current_theme() . '/css/dark.css')) {
$dark = (file_get_contents('view/theme/' . current_theme() . '/css/dark.css'));
echo "$dark";}