From 63887397d7a4cede8e3498b74a42a658d8c957a1 Mon Sep 17 00:00:00 2001
From: veon <veon@fedoraproject.org>
Date: Jan 31 2017 23:11:12 +0000
Subject: fix issue #69 everything and other minor fix


---

diff --git a/alt.fedoraproject.org/data/content/index.html b/alt.fedoraproject.org/data/content/index.html
index 704ed0f..9bcc1d2 100644
--- a/alt.fedoraproject.org/data/content/index.html
+++ b/alt.fedoraproject.org/data/content/index.html
@@ -25,7 +25,7 @@
     </div>
   </header>
 
-  <!-- Servers -->
+  <!-- Network Installers -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
     <div class="container using">
       <div class="row">
@@ -85,7 +85,7 @@
     </div>
   </div>
 
-  <!-- Servers mobile phones-->
+  <!-- Network Installers mobile phones-->
   <div class="jumbotron main-head visible-xs">
     <div class="container using">
       <div class="row">
@@ -130,7 +130,7 @@
     </div>
   </div>
 
-  <!-- Servers mobile tablets-->
+  <!-- Network Installers mobile tablets-->
   <div class="jumbotron main-head visible-sm">
     <div class="container using">
       <div class="row">
@@ -238,28 +238,45 @@
     </div>
   </div>
 
-    <!-- Everything -->
+<!-- Everything -->
   <div class="jumbotron main-head top-space visible-lg hidden-xs hidden-sm hidden-md">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${_('Everything Images')}</h2>
+        <h2>${_('Everything')}</h2>
         </div>
       </div>
       <div class="row">
-        <div class="col-lg-3 product-feature">
-        <p>${_('Everything.')}</p>
+        <div class="col-md-3 product-feature">
+        <p>${_(' ')}</p>
         </div>
-        <div class="col-lg-9">
-            <div class="white">
-            <div class="col-lg-1">
+        <div class="col-md-9">
+          <div class="white">
+            <div class="col-md-1">
             <img src="/static/images/ev.png" />
             </div>
-            <div class="col-lg-6">
+            <div class="col-md-4">
             <h3>${_('Everything')}</h3>
             </div>
-            <div class="col-lg-4 col-lg-offset-1">
-            <p class="download"><a href="https://dl.fedoraproject.org/pub/fedora/linux/releases/25/Everything/">${Markup(_('View Images &gt;'))}</a></p>
+            <div class="col-md-3">
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_ev']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/ev.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Everything')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('32 bit %sMB ISO')) % global_variables.iso_size['i386_ev']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify')}</a></p>
             </div>
           </div>
         </div>
@@ -272,22 +289,31 @@
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${_('Everything Images')}</h2>
+        <h2>${_('Everything')}</h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${_('Everything.')}</p>
+        <p>${_(' ')}</p>
         </div>
       </div>
       <div class="row">
-          <div class="white">
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/ev.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Everything')}</h3>
+          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
           <div class="col-xs-3">
           <img src="/static/images/ev.png" />
           </div>
           <div class="col-xs-9">
           <h3>${_('Everything')}</h3>
-          <p class="download"><a href="https://dl.fedoraproject.org/pub/fedora/linux/releases/25/Everything/">${Markup(_('View Images &gt;'))}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify')}</a></p>
           </div>
         </div>
       </div>
@@ -299,16 +325,27 @@
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${_('Everything Images')}</h2>
+        <h2>${_('Everything')}</h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${_('Everything.')}</p>
+        <p>${_(' ')}</p>
         </div>
       </div>
       <div class="row">
-          <div class="white">
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/ev.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Everything')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/x86_64/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
           <div class="col-sm-3">
           <img src="/static/images/ev.png" />
           </div>
@@ -316,7 +353,7 @@
           <h3>${_('Everything')}</h3>
           </div>
           <div class="col-sm-4">
-          <p class="download"><a href="https://dl.fedoraproject.org/pub/fedora/linux/releases/25/Everything/">${Markup(_('View Images &gt;'))}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Everything/i386/iso/Fedora-Everything-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify')}</a></p>
           </div>
         </div>
       </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index f01af57..813097f 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -254,7 +254,10 @@ iso_size={
     'manual_pre_atomic_raw_cloud':    '100',   # In MB
     'manual_pre_atomic_qcow2_cloud':  '200',   # In MB
     'manual_pre_atomic_VBvag_cloud':  '300',   # In MB
-    'manual_pre_atomic_libvag_cloud': '400'    # In MB
+    'manual_pre_atomic_libvag_cloud': '400',   # In MB
+    # Everything release
+    'x86_64_ev':        '477',   #In MB
+    'i386_ev':          '465'   #In MB
 }
 
 # Redirect EC2 images