From 823aafd81906b8f4401651999f184876d0627b8c Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 30 Jun 2014 18:08:48 +0800
Subject: [PATCH] fixed chinese issue of site title

---
 app/controllers/pages_controller.rb                  | 4 +++-
 app/helpers/application_helper.rb                    | 1 +
 app/templates/orbit_bootstrap/partial/_head.html.erb | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 6ddeee9..3ef65ca 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -42,7 +42,9 @@ class PagesController < ApplicationController
     else
       if path.last.include? '-'
         params[:page_id] = path[-2]
-        params[:slug] = path[-1]
+        s = CGI.unescape(path[-1])
+        s.encode!('UTF-8')
+        params[:slug] = s
         uid = path[-1].split("-").last
         uid = uid.split("?").first
         params[:uid] = uid
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 63f35b0..f3dacd9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "json"
 module ApplicationHelper
 	def render_widget(widget)
diff --git a/app/templates/orbit_bootstrap/partial/_head.html.erb b/app/templates/orbit_bootstrap/partial/_head.html.erb
index 6997c3f..27fc3bd 100644
--- a/app/templates/orbit_bootstrap/partial/_head.html.erb
+++ b/app/templates/orbit_bootstrap/partial/_head.html.erb
@@ -1,7 +1,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
   <%= favicon_link_tag (current_site.favicon.blank? ?  'favicon.ico' : current_site.favicon.url) %>
-  <title>Orbit Classic</title>
+  <title><%= render_site_title %></title>
   <%= stylesheet_link_tag "fontawesome/font-awesome"%>
   <%= stylesheet_link_tag "bootstrap/bootstrap"%>
   <%= stylesheet_link_tag "template/template"%>