aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2011-06-01 00:48:29 +0000
committerRomain d'Alverny <rda@mageia.org>2011-06-01 00:48:29 +0000
commitde8dd3e49308514439f0c593f419fb15ba13b06b (patch)
treef857718c58fcad1c928003095c864eb86f41a6c6 /en
parent916a0e115ec981f2156ca5c65ae54b13c450505e (diff)
downloadwww-de8dd3e49308514439f0c593f419fb15ba13b06b.tar
www-de8dd3e49308514439f0c593f419fb15ba13b06b.tar.gz
www-de8dd3e49308514439f0c593f419fb15ba13b06b.tar.bz2
www-de8dd3e49308514439f0c593f419fb15ba13b06b.tar.xz
www-de8dd3e49308514439f0c593f419fb15ba13b06b.zip
downloads update - do NOT commit to production yet
Diffstat (limited to 'en')
-rw-r--r--en/downloads/dl.php35
-rw-r--r--en/downloads/index.php37
2 files changed, 24 insertions, 48 deletions
diff --git a/en/downloads/dl.php b/en/downloads/dl.php
index 117ccf1ea..c6935c57a 100644
--- a/en/downloads/dl.php
+++ b/en/downloads/dl.php
@@ -116,16 +116,18 @@ $dl2_mirror_alt = sprintf($_t['dl_mirror_loc'],
?></p>
<div class="dlinfo">
+ <p><?php echo $dl2_mirror_alt; ?></p>
<?php if (isset($p['md5'])): ?>
<p><?php echo $_t['signs_check_1']; ?></p>
+ <div id="check-signs">
<pre class="term">
$ md5sum <?php echo basename($product_dl_link), "\n", $p['md5'], "\n"; ?>
$ sha1sum <?php echo basename($product_dl_link), "\n", $p['sha1'], "\n"; ?>
</pre>
<p><?php echo $_t['signs_check_2']; ?></p>
+ </div>
<?php endif; ?>
- <p><?php echo $dl2_mirror_alt; ?></p>
</div>
<table class="dlt2 dlinfo" id="other_mirrors" style="display: none;">
<thead><tr><th>Country</th><th>City</th><th>Download mirrors</th></tr></thead>
@@ -135,25 +137,22 @@ $ sha1sum <?php echo basename($product_dl_link), "\n", $p['sha1'], "\n"; ?>
<hr />
</div></div>
<div class="yui-g">
- <div class="yui-u first"><div class="para"
- <h2><?php echo $_t['whatdouthink?']; ?></h2>
- <p><?php echo $_t['give_feedback']; ?></p>
- <p><?php echo $_t['report_bug']; ?></p>
- <p><?php echo $_t['notify_web']; ?></p>
-
- <hr />
+ <div class="yui-u first"><div class="para">
+ <h2>Thank <em>you</em>!</h2>
+ ...
+ <hr>
+ <h2>Spread the word!</h2>
+ <p><?php include 'dl_twitter.php'; echo dl_twitter($locale); ?></p>
+
+ <hr>
</div></div>
<div class="yui-u"><div class="para">
- <h2><?php echo sprintf($_t['wanttohelp?'], '<a href="http://mageia.org/wiki/doku.php?id=contribute">', '</a>'); ?></h2>
- <p><?php echo $_t['ucanhelp']; ?></p>
- <p><?php echo sprintf($_t['wherehelp'],
- '<a href="http://mageia.org/wiki/doku.php?id=marketing">', '</a>',
- '<a href="http://mageia.org/wiki/doku.php?id=web">', '</a>',
- '<a href="http://mageia.org/wiki/doku.php?id=translators">', '</a>',
- '<a href="http://mageia.org/wiki/doku.php?id=packaging">', '</a>',
- '<a href="http://mageia.org/wiki/doku.php?id=qateam">', '</a>',
- '<a href="http://mageia.org/donate/">', '</a>'
- ); ?>
+ <h2>Need some help? Talk to us!</h2>
+ <p><?php echo $_t['give_feedback']; ?></p>
+ <p><?php echo $_t['report_bug']; ?></p>
+ <hr>
+ <h2><?php echo sprintf($_t['wanttohelp?'], '<strong><a href="http://mageia.org/contribute/">', '</a></strong>'); ?></h2>
+ <hr>
</div></div>
</div>
</div>
diff --git a/en/downloads/index.php b/en/downloads/index.php
index 7a11df7d7..6483d70aa 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1,22 +1,21 @@
<?php require '../../downloads.php';
-$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1 RC</em>');
-$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1 RC');
+$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 1</em>');
+$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1');
?>
<!DOCTYPE html>
<html lang="<?php echo $locale; ?>">
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8">
<title><?php echo $_t['page_title']; ?></title>
- <meta name="description" content="<?php echo $_t['page_desc']; ?>" />
- <meta name="keywords" content="<?php echo $_t['page_kw']; ?>" />
- <meta name="author" content="Mageia" />
- <link rel="stylesheet" type="text/css" href="/g/style/all.css" >
+ <meta name="description" content="<?php echo $_t['page_desc']; ?>">
+ <meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
+ <meta name="author" content="Mageia">
+ <link rel="stylesheet" type="text/css" href="/g/style/all.css">
<?php include '../../analytics.php'; ?>
</head>
<body>
<?php include '../../langs.php'; ?>
-
<div id="doc" class="yui-t7">
<div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
<div id="bd" role="main">
@@ -25,29 +24,7 @@ $_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1 RC');
<p><?php echo $_t['dl_help']; ?></p>
<br />
<?php echo $dl_table; ?>
-
</div></div>
- <div class="yui-g">
- <div class="yui-u first"><div class="para" style="padding-right: 0;">
- <h2><?php echo $_t['changes_since_a2']; ?></h2>
- <ul>
- <li>bugfixes &ndash; lots of them!</li>
- <li>packages version updates</li>
- <li>more packages in ISOs</li>
- </ul>
- </div></div>
- <div class="yui-u"><div class="para">
- <h2><?php echo $_t['release_docs']; ?></h2>
- <ul>
- <li><a href="/wiki/doku.php?id=iso1:rc_release_notes" hreflang="en">Release Notes</a></li>
- <li><a href="/wiki/doku.php?id=mageia1:errata" hreflang="en">Errata</a></li>
- <li><a href="http://blog.mageia.org/en/" hreflang="en">Blog post</a></li>
- <li><a href="/"><?php echo $_t['whatismageia']; ?></a></li>
- </ul>
- <p>Finale will be released on June, 1<sup>st</sup>.</p>
- <p>You can check our <a href="http://mageia.org/wiki/doku.php?id=iso_1_specifications#expected_milestones">roadmap for Mageia 1 here</a>.</p>
- </div></div>
- </div>
</div>
</div>
</body>