more page to adapt for bootstrap

+replace custom .css with common header +clean of inline style
author: Manuel Hiebel <leuhmanu@mageia.org> 2017-07-05 10:56:03 +0200
committer: Manuel Hiebel <leuhmanu@mageia.org> 2017-07-05 10:56:03 +0200
commit: 4d698ae14ddd4801897cf2ccf4e929deee81a944 (patch)
tree: caa8203c41c1519c7ba96cca40a726097ec8afb7
parent: 29731943ca2d537e35e6fea00fe5d96bf223c345 (diff)
download: www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar
www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.gz
www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.bz2
www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.xz
www-4d698ae14ddd4801897cf2ccf4e929deee81a944.zip
7 files changed, 40 insertions, 43 deletions
diff --git a/en/community/index.php b/en/community/index.php
index ba53b637a..d2d84b7af 100644
--- a/en/community/index.php
+++ b/en/community/index.php
@@ -14,17 +14,16 @@ include '../../lib/news.php';
     <meta name="description" content="<?php _g('Mageia Community Central is the place where all contributors and users can find the latest news about Mageia and learn more about what to do in the project.')?>">
     <meta name="keywords" content="<?php _g('mageia, community, news, tools, tasks')?>">
     <meta name="author" content="Mageia">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
+    <?php include '../../analytics.php'; ?>
+    <?php echo common_header(); ?>
     <style>
     #newslist { list-style: none; margin: 0; padding: 0; }
         #newslist > li { list-style: none; padding: 0.6em 0.9em; }
-        #newslist li:first-child { font-weight: bold; outline: 1px solid #fa8; margin-bottom: 0.4em; background: #fffaf0; }
+        #newslist li:first-child { font-weight: bold; border: 1px solid #fa8; margin-bottom: 0.4em; background: #fffaf0; border-radius: .5rem;}
             #newslist > li .dt { display: block; font-size: 80%; color: #888; }
     .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }
     hr { margin-top: 2em; }
     </style>
-    <?php include '../../analytics.php'; ?>
 </head>
 <body class="community">
     <?php echo $hsnav; ?>
@@ -43,9 +42,9 @@ include '../../lib/news.php';
             <li><a href="//people.mageia.org/"><?php _g('People');?></a></li>
         </ul>
     </header>
-    <div id="doc6" class="yui-t7" style="margin-bottom: 0px; max-width: 950px;">
-    <div class="yui-ge">
-    <div class="para" style="width: 400px;">
+    <div id="doc6" class="container">
+    <div class="yui-ge row justify-content-center">
+    <div class="col">
         <section>
             <?php
             if ((strpos($locale, 'en') === 0) || (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/')) {
@@ -65,7 +64,7 @@ include '../../lib/news.php';
             ?></p>
         </section>
     </div>
-    <div class="para" style="width: 300px">
+    <div class="col">
         <h2><a href="../contribute/"><?php _g('How to contribute?')?></a></h2>
         <ul class="hl">
             <li><a href="../contribute/"><?php echo _r('Start here')?></a>,</li>
@@ -91,7 +90,8 @@ include '../../lib/news.php';
             <li><a href="//check.mageia.org/"><?php _g('Global QA report')?></a></li>
         </ul>
     </div>
-    <div class="para">
+    <div class="w-100"></div>
+    <div class="col">
         <h2><?php _g('Conversations')?></h2>
         <p><?php _g('... or, how to get in touch with us? Easy:')?></p>
         <ul class="hl">
@@ -109,7 +109,7 @@ include '../../lib/news.php';
         </section>
         -->
     </div>
-    <div class="para">
+    <div class="col">
         <h2><?php _g('Teams you can join!')?></h2>
         <ul class="hl">
             <li><a href=<?php _g('"https://wiki.mageia.org/en/Atelier_team" hreflang="en"')?>><?php _g('Atelier')?></a></li>
@@ -121,7 +121,7 @@ include '../../lib/news.php';
             <li><a href=<?php _g('"https://wiki.mageia.org/en/Bugsquad" hreflang="en"')?>><?php _g('Bugs triaging')?></a></li>
         </ul>
     </div>
-    <div class="para">
+    <div class="col">
         <h2><?php _g('Mageia')?></h2>
         <ul class="hl">
             <li><a href="../about/"><?php _g('More about Mageia')?></a></li>
@@ -135,7 +135,8 @@ include '../../lib/news.php';
             <li><?php _g('<a href="../donate/">Donations</a> &amp; <a href="../about/reports/">reports</a>.')?></li>
         </ul>
     </div>
-    <p style="clear: both; text-align: center;"><mark><?php _g('This page needs you! <a href="https://wiki.mageia.org/en/Web_team">Join the Web team</a>!')?></mark></p>
+    <div class="w-100"></div>
+    <p style="clear: both; text-align: center;"><mark class=mark"><?php _g('This page needs you! <a href="https://wiki.mageia.org/en/Web_team">Join the Web team</a>!')?></mark></p>
 </div>
 </div>
 <?php echo common_footer($locale); ?>
diff --git a/en/contact/index.php b/en/contact/index.php
index 287261d50..e46a630ed 100644
--- a/en/contact/index.php
+++ b/en/contact/index.php
@@ -11,17 +11,15 @@ $dictionary = read_translation_file($locale, array('contact', 'common_footer'));
     <meta name="description" content="<?php _g('Here you can find out, how to contribute to the Mageia project')?>">
     <meta name="keywords" content="<?php _g('mageia, contact, mail, press, people, board, council, mailing lists')?>">
     <meta name="author" content="Mageia">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
+    <?php echo common_header(); ?>
     <link rel="canonical" href="/<?php echo $locale; ?>/contact/">
-    <style> .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }</style>
     <?php include '../../analytics.php'; ?>
 </head>
 <body class="contact">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Contact Us')?></h1>
-<div style="display: table;margin: 1em auto 0;border-radius: 10px;box-shadow: 0px 0px 6px #555;overflow: hidden;background: none repeat scroll 0% 0% #FFF;">
-      <div class="para" style="width: 300px;">
+<div id="doc" class="container row">
+      <div class="col" >
             <?php
             _g('You are looking for support', null, 'h2');
             _g('Search on:');?>
@@ -41,7 +39,7 @@ $dictionary = read_translation_file($locale, array('contact', 'common_footer'));
 	  <hr>
         </div>
 
-        <div class="para" style="width: 600px;">
+        <div class="col">
         <?php
         _g('You have an idea of whom to contact', null, 'h2');
         echo '<ul class="hl">';
@@ -61,7 +59,7 @@ $dictionary = read_translation_file($locale, array('contact', 'common_footer'));
         _g('Please see <a href="%s">our Contributions page</a>.', array('../contribute/'), 'p');
         ?>
 </div>
-        <div class="para" style="width: 280px;">
+        <div class="col">
         <?php _g('Something particular to ask', null, 'h2')?>
         <span class="dlinfo"><?php _g('In English and this is not for support')?></span>
 
diff --git a/en/contribute/index.php b/en/contribute/index.php
index 35b52fbea..353168cc1 100644
--- a/en/contribute/index.php
+++ b/en/contribute/index.php
@@ -14,22 +14,21 @@ $dictionary = read_translation_file($locale, array('contribute', 'common_footer'
     <meta name="keywords" content="<?php _g('mageia, contribute, howto, operating system')?>">
     <meta name="author" content="Mageia">
     <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
-    <link rel="canonical" href="/<?php echo $locale; ?>/contribute/">
     <?php include '../../analytics.php'; ?>
-    <style> .para {text-align:justify;}</style>
+    <?php echo common_header(); ?>
+    <link rel="canonical" href="/<?php echo $locale; ?>/contribute/">
 </head>
 <body id="top" class="contribute">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Contribute to Mageia')?></h1>
     <div id="doc5" class="yui-t7" style="margin-bottom: 0px;">
-    <div class="yui-ge">
+    <div class="row">
         <div class="para bb1" style="padding-top: 2em;">
             <p><?php _g('Many people from all over the world gather to build Mageia &ndash; a Linux-based operating system <em>and</em> a <a href="../about/code-of-conduct/">lively, fun community</a> for <a href="../about/values/">building Free Software projects</a>.')?></p>
             <p><?php _g('Contributing is open to anyone, this is Free Software! If you are curious and willing to join, there are things you can do, depending on your time and skills; you will always find someone to welcome and help/mentor you if needed so that your contribution to the project can be as good as it can be!')?></p>
             <p><?php _g('Check what you could do below!')?></p>
         </div>
-       <div class="yui-u first" style="width:40%"> 
+       <div class="col-sm-5">
         <div class="para" id="by-time">
             <h2><?php _g('Time')?></h2>
             <p><?php _g('How much free time do you have? and how much of it do you want to commit to Mageia? See what you can do:')?></p>
@@ -60,7 +59,7 @@ $dictionary = read_translation_file($locale, array('contribute', 'common_footer'
             </ul>
         </div>
     </div>
-    <div class="yui-u lb1" style="width:58%">
+    <div class="col-sm-7">
         <div class="para" id="by-role">
         <h2><?php _g('Roles')?></h2>
         <ul id="contrib-roles" class="contrib-list">
diff --git a/en/donate/index.php b/en/donate/index.php
index 03dba11b2..1ca3cc971 100644
--- a/en/donate/index.php
+++ b/en/donate/index.php
@@ -11,8 +11,7 @@ $dictionary = read_translation_file($locale, array('donate', 'common_footer'));
     <meta name="description" content="">
     <meta name="keywords" content="<?php _g('mageia, donate, donation, donors, help'); ?>">
     <meta name="author" content="Mageia">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
+    <?php echo common_header(); ?>
     <link rel="canonical" href="/<?php echo $locale; ?>/donate/">
     <?php include '../../analytics.php'; ?>
     <style>
@@ -27,8 +26,8 @@ $dictionary = read_translation_file($locale, array('donate', 'common_footer'));
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Donate to Mageia')?></h1>
     <div id="doc2" class="yui-t7" style="margin-bottom: 0px;">
-    <div class="yui-ge">
-       <div class="yui-u first" style="width:50%"> 
+    <div class="yui-ge row">
+       <div class="yui-u first col">
         <div class="para">
             <h2 id="d-paypal"><?php _g('Donate via PayPal,'); ?></h2>
                 <?php include '../../paypal.inc.php'; echo html_paypal_form($locale); ?>
@@ -36,7 +35,7 @@ $dictionary = read_translation_file($locale, array('donate', 'common_footer'));
                 <?php echo sprintf(_r('If you want to donate <a href="http://bitcoin.org/">bitcoins</a>, the Mageia.Org bitcoin address is <b>%s</b>.'), '<a href="https://blockchain.info/address/1GYF2h69NrJ7Pp92bNPDEdLABbH1hR7rsA">1GYF2h69NrJ7Pp92bNPDEdLABbH1hR7rsA</a>'); ?>
             <h3><?php _g('via bank transfer,'); ?></h3>
                 <p><?php _g('using the following Bank Identifier Code (IBAN-BIC):') ?></p>
-                <pre class="donate-coord">
+                <pre class="donate-coord p-3">
 <u><?php _g('In favor of:'); ?></u>
 
 <?php echo $G_coord_assos; ?>
@@ -62,7 +61,7 @@ $dictionary = read_translation_file($locale, array('donate', 'common_footer'));
                 </ul>
        </div>
     </div>
-    <div class="yui-u" style="width:50%"> 
+    <div class="yui-u col">
        <div class="para">
         <h2 id="why"><?php _g('Why donate?'); ?></h2>
         <p><?php _g('Mageia.Org is a not-for-profit association to manage the Mageia distribution. As a not-for-profit association, it can receive donations from the community to help in a lot of differents fields:')?></p>
diff --git a/en/downloads/1/index.php b/en/downloads/1/index.php
index 72f34fbb5..ab96c175b 100644
--- a/en/downloads/1/index.php
+++ b/en/downloads/1/index.php
@@ -22,6 +22,7 @@ require './lib.php';
     <meta name="author" content="Mageia">
     <link rel="stylesheet" type="text/css" href="/g/style/all.css">
     <?php include '../../../analytics.php'; ?>
+    <?php echo common_header(); ?>
 </head>
 <body class="release downloads">
     <?php echo $hsnav; ?>
@@ -38,5 +39,6 @@ require './lib.php';
             </div></div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php
index 69248943b..2680199ad 100644
--- a/en/downloads/get/index.php
+++ b/en/downloads/get/index.php
@@ -207,8 +207,7 @@ if ($debug)
     <meta charset="utf-8">
     <title><?php echo $title; ?> | <?php _g('Mageia Downloads') ?></title>
     <meta name="robots" content="noindex,nofollow,nosnippet">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
+    <?php echo common_header(); ?>
     <?php
 if (!isset($_SERVER['APP_MODE']) || $_SERVER['APP_MODE'] == 'prod') {
     include '../../../analytics.php';
@@ -254,7 +253,7 @@ $num_checksums = count($sum_links);
 if ($num_checksums > 0 && !$torrent) {
     _g('As soon as your download is complete, you should check that the checksums match:', null, 'p');
     echo PHP_EOL . '<div id="check-signs">' . PHP_EOL;
-    echo '<pre class="term">' . PHP_EOL;
+    echo '<pre class="term pre-scrollable">' . PHP_EOL;
     echo $chksm_cmd;
     echo '</pre>' . PHP_EOL . '<p>';
     _g('If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-check and try to download again.', null, ' ');
@@ -268,11 +267,11 @@ if ($num_checksums > 0 && !$torrent) {
 _g('They are also available for download as files:', null, ' ');
 echo "$signature_links. ";
 echo sprintf(_r('First you need to import the "Mageia Release" key from a <a href="%s">MIT PGP Public Key Server</a>:'), 'https://pgp.mit.edu/'); ?></p>
-<pre class="term">
+<pre class="term pre-scrollable">
 $ gpg --keyserver pgp.mit.edu --recv-keys EDCA7A90
 </pre>
 <p><?php _g('In response there should be one of the following lines:'); ?></p>
-<pre class="term">
+<pre class="term pre-scrollable">
 <strong>gpg: key EDCA7A90: public key "Mageia Release &lt;release&#x40;mageia.org&gt;" imported</strong>
 
 <?php _g('or if you already imported the key before:'); echo PHP_EOL; ?>
@@ -284,7 +283,7 @@ $ gpg --keyserver pgp.mit.edu --recv-keys EDCA7A90
 $ gpg --verify /your/download/location/<?php echo basename($download); ?>.md5.gpg
 </pre>
 <p><?php _g('In response there should be lines like:'); ?></p>
-<pre class="term">
+<pre class="term pre-scrollable">
 <strong>gpg: Good signature from "Mageia Release &lt;release&#x40;mageia.org&gt;"</strong>
 gpg: WARNING: This key is not certified with a trusted signature!
 gpg:          There is no indication that the signature belongs to the owner.
@@ -297,8 +296,8 @@ gpg:          There is no indication that the signature belongs to the owner.
                 </div>
 
                 <!-- alternative mirrors table -->
-                <table class="dlt2 dlinfo" id="other_mirrors" style="display: none;">
-                    <thead><tr><th><?php _g('Country'); ?></th>
+                <table class="dlt2 dlinfo table table-sm table-bordered table-striped" id="other_mirrors" style="display: none;">
+                    <thead class="thead-inverse"><tr><th><?php _g('Country'); ?></th>
                         <th><?php _g('City'); ?></th>
                         <th><?php _g('Download mirrors'); ?></th></tr></thead>
                     <tbody><?php echo $alternative_mirrors; ?></tbody>
diff --git a/en/support/index.php b/en/support/index.php
index bcd9420bb..31cc83750 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -12,9 +12,8 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer'));
     <meta name="description" content="<?php _g('List of support resources for Mageia distribution.')?>">
     <meta name="keywords" content="<?php _g('mageia, linux, support, help, hardware, qa, test')?>">
     <meta name="author" content="Mageia">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
-    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
     <?php include '../../analytics.php'; ?>
+    <?php echo common_header(); ?>
 </head>
 <body class="support">
     <?php echo $hsnav; ?>
@@ -30,10 +29,10 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer'));
             <li><a href="//bugs.mageia.org/"><?php _g('Bugs Reports')?></a></li>
         </ul>
     </header>
-    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
+    <div id="doc" class="yui-t7">
         <div id="bd" role="main">
             <div class="yui-g">
-                <div class="para donate" style="padding-top: 2em;">
+                <div class="para donate" >
                     <?php
                         _g('Documentation', null, 'h2 id="docu"');
                         _g('You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s.',
author	Manuel Hiebel <leuhmanu@mageia.org>	2017-07-05 10:56:03 +0200
committer	Manuel Hiebel <leuhmanu@mageia.org>	2017-07-05 10:56:03 +0200
commit	4d698ae14ddd4801897cf2ccf4e929deee81a944 (patch)
tree	caa8203c41c1519c7ba96cca40a726097ec8afb7
parent	29731943ca2d537e35e6fea00fe5d96bf223c345 (diff)
download	www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.gz www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.bz2 www-4d698ae14ddd4801897cf2ccf4e929deee81a944.tar.xz www-4d698ae14ddd4801897cf2ccf4e929deee81a944.zip