Merge branch 'master' into comment-latest

Author: Trim

Docker.md

@@ -2,33 +2,34 @@ LinuxFr on Docker
 -----------------
 
 To simplify set up of a developement environment, LinuxFr.org can be
-run on Docker with `docker-compose up`.
+run on Docker with `docker compose up`.
 
 To init the SQL database schema, you need to wait upto the `database`
-and `database-test` containers are ready to listen MySQL connections.
+container to be ready to listen MySQL connections.
 
 For example, you should see in the logs:
 
-> database-test_1  | 2020-09-21 16:03:12 140126029907968 [Note] mysqld: ready for connections.
->
-> database-test_1  | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
->
 > database_1       | 2020-09-21 16:03:12 139820938893312 [Note] mysqld: ready for connections.
 >
 > database_1       | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
 
+Or you can check the `database` container status to be "healthy".
+
 Then, open a second terminal and run:
 
 ```
-docker-compose run linuxfr.org bin/rails db:setup
+docker compose exec linuxfr.org bin/rails db:setup
 ```
 
 Finally, the environment is ready and you can open [http://dlfp.lo](http://dlfp.lo)
 in your favorite browser.
 
-Note: to be able to access this URL, you'll need to add the line
-`127.0.0.1 dlfp.lo image.dlfp.lo` to the `/etc/hosts` file of your
-machine.
+Note: to be able to access this URL, you'll need to add the following line
+into the `/etc/hosts` file of your machine:
+
+```
+127.0.0.1 dlfp.lo image.dlfp.lo
+```
 
 Personalize configuration
 =========================
@@ -44,7 +45,7 @@ service.
 
 If you want to change the application port and/or other configurations, you can
 [override](https://docs.docker.com/compose/extends/)
-the docker-compose configuration (in particular the `nginx` service for
+the docker compose configuration (in particular the `nginx` service for
 the port).
 
 Notice, that if LinuxFr.org doesn't run on port 80, the image cache
@@ -53,7 +54,7 @@ service won't work well and so you won't be able to see images in the news.
 Test modifications
 ==================
 
-The docker-compose is currently configured to share `./app`, `./db` and
+The docker compose is currently configured to share `./app`, `./db` and
 `./public` directories with the docker container.
 
 So you can update files with your prefered IDE on your machine. Rails
@@ -62,39 +63,61 @@ will directly detect changes and apply them on next page reload.
 Furthermore, if you need to access the Rails console, you need a second
 terminal and run:
 
-`docker-compose run linuxfr.org bin/rails console`
+```
+docker compose exec linuxfr.org bin/rails console
+```
 
 Note: currently, we didn't configure rails to show directly the
 `webconsole` in your browser. That's just because of time needed to
 find the good configuration, any help will be appreciated !
 
-Inspect database schema
-=======================
+Run application tests
+=====================
+
+To help maintainers, we are in the process of adding tests to check the
+application has still the expected behaviour.
 
-In case you need to inspect the database, you need a second terminal
-and run:
+To get help about writing tests, see the 
+[Ruby on Rails documentation](https://guides.rubyonrails.org/testing.html#the-rails-test-runner)
+.
 
-`docker-compose run database mysql -hdatabase -ulinuxfr_rails -p linuxfr_rails`
+To run tests with Docker environment, you need to use this command:
 
-By default, the requested password is the same as the username.
+```
+docker compose exec linuxfr.org bin/rails test -v
+```
+
+Inspect the database schema
+===========================
+
+In case you need to inspect the database, the port `3306` of your machine is
+by default bound to the port `3306` of the database container.
+
+Thus you can connect to the linuxfr database with hostname `localhost` and the
+username, password and database name defined in the `deployment/default.env`
+configuration file (all three last are by default `linuxfr_rails`).
 
 Apply database migrations
 =========================
 
 In case you need to apply new database migrations, you need a second
 terminal and run:
 
-`docker-compose run linuxfr.org bin/rails db:migrate`
+```
+docker compose exec linuxfr.org bin/rails db:migrate
+```
 
 If you had issue and want to reset all data in your database system,
 use:
 
-`docker-compose run linuxfr.org bin/rails db:reset`
+```
+docker compose exec linuxfr.org bin/rails db:reset
+```
 
-Services provided by the docker-compose
+Services provided by the docker compose
 =======================================
 
-Currently, these services are directly enabled by docker-compose:
+Currently, these services are directly enabled by docker compose:
 
 1. The [LinuxFr.org](https://github.com/linuxfrorg/linuxfr.org)
 ruby on rails application itself
@@ -111,7 +134,7 @@ For now, these services aren't available:
 because it requires to run 
 LinuxFr.org with a TLS certificate. When the service will accept to
 fetch articles with simple `http://`, we'll be able to provide it
-directly with docker-compose.
+directly with docker compose.
 2. The [svgtex service](https://github.com/linuxfrorg/svgtex), because LinuxFr
 has hard-coded the `localhost`
 hostname in it's [HTML Pipeline tool](https://github.com/linuxfrorg/html-pipeline-linuxfr/blob/linuxfr/lib/html/pipeline/linuxfr.rb#L8)

Gemfile

@@ -45,11 +45,15 @@ gem "sass-rails",            "~>5.0", require: assets
 gem "rails-sass-images",              require: assets
 gem "uglifier",                       require: assets
 
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "byebug", platforms: :mri
+end
+
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
-  gem "byebug",                platform: :mri
   gem "capistrano",            "~>2.15", github: 'capistrano', branch: 'legacy-v2'
   gem "capistrano-maintenance"
   gem "letter_opener"
@@ -62,6 +66,12 @@ group :development do
   gem "web-console"
 end
 
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem "capybara", ">= 2.15"
+  gem "selenium-webdriver"
+end
+
 group :production, :alpha do
   gem "unicorn",               "~>5.1"
   gem "gctools",               "~>0.2"

INSTALL.md

@@ -176,12 +176,24 @@ server {
 
     listen 0.0.0.0:80;
 
-    location ~ ^/(avatars|medias)/ {
+    location ~ ^/medias/ {
       root /home/linuxfr/linuxfr.org/uploads;
     }
 
-    # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+    # Avatars files uploaded on linuxfr server are stored in partitions
+    # with folder name containing 3 digits
+    location ~ ^/avatars/\d\d\d/ { 
+      root /home/linuxfr/linuxfr.org/uploads;
+    }
+
+    # Avatars URLs has to be served by the image service
+    location ~ ^/avatars/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+        proxy_pass http://localhost:8000;
+    }
+
     location /img/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
         proxy_pass http://localhost:8000;
     }
 

app/assets/javascripts/application.coffee

@@ -33,15 +33,18 @@ $("textarea, #form_answers input").keypress (event) ->
 
 # Add/Remove dynamically links in the news form
 langs =
+  xx: "!? hmmm ?!"
   fr: "Français"
-  en: "Anglais"
   de: "Allemand"
+  en: "Anglais"
   eu: "Basque"
   ct: "Catalan"
   cn: "Chinois"
+  wq: "Code/binaire"
   ko: "Coréen"
   da: "Danois"
   es: "Espagnol"
+  ee: "Estonien"
   fi: "Finnois"
   el: "Grec"
   it: "Italien"
@@ -52,7 +55,6 @@ langs =
   pt: "Portugais"
   ru: "Russe"
   sv: "Suédois"
-  xx: "!? hmmm ?!"
 
 $("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: langs
 $("#form_answers").nested_fields "poll", "answer", "choix", "p", answer: "text"
@@ -63,7 +65,7 @@ $("article.news .edited_by").each ->
   nb = field.find("a").length
   if nb > 3
     was = field.html()
-    field.html "<a>#{nb} contributeurs</a>"
+    field.html "<a>#{nb} personnes</a>"
     field.one "click", -> field.html was
 
 # Toolbar preferences

app/assets/javascripts/chat.coffee

@@ -144,9 +144,9 @@ class Chat
               .css(display: "none", position: "absolute")
               .append("<img src=\"#{@totoz_url}#{totozName}\"/>")
       @totoz.append totoz
-    offset = $(event.target).offset()
-    [x, y] = [offset.left, offset.top]
-    totoz.css "z-index": "15", display: "block", top: y + 20, left: x + 20
+    position = $(event.target).position()
+    [x, y] = [position.left, position.top + event.target.offsetHeight]
+    totoz.css "z-index": "15", display: "block", top: y + 5, left: x + 5
 
   destroyTotoz: (event) =>
     totozId = encodeURIComponent(event.target.getAttribute("data-totoz-name")).replace(/[%']/g, "")

app/assets/stylesheets/contrib/grayscale.scss

@@ -2311,6 +2311,11 @@ form#new_diary > p:nth-child(4) {
   position: relative;
   top: 2px;
 }
+*:not(.markItUpHeader) > ul > .link[lang="ee"]:before {
+  content: url("/images/langs/ee.png");
+  position: relative;
+  top: 2px;
+}
 *:not(.markItUpHeader) > ul > .link[lang="el"]:before {
   content: url("/images/contrib/grayscale/flags/el.png");
   position: relative;
@@ -2391,6 +2396,11 @@ form#new_diary > p:nth-child(4) {
   position: relative;
   top: 2px;
 }
+*:not(.markItUpHeader) > ul > .link[lang="wq"]:before {
+  content: url("/images/langs/wq.png");
+  position: relative;
+  top: 2px;
+}
 #phare .link,
 #phare .meta,
 #phare footer {

app/assets/stylesheets/contrib/kaiska-new.scss

@@ -763,6 +763,9 @@ li.link[lang="da"] {
 li.link[lang="de"] {
   list-style: url("/images/langs/de.png");
 }
+li.link[lang="ee"] {
+  list-style: url("/images/langs/ee.png");
+}
 li.link[lang="el"] {
   list-style: url("/images/langs/el.png");
 }
@@ -811,6 +814,9 @@ li.link[lang="sv"] {
 li.link[lang="xx"] {
   list-style: url("/images/langs/xx.png");
 }
+li.link[lang="wq"] {
+  list-style: url("/images/langs/wq.png");
+}
 
 div.content a[href^="/wiki/"],
 div.content a[href^="//linuxfr.org/wiki/"] {

app/assets/stylesheets/contrib/solarized/langs.scss

@@ -15,6 +15,9 @@ li.link[lang="da"] {
 li.link[lang="de"] {
   list-style-image: url("/images/langs/de.png");
 }
+li.link[lang="ee"] {
+  list-style-image: url("/images/langs/ee.png");
+}
 li.link[lang="el"] {
   list-style-image: url("/images/langs/el.png");
 }
@@ -63,3 +66,6 @@ li.link[lang="sv"] {
 li.link[lang="xx"] {
   list-style-image: url("/images/langs/xx.png");
 }
+li.link[lang="wq"] {
+  list-style-image: url("/images/langs/wq.png");
+}

app/assets/stylesheets/parts/content.scss

@@ -4,6 +4,7 @@ ul.threads > li.comment,
 ul.comments_list > li.comment,
 .markdown_cheatsheet,
 #contents > form,
+#followup_container,
 form#new_post,
 body#users-comments #contents > ul > li,
 body#comments-create #contents > ul > li#comment_new,

app/assets/stylesheets/parts/redaction.scss

@@ -528,3 +528,12 @@ body#redaction-index {
   float: left;
   margin: 12px 25px 0 0;
 }
+
+#followup_mail {
+  font-family: mono;
+  hyphens: none;
+  border-width: 1px;
+  pre {
+    white-space: pre-wrap;
+  }
+}