From 5b39ef3b3a316c8d2343fd34531682d09ff14bcf Mon Sep 17 00:00:00 2001
From: Claire Revillet <grenoya@zarb.org>
Date: Wed, 26 Nov 2014 20:55:32 +0100
Subject: changes for mga3 EOL (download pages + doc)

---
 en/3/download_index.php |  1 +
 en/4/download_index.php |  6 ++++--
 en/doc/archive.php      | 12 ++++++++++++
 en/doc/index.php        | 12 ------------
 en/support/index.php    |  3 ++-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/en/3/download_index.php b/en/3/download_index.php
index 6cf7c3fae..df7b8f84c 100755
--- a/en/3/download_index.php
+++ b/en/3/download_index.php
@@ -29,6 +29,7 @@ require '../downloads/get/lib.php';
             <div class="yui-ge bb1">
                 <div class="yui-u first rb1">
                     <div class="para">
+                    <h2 class="warn"><?php _g('But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.')?></h2>
                         <h2><?php _g('Classical Installation Flavours')?></h2>
                         <table class="fr-table dlt2">
                         <thead>
diff --git a/en/4/download_index.php b/en/4/download_index.php
index 237371542..86e305a9d 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -246,8 +246,10 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                         <?php
                             _g('Looking for Mageia 3?', null, 'h3');
                             echo '<p>';
-                            _g('It is <a href="%s">here now</a>.', array('../3/'));
-                            /*_r('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/'), 'span class="warn"'); */?>
+                            _g('It is <a href="%s">here now</a>.', array('../3/'));?>
+                        	<span class="warn">
+                            <?_g('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/')); ?>
+                        </span>
                         </p>
                         <br>
                         <br>
diff --git a/en/doc/archive.php b/en/doc/archive.php
index 5ea7bfc9a..593efff76 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -26,6 +26,18 @@ require 'doc.php';
                     <p><?php _g('Here you will find the documentation for the versions of Mageia that have reached their End-Of-Life.')?><br/>
                     <?php _g('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p>
                     <hr>
+                    <h3>Mageia 3</h3>
+                    <div style="float: left; margin: 1em; width: 24em;">
+                        <p style="margin-left: 2em;"><?php
+                            doc_list(_r('Installer'), 'installer', 3, '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
+                            ?></p>
+                    </div>
+                    <div style="float: right; margin: 1em; width: 24em;">
+                        <p style="margin-left: 2em;"><?php
+                            doc_list(_r('Control Center'), 'control_center', 3, '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
+                            ?></p>
+                    </div>
+                    <hr style="clear: both;">
                     <h3>Mageia 2</h3>
                     <div style="float: left; margin: 2em;">
                         <p><?php
diff --git a/en/doc/index.php b/en/doc/index.php
index c8bc5cc98..af65adbc7 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -45,18 +45,6 @@ require 'doc.php';
                                 '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">PDF</a>');
                             ?></p>
                     </div>
-                    <hr style="clear: both;">
-                    <h3>Mageia 3</h3>
-                    <div style="float: left; margin: 1em; width: 24em;">
-                        <p style="margin-left: 2em;"><?php
-                            doc_list(_r('Installer'), 'installer', 3, '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
-                            ?></p>
-                    </div>
-                    <div style="float: right; margin: 1em; width: 24em;">
-                        <p style="margin-left: 2em;"><?php
-                            doc_list(_r('Control Center'), 'control_center', 3, '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
-                            ?></p>
-                    </div>
                 </div>
             </div>
         </div>
diff --git a/en/support/index.php b/en/support/index.php
index b78e41a21..3c515bf7a 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -50,7 +50,8 @@ $dictionary = read_translation_file($locale, 'support');
                         _g('Mageia releases are supported at least for 18 months.', null, 'p');
                         echo '<ul class="hl">';
                         _g('Mageia 4 will be supported until August 1st, 2015.', null, 'li'); // _g('Mageia 4 was supported until August 1st, 2015.', null, 'li');
-                        _g('Mageia 3 will be supported until November 26th, 2014.', null, 'li'); // _g('Mageia 3 was supported until November 26th, 2014.', null, 'li');
+                        //_g('Mageia 3 will be supported until November 26th, 2014.', null, 'li');  
+                        _g('Mageia 3 was supported until November 26th, 2014.', null, 'li');
                         _g('Mageia 2 was supported until November 22nd, 2013.', null, 'li');
                         _g('Mageia 1 was supported until December 1st, 2012.', null, 'li');
                         echo '</ul>';
-- 
cgit v1.2.1