diff options
author | Manuel Hiebel <leuhmanu@mageia.org> | 2013-08-08 20:13:10 +0000 |
---|---|---|
committer | Manuel Hiebel <leuhmanu@mageia.org> | 2013-08-08 20:13:10 +0000 |
commit | 0eff67d679b828acb2af3019b83e110957fb2778 (patch) | |
tree | b1a225dd76a1cbf8cd655d2e2e5b2706fbaeb456 | |
parent | ab83396059a1fa2ed14c55227ccf44e9a148fee5 (diff) | |
download | www-0eff67d679b828acb2af3019b83e110957fb2778.tar www-0eff67d679b828acb2af3019b83e110957fb2778.tar.gz www-0eff67d679b828acb2af3019b83e110957fb2778.tar.bz2 www-0eff67d679b828acb2af3019b83e110957fb2778.tar.xz www-0eff67d679b828acb2af3019b83e110957fb2778.zip |
no longer use <base> at it gives more trouble than anything else, fix also relative path on some href link
-rwxr-xr-x | en/3/download_index.php | 49 | ||||
-rwxr-xr-x | en/4/download_index.php | 7 |
2 files changed, 27 insertions, 29 deletions
diff --git a/en/3/download_index.php b/en/3/download_index.php index 625b2c6db..ef14962d2 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -17,7 +17,6 @@ require '../downloads/get/lib.php'; <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale; ?>/3/"> <link rel="stylesheet" href="/g/style/all.css"> - <base href="https://<?php echo $_SERVER['HTTP_HOST'].'/'.$locale; ?>/downloads/get/"> <?php include '../../analytics.php'; ?> </head> <body class="release downloads"> @@ -43,20 +42,20 @@ require '../downloads/get/lib.php'; <tr> <th class="name">DVD 32bit</th> <td class="size">3.9GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-i586-DVD.iso" title="Mageia 3 32bit DVD"><?php _e('32bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-i586-DVD.iso&torrent=1" title="Mageia 3 32bit DVD"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-i586-DVD.iso" title="Mageia 3 32bit DVD"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-i586-DVD.iso&torrent=1" title="Mageia 3 32bit DVD"><?php _e('32bit');?></a></td> </tr> <tr> <th class="name">DVD 64bit</th> <td class="size">3.9GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-x86_64-DVD.iso" title="Mageia 3 64bit DVD"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-x86_64-DVD.iso&torrent=1" title="Mageia 3 64bit DVD"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-x86_64-DVD.iso" title="Mageia 3 64bit DVD"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-x86_64-DVD.iso&torrent=1" title="Mageia 3 64bit DVD"><?php _e('64bit');?></a></td> </tr> <tr> <th class="name">CD</th> <td class="size">700MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-dual-CD.iso" title="Mageia 3 dual CD"><?php _e('dualarch')?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-dual-CD.iso&torrent=1" title="Mageia 3 dual CD"><?php _e('dualarch')?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-dual-CD.iso" title="Mageia 3 dual CD"><?php _e('dualarch')?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-dual-CD.iso&torrent=1" title="Mageia 3 dual CD"><?php _e('dualarch')?></a></td> </tr> </tbody> </table> @@ -95,32 +94,32 @@ require '../downloads/get/lib.php'; <th class="name"><?php _e('LiveDVD KDE')?><br> <span class="dlinfo"><?php _e('All languages')?></span></th> <td class="size">1.4GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-KDE4-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> </tr> <tr> <th class="name"><?php _e('LiveDVD GNOME')?><br> <span class="dlinfo"><?php _e('All languages')?></span></th> <td class="size">1.4GB</td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso&torrent=1"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveDVD-GNOME-x86_64-DVD.iso&torrent=1"><?php _e('64bit');?></a></td> <tr> <th class="name"><?php _e('LiveCD KDE')?><br> <span class="dlinfo"><?php _e('English only')?></span></th> <td class="size">700MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> </tr> <tr> <th class="name"><?php _e('LiveCD GNOME')?><br> <span class="dlinfo"><?php _e('English only')?></span></th> <td class="size">700MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td> - <td><a rel="nofollow" href="?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso&torrent=1"><?php _e('32bit');?></a></td> </tr> </tbody> @@ -144,15 +143,15 @@ require '../downloads/get/lib.php'; <tr> <th><?php _e('Network installer, Free Software CD')?></th> <td class="size">~35MB<br>~20MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-Boot-i586-CD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-Boot-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td> </tr> <tr> <th><?php _e('Network installer + nonfree firmware CD')?><br> <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th> <td class="size">~55MB<br>~30MB</td> - <td><a rel="nofollow" href="?q=Mageia-3-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br> - <a rel="nofollow" href="?q=Mageia-3-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td> + <td><a rel="nofollow" href="../downloads/get/?q=Mageia-3-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br> + <a rel="nofollow" href="../downloads/get/?q=Mageia-3-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td> </tr> </tbody> </table> @@ -183,7 +182,7 @@ require '../downloads/get/lib.php'; <?php _h('Looking for Mageia 2?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here now</a>.', array('/2/')); + _e('It is <a href="%s">here now</a>.', array('../2/')); echo '</p>'; ?> <br> @@ -199,7 +198,7 @@ require '../downloads/get/lib.php'; <br> <?php _h('Need more challenge?', null, 'h3'); - _h('You can help us <a href="%s">on Mageia 4</a>.', array('/contribute/')); + _h('You can help us <a href="%s">on Mageia 4</a>.', array('../contribute/')); ?> </div> <hr> diff --git a/en/4/download_index.php b/en/4/download_index.php index 1ea13c771..be91f9eae 100755 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -37,7 +37,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me echo _t('forthcoming'); /* - echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="?q=%s%s" title="%s">%s</a>', + echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>', get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'), $torrent ? '&torrent=1' : '', implode(' ', array($name, $version, $release, $variant, $arch, $medium)), @@ -58,7 +58,6 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/"> <link rel="stylesheet" href="/g/style/all.css"> - <base href="https://<?php echo $_SERVER['HTTP_HOST'].'/'.$locale; ?>/downloads/get/"> <?php include '../../analytics.php'; ?> <style> .unstable-release-warning { @@ -248,14 +247,14 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?></li> <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li> <li><?php _e('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li> - <li><?php _e('Help us on <a href="%s">Mageia 4</a>', array('/contribute/'))?></li> + <li><?php _e('Help us on <a href="%s">Mageia 4</a>', array('../contribute/'))?></li> </ul> <br> <br> <?php _h('Looking for a stable release?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here</a>.', array('/../downloads/')); + _e('It is <a href="%s">here</a>.', array('../downloads/')); echo '</p>'; ?> </div> |