Merge pull request #35 from contao-themes-net/update-social-feed-temp…

…late Update social feed template
contao-themes-net · Dec 9, 2021 · 253f633 · 253f633
2 parents e37dc75 + 1b2ccec
commit 253f633
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.7.1](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.7.1) – 2021-12-03
+
+- [fix] update social feed template
+
 ## [1.7.0](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.7.0) – 2021-11-19
 
 - [feature] add new header layout to show logo and navigation below each other

diff --git a/src/Module/NatureThemeSetup.php b/src/Module/NatureThemeSetup.php
@@ -4,7 +4,7 @@
 
 class NatureThemeSetup extends \BackendModule
 {
-    const VERSION = '1.7.0';
+    const VERSION = '1.7.1';
 
     protected $strTemplate = 'be_naturetheme_setup';
 

diff --git a/src/Resources/contao/templates/news/news_social_feed_extended_nature.html5 b/src/Resources/contao/templates/news/news_social_feed_extended_nature.html5
@@ -1,9 +1,11 @@
 <div class="social_feed_element extended arc_<?= $this->archive->id ?> block<?= $this->class ?>" itemscope itemtype="http://schema.org/Article">
     <div class="inner">
 
-        <div class="icon">
-            {{picture::<?php echo \StringUtil::binToUuid($this->sfFbAccountPicture); ?>}}
-        </div>
+        <?php if($this->accountPicture): ?>
+            <div class="icon">
+                <?php $this->insert('picture_default', $this->accountPicture); ?>
+            </div>
+        <?php endif; ?>
 
         <?php if ($this->hasMetaFields): ?>
         <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">

diff --git a/src/Resources/contao/templates/news/news_social_feed_nature.html5 b/src/Resources/contao/templates/news/news_social_feed_nature.html5
@@ -2,9 +2,11 @@
     <div class="inner">
 
         <a href="<?= $this->url ?>" target="_blank">
-            <div class="icon">
-                {{picture::<?php echo \StringUtil::binToUuid($this->sfFbAccountPicture); ?>}}
-            </div>
+            <?php if($this->accountPicture): ?>
+                <div class="icon">
+                    <?php $this->insert('picture_default', $this->accountPicture); ?>
+                </div>
+            <?php endif; ?>
 
             <?php if ($this->hasMetaFields): ?>
             <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">
@@ -15,6 +17,8 @@
                     <i class="fab fa-instagram" aria-hidden="true"></i>
                 <?php elseif($this->socialFeedType == "Twitter"): ?>
                     <i class="fab fa-twitter" aria-hidden="true"></i>
+                <?php elseif($this->socialFeedType == "LinkedIn"): ?>
+                    <i class="fab fa-linkedin" aria-hidden="true"></i>
                 <?php endif; ?>
             </p>
             <?php endif; ?>

diff --git a/src/Resources/public/scss/parts/modules.scss b/src/Resources/public/scss/parts/modules.scss
@@ -626,6 +626,11 @@ body:not(.home) #header .inside {
       background: $boxes-background;
     }
 
+    i {
+      margin-left: 10px;
+      font-size: 1.2rem;
+    }
+
     .title {
       margin-bottom: 15px;
       text-transform: uppercase;