Merge branch 'title_feature'

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'

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'

app/views/admin/sessions/create.html.slim

@@ -1,2 +0,0 @@
-h1 Admin::Sessions#create
-p Find me in app/views/admin/sessions/create.html.slim

app/views/admin/sessions/destroy.html.slim

@@ -1,2 +0,0 @@
-h1 Admin::Sessions#destroy
-p Find me in app/views/admin/sessions/destroy.html.slim

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}' "

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}

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 }

app/views/comments/create.html.slim

@@ -1,2 +0,0 @@
-h1 Comments#create
-p Find me in app/views/comments/create.html.slim

app/views/comments/index.html.slim

@@ -1,2 +0,0 @@
-h1 Comments#index
-p Find me in app/views/comments/index.html.slim

app/views/common/_slide.html.slim

@@ -1,8 +0,0 @@
-.slide
-  .subscribe
-    .subscribe_descrip
-      = t('rss_description')
-    = link_to(image_tag('rss.png'), rss_blogs_path)
-  .broadcast
-  .comment
-  .recommend

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

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

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

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'