From 981a5fea064cba6adbfe10a9deb3b3ec2b076965 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Tue, 1 Apr 2014 12:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20title=20=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E7=BD=91=E7=AB=99=E5=90=8D=E5=AD=97=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/posts/_form.html.slim   | 2 +-
 app/views/admin/posts/new.html.slim     | 2 +-
 app/views/archives/index.html.slim      | 2 ++
 app/views/blogs/index.html.slim         | 2 ++
 app/views/blogs/show.html.slim          | 2 ++
 app/views/home/index.html.slim          | 2 ++
 app/views/layouts/admin.html.slim       | 4 ++--
 app/views/layouts/application.html.slim | 4 ++--
 config/application.yml.example          | 3 +++
 9 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/posts/_form.html.slim b/app/views/admin/posts/_form.html.slim
index 24a3927..2c42823 100644
--- a/app/views/admin/posts/_form.html.slim
+++ b/app/views/admin/posts/_form.html.slim
@@ -26,7 +26,7 @@
       a href="" ng-click="changeToBody()" 正文
     dd ng-class="{ active: !body_active }"
       a href="#" ng-click="changeToPreview()" 预览
-    = link_to t(:upload_photo), "#", :id=>'upload_photo'
+    = link_to '上传图片', "#", :id=>'upload_photo'
   input[type="file" style="display: none;"]
 
   .content-field ng-show="body_active" ng-model= 'content'
diff --git a/app/views/admin/posts/new.html.slim b/app/views/admin/posts/new.html.slim
index 044b860..b0cc209 100644
--- a/app/views/admin/posts/new.html.slim
+++ b/app/views/admin/posts/new.html.slim
@@ -1,5 +1,5 @@
 .row
   .small-12.columns
     .admin-posts-field ng-controller="AdminPostsController"
-      h3.blog-title #{t('new_post')}
+      h3.blog-title 新建博客
       = render 'form'
diff --git a/app/views/archives/index.html.slim b/app/views/archives/index.html.slim
index 2a498e5..a996863 100644
--- a/app/views/archives/index.html.slim
+++ b/app/views/archives/index.html.slim
@@ -1,3 +1,5 @@
+- content_for(:title) do
+  | #{@type ? @type : '时间线'}
 .row ng-controller="ArchivesController"
   .small-12.large-8.columns
     ul.archives-field ng-model="type" ng-init=" type= '#{@type}' "
diff --git a/app/views/blogs/index.html.slim b/app/views/blogs/index.html.slim
index 441fb20..7de2aa3 100644
--- a/app/views/blogs/index.html.slim
+++ b/app/views/blogs/index.html.slim
@@ -1,3 +1,5 @@
+- content_for(:title) do
+  | 首页
 .row
   .small-12.large-8.columns
     h2.blog-title #{@newest.title}
diff --git a/app/views/blogs/show.html.slim b/app/views/blogs/show.html.slim
index 8c7f0c2..8769baf 100644
--- a/app/views/blogs/show.html.slim
+++ b/app/views/blogs/show.html.slim
@@ -1,3 +1,5 @@
+- content_for(:title) do
+  | #{@post.title}
 .row
   .small-12.large-8.columns
     = render partial: "post", :locals=> { :post=> @post }
diff --git a/app/views/home/index.html.slim b/app/views/home/index.html.slim
index ceb8ca7..1bf37ed 100644
--- a/app/views/home/index.html.slim
+++ b/app/views/home/index.html.slim
@@ -1,3 +1,5 @@
+- content_for(:title) do
+  | 关于我
 .row
   .small-12.large-8.columns.self-introduce 
     h2.blog-title ABOUT ME
diff --git a/app/views/layouts/admin.html.slim b/app/views/layouts/admin.html.slim
index b9ab3af..fa61f08 100644
--- a/app/views/layouts/admin.html.slim
+++ b/app/views/layouts/admin.html.slim
@@ -2,7 +2,7 @@ html
   head
     meta charset="utf-8" 
     meta name="viewport" content="width=device-width, initial-scale=1.0"
-    title Admin Page for WinDy's Blog
+    title Admin Page for #{ENV['SITE_NAME']}
     = stylesheet_link_tag    "application"
     = javascript_include_tag "vendor/modernizr"
     = javascript_include_tag "application"
@@ -12,7 +12,7 @@ html
       ul.title-area
         li.name
           h1
-            = link_to 'Dashboard For WinDy', admin_root_path
+            = link_to "Dashboard For #{ENV['SITE_NAME']}", admin_root_path
         li.toggle-topbar.menu-icon
           a href="#" Menu
       section.top-bar-section
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index affe7bd..31ade89 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -3,7 +3,7 @@ html
     meta charset="utf-8" 
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     title
-      = content_for?(:title) ? yield(:title) + "| WinDy's Blog" : "WinDy's Blog"
+      = content_for?(:title) ? yield(:title) + " | #{ENV['SITE_NAME']}" : ENV['SITE_NAME']
     = stylesheet_link_tag    "application"
     = javascript_include_tag "vendor/modernizr"
     = javascript_include_tag "application"
@@ -18,7 +18,7 @@ html
           section.middle.tab-bar-section
             .row.small-12.large-10.columns
               h1.title.middle-text
-                = link_to 'WinDy', root_path
+                = link_to ENV['SITE_NAME'], root_path
         aslide.left-off-canvas-menu
           ul.off-canvas-list
             li
diff --git a/config/application.yml.example b/config/application.yml.example
index 6f6fadc..d4d739e 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -1,5 +1,8 @@
 # Add application configuration variables here, as shown below.
+#
 
+
+SITE_NAME: "WinDy's Blog"
 # 后台登录的用户名与密码, 不填的话无法管理后台
 ADMIN_USER: 'admin'
 ADMIN_PASSWORD: 'admin'