diff options
| -rw-r--r-- | assets/home.html | 35 | ||||
| -rw-r--r-- | assets/home2.html | 195 | ||||
| -rw-r--r-- | doc/bbcode.html | 2 | ||||
| -rw-r--r-- | mod/home.php | 1 | ||||
| -rw-r--r-- | view/nl/htconfig.tpl | 98 | ||||
| -rw-r--r-- | view/nl/messages.po | 4 | ||||
| -rw-r--r-- | view/nl/register_open_eml.tpl | 17 | ||||
| -rw-r--r-- | view/nl/strings.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 21 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 6 |
11 files changed, 76 insertions, 320 deletions
diff --git a/assets/home.html b/assets/home.html index 4e8c9d67a..3fe3d02d7 100644 --- a/assets/home.html +++ b/assets/home.html @@ -46,7 +46,7 @@ var terms = new Array( "Cloud Storage", "Own Your Content", "Blogging", -"Decent Encryption", +"End-to-end Encryption", "Chatrooms", "Shareable Apps", "Cross-Site Access Control", @@ -92,8 +92,8 @@ var r = 0; var g = 0; var b = 0; -var speed = 5; -var delay = 250; +var speed = 3; +var delay = 450; var timer = null; var holdid = 0; @@ -101,15 +101,20 @@ var element = 'word-flasher'; var custom = ''; var seq = 0; var nindex = 0; - +var firstTime = 1; var curr = null; function update_element() { + if(firstTime) { + firstTime = 0; + fadeout(); + return; + } curr = terms[nindex]; nindex ++; if(terms[nindex] == null) - nindex = 0 + nindex = 0; var id = document.getElementById(element); id.innerHTML = curr; @@ -126,8 +131,10 @@ function fadeout() { if((r != 255) && (g != 255) && (b != 255)) { timer = setTimeout('fadeout();',5); } - else - update_element(); + else { + update_element(); + } + id.style.color = "rgb(" + r + "," + g + "," + b + ")"; } @@ -149,8 +156,7 @@ function fadein() { $(document).ready(function() { - update_element(); - $('.cb').colorbox({width: '50%',inline: true,href:"#farmer"}); + timer = setTimeout('update_element();',2000); }); @@ -160,10 +166,10 @@ $(document).ready(function() { <div style="margin-top: 50px;"></div> <center> -<img style="width: 450px; margin-top: 30px; margin-bottom: 30px;" src="assets/hashlogo.png" > -<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">RedMatrix</div> +<img style="width: 330px; margin-top: 30px; margin-bottom: 30px;" src="assets/hashlogo.png" > +<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">"The Network"</div> <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -The RedMatrix (aka "<span style="color: red;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin. +The RedMatrix (aka "<span style="color: #c60032;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin. </div> <br /> <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> @@ -178,9 +184,8 @@ Warning: After experiencing magic authentication and nomadic identity, you may f For the average person, the biggest advantage of decentralised identity is that you decide who you want to share your stuff with, and if somebody isn't on your list, they're not going to see it. It's all under your control (we're big on privacy). Use the RedMatrix as a social network or a business website or for personal cloud storage or media publishing - or any number of other uses; limited only by your imagination.<br /> </div> <br /> - -<div style="margin-top: 15px; margin-bottom: 15px; color: #808080; font-size: 1.8em;">Welcome to the matrix. Welcome to <span style="color: red;">red</span>.</div> -<div style="font-size: 1.4em;"><a href="pubsites" style="color: white; padding:10px; background-color: red; border-radius: 10px;">Sign up now!</a></div> +<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - "The Network"</strong></div> +<div style="font-size: 1.4em;"><a href="pubsites" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Sign up now!</a></div> <div style="margin-top: 15px; margin-bottom: 15px;"><a href="pubsites">Public Sites</a> | <a href="https://redmatrix.me">Project Home</a> | <a href="https://github.com/friendica/red">Code</a> | <a href="https://zothub.com/channel/one">Developers</a></div></center> diff --git a/assets/home2.html b/assets/home2.html deleted file mode 100644 index 6ea67363d..000000000 --- a/assets/home2.html +++ /dev/null @@ -1,195 +0,0 @@ -<style> -section { position: relative; margin-left: 15px;} -nav { z-index: 9999; position: fixed; width: 100%; top: 0; left: 0; } -header { z-index: 10000; } - -.tr { - clear: both; -} -.tab { - float: left; - width: 25px; -} -.td { - float: left; - width: 200px; - font-size: 1.8em; - margin-bottom: 5px; - margin-right: 25px; - color: #808080; - -} - -body::after { - content: ''; -/* background-image:url(assets/uluru2.jpg); */ - background-position: 50% 50%; - background-repeat: no-repeat; - top: 0; - left: 0; - bottom: 0; - right: 0; - position: absolute; - opacity: 0.5; - z-index: -1; -} - -.heart { - color: #ff0000; -} - - -</style> - -<script> - -var terms = new Array( -"Internet-scale Privacy", -"Social Networking", -"Single Sign-On", -"Photo Albums", -"Decentralised", -"Cloud Storage", -"Own Your Content", -"Blogging", -"Decent Encryption", -"Chatrooms", -"Cross-Site Access Control", -"Unsend Private Mail", -"Webpage Creation", -"Content Management", -"Message Expiration", -"Games and Utilities", -"Unincorporated", -"Forums", -"Like + Dislike", -"Share Anything Digital", -"Communications", -"Identity-Aware Content", -"Pseudonyms", -"Multiple Identities", -"No Advertising", -"Rich Text Post/Comment", -"Event Calendar", -"Bookmarking", -"Community Tagging", -"Mirrored Directory", -"Nomadic Identity", -"Derivative Channels", -"Customised Encryption", -"Multiple Profiles", -"Privacy Groups", -"File Sharing", -"MIT license", -"Autonomy", -"Affinity Filtering", -"Friend Suggestions", -"Cross-Site Auth", -"Themes", -"Plugins", -"External API", -"3rd Party Apps", -"Open Source", -null -); - -var r = 0; -var g = 0; -var b = 0; - -var speed = 2; -var delay = 1000; - -var timer = null; -var holdid = 0; -var element = 'word-flasher'; -var custom = ''; -var seq = 0; -var nindex = 0; - -var curr = null; - -function update_element() { - - curr = terms[nindex]; - nindex ++; - if(terms[nindex] == null) - nindex = 0 - - var id = document.getElementById(element); - id.innerHTML = curr; - timer = setTimeout('fadein();',5); -} - -function fadeout() { - - var id = document.getElementById(element); - r = (((r + speed) < 255) ? r + speed : 255); - g = (((g + speed) < 255) ? g + speed : 255); - b = (((b + speed) < 255) ? b + speed : 255); - - if((r != 255) && (g != 255) && (b != 255)) { - timer = setTimeout('fadeout();',10); - } - else - update_element(); - id.style.color = "rgb(" + r + "," + g + "," + b + ")"; -} - -function fadein() { - var id = document.getElementById(element); - r = (((r - speed) > 0) ? r - speed : 0); - g = (((g - speed) > 0) ? g - speed : 0); - b = (((b - speed) > 0) ? b - speed : 0); - - if(r && g && b) { - timer = setTimeout('fadein();',10); - } - else { - timer = setTimeout('fadeout();',delay); - } - - id.style.color = "rgb(" + r + "," + g + "," + b + ")"; -} - - -$(document).ready(function() { - update_element(); - $('.cb').colorbox({width: '50%',inline: true,href:"#farmer"}); -}); - - -</script> - - -<div style="margin-top: 50px;"></div> - -<center> -<!--img style="width: 450px; margin-top: 30px; margin-bottom: 30px;" src="assets/logo_simplifiedap.png" --> -<div style="width: 450px; margin-top: 30px; margin-bottom: 30px; font-size: 7em; font-weight: bold;" >red<span class="heart" style="font-size:120%; font-family: helvetica;">♥</span>matrix</div> - -<div style="color:#808080;font-weight:bold;font-size:3.0em; margin-bottom:30px;">Follow your heart</div> -<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">RedMatrix</div> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -The RedMatrix (aka "red") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages) with enough features to make your head spin. -</div> -<br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. This ties all RedMatrix sites and channels together into a single super-network where the boundaries between different websites are blurred or seemingly non-existent; where "who you are" has nothing to do with "what computer you're connected to", and where website content can adapt itself according to who is viewing it. -</div> -<br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a server or router in another country is having "<em>issues</em>". -</div> -<br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -For the average person, the biggest advantage of decentralised identity is that you decide who you want to share your stuff with, and if somebody isn't on your list, they're not going to see it. It's all under your control (we're big on privacy). Use the RedMatrix as a social network or a business website or for personal cloud storage or media publishing - or any number of other uses; limited only by your imagination.<br /> -</div> -<br /> - -<div style="margin-top: 15px; color: #808080; font-size: 1.8em;">Welcome to the matrix. Welcome to red.</div> -<div style="font-size: 1.4em;"><a href="pubsites">Sign up now!</a></div> - - -<div style="margin-top: 15px; margin-bottom: 15px;"><a href="pubsites">Public Sites</a> | <a href="https://redmatrix.me">Project Home</a> | <a href="https://github.com/friendica/red">Code</a> | <a href="https://zothub.com/channel/one">Developers</a></div></center> - diff --git a/doc/bbcode.html b/doc/bbcode.html index 1bcb9039c..5692ec0d2 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -64,7 +64,7 @@ <li>[spoiler] for hiding spoilers<br /><br /> <li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional <br /> - +<li>[qr]text to post[/qr] - create a QR code.<br /> </div> diff --git a/mod/home.php b/mod/home.php index 862f6303c..6f7a0b5d7 100644 --- a/mod/home.php +++ b/mod/home.php @@ -76,6 +76,7 @@ function home_content(&$a) { if(get_config('system','projecthome')) { $o .= file_get_contents('assets/home.html'); $a->page['template'] = 'full'; + $a->page['title'] = t('Red Matrix - "The Network"'); return $o; } 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 @@ -<?php - -// Set the following for your MySQL installation -// Copy or rename this file to .htconfig.php - -$db_host = '{{$dbhost}}'; -$db_port = '{{$dbport}}'; -$db_user = '{{$dbuser}}'; -$db_pass = '{{$dbpass}}'; -$db_data = '{{$dbdata}}'; - -/* - * Notice: Many of the following settings will be available in the admin panel - * after a successful site install. Once they are set in the admin panel, they - * are stored in the DB - and the DB setting will over-ride any corresponding - * setting in this file - * - * The command-line tool util/config is able to query and set the DB items - * directly if for some reason the admin panel is not available and a system - * setting requires modification. - * - */ - - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '{{$timezone}}'; - -// What is your site name? - -$a->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"; |