aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhellekin <hellekin@cepheide.org>2021-01-23 15:42:33 +0100
committerhellekin <hellekin@cepheide.org>2021-01-23 15:42:33 +0100
commit84dc56483203e13eafe69962ec6bc0c28c47aca7 (patch)
treee76e6bba8e08a84906f5cccc9205f3da2aff12e3
parent73b3fffdbe730c33480682c40e7e8271e75ddf59 (diff)
downloadincommon-map-84dc56483203e13eafe69962ec6bc0c28c47aca7.tar.gz
Remove unused Taxonomy target and refactor debug
Cleaning up the code.
-rw-r--r--app/javascript/controllers/taxonomy_controller.js3
-rw-r--r--app/views/application/_debug.html.erb2
-rw-r--r--app/views/welcome/index.html.erb19
3 files changed, 13 insertions, 11 deletions
diff --git a/app/javascript/controllers/taxonomy_controller.js b/app/javascript/controllers/taxonomy_controller.js
index 413872b..48d9a52 100644
--- a/app/javascript/controllers/taxonomy_controller.js
+++ b/app/javascript/controllers/taxonomy_controller.js
@@ -9,7 +9,7 @@
import { Controller } from "stimulus"
export default class extends Controller {
- static targets = [ "category", "deploy", "filter", "layers", "section", "toggle" ]
+ static targets = [ "category", "deploy", "filter", "section", "toggle" ]
initialize() {
console.log("Taxonomy controller initialized.")
@@ -18,6 +18,7 @@ export default class extends Controller {
this.sectionsOnMap = []
}
+ // Load filtering sidebar
connect() {
console.log("Taxonomy controller connected.")
this.taxonomy_uuid = this.data.get('uuid')
diff --git a/app/views/application/_debug.html.erb b/app/views/application/_debug.html.erb
index fce114d..94b4a1a 100644
--- a/app/views/application/_debug.html.erb
+++ b/app/views/application/_debug.html.erb
@@ -1,4 +1,4 @@
-<% if Rails.env.development? %>
+<% if Rails.env.development? && current_user.present? %>
<div id="debug">
<%= yield :debug %>
</div>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 0d70707..ca0245a 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,23 +1,24 @@
-<h1>Bienvenue à l'atelier carto d'IN COMMON</h1>
+<h1 lang="fr">Bienvenue à l'atelier carto d'IN COMMON</h1>
<%= map_container %>
+<section class="hidden" lang="fr">
+ <h2>À propos d'IN COMMON</h2>
+
+ <p>Le collectif <a href="https://incommon.cc/">IN COMMON</a> rassemble les personnes et organisations actrices des Communs, pour les identifier, les promouvoir et les défendre.</p>
+ <p>Cette application vous permet de visualiser les données recensées par le soin de nos Agents concernant les ressources partagées notamment sur le territoire Belge. Elle permet également l'édition de ces données afin de les maintenir toujours au plus près de la situation réelle et actuelle.</p>
+ <p>Si vous désirez rejoindre un Agent ou pourquoi pas en créer un, merci de consulter <a href="https://talk.incommon.cc/pub/charte-incommon">la Charte IN COMMON</a> et, s'il vous plaît, de <a href="https://talk.incommon.cc">rejoindre la conversation</a>.</p>
+</section>
<% content_for :aside do %>
<div data-controller="taxonomy" data-taxonomy-uuid="<%= @taxonomy.to_param %>">
<div class="leaflet-bar leaftlet-control" id="taxonomy-toggle">
<button data-action="taxonomy#toggle" data-target="taxonomy.toggle"></button>
</div>
<div data-target="taxonomy.filter"></div>
- <div data-target="taxonomy.layers"></div>
</div>
<% end %>
<% content_for :debug do %>
- <% if current_user.present? %>
- <%= pluralize(Resource.count, "resource") %>
- <% end %><%# ensure it does not break when we don't have a record... %>
-<% end %>
-
-<% content_for :footer do %>
- <%= version_string %>
+ <p><%= pluralize(Resource.count, "resource") %></p>
+ <p><%= pluralize(Agent.count, "agent") %></p>
<% end %>