aboutsummaryrefslogtreecommitdiffstats
path: root/en/4
diff options
context:
space:
mode:
Diffstat (limited to 'en/4')
-rw-r--r--en/4/download_index.php51
-rw-r--r--en/4/index.php83
2 files changed, 84 insertions, 50 deletions
diff --git a/en/4/download_index.php b/en/4/download_index.php
index f0f1260d0..23fb68464 100644
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -6,15 +6,16 @@ define('ALIGNMENT', 'Center');
require '../../langs.php';
$dictionary = read_translation_file($locale, array('4', 'common_footer'));
require '../downloads/get/lib.php';
+$rtl = is_locale_rtl($locale);
-function get_mageia_image_file_name($variant = null, $arch, $medium, $ext)
+function get_mageia_image_file_name($variant, $arch, $medium, $ext)
{
$va = empty($variant) ? $arch : $variant . '-' . $arch;
return implode('-', array('Mageia','4.1', $va, $medium)) . $ext;
}
-function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false)
+function dl_link($variant, $arch, $medium, $torrent = false, $unavailabletorrent = false)
{
switch ($arch) {
case "i586":
@@ -42,7 +43,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
?>
<!DOCTYPE html>
-<html dir="ltr" lang="<?php echo $locale; ?>">
+<html <?php echo $rtl ? 'dir="rtl"' : 'dir="ltr"'?> lang="<?php echo $locale; ?>">
<head>
<meta charset="utf-8">
<title><?php echo sprintf(_r('Download') . ' Mageia 4.1')?></title>
@@ -54,18 +55,18 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
<?php echo common_header(); ?>
<?php include '../../analytics.php'; ?>
</head>
-<body class="release downloads">
+<body class="release downloads" <?php echo $rtl ? 'style="text-align: right;"' : ''?>>
<?php echo $hsnav; ?>
<h1 id="mgnavt"><?php echo sprintf(_r('Download') . ' <strong>Mageia 4.1</strong>')?></h1>
<?php include '../4/nav.php'; ?>
- <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
+ <div id="doc4" class="yui-t7" style="margin-bottom: 0px; <?php echo $rtl ? 'text-align: right;"' : ''?>">
<div id="bd" role="main">
<div class="yui-ge bb1">
<div class="yui-u first rb1">
<div class="para" id="classical">
<?php
_g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r('http://blog.mageia.org/en/2015/09/10/mageia-4-about-to-reach-its-end-of-life/')), 'h2 class="warn"');
- _g('If you want to put the ISO on USB key, <span class="warn">please DO NOT use Unetbootin</span>. Have a look <a href="%s">here</a> for the alternative.',array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'p');
+ _g('If you want to put the ISO on USB key, <span class="warn">please DO NOT use UNetbootin</span>. Have a look <a href="%s">here</a> for the alternative.',array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'p');
_g('Mageia 4.1 is a <a href="%s">maintenance</a> release for Mageia 4 with the current packages from update medias. It also has a fix for a syslinux bug which prevented some people installing from a burned cd/dvd.',array(_r('http://blog.mageia.org/en/2014/06/20/pulling-mageia-4-1-out-of-the-hat/')),'p');
?>
@@ -73,15 +74,15 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
<table class="fr-table dlt2">
<thead>
<tr>
- <th><?php _g('Format');?></th>
- <th class="size"><?php _g('size');?></th>
- <th><?php _g('link');?></th>
- <th><?php _g('BitTorrent');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('Format');?></th>
+ <th<?php echo $rtl ? ' style="text-align: right;"' : ' class="size"'?>><?php _g('size');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('link');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('BitTorrent');?></th>
</tr>
</thead>
<tbody>
<tr>
- <th class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br>
<span class="dlinfo"><?php _g('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th>
<td class="size">3.7GB</td>
<td>
@@ -95,7 +96,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
</td>
</tr>
<tr>
- <th class="name">DVD dualarch<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name">DVD dualarch<br>
<span class="dlinfo"><?php _g('Desktop'); ?>: XFCE</span></th>
<td class="size">1GB</td>
<td>
@@ -131,15 +132,15 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
<table class="fr-table dlt2">
<thead>
<tr>
- <th><?php _g('Desktop');?></th>
- <th class="size"><?php _g('size');?></th>
- <th><?php _g('link');?></th>
- <th><?php _g('BitTorrent');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('Desktop');?></th>
+ <th<?php echo $rtl ? ' style="text-align: right;"' : ' class="size"'?>><?php _g('size');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('link');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('BitTorrent');?></th>
</tr>
</thead>
<tbody>
<tr>
- <th class="name" style="width:60%">LiveDVD KDE<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name" style="width:60%">LiveDVD KDE<br>
<span class="dlinfo"><?php _g('All languages')?></span></th>
<td class="size">1.4GB</td>
<td>
@@ -153,7 +154,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
</td>
</tr>
<tr>
- <th class="name">LiveDVD GNOME<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name">LiveDVD GNOME<br>
<span class="dlinfo"><?php _g('All languages')?></span></th>
<td class="size">1.4GB</td>
<td>
@@ -166,7 +167,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
dl_link('LiveDVD-GNOME','x86_64','DVD',true);?>
</td>
<tr>
- <th class="name">LiveCD KDE<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name">LiveCD KDE<br>
<span class="dlinfo"><?php _g('English only')?></span></th>
<td class="size">700MB</td>
<td>
@@ -176,7 +177,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
</td>
</tr>
<tr>
- <th class="name">LiveCD GNOME<br>
+ <th<?php echo $rtl ? ' class="size"' : ''?> class="name">LiveCD GNOME<br>
<span class="dlinfo"><?php _g('English only')?></span></th>
<td class="size">700MB</td>
<td>
@@ -197,14 +198,14 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
<table class="fr-table dlt2">
<thead>
<tr>
- <th><?php _g('Format');?></th>
- <th class="size"><?php _g('size');?></th>
- <th><?php _g('link');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('Format');?></th>
+ <th<?php echo $rtl ? ' style="text-align: right;"' : ' class="size"'?>><?php _g('size');?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('link');?></th>
</tr>
</thead>
<tbody>
<tr>
- <th><?php _g('Network installer, Free Software CD')?></th>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('Network installer, Free Software CD')?></th>
<td class="size">27MB<br>53MB</td>
<td><?php dl_link('Boot','i586','CD',false);
echo '<br>';
@@ -212,7 +213,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
</td>
</tr>
<tr>
- <th><?php _g('Network installer + nonfree firmware CD')?><br>
+ <th<?php echo $rtl ? ' class="size"' : ''?>><?php _g('Network installer + nonfree firmware CD')?><br>
<span class="dlinfo"><?php _g('needed for some disc controllers, some network cards, etc.')?></span></th>
<td class="size">37MB<br>74MB</td>
<td><?php dl_link('Boot-nonfree','i586','CD',false);
diff --git a/en/4/index.php b/en/4/index.php
index ac3d499d3..eacf6ce5e 100644
--- a/en/4/index.php
+++ b/en/4/index.php
@@ -2,11 +2,12 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
+$rtl = is_locale_rtl($locale);
$dictionary = read_translation_file($locale, array('4', 'common_footer'));
?>
<!DOCTYPE html>
-<html lang="<?php echo $locale; ?>">
+<html <?php echo $rtl ? 'dir="rtl"' : 'dir="ltr"'?> lang="<?php echo $locale; ?>">
<head>
<meta charset="utf-8">
<title><?php _g('Mageia 4')?></title>
@@ -14,11 +15,13 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer'));
<?php echo common_header(); ?>
<meta name="description" content="<?php _g('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>">
<?php include '../../analytics.php'; ?>
- <style>.para{text-align: justify;text-align: -webkit-auto;}</style>
- <link rel="stylesheet" href="/g/style/bjqs.css">
- <script src="/g/js/jquery-1.10.1.min.js"></script>
- <script src="/g/js/bjqs-1.3.min.js"></script>
- </head>
+ <style>.para{text-align: justify;text-align: -webkit-auto;}
+ .bg-caption { background-color: rgba(38, 47, 69, 0.5); color: white; font-weight: bolder}
+ .bg-caption a { color: rgba(38, 47, 69, 0.9) }
+ .carousel-indicators li { height: 5px }
+ .carousel-indicators .active { background-color: rgba(14, 142, 255, 1) }
+ </style>
+</head>
<body class="downloads">
<?php echo $hsnav; ?>
@@ -26,7 +29,7 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer'));
<?php include '../4/nav.php'; ?>
<div id="doc5" class="yui-t3" style="margin-bottom: 0px;">
<div id="bd" role="main">
- <div class="yui-ge bb1">
+ <div class="yui-ge bb1 row">
<div class="yui-u first" style="width:55.5%">
<div class="para">
@@ -63,24 +66,54 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer'));
<div class="yui-u" style="width:44.5%">
<div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;">
- <!-- start Basic Jquery Slider -->
- <ul class="bjqs">
- <li><img src="/g/4/kde.png" title="KDE" alt="KDE"></li>
- <li><img src="/g/4/razorqt.png" title="RazorQT" alt="RazorQT"></li>
- <li><img src="/g/4/xfce.png" title="XFCE" alt="XFCE"></li>
- <li><img src="/g/4/gnome.png" title="Gnome" alt="Gnome"></li>
- <li><img src="/g/4/cinnamon.png" title="Cinnamon" alt="Cinnamon"></li>
- <li><img src="/g/4/mate.png" title="Mate" alt="Mate"></li>
- <li><img src="/g/4/mageiawelcome1.png" title="Mageia Welcome 1." alt="Mageia Welcome 1."></li>
- <li><img src="/g/4/mageiawelcome2.png" title="Mageia Welcome 2." alt="Mageia Welcome 2."></li>
- <li><img src="/g/4/mageiawelcome3.png" title="Mageia Welcome 3." alt="Mageia Welcome 3."></li>
- <li><img src="/g/4/mageiawelcome4.png" title="Mageia Welcome 4." alt="Mageia Welcome 4."></li>
- <li><img src="/g/4/mageiawelcome5.png" title="Mageia Welcome 5." alt="Mageia Welcome 5."></li>
- <li><img src="/g/4/drakconf.png" title="<?php _g('Mageia Control Center');?>" alt="<?php _g('Mageia Control Center');?>"></li>
- </ul>
-
- </div>
- <div class="para" style="padding: 1em 2em 1em 0em">
+
+<div id="carouselMga" class="carousel carousel-fade slide" data-ride="carousel">
+ <ol class="carousel-indicators">
+<?php
+for ($i = 0; $i < 12; $i++) {
+ $li = sprintf('<li data-target="#carouselMga" data-slide-to="%s"%s></li>'. PHP_EOL, $i, $i == 0 ? ' class="active"' : '');
+ echo $li;
+}
+?>
+ </ol>
+<div class="carousel-inner">
+<?php
+function carousel($src, $ttl, $active = false){
+ $div = sprintf('<div class="carousel-item%s">', $active ? ' active' : '') ;
+ $div .= sprintf('<img class="d-block rounded-lg img-fluid"') ;
+ $div .= sprintf (' src="%s" alt="%s" title="%s">',$src, $ttl, $ttl);
+ $div .= sprintf('<div class="carousel-caption d-none d-md-block bg-caption">');
+ $div .= sprintf('<h5>%s</h5>',$ttl);
+ $div .= sprintf('</div>');
+ $div .= sprintf ('</div>'. PHP_EOL);
+ echo $div;
+}
+ carousel('/g/4/kde.png', 'KDE', true );
+ carousel('/g/4/razorqt.png', 'RazorQT');
+ carousel('/g/4/xfce.png', 'XFCE');
+ carousel('/g/4/gnome.png', 'GNOME');
+ carousel('/g/4/cinnamon.png', 'CINNAMON');
+ carousel('/g/4/mate.png', 'mate');
+ carousel('/g/4/mageiawelcome1.png', 'mageiawelcome1');
+ carousel('/g/4/mageiawelcome2.png', 'mageiawelcome2');
+ carousel('/g/4/mageiawelcome3.png', 'mageiawelcome3');
+ carousel('/g/4/mageiawelcome4.png', 'mageiawelcome4');
+ carousel('/g/4/mageiawelcome5.png', 'mageiawelcome5');
+ carousel('/g/4/drakconf.png', _r('Mageia Control Center') );
+?>
+ <a class="carousel-control-prev" href="#carouselMga" role="button" data-slide="prev">
+ <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+ <span class="sr-only"><?php _r('previous')?></span>
+ </a>
+ <a class="carousel-control-next" href="#carouselMga" role="button" data-slide="next">
+ <span class="carousel-control-next-icon" aria-hidden="true"></span>
+ <span class="sr-only"><?php _r('next')?></span>
+ </a>
+ </div>
+</div>
+</div> <!-- div banner -->
+
+<div class="para" style="padding: 1em 2em 1em 0em">
<?php
_g('Mageia in context', null, 'h2');