diff --git a/web/b3desk/routes.py b/web/b3desk/routes.py index c1d9d370..b11534f5 100755 --- a/web/b3desk/routes.py +++ b/web/b3desk/routes.py @@ -296,10 +296,8 @@ def welcome(): max_meetings_per_user=current_app.config["MAX_MEETINGS_PER_USER"], mailto=current_app.config["MAILTO_LINKS"], quick_meeting=current_app.config["QUICK_MEETING"], - shorty=current_app.config["SHORTY"], file_sharing=current_app.config["FILE_SHARING"], clipboard=current_app.config["CLIPBOARD"], - recording=current_app.config["RECORDING"], ) @@ -481,8 +479,6 @@ def edit_meeting_files(meeting_id): "meeting/filesform.html", meeting=meeting, form=form, - fqdn=current_app.config["SERVER_FQDN"], - beta=current_app.config["BETA"], ) flash(_("Vous ne pouvez pas modifier cet élément"), "warning") return redirect(url_for("routes.welcome")) diff --git a/web/b3desk/templates/brand.html b/web/b3desk/templates/brand.html index 0f8903ac..b82c7d49 100644 --- a/web/b3desk/templates/brand.html +++ b/web/b3desk/templates/brand.html @@ -17,7 +17,7 @@
{% trans %}{{ service_title }}{% endtrans %} - {% if beta %} + {% if config.get("BETA") %} BETA {% endif %}
diff --git a/web/b3desk/templates/jumbotron.html b/web/b3desk/templates/jumbotron.html index 7aacd62b..9d57ec03 100644 --- a/web/b3desk/templates/jumbotron.html +++ b/web/b3desk/templates/jumbotron.html @@ -4,14 +4,14 @@{{ welcome_page_subtitle }}
{% endif %}@@ -43,7 +43,7 @@
{% trans %}Vous êtes agent de l’État, créez un compte pour organiser et conserver vos {{ some_meetings }}.{% endtrans %}
{% trans %}Se connecter ou créer un compte{% endtrans %}
- {% if stats %} + {% if stats is defined and stats %}
{% trans trimmed count=stats["runningCount"]%}
diff --git a/web/b3desk/templates/meeting/files.html b/web/b3desk/templates/meeting/files.html
index 56cb3304..60e3037c 100644
--- a/web/b3desk/templates/meeting/files.html
+++ b/web/b3desk/templates/meeting/files.html
@@ -198,7 +198,7 @@
-
+
diff --git a/web/b3desk/templates/meeting/js_script.html b/web/b3desk/templates/meeting/js_script.html
index 720665b3..5f60e3da 100644
--- a/web/b3desk/templates/meeting/js_script.html
+++ b/web/b3desk/templates/meeting/js_script.html
@@ -389,7 +389,7 @@
const nc_login = "{{ user.nc_login }}";
const nc_token = "{{ user.nc_token }}";
const meeting_id = "{{ meeting.id }}";
-const fqdn = "{{ fqdn }}";
+const fqdn = "{{ config.get("SERVER_FQDN") }}";
let ncfilepicker = null;
if (!nc_locator || !nc_login || !nc_token) {
diff --git a/web/b3desk/templates/meeting/row.html b/web/b3desk/templates/meeting/row.html
index 08701256..a0ffaeca 100644
--- a/web/b3desk/templates/meeting/row.html
+++ b/web/b3desk/templates/meeting/row.html
@@ -1,5 +1,5 @@