Merge lp:~ya-bo-ng/ubuntu-online-tour/fixes-1471544 into lp:ubuntu-online-tour/14.04

[Anthony Dillon]

# Details
- Bug: https://bugs.launchpad.net/ubuntu-online-tour/+bug/1471544
- Card: https://canonical.leankit.com/Boards/View/111185042/115908513

## Done
- Updated the language switcher links
- Updated the "back to site" link on both en and zh-CN

### QA
- You could check all updated links work in the code
- If you want to visual QA pull down the project and open index.html in /en/ and /zh-CN/
- Check there are no 404 resources on the pages

[Graham Bancroft (gbancroft-canonical)]

Lgtm +1

review: Approve

=== modified file 'en/index.html'
--- en/index.html	2014-05-22 09:44:31 +0000
+++ en/index.html	2015-07-24 11:09:24 +0000
@@ -50,7 +50,7 @@
 						This demo uses JavaScript. Either your browser doesn't support JavaScript, or it's currently switched off.
 						<br/>
 						<br/>
-						Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
+						Don't panic. We've got <a href="http://www.ubuntu.com/desktop/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
 					</p>
 				</noscript>
 			</div>
@@ -895,7 +895,7 @@
 			<div class="firefox-internet">
 				<div class="web-overlay-tran"></div>
 				<div class="theIframe">
-					<iframe src="../http://www.ubuntu.com" id="firefoxInternet" >
+					<iframe src="http://start.ubuntu.com" id="firefoxInternet" >
 						<p>
 							Your browser does not support iframes.
 						</p>
@@ -1003,7 +1003,7 @@
 				</ul>
 				<div class="language-mode">
 					<span class="active">English</span>
-					<a href="/tour/zh-CN/">中文</a>
+					<a href="/zh-CN/">中文</a>
 				</div>
 				<a class="explore-mode primary" href="#">Show yourself around</a>
 				<a class="tour-mode" href="#">Take the guided tour</a>
@@ -1016,7 +1016,7 @@
 				<div class="guide-logo"><img src="../img/tourguide/back-to-welcome.png" /></div>
 				<h3>Ubuntu online tour</h3>
 				<p>
-					We hope you've enjoyed the Ubuntu online tour. <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">Ready to download?</a> or <a href="/ubuntu/take-the-tour" >back to the site</a>
+					We hope you've enjoyed the Ubuntu online tour. <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">Ready to download?</a> or <a href="http://www.ubuntu.com/desktop/take-the-tour" >back to the site</a>
 				</p>
 			</div>
 			<div class="guide-container home">

=== modified file 'zh-CN/index.html'
--- zh-CN/index.html	2014-04-30 23:17:33 +0000
+++ zh-CN/index.html	2015-07-24 11:09:24 +0000
@@ -50,7 +50,7 @@
 						This demo uses JavaScript. Either your browser doesn't support JavaScript, or it's currently switched off.
 						<br/>
 						<br/>
-						Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
+						Don't panic. We've got <a href="http://www.ubuntu.com/desktop/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
 					</p>
 				</noscript>
 			</div>
@@ -884,7 +884,7 @@
 			<div class="firefox-internet">
 				<div class="web-overlay-tran"></div>
 				<div class="theIframe">
-					<iframe src="../http://www.ubuntu.com" id="firefoxInternet" >
+					<iframe src="http://start.ubuntu.com" id="firefoxInternet" >
 						<p>
 							您的浏览器不支持 iframes
 						</p>
@@ -991,8 +991,8 @@
 					</li>
 				</ul>
 				<div class="language-mode">
-					<span class="active">英文</span>
-					<a href="/tour/zh-CN/">中文</a>
+					<a class="active" href="/en/">English</a>
+					<span class="active">中文</span>
 				</div>
 				<a class="explore-mode primary" href="#">四处看看</a>
 				<a class="tour-mode" href="#">观看此向导</a>
@@ -1005,7 +1005,7 @@
 				<div class="guide-logo"><img src="../img/tourguide/back-to-welcome.png" /></div>
 				<h3>Ubuntu 在线体验</h3>
 				<p>
-					希望您喜欢 Ubuntu 在线漫游 <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">准备好下载了吗？</a> 或 <a href="/ubuntu/take-the-tour" >返回网站</a>
+					希望您喜欢 Ubuntu 在线漫游 <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">准备好下载了吗？</a> 或 <a href="http://www.ubuntu.com/desktop/take-the-tour" >返回网站</a>
 				</p>
 			</div>
 			<div class="guide-container home">