[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 5 commits - debian/changelog loleaflet/css loleaflet/html loleaflet/src loleaflet/welcome loolwsd.spec.in

Pedro Pinto Silva (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 11 10:59:49 UTC 2020


 debian/changelog                                   |    6 +++++
 loleaflet/css/toolbar.css                          |   22 ++++++++++++++-----
 loleaflet/html/loleaflet.html.m4                   |    1 
 loleaflet/src/control/Control.DocumentNameInput.js |   11 +++++++++
 loleaflet/src/control/Toolbar.js                   |    4 +--
 loleaflet/welcome/welcome-de.html                  |   17 +++++++-------
 loleaflet/welcome/welcome-es.html                  |   18 ++++++++-------
 loleaflet/welcome/welcome-fr.html                  |   19 ++++++++--------
 loleaflet/welcome/welcome.html                     |   24 +++++++++++----------
 loolwsd.spec.in                                    |    2 -
 10 files changed, 79 insertions(+), 45 deletions(-)

New commits:
commit 241eac18d324a2712ff9503946fab74f36349df1
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Wed Jun 10 15:56:34 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 12:58:28 2020 +0200

    Desktop: Set max size for document name's width
    
    Change-Id: Ic35990efd9e240ed29ae9da1e72dcd6b58a4e933
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96053
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 13eb379d5..20fb595a0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -149,6 +149,19 @@ w2ui-toolbar {
 #tb_formulabar_item_formula div table {
 		width: 100%;
 }
+#document-title-pencil.editable {
+	visibility: visible;
+	width: 24px;
+	height: 22px;
+	position: absolute;
+	left: 87%;
+	background: url('images/baseline-edit.svg') right center no-repeat, radial-gradient(circle, #fff 20%, #fff0 100%);
+	border-top: solid 3px white;
+}
+
+#document-title-pencil:not(.editable){
+	visibility: hidden;
+}
 
 #document-name-input {
 		font-size: 16px;
@@ -159,25 +172,25 @@ w2ui-toolbar {
 #document-name-input.editable {
 	border: none;
 	box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
-	background-image: url('images/baseline-edit.svg');
 	background-position: right;
 	background-repeat: no-repeat;
+	padding-right: 24px;
+	max-width: 100%;
 }
 
 #document-name-input.editable:focus {
 		border: none;
 		box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
 		background-color: white;
+		background-image: none;
 }
 
 #document-name-input.editable:hover:not(:focus) {
 		border: none;
 		box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
 		background-color: white;
-		background-image: url('images/baseline-edit.svg');
 		background-position: right;
 		background-repeat: no-repeat;
-		padding-right: 2px;
 }
 #tb_editbar_item_fold table.w2ui-button {
 	margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index d3c3e21de..f84271e62 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,6 +145,7 @@ m4_ifelse(MOBILEAPP,[true],
        <ul id="main-menu" class="sm sm-simple lo-menu readonly"></ul>
        <div id="document-titlebar">
          <div class="document-title">
+           <div id="document-title-pencil"></div>
            <input id="document-name-input" type="text" disabled="true" style="display: none"/>
          </div>
        </div>
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js b/loleaflet/src/control/Control.DocumentNameInput.js
index 090cc25f9..28db57f41 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -65,7 +65,13 @@ L.Control.DocumentNameInput = L.Control.extend({
 	},
 
 	onDocLayerInit: function() {
-		$('#document-name-input').attr('size', $('#document-name-input').val().length);
+		var value = $('#document-name-input').val();
+		if (value.length < 27) {
+			$('#document-name-input').attr('size', value.length);
+		}
+		else {
+			$('#document-name-input').attr('size', '25');
+		}
 
 		// FIXME: Android app would display a temporary filename, not the actual filename
 		if (window.ThisIsTheAndroidApp) {
@@ -78,6 +84,7 @@ L.Control.DocumentNameInput = L.Control.extend({
 			// We can now set the document name in the menu bar
 			$('#document-name-input').prop('disabled', false);
 			$('#document-name-input').removeClass('editable');
+			$('#document-title-pencil').removeClass('editable');
 			$('#document-name-input').focus(function() { $(this).blur(); });
 			// Call decodecodeURIComponent twice: Reverse both our encoding and the encoding of
 			// the name in the file system.
@@ -99,12 +106,14 @@ L.Control.DocumentNameInput = L.Control.extend({
 			// Save As allowed
 			$('#document-name-input').prop('disabled', false);
 			$('#document-name-input').addClass('editable');
+			$('#document-title-pencil').addClass('editable');
 			$('#document-name-input').off('keypress', this.onDocumentNameKeyPress).on('keypress', this.onDocumentNameKeyPress.bind(this));
 			$('#document-name-input').off('focus', this.onDocumentNameFocus).on('focus', this.onDocumentNameFocus.bind(this));
 			$('#document-name-input').off('blur', this.documentNameCancel).on('blur', this.documentNameCancel.bind(this));
 		} else {
 			$('#document-name-input').prop('disabled', true);
 			$('#document-name-input').removeClass('editable');
+			$('#document-title-pencil').removeClass('editable');
 			$('#document-name-input').off('keypress', this.onDocumentNameKeyPress);
 		}
 	}
commit a8934aa6e48c0b766807ed5eacfa0a5ebef0f730
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Tue Jun 9 11:25:16 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 12:58:22 2020 +0200

    Desktop: Set (on LayerInit)  document name's size dynamically according to its value
    
    Change-Id: I5e15b50c4ecf51d8e713cfc0fe116b44294e1e45
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95904
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Pedro Silva <pedro.silva at collabora.com>
    Reviewed-by: Pedro Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 45b1531ec..13eb379d5 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -154,7 +154,6 @@ w2ui-toolbar {
 		font-size: 16px;
 		border: 1px solid transparent;
 		background-color: transparent;
-		width: 200px;
 }
 
 #document-name-input.editable {
@@ -169,7 +168,6 @@ w2ui-toolbar {
 		border: none;
 		box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
 		background-color: white;
-		width: 200px;
 }
 
 #document-name-input.editable:hover:not(:focus) {
@@ -179,8 +177,7 @@ w2ui-toolbar {
 		background-image: url('images/baseline-edit.svg');
 		background-position: right;
 		background-repeat: no-repeat;
-		padding-right: 20px;
-		width: 181px;
+		padding-right: 2px;
 }
 #tb_editbar_item_fold table.w2ui-button {
 	margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js b/loleaflet/src/control/Control.DocumentNameInput.js
index ab22cd1a3..090cc25f9 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -65,6 +65,8 @@ L.Control.DocumentNameInput = L.Control.extend({
 	},
 
 	onDocLayerInit: function() {
+		$('#document-name-input').attr('size', $('#document-name-input').val().length);
+
 		// FIXME: Android app would display a temporary filename, not the actual filename
 		if (window.ThisIsTheAndroidApp) {
 			$('#document-name-input').hide();
commit 78e4cc8e447c6eb79fca72f3a008b2f19b9a9358
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jun 11 10:58:28 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 12:57:45 2020 +0200

    Bump version to 4.2.4-4
    
    Change-Id: I65284a7a3d014969fef119eb6afb05d4cb206b45

diff --git a/debian/changelog b/debian/changelog
index 1e0a86899..a3139c31b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-4) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-4
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 11 Jun 2020 11:00:00 +0200
+
 loolwsd (4.2.4-3) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 8cc3a2ce3..67b759986 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        3%{?dist}
+Release:        4%{?dist}
 Vendor:         %{vendor}
 Summary:        LibreOffice Online WebSocket Daemon
 License:        EULA
commit cefdc0c91564d19e5d531686a45ae207861d8a08
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Thu Jun 11 01:35:15 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 12:57:37 2020 +0200

    Relax the cookie for the Welcome message
    
    Change-Id: Ia58b6a0125ece8eb4c3a6ea14c03c7c33dfc655a

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..1ce90a3ba 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -411,7 +411,7 @@ L.Map.include({
 					var cookiePath = '/loleaflet';
 					if (window.socketProxy)
 						cookiePath = window.host + window.serviceRoot + cookiePath;
-					WSDVerCookie += '; max-age=31536000; SameSite=Strict; path=' + cookiePath;
+					WSDVerCookie += '; max-age=31536000; SameSite=Lax; path=' + cookiePath;
 					document.cookie = WSDVerCookie;
 				}
 				map.focus();
@@ -445,7 +445,7 @@ L.Map.include({
 				var cookiePath = '/loleaflet';
 				if (window.socketProxy)
 					cookiePath = window.host + window.serviceRoot + cookiePath;
-				var welcomeDisabledCookie = 'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=' + cookiePath;
+				var welcomeDisabledCookie = 'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
 				document.cookie = welcomeDisabledCookie;
 
 				if (calledFromMenu)
commit c47edff1d71447a798aa4cc7493057fbd839d432
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jun 10 11:33:50 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 12:57:31 2020 +0200

    Updated welcome messages
    
    Change-Id: Ibca158574a31266aab39a88cd39dd73830af089f

diff --git a/loleaflet/welcome/welcome-de.html b/loleaflet/welcome/welcome-de.html
index 01f51d2b8..749596a97 100644
--- a/loleaflet/welcome/welcome-de.html
+++ b/loleaflet/welcome/welcome-de.html
@@ -1,10 +1,11 @@
 <h3 id="product-name" style="text-align:center;">Willkommen</h3>
-<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> zu einer neuen <a href="https://www.collaboraoffice.com/code/#what_are_the_latest_updates" target="_blank">Version von CODE</a> – der Collabora Online Development Edition</p>
-<p>Erleben Sie die <em style="color: rgb(48,48,48);">neuesten Entwicklungen</em> im Bereich der online Büroanwendung. Sie können CODE frei nutzen und mit bis zu 20 weiteren Nutzern gleichzeitig an bis zu 10 paralell offenen Dokumenten ausprobieren. Für den geschäftlich produktiven Einsatz <em style="color: rgb(48,48,48);">empfehlen wir</em> Ihnen eine unserer <a href="https://www.collaboraoffice.com/subscriptions/" target="_blank">unterstützten Versionen</a>.</p>
-<p style="font-size: medium;" "="">Besuchen Sie unsere Webseite und erfahren Sie mehr über unsere verschiedenen Büroanwendungslösungen. Wir sind immer auf der Suche nach Gelegenheiten und Partnerschaften, um <em style="color: rgb(48,48,48);">weitere großartige open source Software zu entwickeln</em>!
+<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> zu einer neuen <a href="https://www.collaboraoffice.com/de/code/#what_are_the_latest_updates" target="_blank">Version von CODE</a> – der Collabora Online Development Edition</p>
+<p style="font-size: medium;">Erleben Sie die neuesten Entwicklungen im Bereich der online Büroanwendung. Sie können CODE frei nutzen und mit bis zu 20 weiteren Nutzern gleichzeitig an bis zu 10 paralell offenen Dokumenten ausprobieren. Für den geschäftlich produktiven Einsatz empfehlen wir Ihnen eine unserer <a href="https://www.collaboraoffice.com/de/subscriptions/" target="_blank">unterstützten Versionen</a>.</p>
+<p style="font-size: medium;">Besuchen Sie unsere Webseite und erfahren Sie mehr über unsere verschiedenen Büroanwendungslösungen. Wir sind immer auf der Suche nach Gelegenheiten und Partnerschaften, um weitere großartige open source Software zu entwickeln!
+</p>
+<hr style="border-top: 1px dashed #dfdfdf;color: #fff;">
+<p style="font-size: small;opacity: 0.8;">Testen Sie unsere mobilen Apps - Sie finden das kostenlose <a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora
+Office für Android & iOS</a> in den App-Stores.
+<br>
+Entdecken Sie auch, <a href="https://www.collaboraoffice.com/de/case-studies/" target="_blank">wie wir helfen</a>, Unternehmen und öffentliche Verwaltungen durch professionellen Support und SLA noch produktiver zu machen.<br>Wir freuen uns über Ihr Feedback!
 </p>
-<hr style=" border-top: 1px dashed #dfdfdf;color: #fff;">
-<p style="font-size: small;opacity: 0.8;">Testen Sie unsere  <em style="color: rgb(48,48,48);">mobilen Apps</em> - Sie finden das kostenlose <a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora
-Office für Android & iOS</a> in den App-Stores.</p>
-<p style="font-size: small;opacity: 0.8;">Entdecken Sie auch, <a href="https://www.collaboraoffice.com/case-studies/" target="_blank">
-wie wir helfen</a>, Unternehmen und öffentliche Verwaltungen durch <em style="color: rgb(48,48,48);">professionellen Support und SLA</em> noch produktiver zu machen.<br>Wir freuen uns über Ihr Feedback!
diff --git a/loleaflet/welcome/welcome-es.html b/loleaflet/welcome/welcome-es.html
index a83211513..cf44585ec 100644
--- a/loleaflet/welcome/welcome-es.html
+++ b/loleaflet/welcome/welcome-es.html
@@ -1,11 +1,13 @@
 <h3 id="product-name" style="text-align:center;">Bienvenido</h3>
-<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> a una nueva <a href="https://www.collaboraoffice.com/code/#what_are_the_latest_updates" target="_blank">versión de CODE</a> – Collabora Online Development Edition</p>
-<p>Disfruta de <em style="color: rgb(48,48,48);">los últimos desarrollos</em> en productividad online, de forma totalmente gratuita, para explorar y usar con otras personas, hasta 20 usuarios concurrentes o 10 documentos abiertos. Para empresas y entornos de producción <em style="color: rgb(48,48,48);">te recomendamos</em> una de nuestras <a href="https://www.collaboraoffice.com/subscriptions/" target="_blank">versiones soportadas</a>.</p>
-<p style="font-size: medium;" "="">¡Vista nuestra web! Aprenderás más sobre nuestras diferentes
-soluciones de productividad. ¡Siempre estamos buscando oportunidades y asociaciones que <em style="color: rgb(48,48,48);">nos ayuden a desarrollar más y mejor software de código abierto</em>!
+<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> La <a href="https://www.collaboraoffice.com/es/code/#what_are_the_latest_updates" target="_blank">nueva versión de CODE</a> – the Collabora Online Development Edition</p>
+<p style="font-size: medium;">Disfruta de los últimos desarrollos en productividad online, de forma totalmente gratuita, para explorar y usar con otras personas, hasta 20 usuarios concurrentes o 10 documentos abiertos. Para empresas y entornos de producción te recomendamos una de nuestras <a href="https://www.collaboraoffice.com/es/subscriptions/" target="_blank">versiones soportadas</a>.</p>
+<p style="font-size: medium;">¡Vista nuestra web! Aprenderás más sobre nuestras diferentes
+soluciones de productividad. ¡Siempre estamos buscando oportunidades y asociaciones que nos ayuden a desarrollar más y mejor software de código abierto!
 </p>
-<hr style=" border-top: 1px dashed #dfdfdf;color: #fff;">
-<p style="font-size: small;opacity: 0.8;">Por qué no pruebas nuestras <em style="color: rgb(48,48,48);">aplicaciones móviles</em> - encontrarás nuestra aplicación gratuita
+<hr style="border-top: 1px dashed #dfdfdf;color: #fff;">
+<p style="font-size: small;opacity: 0.8;">Por qué no pruebas nuestras aplicaciones móviles - encontrarás nuestra aplicación gratuita
 <a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora
-Office para Android & iOS</a> en las tiendas de app.</p>
-<p style="font-size: small;opacity: 0.8;">No te olvides de ver <a href="https://www.collaboraoffice.com/case-studies/" target="_blank">cómo podemos ayudar</a> a empresas, administraciones públicas y otros a ser más productivos con nuestro <em style="color: rgb(48,48,48);">soporte profesional y SLA.</em><br>¡Envíanos tus comentarios!
+Office para Android & iOS</a> en las tiendas de app.
+<br>
+No te olvides de ver <a href="https://www.collaboraoffice.com/es/case-studies/" target="_blank">cómo podemos ayudar</a> a empresas, administraciones públicas y otros a ser más productivos con nuestro soporte profesional y SLA.<br>¡Envíanos tus comentarios!
+</p>
diff --git a/loleaflet/welcome/welcome-fr.html b/loleaflet/welcome/welcome-fr.html
index 0867858e0..b0455864b 100644
--- a/loleaflet/welcome/welcome-fr.html
+++ b/loleaflet/welcome/welcome-fr.html
@@ -1,12 +1,13 @@
 <h3 id="product-name" style="text-align:center;">Bienvenue</h3>
-<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;">dans la <a href="https://www.collaboraoffice.com/fr/code/#what_are_the_latest_updates" target="_blank">nouvelle version de CODE</a> – l'Édition Développement de Collabora Online</p>
-<p>Profitez des <em style="color: rgb(48,48,48);">dernières fonctionnalités développées</em> offertes que vous pourrez découvrir à plusieurs dans cet outil de productivité en ligne, jusqu'à 20 utilisateurs simultanés et 10 documents ouverts simultanément.
-Pour une utilisation dans le monde de l'entreprise et dans un environnement de production, <em style="color: rgb(48,48,48);">on recommande</em> l'utilisation <a href="https://www.collaboraoffice.com/fr/subscriptions/" target="_blank">de versions supportées</a>.</p>
-<p style="font-size: medium;" "="">Visitez notre site web pour connaître les différentes solutions de productivité proposées.
-Nous sommes toujours à la recherche de nouvelles opportunités et de nouveaux partenaires qui <em style="color: rgb(48,48,48);">nous aident à développer encore plus de logiciels open source formidables</em>!
+<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> dans la <a href="https://www.collaboraoffice.com/fr/code/#what_are_the_latest_updates" target="_blank">nouvelle version de CODE</a> – l'Édition Développement de Collabora Online</p>
+<p style="font-size: medium;">Profitez des dernières fonctionnalités développées offertes que vous pourrez découvrir à plusieurs dans cet outil de productivité en ligne, jusqu'à 20 utilisateurs simultanés et 10 documents ouverts simultanément.
+Pour une utilisation dans le monde de l'entreprise et dans un environnement de production, on recommande l'utilisation <a href="https://www.collaboraoffice.com/fr/subscriptions/" target="_blank">de versions supportées</a>.</p>
+<p style="font-size: medium;">Visitez notre site web pour connaître les différentes solutions de productivité proposées.
+Nous sommes toujours à la recherche de nouvelles opportunités et de nouveaux partenaires qui nous aident à développer encore plus de logiciels open source formidables!
 </p>
-<hr style=" border-top: 1px dashed #dfdfdf;color: #fff;">
-<p style="font-size: small;opacity: 0.8;">Pourquoi ne pas utiliser nos <em style="color: rgb(48,48,48);">applications mobiles</em> ? Vous trouverez gratuitement <a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora Office pour Android et iOS</a> dans les stores applicatifs.</p>
-<p style="font-size: small;opacity: 0.8;">N'oubliez pas de jeter un oeil à <a href="https://www.collaboraoffice.com/fr/case-studies/" target="_blank">comment nous pouvons aider</a> les entreprises, administrations publiques et autres structures à être plus productives avec notre <em style="color: rgb(48,48,48);">support professionnel et notre entente de niveau de service (SLA).</em>
+<hr style="border-top: 1px dashed #dfdfdf;color: #fff;">
+<p style="font-size: small;opacity: 0.8;">Pourquoi ne pas utiliser nos applications mobiles? Vous trouverez gratuitement
+<a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora Office pour Android et iOS</a> dans les stores applicatifs.
 <br>
-N'hésitez pas à nous envoyer vos commentaires !
+N'oubliez pas de jeter un oeil à <a href="https://www.collaboraoffice.com/fr/case-studies/" target="_blank">comment nous pouvons aider</a> les entreprises, administrations publiques et autres structures à être plus productives avec notre support professionnel et notre entente de niveau de service (SLA).<br>N'hésitez pas à nous envoyer vos commentaires!
+</p>
diff --git a/loleaflet/welcome/welcome.html b/loleaflet/welcome/welcome.html
index 1146ed294..6dcbc9fa7 100644
--- a/loleaflet/welcome/welcome.html
+++ b/loleaflet/welcome/welcome.html
@@ -1,20 +1,22 @@
 <h3 id="product-name" style="text-align:center;">Welcome</h3>
-<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> to a new <a href="https://www.collaboraoffice.com/code/#what_are_the_latest_updates" target="_blank">version of CODE</a> – the Collabora Online Development Edition</p>
-<p>Enjoy the <em style="color: rgb(48,48,48);">latest developments</em> in online productivity, free
+<p style="text-align: center; font-size: medium;background-color: #f9f9f9;border-radius: 20px;"> to <a href="https://www.collaboraoffice.com/code/#what_are_the_latest_updates" target="_blank">the new version of CODE</a> – the Collabora Online Development Edition</p>
+<p style="font-size: medium;">Enjoy the latest developments in online productivity, free
 for you to use, to explore and to use with others, up to 20
 concurrent users or 10 open documents. For business and production
-use <em style="color: rgb(48,48,48);">we recommend</em> you one of our <a href="https://www.collaboraoffice.com/subscriptions/" target="_blank">supported
+use we recommend you one of our <a href="https://www.collaboraoffice.com/subscriptions/" target="_blank">supported
 versions</a>.</p>
-<p style="font-size: medium;" "="">Do visit our website! You’ll learn more about our different
+<p style="font-size: medium;">Do visit our website! You’ll learn more about our different
 productivity solutions. We are always looking for opportunities and
-partnerships that <em style="color: rgb(48,48,48);">help us to develop more great open source
-software</em>!
+partnerships that help us to develop more great open source
+software!
 </p>
-<hr style=" border-top: 1px dashed #dfdfdf;color: #fff;">
-<p style="font-size: small;opacity: 0.8;">Why not try out our <em style="color: rgb(48,48,48);">mobile apps</em> - you will find our free
+<hr style="border-top: 1px dashed #dfdfdf;color: #fff;">
+<p style="font-size: small;opacity: 0.8;">Why not try out our mobile apps - you will find our free
 <a href="https://www.collaboraoffice.com/collabora-office-4-2-0-for-ios-and-android/" target="_blank">Collabora
-Office for Android & iOS</a> in the app stores.</p>
-<p style="font-size: small;opacity: 0.8;">Don’t forget to look at <a href="https://www.collaboraoffice.com/case-studies/" target="_blank">how
+Office for Android & iOS</a> in the app stores.
+<br>
+Don’t forget to look at <a href="https://www.collaboraoffice.com/case-studies/" target="_blank">how
 we help</a> businesses, public administrations and others to be
-more productive with our <em style="color: rgb(48,48,48);">professional support and SLA.</em><br>Send us
+more productive with our professional support and SLA.<br>Send us
 some feedback!
+</p>


More information about the Libreoffice-commits mailing list