Permalink
Browse files

Merge branch 'order-cd'

  • Loading branch information...
figure002 committed May 25, 2013
2 parents 5a098d5 + 4a6bfdf commit 562e490e59c09726de207e8d711daf51f565b8e6
BIN +673 Bytes images/cd.png
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="648.143px" height="538px" viewBox="0 0 648.143 538" enable-background="new 0 0 648.143 538" xml:space="preserve">
<path fill="#DD4814" d="M500.517,170.078c0,93.926-76.146,170.074-170.078,170.074c-93.934,0-170.079-76.148-170.079-170.074
C160.36,76.146,236.506,0,330.439,0C424.372,0,500.517,76.146,500.517,170.078z"/>
<path fill="#FFFFFF" d="M214.791,147.366c-12.547,0-22.712,10.166-22.712,22.712c0,12.54,10.165,22.705,22.712,22.705
c12.54,0,22.705-10.165,22.705-22.705C237.496,157.532,227.331,147.366,214.791,147.366z M376.919,250.57
c-10.861,6.273-14.585,20.153-8.311,31.008c6.266,10.861,20.146,14.584,31.007,8.311c10.86-6.266,14.584-20.146,8.311-31.008
C401.66,248.027,387.772,244.304,376.919,250.57z M264.114,170.078c0-22.44,11.146-42.265,28.201-54.27l-16.601-27.805
c-19.867,13.28-34.649,33.573-40.792,57.34c7.168,5.849,11.756,14.753,11.756,24.734c0,9.975-4.588,18.879-11.756,24.728
c6.135,23.774,20.917,44.068,40.792,57.348l16.601-27.812C275.26,212.343,264.114,192.519,264.114,170.078z M330.439,103.746
c34.65,0,63.078,26.567,66.062,60.448l32.356-0.477c-1.592-25.013-12.519-47.468-29.309-63.98
c-8.634,3.262-18.607,2.763-27.227-2.206c-8.635-4.983-14.049-13.389-15.529-22.514c-8.392-2.316-17.224-3.584-26.355-3.584
c-15.697,0-30.538,3.687-43.715,10.209l15.778,28.274C310.988,105.966,320.457,103.746,330.439,103.746z M330.439,236.403
c-9.982,0-19.451-2.221-27.938-6.17l-15.778,28.273c13.177,6.53,28.018,10.218,43.716,10.218c9.131,0,17.963-1.269,26.354-3.592
c1.48-9.125,6.896-17.523,15.529-22.515c8.626-4.977,18.593-5.467,27.227-2.205c16.79-16.512,27.717-38.967,29.309-63.98
l-32.364-0.477C393.517,209.845,365.09,236.403,330.439,236.403z M376.911,89.572c10.861,6.272,24.742,2.557,31.008-8.304
c6.273-10.861,2.558-24.742-8.304-31.016c-10.861-6.266-24.741-2.543-31.016,8.318C362.334,69.425,366.057,83.306,376.911,89.572z"
/>
<path d="M90.651,532.025c-4.606,1.152-10.685,2.375-18.238,3.669c-7.555,1.296-16.296,1.941-26.225,1.941
c-8.633,0-15.901-1.261-21.799-3.774c-5.902-2.517-10.65-6.079-14.245-10.686c-3.6-4.604-6.188-10.037-7.771-16.296
C0.789,500.621,0,493.682,0,486.053V423.03h20.073v58.705c0,13.672,2.158,23.456,6.476,29.354c4.316,5.902,11.581,8.852,21.8,8.852
c2.157,0,4.387-0.072,6.69-0.219c2.3-0.141,4.458-0.322,6.476-0.539c2.013-0.216,3.848-0.431,5.504-0.646
c1.651-0.216,2.839-0.465,3.561-0.755V423.03h20.073L90.651,532.025L90.651,532.025z"/>
<path d="M139.644,427.993c2.444-1.581,6.15-3.237,11.114-4.963c4.965-1.729,10.685-2.591,17.159-2.591
c8.058,0,15.216,1.438,21.477,4.315c6.259,2.88,11.547,6.907,15.862,12.088c4.317,5.181,7.589,11.368,9.821,18.562
c2.229,7.195,3.346,15.106,3.346,23.739c0,9.065-1.333,17.234-3.992,24.5c-2.664,7.266-6.441,13.416-11.332,18.451
c-4.895,5.039-10.792,8.924-17.698,11.656c-6.907,2.731-14.677,4.1-23.312,4.1c-9.354,0-17.627-0.646-24.82-1.941
c-7.196-1.295-13.096-2.589-17.698-3.885V371.229l20.073-3.453V427.993z M139.644,517.781c2.013,0.576,4.855,1.115,8.525,1.617
c3.669,0.506,8.235,0.757,13.705,0.757c10.792,0,19.425-3.562,25.9-10.685c6.475-7.124,9.713-17.23,9.713-30.326
c0-5.752-0.577-11.147-1.728-16.188c-1.152-5.035-3.021-9.388-5.61-13.057c-2.59-3.67-5.937-6.547-10.037-8.636
c-4.101-2.084-9.032-3.129-14.785-3.129c-5.47,0-10.505,0.938-15.107,2.807c-4.607,1.872-8.132,3.814-10.576,5.826V517.781
L139.644,517.781z"/>
<path d="M330.44,532.025c-4.607,1.152-10.685,2.375-18.238,3.669c-7.555,1.296-16.295,1.941-26.224,1.941
c-8.635,0-15.901-1.261-21.8-3.774c-5.902-2.517-10.65-6.079-14.245-10.686c-3.6-4.604-6.188-10.037-7.771-16.296
c-1.585-6.26-2.375-13.199-2.375-20.828V423.03h20.073v58.705c0,13.672,2.158,23.456,6.475,29.354
c4.316,5.902,11.581,8.852,21.8,8.852c2.157,0,4.388-0.072,6.69-0.219c2.3-0.141,4.458-0.322,6.475-0.539
c2.014-0.216,3.849-0.431,5.504-0.646c1.652-0.216,2.841-0.465,3.562-0.755V423.03h20.073L330.44,532.025L330.44,532.025z"/>
<path d="M359.359,426.268c4.604-1.15,10.717-2.375,18.346-3.671c7.625-1.294,16.402-1.94,26.33-1.94
c8.922,0,16.33,1.261,22.231,3.775c5.898,2.521,10.609,6.043,14.138,10.576c3.522,4.533,6.006,9.967,7.446,16.296
c1.437,6.333,2.158,13.312,2.158,20.938v63.021h-20.074v-58.708c0-6.903-0.469-12.803-1.401-17.695
c-0.938-4.891-2.48-8.85-4.642-11.87c-2.157-3.023-5.036-5.216-8.633-6.584c-3.6-1.367-8.061-2.052-13.381-2.052
c-2.16,0-4.393,0.074-6.691,0.217c-2.303,0.145-4.497,0.324-6.582,0.541c-2.09,0.215-3.961,0.469-5.61,0.755
c-1.656,0.29-2.844,0.506-3.562,0.646v94.751H359.36L359.359,426.268L359.359,426.268z"/>
<path d="M496.412,423.03h42.52v16.835h-42.52v51.799c0,5.611,0.43,10.253,1.295,13.921c0.863,3.671,2.158,6.549,3.885,8.634
c1.728,2.088,3.885,3.562,6.476,4.425c2.59,0.863,5.61,1.297,9.063,1.297c6.187,0,11.08-0.683,14.678-2.052
c3.595-1.365,6.043-2.337,7.339-2.913l4.315,16.403c-2.016,1.008-5.578,2.304-10.684,3.884c-5.109,1.582-10.898,2.374-17.375,2.374
c-7.627,0-13.92-0.97-18.886-2.913c-4.965-1.942-8.957-4.855-11.979-8.741s-5.146-8.668-6.367-14.354
c-1.225-5.682-1.836-12.264-1.836-19.748V391.732l20.074-3.453L496.412,423.03L496.412,423.03z"/>
<path d="M648.142,532.025c-4.606,1.152-10.686,2.375-18.237,3.669c-7.556,1.296-16.295,1.941-26.226,1.941
c-8.633,0-15.899-1.261-21.799-3.774c-5.901-2.517-10.649-6.079-14.246-10.686c-3.598-4.604-6.188-10.037-7.77-16.296
c-1.586-6.26-2.375-13.199-2.375-20.828V423.03h20.074v58.705c0,13.672,2.157,23.456,6.475,29.354
c4.316,5.902,11.58,8.852,21.799,8.852c2.158,0,4.387-0.072,6.691-0.219c2.299-0.141,4.459-0.322,6.475-0.539
c2.014-0.216,3.848-0.431,5.504-0.646c1.652-0.216,2.84-0.465,3.562-0.755V423.03h20.073V532.025L648.142,532.025z"/>
</svg>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -297,7 +297,7 @@
</ul>
<div id="switcher">
<a href="<?php $this->base_url(); ?>" class="button previousbutton"><span class="previous"><span class="button_title"><?php print _("Return to the Homepage"); ?></span></span></a>
<a href="<?php $this->base_url(); ?>" class="button wide previousbutton"><span class="previous button_title"><?php print _("Return to the Homepage"); ?></span></a>
</div><!-- end of switcher -->
</div><!-- end maincontent -->
@@ -129,7 +129,7 @@
<?php } ?>
<div id="switcher">
<a href="<?php $this->base_url(); ?>" class="button previousbutton"><span class="previous"><span class="button_title"><?php print _("Return to the Homepage"); ?></span></span></a>
<a href="<?php $this->base_url(); ?>" class="button wide previousbutton"><span class="previous button_title"><?php print _("Return to the Homepage"); ?></span></a>
</div><!-- end of switcher -->
</div><!-- end maincontent -->
@@ -369,7 +369,7 @@
<div class="upbutton_section">
<a href="<?php $this->base_url('linux'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
</div>
</div><!-- end maincontent -->
@@ -194,7 +194,7 @@
printf($p, $this->base_url('linux/linux_faq',1)); ?></div>
<div class="upbutton_section">
<a href="<?php $this->base_url('linux'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
</div>
<?php $this->load_footer(); ?>
@@ -67,7 +67,7 @@
<p><?php print _("In the end, individual end-users often get the software at zero cost, while corporate customers are often happy to pay for more support."); ?></p>
<div id="switcher">
<a href="<?php $this->base_url('windows'); ?>" class="button nextbutton"><span class="next"><?php print _("next:"); ?> <span class="button_title"><?php print _("Why not Windows"); ?></span></span></a>
<a href="<?php $this->base_url('windows'); ?>" class="button wide nextbutton"><span class="next"><?php print _("next:"); ?> <span class="button_title"><?php print _("Why not Windows"); ?></span></span></a>
</div><!-- end of switcher -->
<div id="read_more">
@@ -34,7 +34,7 @@
?>
<div class="upbutton_section">
<a href="<?php $this->base_url('linux'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
</div>
<div id="maincontent" class="screenshots">
@@ -115,7 +115,7 @@
</div><!-- end maincontent -->
<div class="upbutton_section">
<a href="<?php $this->base_url('linux'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
</div>
<?php $this->load_footer(); ?>
@@ -29,7 +29,7 @@
$p = _("If you found a broken link, please <a href=\"%s\">report it</a> so we can repair it. Thank you!"); printf($p, $ggl->get('tracker_url')); ?></p>
<div id="switcher">
<a href="<?php $this->base_url(); ?>" class="button previousbutton"><span class="previous"><span class="button_title"><?php print _("Return to the Homepage"); ?></span></span></a>
<a href="<?php $this->base_url(); ?>" class="button wide previousbutton"><span class="previous button_title"><?php print _("Return to the Homepage"); ?></span></a>
</div><!-- end of switcher -->
</div><!-- end maincontent -->
@@ -41,12 +41,11 @@
<div class="section">
<img src="<?php print $this->language_file("switch_to_linux.try_or_install.computer_screen.png"); ?>" width="170" height="201" alt="|| computer screen ||"/>
<h2 id="install_dual_boot"><?php print _("Installing as a dual boot"); ?></h2>
<h3 id="dual_boot_what_is"><?php print _("Choose at start-up"); ?></h3>
<p><?php print _("It is possible to install GNU/Linux along with Windows. This means that upon start-up, you will be greeted with a screen allowing you to boot into the operating system you prefer."); ?></p>
<p><?php print _("Setting up a dual-boot can be helpful if you need time to abandon restrictive software. It is <a href=\"http://www.psychocats.net/ubuntu/installing\" title=\"a tutorial on dual-booting Windows and Ubuntu\">not difficult to set-up</a>, though erasing Windows altogether is even easier."); ?></p>
<p><?php print _("Setting up a dual-boot can be helpful if you need time to abandon restrictive software. It is <a href=\"http://www.ubuntu.com/download/desktop/install-desktop-latest\" title=\"a tutorial on installing Ubuntu\">not difficult to set-up</a>, though erasing Windows altogether is even easier."); ?></p>
<h3 id="dual_boot_what_need"><?php print _("What you need"); ?></h3>
<p><?php print _("Installing Linux on your computer will take you less than 30 minutes. It is not an obvious step for complete beginners, but if you use computers on a daily basis this is very likely within your reach. If you have already re-installed Windows on your computer, rest assured that installing Linux is no harder."); ?></p>
@@ -59,36 +58,50 @@
<div class="section">
<h2 id="get_the_cd"><?php print _("Get the CD you need"); ?></h2>
<h2 id="get_the_cd"><?php print _("Get the CD or DVD you need"); ?></h2>
<p><?php print _("For the distributions we recommend, the live CD is the same as the installation CD."); ?></p>
<p><?php print _("For the distributions we recommend, the live CD/DVD is the same as the installation CD/DVD. You can either download and burn a CD/DVD yourself, or order a CD/DVD from a trusted vendor."); ?></p>
<div class="ubuntu_light">
<h4 class="ubuntu_title">Ubuntu</h4>
<p>
<a href="http://www.ubuntu.com/download/" class="get_it_button"><span class="go_download"><span class="download"><?php print _("Download Ubuntu"); ?></span></span></a>
<?php print _("You can download an <code>iso</code> image (rather large file) and then <a href=\"https://help.ubuntu.com/community/BurningIsoHowto\">burn it to a CD</a>."); ?>
</p>
<div class="getit_box_left">
<div class="getit_box_logo"><img src="/images/switch_to_linux/switch_to_linux.try_or_install.ubuntu.png" height="60" alt="Ubuntu"/></div>
<div class="getit_box_text">
<p><?php print _("You can download an <code>iso</code> image (rather large file) and then <a href=\"http://www.ubuntu.com/download/desktop/burn-a-dvd-on-windows\">burn it to a CD or DVD</a>. Once the CD/DVD is burned, you can use it to <a href=\"http://www.ubuntu.com/download/desktop/install-desktop-latest\">install Ubuntu</a> onto your computer."); ?></p>
</div>
</div>
<div class="getit_box_right">
<a href="http://www.ubuntu.com/download/" class="button green"><span class="link_download"><?php print _("Download Ubuntu"); ?></span></a>
<a href="http://www.osdisc.com/products/linux/ubuntu" class="button blue"><span class="link_disc"><?php print _("Order a CD/DVD"); ?></span></a>
</div>
<div style="clear: both;"></div>
</div><!-- end ubuntu_light -->
<div class="fedora_light">
<h4 class="fedora_title">Fedora</h4>
<p>
<a href="http://fedoraproject.org/get-fedora" class="get_it_button"><span class="go_download"><span class="download"><?php print _("Download Fedora"); ?></span></span></a>
<?php print _("The Fedora live CD also enables installation. Alternatively, you can download the DVD, which cannot act as live CD but permits speedier installation."); ?>
</p>
<div class="getit_box_left">
<div class="getit_box_logo"><img src="/images/switch_to_linux/switch_to_linux.try_or_install.fedora.png" height="60" alt="Fedora"/></div>
<div class="getit_box_text">
<p><?php print _("The Fedora live CD/DVD also enables installation. Follow the <a href=\"http://docs.fedoraproject.org/en-US/Fedora/18/html/Installation_Quick_Start_Guide/index.html\">installation quick start guide</a> to get started with Fedora."); ?></p>
</div>
</div>
<div class="getit_box_right">
<a href="http://fedoraproject.org/get-fedora" class="button green"><span class="link_download"><?php print _("Download Fedora"); ?></span></a>
<a href="http://www.osdisc.com/products/linux/fedora" class="button blue"><span class="link_disc"><?php print _("Order a CD/DVD"); ?></span></a>
</div>
<div style="clear: both;"></div>
</div><!-- end fedora_light -->
<div class="trisquel_light">
<h4 class="trisquel_title">Trisquel</h4>
<p>
<a href="http://trisquel.info/download" class="get_it_button"><span class="go_download"><span class="download"><?php print _("Download Trisquel"); ?></span></span></a>
<?php print _("The Trisquel installation is very similar to that of Ubuntu."); ?></p>
<div class="getit_box_left">
<div class="getit_box_logo"><img src="/images/switch_to_linux/switch_to_linux.try_or_install.trisquel.png" height="60" alt="Trisquel"/></div>
<div class="getit_box_text">
<p><?php print _("The <a href=\"http://trisquel.info/en/wiki/installation-guide\">Trisquel installation</a> is very similar to that of Ubuntu."); ?></p></p>
</div>
</div>
<div class="getit_box_right">
<a href="http://trisquel.info/download" class="button green"><span class="link_download"><?php print _("Download Trisquel"); ?></span></a>
<a href="http://www.osdisc.com/products/linux/trisquel" class="button blue"><span class="link_disc"><?php print _("Order a CD/DVD"); ?></span></a>
</div>
<div style="clear: both;"></div>
</div><!-- end trisquel_light -->
@@ -89,9 +89,9 @@
<div id="switcher">
<a href="<?php $this->base_url('switch_to_linux'); ?>" class="button nextbutton"><span class="next"><?php print _("next:"); ?> <span class="button_title"><?php print _("Switch to Linux"); ?></span></span></a>
<a href="<?php $this->base_url('switch_to_linux'); ?>" class="button wide nextbutton"><span class="next"><?php print _("next:"); ?> <span class="button_title"><?php print _("Switch to Linux"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button previousbutton"><span class="previous"><?php print _("previous:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
<a href="<?php $this->base_url('linux'); ?>" class="button wide previousbutton"><span class="previous"><?php print _("previous:"); ?> <span class="button_title"><?php print _("What is Linux?"); ?></span></span></a>
</div><!-- end of switcher -->
</div><!-- end maincontent -->
@@ -11,7 +11,7 @@
?>
<div class="upbutton_section">
<a href="<?php $this->base_url('windows/restrictions'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("Restrictions"); ?></span></span></a>
<a href="<?php $this->base_url('windows/restrictions'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("Restrictions"); ?></span></span></a>
</div>
<div id="maincontent" class="windows_sub">
@@ -90,7 +90,7 @@
</div><!-- end maincontent -->
<div class="upbutton_section">
<a href="<?php $this->base_url('windows/restrictions'); ?>" class="button upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("Restrictions"); ?></span></span></a>
<a href="<?php $this->base_url('windows/restrictions'); ?>" class="button wide upbutton"><span class="up"><?php print _("back up:"); ?> <span class="button_title"><?php print _("Restrictions"); ?></span></span></a>
</div>
<?php $this->load_footer(); ?>
Oops, something went wrong.

0 comments on commit 562e490

Please sign in to comment.