Move popover to separate action from main button

1 files changed, 25 insertions, 13 deletions

diff --git a/en/6/download_index.php b/en/6/download_index.php
index 929b348b9..907777274 100644
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -194,11 +194,14 @@ input[type="radio"], input[type="submit"], .popover-content  {
 
 <div class="d-sm-flex justify-content-center">
     <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/>
-    <label for="classical" class="btn btn-outline-primary pop" data-tip="classical" ><?php _g('Classic Installation', null, ' '); _g('(initial release 6)'); ?></label><?php }?>
+    <label for="classical" class="btn btn-outline-primary" ><?php _g('Classic Installation', null, ' '); _g('(initial release 6)'); ?>
+    <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="classical">?</a></label><?php }?>
     <?php if($live){ ?><input type="radio" id="live" value="LiveDVD" name="format" />
-    <label for="live" class="btn btn-outline-primary pop" data-tip="live"><?php _g('Live Media');?></label><?php }?>
+    <label for="live" class="btn btn-outline-primary"><?php _g('Live Media');?>
+    <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="live">?</a></label><?php }?>
     <input type="radio" id="lan" value="netinstall" name="format" />
-    <label for="lan" class="btn btn-outline-primary pop" data-tip="lan"><?php _g('Network Installation')?></label>
+    <label for="lan" class="btn btn-outline-primary"><?php _g('Network Installation')?>
+    <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="lan">?</a></label>
 </div>
 <?php if( !$live || !$classical ){?>
 <p style="margin-top:1.5em;" class="warn">
@@ -228,11 +231,14 @@ input[type="radio"], input[type="submit"], .popover-content  {
 
     <div class="d-sm-flex justify-content-center">
         <input type="radio" id="kde" value="Plasma" name="desktop" />
-        <label for="kde" class="btn btn-outline-primary pop" data-tip="kde"><?php _g('Plasma Desktop')?></label>
+        <label for="kde" class="btn btn-outline-primary"><?php _g('Plasma Desktop')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="kde">?</a></label>
         <input type="radio" id="gnome" value="GNOME" name="desktop" />
-        <label for="gnome" class="btn btn-outline-primary pop" data-tip="gnome"><?php _g('GNOME Desktop')?></label>
+        <label for="gnome" class="btn btn-outline-primary"><?php _g('GNOME Desktop')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="gnome">?</a></label>
         <input type="radio" id="xfce" value="Xfce" name="desktop" />
-        <label for="xfce" class="btn btn-outline-primary pop" data-tip="xfce"><?php _g('Xfce Desktop')?></label>
+        <label for="xfce" class="btn btn-outline-primary"><?php _g('Xfce Desktop')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="xfce">?</a></label>
     </div>
 </div><?php }/*live*/?>
 
@@ -249,9 +255,11 @@ input[type="radio"], input[type="submit"], .popover-content  {
     </div>
     <div class="d-sm-flex justify-content-center">
         <input type="radio" id="free" value="-" name="nat" />
-        <label for="free" class="btn btn-outline-primary pop" data-tip="free"><?php _g('Free Software CD')?></label>
+        <label for="free" class="btn btn-outline-primary"><?php _g('Free Software CD')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="free">?</a></label>
         <input type="radio" id="nonfree" value="nonfree" name="nat" />
-        <label for="nonfree" class="btn btn-outline-primary pop" data-tip="nonfree"><?php _g('Nonfree Firmware CD')?></label>
+        <label for="nonfree" class="btn btn-outline-primary"><?php _g('Nonfree Firmware CD')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="nonfree">?</a></label>
     </div>
 </div>
 
@@ -268,9 +276,11 @@ input[type="radio"], input[type="submit"], .popover-content  {
 
     <div class="d-sm-flex justify-content-center">
         <input type="radio" id="32b" value="i586" name="arch" />
-        <label for="32b" class="btn btn-outline-primary pop" data-tip="32b"><?php _g('32 bit')?></label>
+        <label for="32b" class="btn btn-outline-primary"><?php _g('32 bit')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="32b">?</a></label>
         <input type="radio" id="64b" value="x86_64" name="arch" />
-        <label for="64b" class="btn btn-outline-primary pop" data-tip="64b"><?php _g('64 bit')?></label>
+        <label for="64b" class="btn btn-outline-primary"><?php _g('64 bit')?>
+        <a role="button" class="badge badge-pill badge-info text-white pop" data-tip="64b">?</a></label>
     </div>
 </div>
 
@@ -291,8 +301,10 @@ input[type="radio"], input[type="submit"], .popover-content  {
 
     <div class="d-sm-flex justify-content-center">
     <?php if($torrentavailable){ ?>
-        <a href="#" id="torrentlink" class="btn btn-outline-primary pop" data-tip="torrent"><?php _g('BitTorrent')?></a><?php }?>
-        <a href="#" id="directlink" class="btn btn-outline-primary pop" data-tip="direct"><?php _g('Direct Link')?></a>
+        <a href="#" id="torrentlink" class="btn btn-outline-primary"><?php _g('BitTorrent')?>
+        <span class="badge badge-pill badge-info text-white pop" data-tip="torrent">?</span></a><?php }?>
+        <a href="#" id="directlink" class="btn btn-outline-primary" ><?php _g('Direct Link')?>
+        <span class="badge badge-pill badge-info text-white pop" data-tip="direct">?</span></a>
     </div>
 </div>
 
@@ -413,7 +425,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
                             <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')), 'li')?>
                             <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'li') ?>
                             <?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')), 'li')?>
-                            <?php //_g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"), 'li')?>
+                            <?php _g('Help us on %s', array("<a href=\"./prerelease/\">$name 7</a>"), 'li')?>
                             <li><a href="../downloads/alternative/"><?php _g('Alternative downloads')?></a></li>
                         </ul>