From fe122eaf890fc047fd4e435d48ba07bce4a26bef Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraonline.it>
Date: Fri, 29 Jun 2012 00:04:00 +0200
Subject: [PATCH 2/2] Downloads by Formats - Netinstall updated

---
 fedoraproject.org/build/globalvar.py                   |    4 +++-
 fedoraproject.org/data/content/get-fedora-options.html |   13 ++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fedoraproject.org/build/globalvar.py b/fedoraproject.org/build/globalvar.py
index 32c5c2e..fc73a02 100644
--- a/fedoraproject.org/build/globalvar.py
+++ b/fedoraproject.org/build/globalvar.py
@@ -28,5 +28,7 @@ iso_size={
     'i686_Live_LXDE':      '590',       # In MB
     'x86_64_Live_LXDE':    '587',       # In MB
     'i686_Live_XFCE':      '672',       # In MB
-    'x86_64_Live_XFCE':    '670'        # In MB
+    'x86_64_Live_XFCE':    '670',       # In MB
+    'i386_Netinstall':		'199',		 # In MB
+    'x86_64_Netinstall':	'162'			 # In MB
 }
diff --git a/fedoraproject.org/data/content/get-fedora-options.html b/fedoraproject.org/data/content/get-fedora-options.html
index 6635320..194951d 100644
--- a/fedoraproject.org/data/content/get-fedora-options.html
+++ b/fedoraproject.org/data/content/get-fedora-options.html
@@ -222,7 +222,7 @@ ec2_f15 = [
 			</div>
 			<div class="grid_6 omega arch">
                             <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Fedora/i386/iso/Fedora-${global_variables.release['curr_id']}-i386-DVD.iso" class="download-button-mini download-splash">${_('Download Now!')}</a><span class="star-most-compatible">${_('Most Compatible')}</span>
-                            <p class="fine-print">${_('3.5GB ISO disk image for 32-bit PC')}</p>
+                            <p class="fine-print">${_('%sGB ISO disk image for 32-bit PC') % global_variables.iso_size['i386_DVD']}</p>
                         </div>
 			<div class="grid_10 prefix_2 alpha omega"><hr /></div>
                         <div class="grid_4 prefix_2 alpha arch">
@@ -231,15 +231,10 @@ ec2_f15 = [
 			</div>
 			<div class="grid_6 omega arch">
                             <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Fedora/x86_64/iso/Fedora-${global_variables.release['curr_id']}-x86_64-DVD.iso" class="download-button-mini download-splash">${_('Download Now!')}</a>
-                            <p class="fine-print">${_('3.5GB ISO disk image for 64-bit PC')}</p>
+                            <p class="fine-print">${_('%sGB ISO disk image for 64-bit PC') % global_variables.iso_size['x86_64_DVD']}</p>
                         </div>
 			<div class="grid_10 prefix_2 alpha omega"><hr /></div>
                         <div class="clear"></div>
-		
-                        <div class="grid_10 prefix_2 alpha omega">
-                            <p class="help" style="clear: both;"><img class="support-icon" src="${path}/static/images/icon-support.png" alt="support-icon" />${Markup(_('For help determining what architecture your system is, &lt;a href="%s"&gt;please view our architecture help guide&lt;/a&gt;.') % 'http://docs.fedoraproject.org/en-US/Fedora/%s/html/Installation_Guide/ch-new-users.html#sn-which-arch' % (global_variables.release['curr_id']))}</p>
-                        </div>
-                        <div class="clear"></div>
 			</div>
 			
 			<div class="format-block">
@@ -258,7 +253,7 @@ ec2_f15 = [
 			</div>
 			<div class="grid_6 omega arch">
                             <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Fedora/i386/iso/Fedora-${global_variables.release['curr_id']}-i386-netinst.iso" class="download-button-mini download-splash">${_('Download Now!')}</a><span class="star-most-compatible">${_('Most Compatible')}</span>
-                            <p class="fine-print">${_('199MB ISO disk image for 32-bit PC')}</p>
+									 <p class="fine-print">${_('%sMB ISO disk image for 32-bit PC') % global_variables.iso_size['i386_Netinstall']}</p>                            
                         </div>
 			<div class="grid_10 prefix_2 alpha omega"><hr /></div>
                         <div class="grid_4 prefix_2 alpha arch">
@@ -267,7 +262,7 @@ ec2_f15 = [
 			</div>
 			<div class="grid_6 omega arch">
                             <a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Fedora/x86_64/iso/Fedora-${global_variables.release['curr_id']}-x86_64-netinst.iso" class="download-button-mini download-splash">${_('Download Now!')}</a>
-                            <p class="fine-print">${_('162MB ISO disk image for 64-bit PC')}</p>
+                            <p class="fine-print">${_('%sMB ISO disk image for 64-bit PC') % global_variables.iso_size['x86_64_Netinstall']}</p>
                         </div>
 			<div class="grid_10 prefix_2 alpha omega"><hr /></div>
                         <div class="clear"></div>
-- 
1.7.10.2

