From patchwork Sat Sep 15 00:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1933 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 9A85F60DE2 for ; Fri, 14 Sep 2018 16:34:01 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 50AF31149039; Fri, 14 Sep 2018 15:34:01 +0100 (BST) Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 5576111340A3 for ; Fri, 14 Sep 2018 15:33:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1536935627; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=0rL2t4BQLo4iZSXMH4xu4n4CntXZ2VhSqveqY4Kb0C8=; b=TCsvTw9bPwbhQr7FaUZ3tBg8KQ1TltRe6WoNmRvRS4SYdMBZyVdgQ2FCcYEob24cPH4Mof +1HoL7rx17QDge0SJD6KaGP2rMMzMVb3ObHtXCwQbFvvGCLcgqDeTJ9vBT+n6x2aPJHq+A WbseXyHEIV0cwRqU8xZz2ns5iQkQoPBzbc3oEKc26wEKtbhGjM4jf5Lkqvkol76A+dpZnM LiS6V2osJRPl4chjCdsA4bp3OSSIcbT1B9yjQ4lEdQOx1l8TDh77lAC+iBFcVOCzk8i6db VimQRKQ75PV5hRwJdqLp3L2QJrCX0R8qXDOJELyrf9Ge4OR7DjskdLdFeK+Odg== From: =?utf-8?q?Peter_M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 1/2] update links to HTTPS in main website templates Date: Fri, 14 Sep 2018 16:33:44 +0200 Message-Id: <20180914143345.4438-1-peter.mueller@link38.eu> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu X-Spamd-Result: default: False [-11.54 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[link38.eu]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_TRACE(0.00)[link38.eu:+]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2]; MID_CONTAINS_FROM(1.00)[]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; NEURAL_HAM(-3.00)[-1.000,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-3.78)[ip: (-9.91), ipnet: 37.120.160.0/19(-4.96), asn: 197540(-3.96), country: DE(-0.09)]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-11.54 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Some of the embedded links were still pointing to HTTP destinations or non-existent (i.e. renamed) Wiki pages. These have been fixed now. Signed-off-by: Peter Müller --- templates/admin-planet.html | 2 +- templates/base.html | 24 ++++++++++++------------ templates/download-splash.html | 10 +++++----- templates/index.html | 14 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/templates/admin-planet.html b/templates/admin-planet.html index c40118d..6c3ab5b 100644 --- a/templates/admin-planet.html +++ b/templates/admin-planet.html @@ -20,7 +20,7 @@ {{ entry.author.name }} - {{ entry.title }} + {{ entry.title }} {% if entry.is_draft() %} {{ _("Draft") }} {% end %} diff --git a/templates/base.html b/templates/base.html index 83533f9..899c2de 100644 --- a/templates/base.html +++ b/templates/base.html @@ -70,7 +70,7 @@ @@ -89,10 +89,10 @@ @@ -102,16 +102,16 @@ @@ -121,7 +121,7 @@
- + {{ _("Donate") }}

- + diff --git a/templates/download-splash.html b/templates/download-splash.html index a4ca41b..2bddef9 100644 --- a/templates/download-splash.html +++ b/templates/download-splash.html @@ -10,8 +10,8 @@

{% if lang == "de" %} - Der Download beginnt in Kürze. - Falls nicht, auf den untenstehenden Link klicken. + Ihr Download beginnt in Kürze. + Falls nicht, bitte auf den untenstehenden Link klicken. {% else %} Your download should begin in a few seconds. If not, click the link below. @@ -24,21 +24,21 @@

- +

{{ _("How to install IPFire") }}
- +

{{ _("Donate") }}
- +

{{ _("Get Support") }}

 diff --git a/templates/index.html b/templates/index.html index 99a0247..f9900f8 100644 --- a/templates/index.html +++ b/templates/index.html @@ -178,12 +178,12 @@

{% if lang == "de" %} IPFire wird in Europa entwickelt, - in vielen Ländern + in vielen Ländern überall auf der Welt eingesetzt, und bietet Internetzugang für hundertausende Nutzer jeden Tag. {% else %} IPFire is developed in Europe and used all over the world - in hundreds of countries + in hundreds of countries by hundreds of thousands of users every day. {% end %}

@@ -232,7 +232,7 @@ {{ item.title }} {% elif type == "planet" %} - + {{ item.title }} {% end %} @@ -257,11 +257,11 @@ {% end %} - + {{ _("IPFire Wishlist") }} - + {{ hottest_wish.title }} @@ -281,12 +281,12 @@

{% if lang == "de" %} - Lightning Wire Labs bietet + Lightning Wire Labs bietet Hardware-Appliances für mittlere bis große Unternehmen und SOHO an. Diese sorgen in jedem Netz für beste Zuverlässigkeit, Stabilität und Performance. {% else %} - Lightning Wire Labs offer + Lightning Wire Labs offer IPFire hardware appliances for enterprises, large businesses and SOHO. Deploying one of these on your network will provide you with the greatest reliability, stability and performance. From patchwork Sat Sep 15 00:33:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1932 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id ADF4160DE2 for ; Fri, 14 Sep 2018 16:33:52 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 1598110FE4A2; Fri, 14 Sep 2018 15:33:51 +0100 (BST) Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 03B9310EA93B for ; Fri, 14 Sep 2018 15:33:48 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1536935627; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hAXnoW1SSyrPxQsNHopO5WgDLZ3lJzJI1aUV1zrORIw=; b=tZ82EDwSy8iVrvJRuussbw+eZ1FOtv9CKc5D5htVSwPu88tGITyTCr7LNFVSnf1tOphVJs j0+Qugb8VlXGeyzIzsAfga/Hzy39HnLmbpwIKkA5QUk0bp2p90ee1+rhY1kpotE5HQcW4p bmTGon8j/r9C9E46XDZCxtwuDca3ZO48fQIbC/wQ+a3NSe8o+KqyLL1AOmj2apTkIRK3SS Oy4qg10SQmzgZtIYy03FNJzjC4MokaqErHJH2SouOZY6004El7saXmzMEGsPU58GqxfFiS UQHNHSdirmqQPJPFlDC1Nyakagt2Q/8ubKn5gK6SUmKyjwiKnX99oBVECJRFfw== From: =?utf-8?q?Peter_M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 2/2] update HTTP link on geoip.ipfire.org Date: Fri, 14 Sep 2018 16:33:45 +0200 Message-Id: <20180914143345.4438-2-peter.mueller@link38.eu> In-Reply-To: <20180914143345.4438-1-peter.mueller@link38.eu> References: <20180914143345.4438-1-peter.mueller@link38.eu> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu X-Spamd-Result: default: False [-11.14 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[link38.eu]; URL_IN_SUBJECT(0.40)[geoip.ipfire.org]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2]; MID_CONTAINS_FROM(1.00)[]; DKIM_TRACE(0.00)[link38.eu:+]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; NEURAL_HAM(-3.00)[-1.000,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-3.78)[ip: (-9.91), ipnet: 37.120.160.0/19(-4.96), asn: 197540(-3.96), country: DE(-0.09)]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-11.14 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Peter Müller --- templates/geoip/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/geoip/index.html b/templates/geoip/index.html index e0609a4..2e4c931 100644 --- a/templates/geoip/index.html +++ b/templates/geoip/index.html @@ -42,7 +42,7 @@