From 1ae07cd226f7526d10ecc6dc75e410d036b4a4ef Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Tue, 28 Apr 2015 21:41:11 +0200
Subject: adding blog link and it's first title to the front page (main index)

---
 en/index.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'en/index.php')

diff --git a/en/index.php b/en/index.php
index 65971f2fd..f9bf60567 100644
--- a/en/index.php
+++ b/en/index.php
@@ -4,7 +4,9 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../langs.php';
-$dictionary = read_translation_file($locale, 'index');
+$dictionary_1 = read_translation_file($locale, 'index');
+$dictionary_2 = read_translation_file($locale, 'news');
+$dictionary = array_merge($dictionary_1, $dictionary_2);
 
 $nav = array(
     'nav-support'    => array('support/',    _r('Support')),
@@ -212,6 +214,21 @@ overflow: hidden; }
         }
     }
     @media (min-width: 1200px) {}
+
+    #newslist {
+        display: block;
+        padding: 10px 20px 10px 20px;
+        margin: 0px 0px 0px 70px;
+        margin-left: 70px;
+        background: rgba(255,255,255, 0.1);
+        border-radius: 4px;
+        color: #ddeeff;
+        text-shadow: none;
+        font-size: 120%;
+    }
+    #newslist a {
+        color: #ddeeff;
+    }
     </style>
     <link rel="stylesheet" href="/g/fa/css/font-awesome.css">
 </head>
@@ -223,6 +240,19 @@ overflow: hidden; }
 
 <div id="up">
     <div class="container">
+        <div>
+        <?php
+            include '../lib/news.php';
+            $prefix  = '<span style="font-weight: bold;">';
+            $prefix .= sprintf(_r('Latest news from our <a href="%s">blog</a>:'), _r('https://blog.mageia.org/en/'));
+            $prefix .= '</span> ';
+            if (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/') {
+                show_feed($locale, null, _r('https://planet.mageia.org/en/'), _r('https://planet.mageia.org/en/') . '?type=rss10', 1, null, true, $prefix);
+            } else {
+                show_feed($locale, null, _r('https://blog.mageia.org/en/'), _r('https://blog.mageia.org/en/') . '?feed=rss', 1, null, true, $prefix);
+            }
+        ?>
+        </div>
         <div id="b1">
             <h2><?php _g('Change your perspective'); ?></h2>
             <ul id="p"><?php
@@ -235,7 +265,7 @@ overflow: hidden; }
         <div id="b2">
             <ul id="dl">
                 <li><a href="downloads/" id="dl-btn">
-                        <span id="dl-btn-mageia">Mageia 3</span>
+                        <span id="dl-btn-mageia">Mageia</span>
                         <span style="font-size: 32px; color: green; float: right;" class="icon-download-alt"></span>
                         <span class="dl-btn free-dl"><?php _g('Free Download'); ?></span>
                         <span class="dl-btn"><?php _g('version 4 (February 2014)'); ?></span>
-- 
cgit v1.2.1