From b7f9a70be7c7190a398ad54124d792f918389054 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Mon, 16 Jun 2014 22:55:29 +0000 Subject: Update nl / Dark schema: Some minor, but important fixes --- view/nl/htconfig.tpl | 98 ------------------------------------- view/nl/messages.po | 4 +- view/nl/register_open_eml.tpl | 17 +++++++ view/nl/strings.php | 4 +- view/theme/redbasic/css/style.css | 13 ++++- view/theme/redbasic/php/style.php | 21 +++++--- view/theme/redbasic/schema/dark.php | 6 +++ 7 files changed, 54 insertions(+), 109 deletions(-) delete mode 100644 view/nl/htconfig.tpl diff --git a/view/nl/htconfig.tpl b/view/nl/htconfig.tpl deleted file mode 100644 index 9377472bd..000000000 --- a/view/nl/htconfig.tpl +++ /dev/null @@ -1,98 +0,0 @@ -config['system']['baseurl'] = '{{$siteurl}}'; -$a->config['system']['sitename'] = "Red Matrix"; -$a->config['system']['location_hash'] = '{{$site_id}}'; - - -// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Be certain to create your own personal account before setting -// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on -// the registration page. REGISTER_APPROVE requires you set 'admin_email' -// to the email address of an already registered person who can authorise -// and/or approve/deny the request. - -$a->config['system']['register_policy'] = REGISTER_OPEN; -$a->config['system']['register_text'] = ''; -$a->config['system']['admin_email'] = '{{$adminmail}}'; - - -// Site access restrictions. By default we will create private sites. -// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE. -// If you leave REGISTER_OPEN above, anybody may register on your -// site, however your site will not be listed anywhere as an open -// registration hub. We will use the system access policy (below) -// to determine whether or not to list your site in the directory -// as an open hub where anybody may create accounts. Your choice of -// paid, tiered, or free determines how these listings will be presented. - - -$a->config['system']['access_policy'] = ACCESS_PRIVATE; - -// If you operate a public site, you might wish that people are directed -// to a "sellpage" where you can describe for features or policies or service plans in depth. -// This must be an absolute URL beginning with http:// or https:// . - -$a->config['system']['sellpage'] = ''; - -// Maximum size of an imported message, 0 is unlimited -// FIXME - NOT currently implemented. - -$a->config['system']['max_import_size'] = 200000; - -// Location of PHP command line processor - -$a->config['system']['php_path'] = '{{$phpath}}'; - -// Configure how we communicate with directory servers. -// DIRECTORY_MODE_NORMAL = directory client, we will find a directory -// DIRECTORY_MODE_SECONDARY = caching directory or mirror -// DIRECTORY_MODE_PRIMARY = main directory server -// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services - -$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; - -// default system theme - -$a->config['system']['theme'] = 'redbasic'; - - -// PHP error logging setup -// Before doing this ensure that the webserver has permission -// to create and write to php.out in the top level Red directory, -// or change the name (below) to a file/path where this is allowed. - -// Uncomment the following 4 lines to turn on PHP error logging. -//error_reporting(E_ERROR | E_WARNING | E_PARSE ); -//ini_set('error_log','php.out'); -//ini_set('log_errors','1'); -//ini_set('display_errors', '0'); diff --git a/view/nl/messages.po b/view/nl/messages.po index 7ec43f6a1..8c0088583 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -755,7 +755,7 @@ msgstr "jouw registratiewachtwoord" #: ../../include/account.php:300 ../../include/account.php:357 #, php-format msgid "Registration details for %s" -msgstr "Registratiedetails voor %s" +msgstr "Registratiegegevens voor %s" #: ../../include/account.php:366 msgid "Account approved." @@ -994,7 +994,7 @@ msgstr "Plaats:" #: ../../include/nav.php:77 ../../include/nav.php:96 ../../boot.php:1451 msgid "Logout" -msgstr "Uitloggen:" +msgstr "Uitloggen" #: ../../include/nav.php:77 ../../include/nav.php:96 msgid "End this session" diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl index 4b397201c..d6cf329d1 100644 --- a/view/nl/register_open_eml.tpl +++ b/view/nl/register_open_eml.tpl @@ -1,3 +1,20 @@ +(English below) + +Er is met dit e-mailadres een account aangemaakt op {{$sitename}}. +De inloggegevens zijn als volgt: + +Hub: {{$siteurl}} +Inlognaam: {{$email}} +Wachtwoord: (het wachtwoord dat je tijdens de registratie hebt opgegeven) + +Wanneer dit account was aangemaakt zonder jouw medeweten en tevens niet gewenst, dan kan je {{$siteurl}} bezoeken en een nieuwe wachtwoord aanvragen. Je kan daarna inloggen en via 'instellingen > account' het kanaal verwijderen dat ten onrechte jouw e-mailadres gebruikt. Wanneer dat is voltooid, dan kan je een e-mail sturen naar de beheerder van deze hub om het account volledig te laten verwijderen. Zie voor de beheerder {{$siteurl}}/siteinfo . + +Hoogachtend, + Beheerder {{$sitename}} + + +----- + An account has been created at {{$sitename}} for this email address. The login details are as follows: diff --git a/view/nl/strings.php b/view/nl/strings.php index ef2906a29..568b88fb5 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -172,7 +172,7 @@ $a->strings["Failed to store account information."] = "Account-informatie kon ni $a->strings["Registration request at %s"] = "Registratieverzoek op %s"; $a->strings["Administrator"] = "Beheerder"; $a->strings["your registration password"] = "jouw registratiewachtwoord"; -$a->strings["Registration details for %s"] = "Registratiedetails voor %s"; +$a->strings["Registration details for %s"] = "Registratiegegevens voor %s"; $a->strings["Account approved."] = "Account goedgekeurd"; $a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; $a->strings["Permission denied."] = "Toegang geweigerd."; @@ -218,7 +218,7 @@ $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; $a->strings["Starts:"] = "Start:"; $a->strings["Finishes:"] = "Einde:"; $a->strings["Location:"] = "Plaats:"; -$a->strings["Logout"] = "Uitloggen:"; +$a->strings["Logout"] = "Uitloggen"; $a->strings["End this session"] = "Beëindig deze sessie"; $a->strings["Home"] = "Home"; $a->strings["Your posts and conversations"] = "Jouw berichten en conversaties"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5e7d87df5..06aa08030 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -534,11 +534,18 @@ aside li { } - .directory-details { font-size: 0.7em; } +#cboxContent { + color: $dirpopup_txtcol; +} + +#cboxContent a { + color: $dirpopup_linkcol; +} + .app-name { width: 125px; overflow: none; @@ -1802,6 +1809,10 @@ text-decoration: none; margin-right: 10px; } +#adminpage table tr:hover { + background-color: $admintable_hoverbgcol; +} + /* message */ img.mail-list-sender-photo { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 1165fab95..23d9c695f 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -269,8 +269,14 @@ if(! $a->install) { if (!$comment_border_top) $comment_border_top="0px solid"; if (!$comment_border_bottom) - $comment_border_bottom="0px solid"; - + $comment_border_bottom="0px solid"; + if (!$admintable_hoverbgcol) + $admintable_hoverbgcol="#BBC7D7"; + if (!$dirpopup_txtcol) + $dirpopup_txtcol=""; + if (!$dirpopup_linkcol) + $dirpopup_linkcol=""; + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -387,10 +393,13 @@ $options = array ( '$comment_indent' => $comment_indent, '$body_width' => $body_width, '$comment_padding' => $comment_padding, -'$comment_border_left' =>$comment_border_left, -'$comment_border_right' =>$comment_border_right, -'$comment_border_top' =>$comment_border_top, -'$comment_border_bottom' =>$comment_border_bottom, +'$comment_border_left' => $comment_border_left, +'$comment_border_right' => $comment_border_right, +'$comment_border_top' => $comment_border_top, +'$comment_border_bottom' => $comment_border_bottom, +'$admintable_hoverbgcol' => $admintable_hoverbgcol, +'$dirpopup_txtcol' => $dirpopup_txtcol, +'$dirpopup_linkcol' => $dirpopup_linkcol, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 4d53def95..69fcf403f 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -164,3 +164,9 @@ $cal_bgcolour = "#333"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#1E1E1E"; + if (!$admintable_hoverbgcol) + $admintable_hoverbgcol="#222"; + if (!$dirpopup_txtcol) + $dirpopup_txtcol="#111"; + if (!$dirpopup_linkcol) + $dirpopup_linkcol="#000"; -- cgit v1.2.3