diff options
Diffstat (limited to 'en/5')
| -rwxr-xr-x | en/5/download_index.php | 74 | ||||
| -rw-r--r-- | en/5/index.php | 91 | ||||
| -rw-r--r-- | en/5/nav.php | 6 |
3 files changed, 84 insertions, 87 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php index 4655d58ac..4870ec129 100755 --- a/en/5/download_index.php +++ b/en/5/download_index.php @@ -65,39 +65,10 @@ function get_image($ttl, $src, $sty){ <meta name="keywords" content="<?php _g('mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent', array("$name $version"))?>"> <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale.'/'.$version;?>/"> - <link rel="stylesheet" href="/g/style/all.css"> - <script src="/g/js/jquery-1.10.1.min.js"></script> - <script src="/g/js/tooltipsy.min.js"></script> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> <style> -.radiobutton{ - display: table; - border-spacing:0.4em 0; - margin: 0px auto; -} -.radiobutton .ui-button{ - display: table-cell; - height: 100%; -} -.ui-button,.ui-button:link { - border: 1px solid #AED0EA; - -moz-box-sizing: content-box; - outline: 0 none !important; - background: repeat-x scroll 50% 50% #D7EBF9; - font-size: 1.4em; - cursor: pointer; - text-align: center; - vertical-align: middle; - border-radius: 6px; - padding: .5em .4em; - min-width: 200px; - text-decoration: none; - color: black; - text-shadow: 1px 2px 3px rgba(0,0,0, 0.5); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .5); - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .5); - box-shadow: 2px 2px 5px rgba(0, 0, 0, .5); -} + .iso2usb {cursor:pointer} .italic {font-style:italic} @@ -107,13 +78,11 @@ input[type="radio"]:checked + label,.ui-button:active { background: -moz-linear-gradient(top, #3494D3 0%, #2383C2 50%); background: -o-linear-gradient(top, #3494D3 0%, #2383C2 50%); background: linear-gradient(top, #3494D3 0%, #2383C2 50%); + color: white; } input[type="radio"], input[type="submit"] { display: none; } -.ui-button:hover{ - background: #23AEC2; -} .tooltipsy{ padding: 0.5em; @@ -130,7 +99,6 @@ input[type="radio"], input[type="submit"] { border-radius: 6px; } </style> -<link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> </head> <body class="release downloads"> <?php echo $hsnav; ?> @@ -140,8 +108,8 @@ input[type="radio"], input[type="submit"] { <div id="doc4" class="yui-t7" style="margin-bottom: 0px;"> <div id="bd" role="main"> - <div class="yui-ge bb1"> - <div class="yui-u first rb1"> + <div class="yui-ge bb1 row"> + <div class="yui-u first col-md-8"> <noscript> <div class="para warn"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','#Fclassical'),'p'); ?></div> @@ -222,12 +190,13 @@ input[type="radio"], input[type="submit"] { <div class="radiobutton"> <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/> - <label for="classical" class="ui-button classical" ><?php _g('Classic Installation')?></label><?php }?> + <label for="classical" class="classical btn btn-outline-primary" ><?php _g('Classic Installation')?></label><?php }?> <?php if($live){ ?><input type="radio" id="live" value="LiveDVD" name="format" /> - <label for="live" class="ui-button live"><?php _g('Live Media');?></label><?php }?> + <label for="live" class="live btn btn-outline-primary"><?php _g('Live Media');?></label><?php }?> <input type="radio" id="lan" value="Boot" name="format" /> - <label for="lan" class="ui-button lan"><?php _g('Network Installation')?></label> + <label for="lan" class="lan btn btn-outline-primary"><?php _g('Network Installation')?></label> </div> + <?php if( !$dual || !$live || !$classical ){?> <p style="margin-top:1.5em;" class="warn"> <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?> @@ -253,9 +222,9 @@ input[type="radio"], input[type="submit"] { <div class="radiobutton"> <input type="radio" id="kde" value="KDE4" name="desktop" /> - <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label> + <label for="kde" class="btn btn-outline-primary kde"><?php _g('KDE Desktop')?></label> <input type="radio" id="gnome" value="GNOME" name="desktop" /> - <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label> + <label for="gnome" class="btn btn-outline-primary gnome"><?php _g('GNOME Desktop')?></label> </div> </div><?php }/*live*/?> @@ -272,9 +241,9 @@ input[type="radio"], input[type="submit"] { </div> <div class="radiobutton"> <input type="radio" id="free" value="-" name="nat" /> - <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label> + <label for="free" class="btn btn-outline-primary free"><?php _g('Free Software CD')?></label> <input type="radio" id="nonfree" value="nonfree" name="nat" /> - <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label> + <label for="nonfree" class="btn btn-outline-primary nonfree"><?php _g('Nonfree Firmware CD')?></label> </div> </div> @@ -291,9 +260,9 @@ input[type="radio"], input[type="submit"] { <div class="radiobutton"> <input type="radio" id="32b" value="i586" name="arch" /> - <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label> + <label for="32b" class="btn btn-outline-primary 32b"><?php _g('32 bit')?></label> <input type="radio" id="64b" value="x86_64" name="arch" /> - <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label> + <label for="64b" class="btn btn-outline-primary 64b"><?php _g('64 bit')?></label> </div> </div> @@ -314,8 +283,8 @@ input[type="radio"], input[type="submit"] { <div class="radiobutton"> <?php if($torrentavailable){ ?> - <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?> - <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a> + <a href="#" id="torrentlink" class="btn btn-outline-primary torrentlink"><?php _g('BitTorrent')?></a><?php }?> + <a href="#" id="directlink" class="btn btn-outline-primary directlink"><?php _g('Direct Link')?></a> </div> </div> @@ -423,8 +392,8 @@ input[type="radio"], input[type="submit"] { </noscript> </div> - <div class="yui-u"> - <div class="para" style="padding-left: 1em;"> + <div class="yui-u col"> + <div class="para mt-3"> <ul class="hl"> <li><a href=<?php echo sprintf('"%s">',$releasenotes); _g('Release notes')?></a></li> <li><a href=<?php echo sprintf('"%s">',$errata); _g('More about known issues or limitation in installation and usage')?></a></li> @@ -459,6 +428,8 @@ input[type="radio"], input[type="submit"] { </div> </div> </div> +<?php echo common_footer($locale); ?> +<script src="/g/js/tooltipsy.min.js"></script> <script> $(function () { @@ -536,7 +507,7 @@ $('img.lazy').each(function(){ getname ='<?php echo get_mageia($name, $version, $release)?>' + '-'; file = $('#live').is(':checked') ? format + '-' + desktop + '-' + arch + '-' + 'DVD.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso'; file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ; - $("a.ui-button").attr('href','../downloads/get/?q=' + file); + $("a.btn").attr('href','../downloads/get/?q=' + file); }); gettooltip('.iso2usb', '#iso2usbEx',0,1) @@ -554,6 +525,5 @@ $('img.lazy').each(function(){ }); </script> -<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/5/index.php b/en/5/index.php index 6df61a52e..daa8b8224 100644 --- a/en/5/index.php +++ b/en/5/index.php @@ -10,16 +10,11 @@ $dictionary = read_translation_file($locale, array('5', 'common_footer')); <head> <meta charset="utf-8"> <title><?php _g('Mageia 5.1')?></title> - <link rel="stylesheet" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <meta name="description" content="<?php _g('Mageia 5 is the new, solid, stable Linux distribution from the Mageia project.')?>"> + <?php echo common_header(); ?> <?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> .fixed-img{ max-height:342px } </style> +</head> <body class="downloads"> <?php echo $hsnav; ?> @@ -28,15 +23,15 @@ $dictionary = read_translation_file($locale, array('5', 'common_footer')); <div id="doc5" class="yui-t3" style="margin-bottom: 0px;"> <div id="bd" role="main"> - <div class="yui-ge bb1"> - <div class="yui-u first" style="width:55.5%"> + <div class="yui-ge bb1 row"> + <div class="yui-u first col" > <div class="para"> <?php _g('About Mageia 5', null, 'h2'); _g('Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?> - <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _g('Download it right away!');?></a></p> + <p><a href="../downloads/" class="btn btn-primary"><?php _g('Download it right away!');?></a></p> <?php _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')), 'p'); _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p'); @@ -59,29 +54,61 @@ $dictionary = read_translation_file($locale, array('5', 'common_footer')); </div> </div> - <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/5/Cinnamon.png" title="Cinnamon"></li> - <li><img src="/g/5/Enlightenment.png" title="Enlightenment"></li> - <li><img src="/g/5/gnome.png" title="GNOME"></li> - <li><img src="/g/5/kde.png" title="KDE"></li> - <li><img src="/g/5/Lxde.png" title="LXDE"></li> - <li><img src="/g/5/Lxqt.png" title="LXQT"></li> - <li><img src="/g/5/Mate.png" title="MATE"></li> - <li><img src="/g/5/Xfce.png" title="XFCE"></li> - <li><img src="/g/5/MageiaControlCenter.png" title="<?php _g('Mageia Control Center');?>"></li> - <li><img src="/g/5/MageiaWelcome1.png" title="Mageia Welcome 1"></li> - <li><img src="/g/5/MageiaWelcome2.png" title="Mageia Welcome 2"></li> - <li><img src="/g/5/MageiaWelcome3.png" title="Mageia Welcome 3"></li> - <li><img src="/g/5/MageiaWelcome4.png" title="Mageia Welcome 4"></li> - <li><img src="/g/5/MageiaWelcome5.png" title="Mageia Welcome 5"></li> - </ul> - + <div class="yui-u col-sm-6" > + + <div id="carouselExampleControls" class="carousel slide mx-30" data-ride="carousel"> + <div class="carousel-inner" role="listbox"> + <div class="carousel-item active"> + <img class="d-block fixed-img" src="/g/5/Cinnamon.png" alt="Cinnamon"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/Enlightenment.png" alt="Enlightenment"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/gnome.png" alt="gnome"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/kde.png" alt="kde"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/Lxde.png" alt="Lxde"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/Mate.png" alt="Mate"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/Xfce.png" alt="Xfce"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaControlCenter.png" alt="<?php _g('Mageia Control Center');?>"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaWelcome1.png" alt="Mageia Welcome 1"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaWelcome2.png" alt="Mageia Welcome 2"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaWelcome3.png" alt="Mageia Welcome 3"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaWelcome4.png" alt="Mageia Welcome 4"> + </div> + <div class="carousel-item"> + <img class="d-block fixed-img" src="/g/5/MageiaWelcome5.png" alt="Mageia Welcome 5"> + </div> </div> - <div class="para" style="padding: 1em 2em 1em 0em"> + <a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev"> + <span class="carousel-control-prev-icon" aria-hidden="true"></span> + <span class="sr-only">Previous</span> + </a> + <a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next"> + <span class="carousel-control-next-icon" aria-hidden="true"></span> + <span class="sr-only">Next</span> + </a> + </div> + <div class="para py-3"> <?php _g('Mageia in context', null, 'h2'); diff --git a/en/5/nav.php b/en/5/nav.php index 630951f5a..84a8a6172 100644 --- a/en/5/nav.php +++ b/en/5/nav.php @@ -17,13 +17,13 @@ $sru = trim($_SERVER['REQUEST_URI']); $pnav = array(); foreach ($nav as $k => $v) { - $pnav[] = sprintf('<li><a href="%s"%s>%s</a></li>', + $pnav[] = sprintf('<li class="flex-sm-fill text-sm-center nav-item"><a href="%s"%s>%s</a></li>', $k, - $k == $sru ? ' class="sel"' : null, + $k == $sru ? ' class="nav-link active"' : ' class="nav-link"', $v); } $pnav = implode($pnav); echo <<<S -<div id="mgnavsub"><ul id="mgnavsubl">{$pnav}</ul></div> +<div id="mgnavsub"><ul id="mgnavsubl" class="nav nav-pills flex-column flex-sm-row justify-content-center">{$pnav}</ul></div> S; |