diff options
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/config.php | 109 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 109 |
2 files changed, 173 insertions, 45 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ad5df57ce..24bdc7794 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -4,13 +4,20 @@ */ function theme_content(&$a) { + // Doesn't yet work for anyone other than the channel owner, and stupid mode isn't finished, so return both for now. if(!local_user()) { return; } - + if(! feature_enabled(local_user(),'expert')) {return;} + $font_size = get_pconfig(local_user(),'redbasic', 'font_size' ); $line_height = get_pconfig(local_user(), 'redbasic', 'line_height' ); $colour = get_pconfig(local_user(), 'redbasic', 'colour' ); - - return redbasic_form($a, $font_size, $line_height, $colour); + $shadow = get_pconfig(local_user(), 'redbasic', 'shadow' ); + $navcolour = get_pconfig(local_user(), 'redbasic', 'navcolour'); + $displaystyle = get_pconfig(local_user(), 'redbasic', 'displaystyle'); + $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); } function theme_post(&$a) { @@ -20,26 +27,47 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']); set_pconfig(local_user(), 'redbasic', 'colour', $_POST['redbasic_colour']); + set_pconfig(local_user(), 'redbasic', 'shadow', $_POST['redbasic_shadow']); + set_pconfig(local_user(), 'redbasic', 'navcolour', $_POST['redbasic_navcolour']); + set_pconfig(local_user(), 'redbasic', 'displaystyle', $_POST['redbasic_displaystyle']); + 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']); } } -function theme_admin(&$a) { - $font_size = get_config('redbasic', 'font_size' ); - $line_height = get_config('redbasic', 'line_height' ); - $colour = get_config('redbasic', 'colour' ); - - return redbasic_form($a, $font_size, $line_height, $colour); -} +// We probably don't want these if we're having global settings, but we'll comment out for now, just in case +//function theme_admin(&$a) { $font_size = get_config('redbasic', 'font_size' ); +// $line_height = get_config('redbasic', 'line_height' ); +// $colour = get_config('redbasic', 'colour' ); +// $shadow = get_config('redbasic', 'shadow' ); +// $navcolour = get_config('redbasic', 'navcolour' ); +// $opaquenav = get_config('redbasic', 'opaquenav' ); +// $itemstyle = get_config('redbasic', 'itemstyle' ); +// $linkcolour = get_config('redbasic', 'linkcolour' ); +// $iconset = get_config('redbasic', 'iconset' ); +// $shiny = get_config('redbasic', 'shiny' ); +// +// return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $itemstyle, $linkcolour, $iconset, $shiny); +//} -function theme_admin_post(&$a) { - if (isset($_POST['redbasic-settings-submit'])) { - set_config('redbasic', 'font_size', $_POST['redbasic_font_size']); - set_config('redbasic', 'line_height', $_POST['redbasic_line_height']); - set_config('redbasic', 'colour', $_POST['redbasic_colour']); - } -} +//function theme_admin_post(&$a) { +// if (isset($_POST['redbasic-settings-submit'])) { +// set_config('redbasic', 'font_size', $_POST['redbasic_font_size']); +// set_config('redbasic', 'line_height', $_POST['redbasic_line_height']); +// set_config('redbasic', 'colour', $_POST['redbasic_colour']); +// set_config('redbasic', 'shadow', $_POST['redbasic_shadow']); +// set_config('redbasic', 'navcolour', $_POST['redbasic_navcolour']); +// set_config('redbasic', 'opaquenav', $_POST['redbasic_opaquenav']); +// set_config('redbasic', 'itemstyle', $_POST['redbasic_itemstyle']); +// set_config('redbasic', 'linkcolour', $_POST['redbasic_linkcolour']); +// set_config('redbasic', 'iconset', $_POST['redbasic_iconset']); +// set_config('redbasic', 'shiny', $_POST['redbasic_shiny']); +// } +//} -function redbasic_form(&$a, $font_size, $line_height, $colour) { +// 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) { $line_heights = array( "1.3" => "1.3", "---" => "---", @@ -61,19 +89,54 @@ function redbasic_form(&$a, $font_size, $line_height, $colour) { '12' => '12', ); $colours = array( - 'light' => 'light', - 'dark' => 'dark', + 'redbasic' => 'light', + 'fancyred' => 'dark', + ); + + $shadows = array( + 'true' => 'Yes', + 'false' => 'No', ); - $t = get_markup_template('theme_settings.tpl'); - $o .= replace_macros($t, array( + $navcolours = array ( + 'red' => 'red', + 'black' => 'black', + ); + + $displaystyles = array ( + 'fancy' => 'fancy', + 'classic' => 'classic', + ); + + $linkcolours = array ( + 'blue' => 'blue', + 'red' => 'red', + ); + + $iconsets = array ( + 'default' => 'default', + ); + + $shinys = array ( + 'none' => 'none', + 'opaque' => 'opaque', + ); + if(feature_enabled(local_user(),'expert')) { + $t = get_markup_template('theme_settings.tpl'); + $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), '$title' => t("Theme settings"), '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), '$line_height' => array('redbasic_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), '$colour' => array('redbasic_colour', t('Set colour scheme'), $colour, '', $colours), - )); + '$shadow' => array('redbasic_shadow', t('Draw shadows'), $shadow, '', $shadows), + '$navcolour' => array('redbasic_navcolour', t('Navigation bar colour'), $navcolour, '', $navcolours), + '$displaystyle' => array('redbasic_displaystyle', t('Display style'), $displaystyle, '', $displaystyles), + '$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours), + '$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets), + '$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys), + ));} return $o; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 99ad06c55..450cabc7c 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,46 +1,111 @@ <?php + // This needs changing now, if we're going for global settings. Admin settings have been removed in preparation, You *should* just be able to remove all + // 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. + $line_height = false; $redbasic_font_size = false; $resolution = false; $colour = false; + $shadows = false; + $navcolour = false; + $nav_bg_1 = "f88"; + $nav_bg_2 = "b00"; + $displaystyle = false; + $linkcolour = false; + $shiny = false; $site_line_height = get_config("redbasic","line_height"); $site_redbasic_font_size = get_config("redbasic", "font_size" ); $site_colour = get_config("redbasic", "colour" ); - + $shadows = get_config("redbasic", "shadow" ); + $navcolour = get_config("redbasic", "navcolour" ); + $displaystyle = get_config("redbasic", "displaystyle" ); + $linkcolour = get_config("redbasic", "linkcolour" ); + $shiny = get_config("redbasic", "shiny" ); + if (local_user()) { $line_height = get_pconfig(local_user(), "redbasic","line_height"); $redbasic_font_size = get_pconfig(local_user(), "redbasic", "font_size"); $colour = get_pconfig(local_user(), "redbasic", "colour"); + $shadows = get_pconfig(local_user(), "redbasic", "shadow"); + $navcolour = get_pconfig(local_user(), "redbasic", "navcolour"); + $displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle"); + $linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour"); + $shiny = get_pconfig(local_user(), "redbasic", "shiny"); } - if ($line_height === false) { - $line_height = $site_line_height; - } - if ($line_height === false) { - $line_height = "1.2"; - } - if ($redbasic_font_size === false) { - $redbasic_font_size = $site_redbasic_font_size; - } - if ($redbasic_font_size === false) { - $redbasic_font_size = "12"; - } - if ($colour === false) { - $colour = $site_colour; - } - if($colour === false) { - $colour = "light"; - } - + +// 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. +// Then all you need to do is add a "Global Settings" tab to settings/display, and make an equivalent of theme_settings.tpl and config.php to be loaded there. Easy. + + if ($line_height === false) {$line_height = $site_line_height;} + if ($line_height === false) {$line_height = "1.2";} + if ($redbasic_font_size === false) {$redbasic_font_size = $site_redbasic_font_size;} + if ($redbasic_font_size === false) {$redbasic_font_size = "12";} + if ($colour === false) {$colour = $site_colour;} + if ($colour === false) {$colour = "light";} + if ($navcolour === "black") {$nav_bg_1 = "000"; + $nav_bg_2 = "2e2f2e";} + if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { echo file_get_contents('view/theme/' . current_theme() . '/css/style.css'); } echo "\r\n"; - if(($redbasic_font_size >= 10.0) && ($redbasic_font_size <= 16.0)) { + //if($colour != "light" { grab the contents of file $colour which doesn't exist yet, and echo it when it does} + //see the displaystyle bit to see how this works. + //Then, grab the "Light" PCSS from KakSte Friendica theme, flip the colours, and the job is 90% done + //$colour_scheme (not yet implemented) should be used for idiot mode + + +// Enforce sane limits for expert mode - otherwise we'll end up with "experts" who think font size is a percentage. + + if(($redbasic_font_size >= 8.0) && ($redbasic_font_size <= 20.0)) { echo ".wall-item-content { font-size: $redbasic_font_size; }\r\n"; } - if(($line_height >= 1.0) && ($line_height <= 1.5)) { + if(($line_height >= 1.0) && ($line_height <= 2.0)) { echo ".wall-item-content { line-height: $line_height; }\r\n"; } + + +// Minimum value shadows - they shouldn't all be the same size; just get it working, clean up later. + if($shadows === "true") { + echo "code, blockquote, .wall-item-content-wrapper, .wall-item-content-wrapper.comment, .wall-item-content img, #profile-jot-perms, #profile-jot-submit, .tab, .tab.active, .settings-widget li, .wall-item-photo, .photo, .contact-block-img, .my-comment-photo, #posted-date-selector:hover, .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .group-selected, .nets-selected, .fileas-selected, .categories-selected { + box-shadow: 5px 5px 5px #111;}\r\n + + .tab.active, #jot-title, #jot-category, .comment-edit-text-empty, .comment-edit-text-full, iframe#profile-jot-text_ifr, #profile-jot-text { + box-shadow: 5px 5px 5px #666 inset;}\r\n"; + + } + +// Since every change would otherwise require five lines, it's simpler to just set a default and echo this without first checking if we've set it. + echo "nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%); + background-image: -o-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%); + background-image: -moz-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%) !important; + background-image: -webkit-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%); + background-image: -ms-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);}"; + +// This takes quite a lot of code, so we'll keep it in a separate file, and echo the lot. Devs still don't have to worry about - it's just overrides. +// Theme devs can play with it without facing scary PHP. + + if ($displaystyle === "fancy") + {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) { + $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css')); + echo "$fancy";} + } + +// Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums +// until one of us works out what they've done. + + if ($linkcolour != false) { + echo "a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {color: #$linkcolour;}\r\n"; + } + +// If you want a shiny that just sets a different colour, add an if $shiny != false and handle it as the linkcolour above. + + if ($shiny === opaque) { + echo "div.wall-item-content-wrapper.shiny {opacity: 1;}\r\n + .wall-item-content-wrapper {opacity: 0.8;}"; + }
\ No newline at end of file |