diff options
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/dark.css | 186 | ||||
| -rw-r--r-- | view/theme/redbasic/css/fancy.css | 107 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 223 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 17 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 42 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 1 |
7 files changed, 119 insertions, 469 deletions
diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css deleted file mode 100644 index 3bcf15bc9..000000000 --- a/view/theme/redbasic/css/dark.css +++ /dev/null @@ -1,186 +0,0 @@ -/* This file is deprecated. We'll keep it here as reference until somebody -defines a dark colour scheme */ - - -body { font-family: sans-serif; - font-size: 12px; - background-color: #101010; - background-image: -moz-linear-gradient(top, #000 16%, #101010 82%); - background-image: linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -o-linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -webkit-linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -ms-linear-gradient(bottom, #000 16%, #101010 82%); - background-repeat: no-repeat; - background-attachment: fixed; - color: #eec; - -} - -aside { -border: none; -color: #fff; -} - -.fn { - color: #fff; -} - -.acl-list-item, -.profile-jot-net { - color: #000; -} - - -.tab.active { - color: #fff; -} - -blockquote {color: #000;} - -.wall-item-content-wrapper { - background: #262626; - border-radius: 5px; - box-shadow: 12px 12px 12px #000; - margin-bottom: 20px; -} - -.wall-item-content-wrapper.comment { - margin-left: 50px; - box-shadow: 5px 5px 5px #000; -} - -.comment-edit-text-empty, .comment-edit-text-full { - border-radius: 5px 5px 5px 5px; - box-shadow: 5px 5px 5px #000 inset; -} - - -#profile-jot-text { - height: 20px; - color:#000; - border: 1px solid #cccccc; - padding: 8px; - margin-right: 0px; - width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; - box-shadow: 4px 4px 3px 0 #666 inset; -} -#profile-jot-text:hover { - color: #000000; -} - -#profile-jot-submit { - height: auto; - background-color: #0080FF; - color: #eeeeec; - font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 2px outset #222420 !important; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - box-shadow: 5px 5px 5px #444; -} - - -.widget { - border-bottom: 1px solid #eec; - padding: 8px; - margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - -} - -nav a, -nav a:active, -nav a:visited, -nav a:link { - color: #ffffff; - text-decoration: none; - outline: none; -} - -.nav-menu.selected a { - color: #0080ff !important; -} - -nav .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; -/* margin: 3px 10px; */ - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -nav .nav-notify { - background-color: #0080FF; - color: #fff; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - opacity: 0.6; - filter:alpha(opacity=60); - -} -.nav-notify:hover, nav .nav-notify.selected span { - color: #ffffff; -} - -ul.menu-popup { - - position: absolute; - display: none; - width: 10em; - background: #000; - color: #fff; - padding: 0px; - list-style: none; - border-radius: 0px 0px 20px 20px; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - display: block; - color: #FFFFFF; - padding: 5px 10px; - text-decoration: none; -} - - -ul.menu-popup a:hover { - background-color: #888888; - color: #FFFFFF; -} -ul.menu-popup .menu-sep { - border-top: 1px solid #9eabb0; -} - -.wall-item-photo, -.photo, -.contact-block-img, -.my-comment-photo { - border-radius: 5px; - box-shadow: 4px 4px 3px #000; -} - - -div#pagelist-content-wrapper { -width: 80%; -background: #111; -margin-left: auto; -margin-right: auto; -} - -div.page-list-item { -margin: 20px; -} diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css deleted file mode 100644 index 9b8899d2f..000000000 --- a/view/theme/redbasic/css/fancy.css +++ /dev/null @@ -1,107 +0,0 @@ -/*This file is deprecated. We'll keep it for reference until we provide window decorations */ - - -aside { -border-radius: $radiuspx;} - - -.tab { - height: auto; - background-color: #f00; - color: #fff !important; - font-weight: bold; - -webkit-border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - margin: 0; - width: auto; - margin-left: 8px; - padding: 4px; - text-align: center; -} -.tab:hover, .tab.active:hover { - background: #d00; - color: #fff; - ; -} -.tab:active { - background: #fff; - color: #f00; -} -.tab.active { - background: #f00; - color: #fff; - box-shadow: 3px 3px 3px #333 inset; - padding: 5px; /* strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */ -} - - - -.wall-item-content-wrapper { - position: relative; - border-radius: $radiuspx; - box-shadow: 8px 8px 8px #000; - border: 1px solid #eec; -} - -.wall-item-content-wrapper.comment { - margin-top: 15px; -} - -.wall-item-like:hover, .wall-item-dislike:hover{ -opacity: 1; -} - -.wall-item-author { - margin-top: 10px; -} - -.comment-edit-wrapper { - margin-top: 15px; - background: #ffffff; - margin-left: 50px; -} - -#profile-jot-submit { - background-color: #dd0000; -} - -ul.menu-popup { - background: #dd0000; - color: #eec; - border-radius: $radiuspx; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - color: #eec; -} -ul.menu-popup a:hover { - background-color: #eec; - color: #f00; -} - -section { -left: 0px; -width: 800px; -margin-left: auto; -margin-right: auto; -} -body {background-color: #d00 !important;} - -.page-content-wrapper {background: #fff; - color: #000; - border-radius: 20px; - box-shadow: 5px 5px 5px #111; -} - -h3.page-title { -padding-top: 30px; - color: #033} -.page-body {padding: 40px;} - -.page-body strong {color: #033;} - -.nav-links {margin-top: 5px;} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e13bc1edb..776b4c31a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -40,11 +40,11 @@ abbr { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #0080FF; + color: $link_colour; text-decoration: none; } -a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } +a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } .fakelink { cursor: pointer; @@ -91,6 +91,7 @@ blockquote { border-left: 4px solid #dae4ee; padding: 0.4em; color: #000; + margin-left: 20px; } .ccollapse-wrapper { @@ -234,7 +235,7 @@ header #banner #logo-text { background-color: #aec0d3; color: #565854; -moz-border-radius: $radiuspx; - border-radius: $radiuspx;; + border-radius: $radiuspx; } nav .nav-link { @@ -327,11 +328,8 @@ footer { margin-bottom: 15px; } -#group-sidebar { - margin-bottom: 10px; -} - -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active { +/*TODO: we should use one class for all this. */ +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -585,15 +583,6 @@ footer { .thread-end-wrapper { margin-left: 50px; } - -#profile-listing-desc { - margin-left: 30px; -} - -#profile-listing-new-link-wrapper { - margin-left: 30px; - margin-bottom: 30px; -} .profile-listing-photo-wrapper { float: left; } @@ -671,36 +660,6 @@ footer { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } - -#datebrowse-sidebar select { - margin-left: 25px; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - opacity: 0.3; - filter:alpha(opacity=30); -} - -#datebrowse-sidebar select:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#posted-date-selector { - margin-left: 30px !important; - margin-top: 5px !important; - margin-right: 0px !important; - margin-bottom: 0px !important; -} - -#posted-date-selector:hover { - box-shadow: 4px 4px 3px 0 #444444; - margin-left: 25px !important; - margin-top: 0px !important; - margin-right: 5px !important; - margin-bottom: 5px !important; - -} - #side-bar-photos-albums { margin-top: 15px; } @@ -709,7 +668,7 @@ footer { list-style: none; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -767,75 +726,15 @@ footer { #netsearch-box { margin-bottom: 5px; } -#sidebar-group-list ul { - list-style-type: none; -} - -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -#sidebar-group-list li, -.saved-search-li { - margin-top: 3px; -} - - -.nets-ul, .fileas-ul, .categories-ul { - list-style-type: none; -} - -.nets-ul li, .fileas-ul li, .categories-ul li { - margin-top: 10px; -} - -.nets-link { - margin-left: 24px; -} -.nets-all { - margin-left: 42px; -} - -.fileas-link, .categories-link { - margin-left: 24px; -} - -.fileas-all, .categories-all { - margin-left: 0px; -} - #search-save { margin-left: 5px; } -.groupsideedit { - margin-right: 10px; -} - -#saved-search-ul { - list-style-type: none; -} - -.saved-search-li i { - opacity: 0; -} - -.saved-search-li:hover i { - opacity: 1; -} - - - -.savedsearchterm { - margin-left: 10px; -} - #side-follow-wrapper { margin-top: 20px; } -#side-follow-url, #side-peoplefind-url { + +#side-peoplefind-url { margin-top: 5px; } @@ -851,7 +750,7 @@ footer { font-family: FontAwesome; } -#side-follow-submit, #side-peoplefind-submit { +#side-peoplefind-submit { margin-top: 15px; } @@ -860,7 +759,7 @@ footer { } -.widget, .pmenu { +.pmenu { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; @@ -1679,12 +1578,6 @@ div.jGrowl div.info { text-overflow: ellipsis; } -#datebrowse-sidebar select { - margin-left: 25px; -} - - - .jslider .jslider-scale ins { color: #333; font-size: $body_font_size; @@ -1692,21 +1585,6 @@ div.jGrowl div.info { text-align: center; } - -.slider { - margin-top: 10px; - margin-bottom: 45px; -} - - -#main-slider { - position: relative; - left: 5px; - width: 90%; - -} - - #contact-slider { position: relative; left: 5%; @@ -2099,13 +1977,6 @@ ul.menu-popup { .reshared-content { margin-left: 30px; } .shared_header img { margin-right: 10px; } -/* might be obsolete -span.mail-delete { -float: left; -width: 30px; -} -*/ - .tag1 { font-size : 1.0em !important; } @@ -2208,12 +2079,12 @@ margin-right: 50px; } a .drop-icons { - color: #777; + color: $toolicon_colour;; font-size: 1.2em; text-decoration: none; } -.drop-icons:hover { +a .drop-icons:hover { color: #FF0000; } @@ -2243,6 +2114,10 @@ a .drop-icons { margin-right: 10px; } +.design-tools ul { + list-style-type: none; +} + .design-icons { margin-right: 10px; } @@ -2255,11 +2130,6 @@ text-decoration: none; list-style-type: none; } -.group-edit-icon, -.savedsearchdrop { - opacity: 0; -} - .admin-icons { color: $toolicon_colour; margin-right: 10px; @@ -2391,12 +2261,10 @@ img.mail-list-sender-photo { border-left: 2px solid #eee; } -.thread-wrapper .toplevel_item { +.thread-wrapper.toplevel_item { max-width: $converse_width; } -/* conv_item */ - .wall-item-content-wrapper { border-radius: $radiuspx; background-color: $item_colour; @@ -2492,16 +2360,10 @@ img.mail-list-sender-photo { color: $toolicon_activecolour; } -.drop-icons.item-tool { - color: $toolicon_colour; -} - .like-rotator { color: $toolicon_colour; } -/* comment_item */ - .my-comment-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; @@ -2538,14 +2400,53 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } -.suggest-widget-more { margin-top: 10px; } +/* widgets */ + +.widget { + border-bottom: 1px solid #eec; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; +} #note-text { - width: 190px; - max-width: 190px; - height: 150px; + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; } -#note-save { margin-top: 10px; } +#saved-search-ul { + list-style-type: none; +} + +.fileas-ul { + list-style-type: none; +} +#datebrowse-sidebar select { + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + +.categories-ul { + list-style-type: none; +} + +#sidebar-group-list ul { + list-style-type: none; +} + +.profile-thing-list img, .thing-show img, .thing-edit-links a { + margin-top: 8px; + margin-right: 15px; +} + +.abook-self { + background-color: #ffdddd; +} +.online-now { + color: red; + cursor: pointer; +} diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e89c51119..e41fde2b8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -47,16 +47,6 @@ $('.savedsearchdrop').hover( $(this).css('opacity','0');} ); -$('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','1.0');}, - - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','0'); - }); - }); @@ -72,4 +62,4 @@ $(document).ready(function(){ } }; setInterval(function () {checkNotify();}, 10 * 1000); -});
\ No newline at end of file +}); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 20355197f..68a72fffd 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -7,6 +7,7 @@ function theme_content(&$a) { $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); @@ -33,6 +34,7 @@ function theme_post(&$a) { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); + set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); @@ -72,9 +74,17 @@ function redbasic_form(&$a, $arr) { $nav_colours = array ( '' => t('Scheme Default'), - 'red' => t('red'), - 'black' => t('black'), - 'silver' => t('silver'), + 'red' => 'red', + 'pink' => 'pink', + 'green' => 'green', + 'blue' => 'blue', + 'purple' => 'purple', + 'black' => 'black', + 'orange' => 'orange', + 'brown' => 'brown', + 'grey' => 'grey', + 'gold' => 'gold', + 'silver' => t('silver'), ); if(feature_enabled(local_user(),'expert')) @@ -88,6 +98,7 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9956ccd31..8d5c23a03 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,5 +1,7 @@ <?php -// Get the UID of the channel owner + +if(! $a->install) { + // Get the UID of the channel owner $uid = get_theme_uid(); if($uid) @@ -13,6 +15,7 @@ // Load the owners pconfig $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); @@ -31,6 +34,8 @@ $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); +} + // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema // Setting $scheme to '' wasn't working for some reason, so we'll check it's @@ -63,6 +68,8 @@ $nav_bg_3 = "#f00"; $nav_bg_4 = "#b00"; } + if (! $link_colour) + $link_colour = "#0080FF"; if (! $banner_colour) $banner_colour = "fff"; if (! $bgcolour) @@ -130,6 +137,38 @@ $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; $search_background = '#EEEEEE'; } + if($nav_colour === "pink") { + $nav_bg_1 = $nav_bg_3 = "#FFC1CA"; + $nav_bg_2 = $nav_bg_4 = "#FFC1CA"; + } + if($nav_colour === "green") { + $nav_bg_1 = $nav_bg_3 = "#5CD65C"; + $nav_bg_2 = $nav_bg_4 = "#5CD65C"; + } + if($nav_colour === "blue") { + $nav_bg_1 = $nav_bg_3 = "#1872a2"; + $nav_bg_2 = $nav_bg_4 = "#1872a2"; + } + if($nav_colour === "purple") { + $nav_bg_1 = $nav_bg_3 = "#551A8B"; + $nav_bg_2 = $nav_bg_4 = "#551A8B"; + } + if($nav_colour === "orange") { + $nav_bg_1 = $nav_bg_3 = "#FF3D0D"; + $nav_bg_2 = $nav_bg_4 = "#FF3D0D"; + } + if($nav_colour === "brown") { + $nav_bg_1 = $nav_bg_3 = "#330000"; + $nav_bg_2 = $nav_bg_4 = "#330000"; + } + if($nav_colour === "grey") { + $nav_bg_1 = $nav_bg_3 = "#2e2f2e"; + $nav_bg_2 = $nav_bg_4 = "#2e2f2e"; + } + if($nav_colour === "gold") { + $nav_bg_1 = $nav_bg_3 = "#FFAA00"; + $nav_bg_2 = $nav_bg_4 = "#FFAA00"; + } // Apply the settings @@ -141,6 +180,7 @@ $options = array ( '$nav_bg_2' => $nav_bg_2, '$nav_bg_3' => $nav_bg_3, '$nav_bg_4' => $nav_bg_4, +'$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index e0f546896..ca05986a2 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -6,6 +6,7 @@ {{if $expert}} {{include file="field_select.tpl" field=$nav_colour}} {{include file="field_input.tpl" field=$banner_colour}} +{{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} {{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$item_colour}} |