aboutsummaryrefslogtreecommitdiffstats
path: root/en/downloads
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2011-05-30 16:19:19 +0000
committerRomain d'Alverny <rda@mageia.org>2011-05-30 16:19:19 +0000
commitd12ab85835d77add3f072cf5adab03d2337d0379 (patch)
treedfd76cd434bf367b8c674693b30eac91944a0873 /en/downloads
parent66ee1692e64985cf6614159da368fd9eb869df3c (diff)
downloadwww-d12ab85835d77add3f072cf5adab03d2337d0379.tar
www-d12ab85835d77add3f072cf5adab03d2337d0379.tar.gz
www-d12ab85835d77add3f072cf5adab03d2337d0379.tar.bz2
www-d12ab85835d77add3f072cf5adab03d2337d0379.tar.xz
www-d12ab85835d77add3f072cf5adab03d2337d0379.zip
downloads section is not only about ISOs but other products as well
Diffstat (limited to 'en/downloads')
-rw-r--r--en/downloads/dl.php12
-rw-r--r--en/downloads/index.php10
2 files changed, 17 insertions, 5 deletions
diff --git a/en/downloads/dl.php b/en/downloads/dl.php
index 57d7175ee..117ccf1ea 100644
--- a/en/downloads/dl.php
+++ b/en/downloads/dl.php
@@ -14,7 +14,8 @@ session_start();
if (!is_null($product)) {
$found = false;
foreach ($prods as $k => $p) {
- if ($product == sprintf('%s-%s', $glob['prefix'], $k)) {
+ if ($product == sprintf('%s-%s', $glob['prefix'], $k)
+ || $product == $k) {
$found = true;
break;
}
@@ -51,7 +52,12 @@ else {
$dl_link = sprintf('%s/%s', $a['mirror_url'], $product_dl_link);
}
-$title = 'Mageia 1 beta1';
+$title = 'Mageia 1 RC';
+if (isset($p['page_title']))
+ $title = $p['page_title'];
+
+$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">' . $title . '</em>');
+$_t['page_title'] = sprintf($_t['page_title'], '<em class="tag">' . $title . '</em>');
$dl_alt_mirrors_table = '';
@@ -104,7 +110,7 @@ $dl2_mirror_alt = sprintf($_t['dl_mirror_loc'],
<h2><?php echo $_t['page_title']; ?></h2>
<p><?php
echo
- sprintf($_t['dl_shld_start'], 'Mageia 1 beta1 ' . $p['name']),
+ sprintf($_t['dl_shld_start'], '<em class="tag">' . $p['name'] . '</em>'),
' ', sprintf($_t['dl_size'], $p['size']),
' ', sprintf($_t['alt_download'], $dl_link, $dl_link);
?></p>
diff --git a/en/downloads/index.php b/en/downloads/index.php
index acc0d0095..a247db258 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1,4 +1,7 @@
-<?php require '../../downloads.php'; ?>
+<?php require '../../downloads.php';
+
+$_t ['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1 RC</em>');
+?>
<!DOCTYPE html>
<html lang="<?php echo $locale; ?>">
<head>
@@ -18,7 +21,10 @@
<div id="bd" role="main">
<div class="yui-g">
<div class="para">
- <p><?php echo $_t['dl_help']; ?></p>
+ <p><?php echo $_t['dl_help']; ?>
+ If you are using Mandriva Linux 2010.1 or 2010.2,
+ you may directly <a href="/en/1/migrate/">upgrade
+ your system to Mageia 1</a> as well.</p>
<br />
<?php echo $dl_table; ?>