From ad9f5079cdef2dad629ef99751b03404f4acf0b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 12:40:04 +0100 Subject: [PATCH 1/6] do not destroy page layout if feature_encrypt is not enabled --- view/tpl/comment_item.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index b62b31033..49c6af764 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -49,9 +49,9 @@ - + {{if $feature_encrypt}} - +
From db355db9a6fe2bb369ca464391a010d992b72447 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 15:33:15 +0100 Subject: [PATCH 2/6] remove $abook_changebg from style.css --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 4 +--- view/theme/redbasic/schema/dark.css | 4 +++- view/theme/redbasic/schema/dark.php | 2 -- view/theme/redbasic/schema/simple_black_on_white.css | 4 +++- view/theme/redbasic/schema/simple_black_on_white.php | 2 -- view/theme/redbasic/schema/simple_green_on_black.css | 4 ++++ view/theme/redbasic/schema/simple_green_on_black.php | 2 -- view/theme/redbasic/schema/simple_white_on_black.css | 3 +++ view/theme/redbasic/schema/simple_white_on_black.php | 2 -- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d3d3882e4..a7f2a6754 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1853,7 +1853,7 @@ img.mail-list-sender-photo { } .abook-pending-contact, .abook-permschange { - background: $abook_changebg; + background: orange; } .online-now { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a18812857..c71c1110b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -288,8 +288,7 @@ if(! $a->install) { $dirpopup_txtcol=""; if (!$dirpopup_linkcol) $dirpopup_linkcol=""; - if (!$abook_changebg) - $abook_changebg="orange"; + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; @@ -422,7 +421,6 @@ $options = array ( '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, -'$abook_changebg' => $abook_changebg, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 853cd35a3..6817f756f 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -10,4 +10,6 @@ border-bottom: 1px solid #333; } - +.abook-pending-contact, .abook-permschange { + background: #402900; +} diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 3f462a311..93aa3ecf8 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#111"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#402900"; diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 6db85e19d..3242f3543 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -10,4 +10,6 @@ border-bottom: 1px solid #fff; } - +.abook-pending-contact, .abook-permschange { + background: #fff; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 7c8a18217..c34bd8d5d 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#fff"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#fff"; - if (!$abook_changebg) - $abook_changebg="#fff"; diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 5360fceb4..439e460aa 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -10,4 +10,8 @@ border-bottom: 1px solid #000; } +.abook-pending-contact, .abook-permschange { + background: #000; +} + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index eedd6b2b7..f07a21af9 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -184,5 +184,3 @@ if (! $navaside_bghover) $dirpopup_txtcol="#000"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#000"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 5360fceb4..c6820ba8c 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -10,4 +10,7 @@ border-bottom: 1px solid #000; } +.abook-pending-contact, .abook-permschange { + background: #000; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index beef5e49e..5ac9aa3a1 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#000"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#000"; From d1dd883d8868d25e1be0a67723210b5171f3a449 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 16:17:01 +0100 Subject: [PATCH 3/6] remove more $vars from style.css --- view/theme/redbasic/css/style.css | 31 +++------------ view/theme/redbasic/php/style.php | 26 ------------- view/theme/redbasic/schema/dark.css | 38 +++++++++++++++++++ view/theme/redbasic/schema/dark.php | 26 ------------- .../redbasic/schema/simple_black_on_white.css | 38 +++++++++++++++++++ .../redbasic/schema/simple_black_on_white.php | 26 ------------- .../redbasic/schema/simple_green_on_black.css | 37 ++++++++++++++++++ .../redbasic/schema/simple_green_on_black.php | 26 ------------- .../redbasic/schema/simple_white_on_black.css | 38 +++++++++++++++++++ .../redbasic/schema/simple_white_on_black.php | 26 ------------- 10 files changed, 156 insertions(+), 156 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a7f2a6754..f1807da83 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -493,18 +493,10 @@ footer { font-size: 0.7em; } -#cboxContent { - color: $dirpopup_txtcol; -} - #colorbox { padding: 5px; } -#cboxContent a { - color: $dirpopup_linkcol; -} - .app-name { overflow: none; } @@ -967,12 +959,12 @@ nav .acpopup { } .fc-state-highlight { - background: none repeat scroll 0% 0% $cal_bgcolour !important; + background: none repeat scroll 0% 0% #FCF8E3 !important; } #colorbox { - border: 0px solid $fancybox_bgcolour; - background-color: $fancybox_bgcolour; + border: 0px solid #fff; + background-color: #fff; z-index: 9; } @@ -1590,7 +1582,7 @@ text-decoration: none; } #adminpage table tr:hover { - background-color: $admintable_hoverbgcol; + background-color: #BBC7D7; } table { @@ -1867,7 +1859,7 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; - background-color: $chat_txtbgcol; + background-color: #eee; } /* nav bootstrap */ @@ -2194,19 +2186,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { text-decoration: none; } -.alert-info { - color: $alert_txtcolour; - background-color:$alert_bgcolour; - border-color: $alert_bordercol; - background-image: linear-gradient(to bottom, $alert_bgcolour 0px, $alert_gradientcol 100%); -} - -.well { - background-color: $advperm_bgcolour; - border: 1px solid $advperm_bordercol; - background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); -} - @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c71c1110b..8789e2e9b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -262,32 +262,6 @@ if(! $a->install) { $reply_photo = '32px'; if(! $infomess_bgcolour) $infomess_bgcolour = "#F0F0F0"; - if(! $alert_txtcolour) - $alert_txtcolour = "#31708F"; - if(! $alert_bgcolour) - $alert_bgcolour = "#D9EDF7"; - if(! $alert_bordercol) - $alert_bordercol = "#BCE8F1"; - if(! $alert_gradientcol) - $alert_gradientcol = "#B9DEF0"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#F5F5F5"; - if(! $advperm_bordercol) - $advperm_bordercol = "#E3E3E3"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#E8E8E8"; - if(! $cal_bgcolour) - $cal_bgcolour = "#FCF8E3"; - if(! $chat_txtbgcol) - $chat_txtbgcol = "#EEE"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#FFFFFF"; - if (!$admintable_hoverbgcol) - $admintable_hoverbgcol="#BBC7D7"; - if (!$dirpopup_txtcol) - $dirpopup_txtcol=""; - if (!$dirpopup_linkcol) - $dirpopup_linkcol=""; if($nav_min_opacity === false || $nav_min_opacity === '') { diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 6817f756f..e64add844 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -13,3 +13,41 @@ .abook-pending-contact, .abook-permschange { background: #402900; } + +#cboxContent a { + color: #000; +} + +#cboxContent { + color: #111; +} + +#adminpage table tr:hover { + background-color: #222; +} + +#colorbox { + border: 0px solid #1E1E1E; + background-color: #1E1E1E; +} + +.chat-item-text { + background-color: #222; +} + +.fc-state-highlight { + background: none repeat scroll 0% 0% #333 !important; +} + +.well { + background-color: #1E1E1E; + border: 1px solid #222; + background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%); +} + +.alert-info { + color: #CCC; + background-color:#333; + border-color: #444; + background-image: linear-gradient(to bottom, #333 0px, #333 100%); +} diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 93aa3ecf8..bd213de34 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -158,29 +158,3 @@ $abookself_bgcolour = "#251111"; if(! $infomess_bgcolour) $infomess_bgcolour = "#333"; - if(! $alert_txtcolour) - $alert_txtcolour = "#CCC"; - if(! $alert_bgcolour) - $alert_bgcolour = "#333"; - if(! $alert_bordercol) - $alert_bordercol = "#444"; - if(! $alert_gradientcol) - $alert_gradientcol = "#333"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#1E1E1E"; - if(! $advperm_bordercol) - $advperm_bordercol = "#222"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#1E1E1E"; - if(! $cal_bgcolour) - $cal_bgcolour = "#333"; - if(! $chat_txtbgcol) - $chat_txtbgcol = "#222"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#1E1E1E"; - if (!$admintable_hoverbgcol) - $admintable_hoverbgcol="#222"; - if (!$dirpopup_txtcol) - $dirpopup_txtcol="#111"; - if (!$dirpopup_linkcol) - $dirpopup_linkcol="#000"; diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 3242f3543..1a29ed6f2 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -13,3 +13,41 @@ .abook-pending-contact, .abook-permschange { background: #fff; } + +#cboxContent a { + color: #fff; +} + +#cboxContent { + color: #fff; +} + +#adminpage table tr:hover { + background-color: #fff; +} + +#colorbox { + border: 0px solid #fff; + background-color: #fff; +} + +.chat-item-text { + background-color: #fff; +} + +.fc-state-highlight { + background: none repeat scroll 0% 0% #fff !important; +} + +.well { + background-color: #fff; + border: 1px solid #000; + background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); +} + +.alert-info { + color: #000; + background-color:#fff; + border-color: #000; + background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index c34bd8d5d..55e92f9e6 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -158,29 +158,3 @@ $abookself_bgcolour = "#fff"; if(! $infomess_bgcolour) $infomess_bgcolour = "#fff"; - if(! $alert_txtcolour) - $alert_txtcolour = "#000"; - if(! $alert_bgcolour) - $alert_bgcolour = "#fff"; - if(! $alert_bordercol) - $alert_bordercol = "#000"; - if(! $alert_gradientcol) - $alert_gradientcol = "#fff"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#fff"; - if(! $advperm_bordercol) - $advperm_bordercol = "#000"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#fff"; - if(! $cal_bgcolour) - $cal_bgcolour = "#fff"; - if(! $chat_txtbgcol) - $chat_txtbgcol = "#fff"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#fff"; - if (!$admintable_hoverbgcol) - $admintable_hoverbgcol="#fff"; - if (!$dirpopup_txtcol) - $dirpopup_txtcol="#fff"; - if (!$dirpopup_linkcol) - $dirpopup_linkcol="#fff"; diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 439e460aa..4828eb249 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -14,4 +14,41 @@ background: #000; } +#cboxContent a { + color: #000; +} + +#cboxContent { + color: #000; +} + +#adminpage table tr:hover { + background-color: #000; +} + +#colorbox { + border: 0px solid #000; + background-color: #000; +} + +.chat-item-text { + background-color: #000; +} + +.fc-state-highlight { + background: none repeat scroll 0% 0% #000 !important; +} + +.well { + background-color: #000; + border: 1px solid #143D12; + background-image: linear-gradient(to bottom, #000 0px, #000 100%); +} + +.alert-info { + color: #50f148; + background-color:#000; + border-color: #143D12; + background-image: linear-gradient(to bottom, #000 0px, #000 100%); +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index f07a21af9..3ec642526 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -158,29 +158,3 @@ if (! $navaside_bghover) $abookself_bgcolour = "#000"; if(! $infomess_bgcolour) $infomess_bgcolour = "#000"; - if(! $alert_txtcolour) - $alert_txtcolour = "#50f148"; - if(! $alert_bgcolour) - $alert_bgcolour = "#000"; - if(! $alert_bordercol) - $alert_bordercol = "#143D12"; - if(! $alert_gradientcol) - $alert_gradientcol = "#000"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#000"; - if(! $advperm_bordercol) - $advperm_bordercol = "#143D12"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#000"; - if(! $cal_bgcolour) - $cal_bgcolour = "#000"; - if(! $chat_txtbgcol) - $chat_txtbgcol = "#000"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#000"; - if (!$admintable_hoverbgcol) - $admintable_hoverbgcol="#000"; - if (!$dirpopup_txtcol) - $dirpopup_txtcol="#000"; - if (!$dirpopup_linkcol) - $dirpopup_linkcol="#000"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index c6820ba8c..0367eb5f4 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -14,3 +14,41 @@ background: #000; } + +#cboxContent a { + color: #000; +} + +#cboxContent { + color: #000; +} + +#adminpage table tr:hover { + background-color: #000; +} + +#colorbox { + border: 0px solid #000; + background-color: #000; +} + +.chat-item-text { + background-color: #000; +} + +.fc-state-highlight { + background: none repeat scroll 0% 0% #000 !important; +} + +.well { + background-color: #000; + border: 1px solid #fff; + background-image: linear-gradient(to bottom, #000 0px, #000 100%); +} + +.alert-info { + color: #fff; + background-color:#000; + border-color: #fff; + background-image: linear-gradient(to bottom, #000 0px, #000 100%); +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 5ac9aa3a1..5f61326e4 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -158,29 +158,3 @@ $abookself_bgcolour = "#000"; if(! $infomess_bgcolour) $infomess_bgcolour = "#000"; - if(! $alert_txtcolour) - $alert_txtcolour = "#fff"; - if(! $alert_bgcolour) - $alert_bgcolour = "#000"; - if(! $alert_bordercol) - $alert_bordercol = "#fff"; - if(! $alert_gradientcol) - $alert_gradientcol = "#000"; - if(! $advperm_bgcolour) - $advperm_bgcolour = "#000"; - if(! $advperm_bordercol) - $advperm_bordercol = "#fff"; - if(! $advperm_gradientcol) - $advperm_gradientcol = "#000"; - if(! $cal_bgcolour) - $cal_bgcolour = "#000"; - if(! $chat_txtbgcol) - $chat_txtbgcol = "#000"; - if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#000"; - if (!$admintable_hoverbgcol) - $admintable_hoverbgcol="#000"; - if (!$dirpopup_txtcol) - $dirpopup_txtcol="#000"; - if (!$dirpopup_linkcol) - $dirpopup_linkcol="#000"; From b3ff6da6bc9dc33abf0c0d74eccf9e9484a336d2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 16:33:15 +0100 Subject: [PATCH 4/6] remove more unused $vars --- view/theme/redbasic/php/config.php | 2 -- view/theme/redbasic/php/style.php | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 69c6f19ee..8ab31efc0 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -35,7 +35,6 @@ function theme_content(&$a) { $arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); - $arr['sloppy_photos']=get_pconfig(local_channel(),"redbasic","sloppy_photos"); return redbasic_form($a, $arr); } @@ -73,7 +72,6 @@ function theme_post(&$a) { set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); - set_pconfig(local_channel(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']); } } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8789e2e9b..3c6a4f0b1 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -36,7 +36,6 @@ if(! $a->install) { $converse_width=get_pconfig($uid,"redbasic","converse_width"); $converse_center=get_pconfig($uid,"redbasic","converse_center"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); - $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); @@ -376,33 +375,15 @@ $options = array ( '$top_photo' => $top_photo, '$reply_photo' => $reply_photo, '$infomess_bgcolour' => $infomess_bgcolour, -'$alert_txtcolour' => $alert_txtcolour, -'$alert_bgcolour' => $alert_bgcolour, -'$alert_bordercol' => $alert_bordercol, -'$alert_gradientcol' => $alert_gradientcol, -'$advperm_bgcolour' => $advperm_bgcolour, -'$advperm_bordercol' => $advperm_bordercol, -'$advperm_gradientcol' => $advperm_gradientcol, -'$cal_bgcolour' => $cal_bgcolour, -'$chat_txtbgcol' => $chat_txtbgcol, -'$fancybox_bgcolour' => $fancybox_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, -'$wwtop' => $wwtop, '$comment_indent' => $comment_indent, '$main_width' => $main_width, -'$comment_padding' => $comment_padding, -'$admintable_hoverbgcol' => $admintable_hoverbgcol, -'$dirpopup_txtcol' => $dirpopup_txtcol, -'$dirpopup_linkcol' => $dirpopup_linkcol, ); echo str_replace(array_keys($options), array_values($options), $x); } -if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { - echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); -} if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } From b5823579838c4507dddd8764d0f26479f777695c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 17:06:02 +0100 Subject: [PATCH 5/6] update schema doco a little. needs some more... --- doc/Schema-development.md | 8 +++++--- doc/schema_development.bb | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/Schema-development.md b/doc/Schema-development.md index e800479f6..3ac96a02b 100644 --- a/doc/Schema-development.md +++ b/doc/Schema-development.md @@ -68,11 +68,13 @@ theme are as follows: Set the size of shadows shown with inline images. Accepts a numerical value. Note shadows are not applied to smileys. * converse_width - Set the maximum width of conversations. Accepts px, or %. + Set the maximum width of the content region in px. * nav_min_opacity * top_photo * reply_photo -* sloppy_photos - Determins whether photos are "sloppy" or aligned. Set or unset (1 or '') + +If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. +This gives the schem developer the possiblity to override any style component. + #include doc/macros/main_footer.bb; diff --git a/doc/schema_development.bb b/doc/schema_development.bb index c92536d7a..998111431 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -2,7 +2,7 @@ A schema, in a nutshell, is a collection of settings for a bunch of variables to define certain elements of a theme. A schema is loaded as though it were part of config.php -and has access to all the same information. Importantly, this means it is identity aware, +and has access to all the same information. Importantly, this means it is identity aware, and can be used to do some interesting things. One could, for example, restrict options by service class, or present different options to different members. @@ -25,8 +25,8 @@ is even simpler: Members will not thank you for this, however, so only use it when it is required. If no personal options are set, and no schema is selected, we will first try to load a schema -with the file name "default.php". This file should never be included with a theme. If it -is, merge conflicts will occur as people update their code. Rather, this should be defined +with the file name "default.php". This file should never be included with a theme. If it +is, merge conflicts will occur as people update their code. Rather, this should be defined by administrators on a site by site basis. You schema does not need to - and should not - contain all of these values. Only the values @@ -66,11 +66,12 @@ theme are as follows: Set the size of shadows shown with inline images. Accepts a numerical value. Note shadows are not applied to smileys.[/li] [li] converse_width - Set the maximum width of conversations. Accepts px, or %.[/li] + Set the maximum width of the content region in px.[/li] [li] nav_min_opacity[/li] [li] top_photo[/li] [li] reply_photo[/li] -[li] sloppy_photos - Determins whether photos are "sloppy" or aligned. Set or unset (1 or '')[/li] + +If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. +This gives the schem developer the possiblity to override any style component. #include doc/macros/main_footer.bb; From a185b555dcc6a701662a72566ed896402c63d3d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 17:20:16 +0100 Subject: [PATCH 6/6] there are no vars to replace in converse_center.css --- view/theme/redbasic/php/style.php | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 3c6a4f0b1..76fad1b18 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -388,7 +388,6 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { - $x = file_get_contents('view/theme/redbasic/css/converse_center.css'); echo str_replace(array_keys($options), array_values($options), $x); }