From c4023c813f02a6a0cd5f7c1ad8fbfb2393ed3319 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 12 May 2015 17:50:03 +0800
Subject: [PATCH] aside

---
 components/button.md              | 12 ------------
 components/button/demo.md         |  5 +++++
 components/button/index.md        |  7 +++++++
 components/{ => select}/select.md |  5 -----
 nico.js                           |  3 +++
 theme/templates/aside.html        |  2 +-
 theme/templates/component.html    |  5 +----
 theme/templates/layout.html       |  5 +++--
 theme/templates/page.html         |  9 ++++++++-
 theme/theme.js                    |  6 +++---
 10 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 components/button.md
 create mode 100644 components/button/demo.md
 create mode 100644 components/button/index.md
 rename components/{ => select}/select.md (74%)

diff --git a/components/button.md b/components/button.md
deleted file mode 100644
index 24f4ba9349..0000000000
--- a/components/button.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Button 按钮
-
-- category: Component
-- API: github.com/react-component/button
-
----
-
-这是一个按钮。
-
-```html
-<button>按钮</button>
-```
diff --git a/components/button/demo.md b/components/button/demo.md
new file mode 100644
index 0000000000..7057df88e2
--- /dev/null
+++ b/components/button/demo.md
@@ -0,0 +1,5 @@
+# 基本型
+
+---
+
+<button></button>
diff --git a/components/button/index.md b/components/button/index.md
new file mode 100644
index 0000000000..5103975a0e
--- /dev/null
+++ b/components/button/index.md
@@ -0,0 +1,7 @@
+# Button 按钮
+
+- category: CSS
+
+---
+
+这是一个按钮。
diff --git a/components/select.md b/components/select/select.md
similarity index 74%
rename from components/select.md
rename to components/select/select.md
index dc63546198..9360379696 100644
--- a/components/select.md
+++ b/components/select/select.md
@@ -6,8 +6,3 @@
 ---
 
 这是一个下拉选择器。
-
-```html
-<Select>选择器</Select>
-```
-
diff --git a/nico.js b/nico.js
index 02e71cef3d..eda9dbb6d8 100644
--- a/nico.js
+++ b/nico.js
@@ -1,6 +1,9 @@
 var path = require('path');
 
 // {{ settings for nico
+exports.site = {
+  name: 'Ant Design'
+};
 exports.theme = 'theme';
 exports.source = process.cwd();
 exports.output = path.join(process.cwd(), '_site');
diff --git a/theme/templates/aside.html b/theme/templates/aside.html
index 616525d399..350a6acd22 100644
--- a/theme/templates/aside.html
+++ b/theme/templates/aside.html
@@ -1,8 +1,8 @@
 {%- set categories = resource.pages|get_all_category %}
-{%- set items = resource.pages|find_category(post.meta.category) %}
 <aside class="aside-container">
   <ul>
   {%- for category in categories %}
+  {%- set items = resource.pages|find_category(category) %}
     <li>
       <h4>{{category}}</h4>
       <ul>
diff --git a/theme/templates/component.html b/theme/templates/component.html
index 6a01302ba4..fa11c0311f 100644
--- a/theme/templates/component.html
+++ b/theme/templates/component.html
@@ -1,4 +1 @@
-{% extends "layout.html" %}
-
-{% block title %}{{post.title}} - {{config.site.name}}{% endblock %}
-{% block description %}{% if post.summay %}{{post.summary}}{% endif %}{% endblock %}
+{% extends "page.html" %}
diff --git a/theme/templates/layout.html b/theme/templates/layout.html
index b72ba576d1..a2fe6ea3bf 100644
--- a/theme/templates/layout.html
+++ b/theme/templates/layout.html
@@ -6,7 +6,7 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="format-detection" content="telephone=no">
-  <title>Ant Design</title>
+  <title>{% block title %}Ant Design{% endblock %}</title>
   <link rel="stylesheet" href="/static/normalize.css">
   <link rel="stylesheet" href="/static/style.css">
   <link rel="stylesheet" href="//at.alicdn.com/t/font_1429685559_8155303.css">
@@ -34,7 +34,7 @@
     </div>
     <nav class="nav">
       <ul>
-        <li class="{%- if post.filename === 'index' %}current{%- endif %}">
+        <li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}">
           <a href="/">首页</a>
         </li>
         <li class="{%- if post.filename === 'start' %}current{%- endif %}">
@@ -89,6 +89,7 @@
         {%- endif %}
       </h1>
       {{ post.html }}
+      <CodeBox code="code"></CodeBox>
       <div id="code-boxes"></div>
       <script type="text/jsx">
         React.render(
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 6a01302ba4..9c20a17919 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,4 +1,11 @@
 {% extends "layout.html" %}
 
-{% block title %}{{post.title}} - {{config.site.name}}{% endblock %}
+{% block title %}
+{%- if post.title !== config.site.name %}
+{{post.title}} - {{config.site.name}}
+{%- else %}
+{{config.site.name}}
+{%- endif %}
+{% endblock %}
+
 {% block description %}{% if post.summay %}{{post.summary}}{% endif %}{% endblock %}
diff --git a/theme/theme.js b/theme/theme.js
index e7e06f22db..b1ddecb7fb 100644
--- a/theme/theme.js
+++ b/theme/theme.js
@@ -4,13 +4,13 @@ module.exports = function(nico) {
   var exports = {};
 
   exports.reader = function(post) {
-    var filename = post.meta.filepath.toLowerCase();
-    if (filename.indexOf('components') >= 0) {
+    var filepath = post.meta.filepath.toLowerCase();
+    if (filepath.indexOf('components') === 0) {
       post.template = post.meta.template = 'component';
     } else {
       post.template = post.meta.template = (post.meta.template || 'page');
     }
-    if (filename === 'readme.md') {
+    if (filepath === 'readme.md') {
       post.filename = post.meta.filename = 'index';
     }
     return post;