Merge pull request #30 from bramley/Mantis_18456

Mantis 18456 - Bootstrap theme not using the updated community rss feed code
phpList · Dec 18, 2016 · e477e92 · e477e92
2 parents 4da9c12 + 2c00d0a
commit e477e92
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 502 deletions.
diff --git a/footer.inc b/footer.inc
@@ -1,4 +1,4 @@
-	    </div>
+        </div>
     </div> <!-- end #content -->
 
     <div id="right-bar" class="grid_4 four columns">
@@ -10,14 +10,17 @@
         <div id="recent" class="menutableright block">
             <?php print recentlyVisited(); ?>
         </div>
-	    <div id="language">
+        <div id="language">
             <?php print $languageswitcher; ?>
         </div>
-	<div class="clear"></div>
-<?php include dirname(__FILE__).'/rssfeed.php'; ?>  
-	</div><!-- end #right-bar -->
-
-	<div class="clear"></div>
+        <div class="clear"></div>
+        <div id="newsfeed" class="menutableright block">
+            <h3><?php echo s('phpList community news'); ?></h3>
+            <?php include 'communityfeed.php'; ?>
+        </div>
+    </div><!-- end #right-bar -->
+
+    <div class="clear"></div>
 
 </div> <!-- end #container -->
 

diff --git a/footer_minified.inc b/footer_minified.inc
@@ -1,4 +1,4 @@
-	    </div>
+        </div>
     </div> <!-- end #content -->
 
     <div id="right-bar" class="grid_4 four columns">
@@ -10,14 +10,17 @@
         <div id="recent" class="menutableright block">
             <?php print recentlyVisited(); ?>
         </div>
-	    <div id="language">
+        <div id="language">
             <?php print $languageswitcher; ?>
         </div>
-	<div class="clear"></div>
-<?php include dirname(__FILE__).'/rssfeed.php'; ?>  
-	</div><!-- end #right-bar -->
-
-	<div class="clear"></div>
+        <div class="clear"></div>
+        <div id="newsfeed" class="menutableright block">
+            <h3><?php echo s('phpList community news'); ?></h3>
+            <?php include 'communityfeed.php'; ?>
+        </div>
+    </div><!-- end #right-bar -->
+
+    <div class="clear"></div>
 
 </div> <!-- end #container -->