Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

app/views/layouts/_orbit_bar.html.erb

@@ -16,7 +16,7 @@
 			</div>
 			<ul class="nav">
 				<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
-				<li><a class="orbit-bar-desktop" href="https://i.nccu.edu.tw/Login.aspx?ReturnUrl=/Default.aspx" target="_blank">Desktop</a></li>
+				<li><%= link_to t(:desktop), desktop_path, :class => 'orbit-bar-desktop' %></li>
 			</ul>
 			<ul class="nav pull-right">
         <li class="dropdown language">

app/views/layouts/desktop.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+	<title><%= @title || APP_CONFIG['orbit'] %></title>
+	<!--[if lt IE 9]>
+	   <%= javascript_include_tag "html5" %>
+	<![endif]-->
+	<%= stylesheet_link_tag "desktop" %>
+	<%= javascript_include_tag "desktop" %>
+	<%= yield :page_specific_css %>
+	<%= yield :page_specific_javascript %>
+	<%= csrf_meta_tag %>
+</head>
+<body>
+	<%= render 'layouts/orbit_bar' %>
+	<%= yield %>
+</body>
+</html>