diff options
| -rwxr-xr-x | .gitignore | 6 | ||||
| -rwxr-xr-x | boot.php | 6 | ||||
| -rw-r--r-- | include/Contact.php | 13 | ||||
| -rw-r--r-- | include/cli_startup.php | 6 | ||||
| -rw-r--r-- | include/config.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 7 | ||||
| -rw-r--r-- | include/permissions.php | 5 | ||||
| -rwxr-xr-x | index.php | 4 | ||||
| -rw-r--r-- | mod/siteinfo.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php | 182 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php | 182 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php | 182 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 3 |
16 files changed, 610 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 80fe3ec72..df7ca3549 100755 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,9 @@ nbproject #Kdevelop project files *.kdev4 + +# Ignore site TOS +doc/SiteTOS.md + +#Ingore site theme schemas +view/theme/redbasic/schema/default.php @@ -716,10 +716,8 @@ class App { function __construct() { - global $default_timezone; - $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); - - date_default_timezone_set($this->timezone); + // we'll reset this after we read our config file + date_default_timezone_set('UTC'); $this->config = array('system'=>array()); $this->page = array(); diff --git a/include/Contact.php b/include/Contact.php index 8d50b1e5b..4440369dc 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -328,6 +328,19 @@ function mark_orphan_hubsxchans() { intval(HUBLOC_OFFLINE) ); +// $realm = get_directory_realm(); +// if($realm == DIRECTORY_REALM) { +// $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by rand()", +// dbesc($realm) +// ); +// } +// else { +// $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by rand()", +// dbesc($realm) +// ); +// } + + $r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d) and not (hubloc_flags & %d)", intval(HUBLOC_OFFLINE), intval(HUBLOC_FLAGS_ORPHANCHECK) diff --git a/include/cli_startup.php b/include/cli_startup.php index 6bd4e7520..f90a75cd1 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -6,7 +6,7 @@ require_once('boot.php'); function cli_startup() { - global $a, $db; + global $a, $db, $default_timezone; if(is_null($a)) { $a = new App; @@ -14,6 +14,10 @@ function cli_startup() { if(is_null($db)) { @include(".htconfig.php"); + + $a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); + date_default_timezone_set($a->timezone); + require_once('include/dba/dba_driver.php'); $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data); unset($db_host, $db_port, $db_user, $db_pass, $db_data); diff --git a/include/config.php b/include/config.php index a77801717..3292059d1 100644 --- a/include/config.php +++ b/include/config.php @@ -248,7 +248,7 @@ function load_pconfig($uid) { * @return mixed Stored value or false if it does not exist */ function get_pconfig($uid, $family, $key, $instore = false) { - logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG); +// logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG); global $a; if($uid === false) diff --git a/include/nav.php b/include/nav.php index 98d1b644e..c35466412 100644 --- a/include/nav.php +++ b/include/nav.php @@ -239,6 +239,12 @@ EOT; $x = array('nav' => $nav, 'usermenu' => $userinfo ); call_hooks('nav', $x); +// Not sure the best place to put this on the page. So I'm implementing it but leaving it +// turned off until somebody discovers this and figures out a good location for it. +$powered_by = ''; + +// $powered_by = '<strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong>'; + $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( @@ -250,6 +256,7 @@ EOT; '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, + '$powered_by' => $powered_by, '$pleasewait' => t('Please wait...') )); diff --git a/include/permissions.php b/include/permissions.php index 438b807d0..61ac8aea3 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -722,6 +722,11 @@ function get_role_perms($role) { } + $x = get_config('system','role_perms'); + // let system settings over-ride any or all + if($x && is_array($x) && array_key_exists($role,$x)) + $ret = array_merge($ret,$x[$role]); + call_hooks('get_role_perms',$ret); return $ret; @@ -27,6 +27,10 @@ $a->install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? fal @include(".htconfig.php"); +$a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); +date_default_timezone_set($a->timezone); + + /** * * Try to open the database; diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 4568906f3..eab52e41e 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -4,7 +4,8 @@ function siteinfo_init(&$a) { if ($a->argv[1]=="json"){ $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); - + $directory_mode = Array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_SECONDARY','DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_STANDALONE'); + $sql_extra = ''; $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) and account_default_channel = channel_id"); @@ -100,6 +101,7 @@ function siteinfo_init(&$a) { 'url' => z_root(), 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['system']['register_policy']], + 'directory_mode' => $directory_mode[$a->config['system']['directory_mode']], 'diaspora_emulation' => get_config('system','diaspora_enabled'), 'rss_connections' => get_config('system','feed_contacts'), 'default_service_restrictions' => $service_class, diff --git a/version.inc b/version.inc index 0947c89cf..39675f71c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-27.811 +2014-09-29.813 diff --git a/view/js/main.js b/view/js/main.js index f3b252171..7d036076c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1069,6 +1069,7 @@ function previewTheme(elm) { } $(document).ready(function() { + jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], prefixFromNow : aStr['t02'], diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1d43fe983..9bbf996d5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -166,6 +166,19 @@ header { filter:alpha(opacity=$nav_percent_min_opacity); } +#powered-by { + font-size: 0.5rem; + position: absolute; + top: 50px; + left: 16px; +} + +#powered-by img { + margin-top: -2px; + height: 10px; + width: 10px; +} + .error-message { color: #FF0000; font-size: 1.1em; diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php new file mode 100644 index 000000000..cdd85a129 --- /dev/null +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -0,0 +1,182 @@ +<?php + + if (! $nav_bg) + $nav_bg = "#fff"; + if (! $nav_gradient_top) + $nav_gradient_top = "#fff"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#fff"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#fff"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#fff"; + if (! $nav_bd) + $nav_bd = "#fff"; + if (! $nav_icon_colour) + $nav_icon_colour = "#111"; + if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#000"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#F5F5F5"; + if (! $navmenu_bgimage) + $navmenu_bgimage = "background-image: none;"; + if (! $navtabs_borderc) + $navtabs_borderc = "#000"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#000"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#fff"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = "color: #000;"; + if (! $navtabs_linkchover) + $navtabs_linkchover = "color: #000;"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#fff"; + if (! $navtabs_decohover) + $navtabs_decohover = "underline"; + if (! $link_colour) + $link_colour = "#000"; + if (! $selected_active_colour) + $selected_active_colour = "#000"; + if (! $selected_active_deco) + $selected_active_deco = "underline"; + if (! $banner_colour) + $banner_colour = "#fff"; + if (! $search_background) + $search_background = "#F5F5F5"; + if (! $bgcolour) + $bgcolour = "#fff"; + if (! $item_colour) + $item_colour = "rgba(255,255,255,0.8)"; + if (! $comment_item_colour) + $comment_item_colour = "rgba(255,255,255,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(255,255,255,0.8)"; + if (! $toolicon_colour) + $toolicon_colour = '#111'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#000'; + if (! $font_colour) + $font_colour = "#000"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#fff"; + if (! $blockquote_colour) + $blockquote_colour = "#111"; + if (! $blockquote_bgcolour) + $blockquote_bgcolour = "#fff"; + if (! $blockquote_bordercolour) + $blockquote_bordercolour = "#000"; + if (! $code_borderc) + $code_borderc = "#000"; + if (! $code_bgcolour) + $code_bgcolour = "#fff"; + if (! $code_txtcolour) + $code_txtcolour = "#000"; + if (! $pre_borderc) + $pre_borderc = "#000"; + if (! $pre_bgcolour) + $pre_bgcolour = "#fff"; + if (! $pre_txtcolour) + $pre_txtcolour = "#111"; + if (! $item_bordercolour) + $item_bordercolour = "#000"; + if (! $notif_itemcolour) + $notif_itemcolour = "#000"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#000"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#fff"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#000"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#fff"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#000"; + if (! $editbuttons_bgcolour) + $editbuttons_bgcolour = "#fff"; + if (! $editbuttons_bordercolour) + $editbuttons_bordercolour = "#000"; + if (! $editbuttons_colour) + $editbuttons_colour = "#111"; + if (! $editbuttons_bghover) + $editbuttons_bghover = "#fff"; + if (! $dropdown_bgcolour) + $dropdown_bgcolour = "#fff"; + if (! $dropdown_textcolour) + $dropdown_textcolour = "#000"; + if (! $dropdown_txtcolhover) + $dropdown_txtcolhover = "#000"; + if (! $dropdown_bgcolhover) + $dropdown_bgcolhover = "#F5F5F5"; + if (! $dropdown_bgimghover) + $dropdown_bgimghover = "background-image: none;"; + if (! $dropdown_togglecol) + $dropdown_togglecol = "#000"; + if (! $dropdown_togglebgcol) + $dropdown_togglebgcol = "#fff"; + if (! $dropdown_bordercol) + $dropdown_bordercol = "#fff"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif"; + if (! $notify_bgcolour) + $notify_bgcolour = "#fff"; + if (! $notify_linkcolour) + $notify_linkcolour = "#000"; + if (! $notify_bghover) + $notify_bghover = "#fff"; + if (! $notify_topmargin) + $notify_topmargin = "-1px"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#fff"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#fff"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#fff"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#000"; + if (! $input_bgsubmit) + $input_bgsubmit = "#fff"; + if (! $input_linksubmit) + $input_linksubmit = "#000"; + if (! $input_border) + $input_border = "#000"; + if (! $input_colourhover) + $input_colourhover = "#000"; + if (! $input_decohover) + $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#fff"; + if (! $acl_bordercolour) + $acl_bordercolour = "#fff"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #000;"; + if (! $abookself_bgcolour) + $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(! $fancybox_bgcolour) + $fancybox_bgcolour = "#fff"; + if (!$admintable_hoverbgcol) + $admintable_hoverbgcol="#fff"; + if (!$dirpopup_txtcol) + $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.php b/view/theme/redbasic/schema/simple_green_on_black.php new file mode 100644 index 000000000..3a1ea9134 --- /dev/null +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -0,0 +1,182 @@ +<?php + + if (! $nav_bg) + $nav_bg = "#000"; + if (! $nav_gradient_top) + $nav_gradient_top = "#000"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#000"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#000"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#000"; + if (! $nav_bd) + $nav_bd = "#000"; + if (! $nav_icon_colour) + $nav_icon_colour = "#32962D"; + if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#50f148"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#143D12"; + if (! $navmenu_bgimage) + $navmenu_bgimage = "background-image: none;"; + if (! $navtabs_borderc) + $navtabs_borderc = "#143D12"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#46D43F"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#000"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = "color: #50f148;"; + if (! $navtabs_linkchover) + $navtabs_linkchover = "color: #50f148;"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#000"; + if (! $navtabs_decohover) + $navtabs_decohover = "underline"; + if (! $link_colour) + $link_colour = "#50f148"; + if (! $selected_active_colour) + $selected_active_colour = "#50f148"; + if (! $selected_active_deco) + $selected_active_deco = "underline"; + if (! $banner_colour) + $banner_colour = "#000"; + if (! $search_background) + $search_background = "#000"; + if (! $bgcolour) + $bgcolour = "#000"; + if (! $item_colour) + $item_colour = "rgba(0,0,0,0.8)"; + if (! $comment_item_colour) + $comment_item_colour = "rgba(0,0,0,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(0,0,0,0.8)"; + if (! $toolicon_colour) + $toolicon_colour = '#32962D'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#50f148'; + if (! $font_colour) + $font_colour = "#46D43F"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#000"; + if (! $blockquote_colour) + $blockquote_colour = "#32962D"; + if (! $blockquote_bgcolour) + $blockquote_bgcolour = "#000"; + if (! $blockquote_bordercolour) + $blockquote_bordercolour = "#143D12"; + if (! $code_borderc) + $code_borderc = "#143D12"; + if (! $code_bgcolour) + $code_bgcolour = "#000"; + if (! $code_txtcolour) + $code_txtcolour = "#32962D"; + if (! $pre_borderc) + $pre_borderc = "#143D12"; + if (! $pre_bgcolour) + $pre_bgcolour = "#000"; + if (! $pre_txtcolour) + $pre_txtcolour = "#32962D"; + if (! $item_bordercolour) + $item_bordercolour = "#143D12"; + if (! $notif_itemcolour) + $notif_itemcolour = "#50f148"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#50f148"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#000"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#143D12"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#000"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#50f148"; + if (! $editbuttons_bgcolour) + $editbuttons_bgcolour = "#000"; + if (! $editbuttons_bordercolour) + $editbuttons_bordercolour = "#143D12"; + if (! $editbuttons_colour) + $editbuttons_colour = "#32962D"; + if (! $editbuttons_bghover) + $editbuttons_bghover = "#000"; + if (! $dropdown_bgcolour) + $dropdown_bgcolour = "#000"; + if (! $dropdown_textcolour) + $dropdown_textcolour = "#32962D"; + if (! $dropdown_txtcolhover) + $dropdown_txtcolhover = "#50f148"; + if (! $dropdown_bgcolhover) + $dropdown_bgcolhover = "#143D12"; + if (! $dropdown_bgimghover) + $dropdown_bgimghover = "background-image: none;"; + if (! $dropdown_togglecol) + $dropdown_togglecol = "#50f148"; + if (! $dropdown_togglebgcol) + $dropdown_togglebgcol = "#000"; + if (! $dropdown_bordercol) + $dropdown_bordercol = "#143D12"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; + if (! $notify_bgcolour) + $notify_bgcolour = "#000"; + if (! $notify_linkcolour) + $notify_linkcolour = "#50f148"; + if (! $notify_bghover) + $notify_bghover = "#000"; + if (! $notify_topmargin) + $notify_topmargin = "-1px"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#000"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#000"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#000"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#50f148"; + if (! $input_bgsubmit) + $input_bgsubmit = "#000"; + if (! $input_linksubmit) + $input_linksubmit = "#50f148"; + if (! $input_border) + $input_border = "#143D12"; + if (! $input_colourhover) + $input_colourhover = "#50f148"; + if (! $input_decohover) + $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#000"; + if (! $acl_bordercolour) + $acl_bordercolour = "#000"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #fff;"; + if (! $abookself_bgcolour) + $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(! $fancybox_bgcolour) + $fancybox_bgcolour = "#000"; + if (!$admintable_hoverbgcol) + $admintable_hoverbgcol="#000"; + if (!$dirpopup_txtcol) + $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.php b/view/theme/redbasic/schema/simple_white_on_black.php new file mode 100644 index 000000000..74d133038 --- /dev/null +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -0,0 +1,182 @@ +<?php + + if (! $nav_bg) + $nav_bg = "#000"; + if (! $nav_gradient_top) + $nav_gradient_top = "#000"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#000"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#000"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#000"; + if (! $nav_bd) + $nav_bd = "#000"; + if (! $nav_icon_colour) + $nav_icon_colour = "#eee"; + if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#fff"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#030303"; + if (! $navmenu_bgimage) + $navmenu_bgimage = "background-image: none;"; + if (! $navtabs_borderc) + $navtabs_borderc = "#fff"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#fff"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#000"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = "color: #fff;"; + if (! $navtabs_linkchover) + $navtabs_linkchover = "color: #fff;"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#000"; + if (! $navtabs_decohover) + $navtabs_decohover = "underline"; + if (! $link_colour) + $link_colour = "#fff"; + if (! $selected_active_colour) + $selected_active_colour = "#fff"; + if (! $selected_active_deco) + $selected_active_deco = "underline"; + if (! $banner_colour) + $banner_colour = "#000"; + if (! $search_background) + $search_background = "#000"; + if (! $bgcolour) + $bgcolour = "#000"; + if (! $item_colour) + $item_colour = "rgba(0,0,0,0.8)"; + if (! $comment_item_colour) + $comment_item_colour = "rgba(0,0,0,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(0,0,0,0.8)"; + if (! $toolicon_colour) + $toolicon_colour = '#eee'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#fff'; + if (! $font_colour) + $font_colour = "#fff"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#000"; + if (! $blockquote_colour) + $blockquote_colour = "#eee"; + if (! $blockquote_bgcolour) + $blockquote_bgcolour = "#000"; + if (! $blockquote_bordercolour) + $blockquote_bordercolour = "#fff"; + if (! $code_borderc) + $code_borderc = "#eee"; + if (! $code_bgcolour) + $code_bgcolour = "#000"; + if (! $code_txtcolour) + $code_txtcolour = "#eee"; + if (! $pre_borderc) + $pre_borderc = "#fff"; + if (! $pre_bgcolour) + $pre_bgcolour = "#000"; + if (! $pre_txtcolour) + $pre_txtcolour = "#eee"; + if (! $item_bordercolour) + $item_bordercolour = "#fff"; + if (! $notif_itemcolour) + $notif_itemcolour = "#fff"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#fff"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#000"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#fff"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#000"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#fff"; + if (! $editbuttons_bgcolour) + $editbuttons_bgcolour = "#000"; + if (! $editbuttons_bordercolour) + $editbuttons_bordercolour = "#fff"; + if (! $editbuttons_colour) + $editbuttons_colour = "#eee"; + if (! $editbuttons_bghover) + $editbuttons_bghover = "#000"; + if (! $dropdown_bgcolour) + $dropdown_bgcolour = "#000"; + if (! $dropdown_textcolour) + $dropdown_textcolour = "#fff"; + if (! $dropdown_txtcolhover) + $dropdown_txtcolhover = "#fff"; + if (! $dropdown_bgcolhover) + $dropdown_bgcolhover = "#030303"; + if (! $dropdown_bgimghover) + $dropdown_bgimghover = "background-image: none;"; + if (! $dropdown_togglecol) + $dropdown_togglecol = "#fff"; + if (! $dropdown_togglebgcol) + $dropdown_togglebgcol = "#000"; + if (! $dropdown_bordercol) + $dropdown_bordercol = "#000"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; + if (! $notify_bgcolour) + $notify_bgcolour = "#000"; + if (! $notify_linkcolour) + $notify_linkcolour = "#fff"; + if (! $notify_bghover) + $notify_bghover = "#000"; + if (! $notify_topmargin) + $notify_topmargin = "-1px"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#000"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#000"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#000"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#fff"; + if (! $input_bgsubmit) + $input_bgsubmit = "#000"; + if (! $input_linksubmit) + $input_linksubmit = "#fff"; + if (! $input_border) + $input_border = "#fff"; + if (! $input_colourhover) + $input_colourhover = "#fff"; + if (! $input_decohover) + $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#000"; + if (! $acl_bordercolour) + $acl_bordercolour = "#000"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #fff;"; + if (! $abookself_bgcolour) + $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(! $fancybox_bgcolour) + $fancybox_bgcolour = "#000"; + if (!$admintable_hoverbgcol) + $admintable_hoverbgcol="#000"; + if (!$dirpopup_txtcol) + $dirpopup_txtcol="#000"; + if (!$dirpopup_linkcol) + $dirpopup_linkcol="#000"; + if (!$abook_changebg) + $abook_changebg="#000"; diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 2953f3b41..6c461f062 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -166,6 +166,9 @@ <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> </li> + {{if $powered_by}} + <div id="powered-by">{{$powered_by}}</div> + {{/if}} {{if $nav.directory}} <li class="{{$sel.directory}}"> <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> |