Moved content to proper dir

content/doc/advanced.en-us.md

@@ -4,10 +4,9 @@ title: "Advanced"
 weight: 30
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "Advanced"
-    weight: 30
+    weight: 40
     identifier: "advanced"
 ---

content/doc/advanced.zh-cn.md

@@ -4,10 +4,9 @@ title: "进阶"
 weight: 30
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "进阶"
-    weight: 30
+    weight: 40
     identifier: "advanced"
 ---

content/doc/advanced/hacking-on-gitea.en-us.md

@@ -4,7 +4,6 @@ title: "Hacking on Gitea"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "advanced"

content/doc/advanced/hacking-on-gitea.zh-cn.md

@@ -4,7 +4,6 @@ title: "加入 Gitea 开源"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "advanced"

content/doc/features.en-us.md

@@ -4,10 +4,9 @@ title: "Features"
 weight: 20
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "Features"
-    weight: 20
+    weight: 30
     identifier: "features"
 ---

content/doc/features.zh-cn.md

@@ -4,10 +4,9 @@ title: "特性"
 weight: 20
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "特性"
-    weight: 20
+    weight: 30
     identifier: "features"
 ---

content/doc/features/authentication.en-us.md

@@ -4,7 +4,6 @@ title: "Authentication"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/features/authentication.zh-cn.md

@@ -4,7 +4,6 @@ title: "认证"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/features/localization.en-us.md

@@ -4,7 +4,6 @@ title: "Localization"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/features/localization.zh-cn.md

@@ -4,7 +4,6 @@ title: "本地化"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/features/webhooks.en-us.md

@@ -4,7 +4,6 @@ title: "Webhooks"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/features/webhooks.zh-cn.md

@@ -4,7 +4,6 @@ title: "Webhooks"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "features"

content/doc/installation.en-us.md

@@ -4,7 +4,6 @@ title: "Installation"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "Installation"

content/doc/installation.zh-cn.md

@@ -4,7 +4,6 @@ title: "安装"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "安装"

content/doc/installation/from-binary.en-us.md

@@ -4,7 +4,6 @@ title: "Installation from binary"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/installation/from-binary.zh-cn.md

@@ -4,7 +4,6 @@ title: "从二进制安装"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/installation/from-source.en-us.md

@@ -4,7 +4,6 @@ title: "Installation from source"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/installation/from-source.zh-cn.md

@@ -4,7 +4,6 @@ title: "从源代码安装"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/installation/with-docker.en-us.md

@@ -4,7 +4,6 @@ title: "Installation with Docker"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/installation/with-docker.zh-cn.md

@@ -4,7 +4,6 @@ title: "从Docker安装"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "installation"

content/doc/upgrade.en-us.md

@@ -4,10 +4,9 @@ title: "Upgrade"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "Upgrade"
-    weight: 10
+    weight: 20
     identifier: "upgrade"
 ---

content/doc/upgrade.zh-cn.md

@@ -4,10 +4,9 @@ title: "升级"
 weight: 10
 toc: false
 draft: false
-type: "docs"
 menu:
   sidebar:
     name: "升级"
-    weight: 10
+    weight: 20
     identifier: "upgrade"
 ---

content/doc/upgrade/from-gogs.en-us.md

@@ -4,19 +4,17 @@ title: "Upgrade from Gogs"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "upgrade"
-    name: "From gogs"
-    weight: 30
+    name: "From Gogs"
+    weight: 10
     identifier: "upgrade-from-gogs"
 ---
 
-# Upgrade from gogs
+# Upgrade from Gogs
 
-If you are running Gogs which version is below 0.9.99, you can upgrade Gogs to Gitea smoothly.
-There are some steps to do below:
+If you are running Gogs which version is below 0.9.99, you can upgrade Gogs to Gitea smoothly. There are some steps to do below:
 
 * Stop Gogs
 * Copy Gogs `custom/conf/app.ini` to Gitea. If you have changed the templates, you have to merge them to Gitea's templates manually.

content/doc/upgrade/from-gogs.zh-cn.md

@@ -4,12 +4,11 @@ title: "从 Gogs 升级"
 weight: 10
 toc: true
 draft: false
-type: "docs"
 menu:
   sidebar:
     parent: "upgrade"
     name: "从 Gogs 升级"
-    weight: 30
+    weight: 10
     identifier: "upgrade-from-gogs"
 ---
 
@@ -20,7 +19,6 @@ menu:
 * 停止 Gogs 的运行
 * 拷贝 Gogs 的配置文件 `custom/conf/app.ini` 到 Gitea 的相应位置。如果你自己修改过templates目录，你需要手工合并你的修改到Gitea的templates目录下。
 * 运行 Gitea
-* 登陆 Gitea 并进入 管理面板, 运行 `重新生成 '.ssh/authorized_keys' 文件（警告：不是 Gitea 的密钥也会被删除）`
-   和 `重新生成所有仓库的 Update 钩子（用于自定义配置文件被修改）`。
+* 登陆 Gitea 并进入 管理面板, 运行 `重新生成 '.ssh/authorized_keys' 文件（警告：不是 Gitea 的密钥也会被删除）` 和 `重新生成所有仓库的 Update 钩子（用于自定义配置文件被修改）`。
 
 ## TBD

content/page/index.en-us.md

@@ -4,7 +4,6 @@ title: "Documentation"
 weight: 10
 toc: true
 draft: false
-type: "default"
 ---
 
 # What is Gitea?

content/page/index.zh-cn.md

@@ -4,7 +4,6 @@ title: "文档"
 weight: 10
 toc: true
 draft: false
-type: "default"
 ---
 
 # 关于Gitea

layouts/index.html

@@ -6,10 +6,16 @@
 		<div class="col-xs-3">
 			{{ partial "menu" . }}
 		</div>
-		<div class="col-xs-8">
-			{{ range where .Site.Pages "Type" "default" }}
+		<div class="col-xs-9">
+			{{ range where .Site.Pages "Type" "page" }}
 				{{ .Content }}
 			{{ end }}
+
+			{{ if .Site.DisqusShortname }}
+				<div class="col-xs-12">
+					{{ template "_internal/disqus.html" . }}
+				</div>
+			{{ end }}
 		</div>
 	</div>
 </div>