alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed chinese issue of site title

This commit is contained in:
Harry Bomrah 2014-06-30 18:08:48 +08:00
parent 3155c44a5e
commit 823aafd819
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pages_controller.rb
View File

@ -42,7 +42,9 @@ class PagesController < ApplicationController
else else
if path.last.include? '-' if path.last.include? '-'
params[:page_id] = path[-2] 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 = path[-1].split("-").last
uid = uid.split("?").first uid = uid.split("?").first
params[:uid] = uid params[:uid] = uid

1
app/helpers/application_helper.rb
View File

@ -1,3 +1,4 @@
# encoding: utf-8
require "json" require "json"
module ApplicationHelper module ApplicationHelper
def render_widget(widget) def render_widget(widget)

2
app/templates/orbit_bootstrap/partial/_head.html.erb
View File

@ -1,7 +1,7 @@
<meta charset="UTF-8"> <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"> <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) %> <%= 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 "fontawesome/font-awesome"%>
<%= stylesheet_link_tag "bootstrap/bootstrap"%> <%= stylesheet_link_tag "bootstrap/bootstrap"%>
<%= stylesheet_link_tag "template/template"%> <%= stylesheet_link_tag "template/template"%>