From e17d7eff4b775f7cb79005f30a2d1c7232064321 Mon Sep 17 00:00:00 2001
From: "michael.daniel" <michael.danielczok@gmail.com>
Date: Tue, 26 Sep 2017 14:41:06 +0200
Subject: [PATCH] =?UTF-8?q?Issue=20#2=20fix:=20Die=20URL=20werden=20ohne?=
=?UTF-8?q?=20http://=20bzw.=20https://=20gesetzt.=20Daf=C3=BCr=20muss=20d?=
=?UTF-8?q?er=20Benutzer=20sorgen=20-=20entsprechender=20Hinweis=20ist=20i?=
=?UTF-8?q?n=20Backend=20zu=20sehen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/css/style.css | 2 +-
index.php | 2 +-
locale.xml | 5 +++++
settings.xml | 12 ++++++++++++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/bin/css/style.css b/bin/css/style.css
index 163dd2b..a7071b3 100644
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -631,7 +631,7 @@ h1.page-header-text-title {
.start-page-header {
padding: 0 !important;
- height: 100vh;
+ height: auto;
overflow: hidden;
}
diff --git a/index.php b/index.php
index c119c31..42163e1 100644
--- a/index.php
+++ b/index.php
@@ -129,7 +129,7 @@ class="header-bar-search-link searchMobile">
// check which socials should be displayed
if ($Project->getConfig('templatePresentation.settings.social.facebook')) {
- $socialHTML .= '<a href="http://' .
+ $socialHTML .= '<a href="' .
$Project->getConfig('templatePresentation.settings.social.facebook')
. '" target="_blank"><span class="fa fa-facebook"></span></a>';
}
diff --git a/locale.xml b/locale.xml
index 5c38523..cf101ac 100644
--- a/locale.xml
+++ b/locale.xml
@@ -619,6 +619,11 @@
<en><![CDATA[Show in footer]]></en>
<pl><![CDATA[Wlacz w stopce]]></pl>
</locale>
+ <locale name="social.linksNote" html="true">
+ <de><![CDATA[Bitte Links mit <strong>http:///</strong> oder <strong>https:///</strong> verwenden, z.B. https:///www.facebook.com]]></de>
+ <en><![CDATA[Please use only hyperlinks with <strong>http:///</strong> or <strong>https:///</strong>, e.g. https:///www.facebook.com]]></en>
+ <pl><![CDATA[Proszę używać linków z <strong>http:///</strong> albo <strong>https:///</strong>, na przyklad: https:///www.facebook.com]]></pl>
+ </locale>
<locale name="social.facebook">
<de><![CDATA[Facebook]]></de>
<en><![CDATA[Facebook]]></en>
diff --git a/settings.xml b/settings.xml
index 12f030b..f481cc6 100644
--- a/settings.xml
+++ b/settings.xml
@@ -605,8 +605,15 @@
</text>
</input>
+ <text>
+ <locale group="quiqqer/template-presentation"
+ var="social.linksNote"
+ />
+ </text>
+
<!-- facebook -->
<input conf="templatePresentation.settings.social.facebook"
+ placeholder="https://www.facebook.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
@@ -616,6 +623,7 @@
</input>
<!-- twitter -->
<input conf="templatePresentation.settings.social.twitter"
+ placeholder="https://www.twitter.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
@@ -625,6 +633,7 @@
</input>
<!-- google -->
<input conf="templatePresentation.settings.social.google"
+ placeholder="https://www.google.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
@@ -634,6 +643,7 @@
</input>
<!-- youtube -->
<input conf="templatePresentation.settings.social.youtube"
+ placeholder="https://www.youtube.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
@@ -643,6 +653,7 @@
</input>
<!-- github -->
<input conf="templatePresentation.settings.social.github"
+ placeholder="https://www.github.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
@@ -652,6 +663,7 @@
</input>
<!-- gitlab -->
<input conf="templatePresentation.settings.social.gitlab"
+ placeholder="https://www.gitlab.com"
type="text">
<text>
<locale group="quiqqer/template-presentation"
--
GitLab