diff --git a/harp.json b/harp.json index af63aafa53..0c1bdaa2bd 100644 --- a/harp.json +++ b/harp.json @@ -95,14 +95,6 @@ "bio": "Rob is a Developer Advocate on the Angular team at Google. He's the Angular team's resident reactive programming geek and founded the Reactive Extensions for Angular project, ngrx.", "type": "Google" }, - "aaronzhang": { - "name": "Aaron Zhang (章小飞)", - "picture": "/resources/images/bios/xiaofei.jpg", - "twitter": "", - "website": "http://github.com/damoqiongqiu", - "bio": "Aaron is Angular's developer PM in China. He is the lead for angular.cn and social channels in China, and helps developers in China's enterprise and open source communities to be successful with Angular. One of the earliest Angular developers in China since Angular 2012, he translated the first books on Angular into Chinese. Aaron joined the Google team in 2016.", - "type": "Google" - }, "tobias": { "name": "Tobias Bosch", "picture": "/resources/images/bios/tobias.jpg", @@ -506,7 +498,7 @@ "bio": "George is a Software Engineer with a passion for chess, robotics and automating stuff. He has a strong need to know how things work (so if you already know, he'd love to have a talk with you). He has been a member of the AngularJS team since 2014. When not doing geeky stuff, he is probably trying to convince his wife and kids to apply programming principles in real life. (Or is it the other way around?)", "type": "Community" }, - + "kapunahelewong": { "name": "Kapunahele Wong", "picture": "/resources/images/bios/kapunahelewong.jpg", diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade index 6dc0c2271d..40f13bb4c7 100644 --- a/public/_includes/_footer.jade +++ b/public/_includes/_footer.jade @@ -20,16 +20,21 @@ div(class="main-footer" data-swiftype-index="false") ul.text-body // TODO: (ericjim) make a libraries page to showcase all angular libraries //li Libraries - li About - li 关于 - li Books & Training - li 书籍与培训 - li Tools & Libraries - li 工具与库 - li Community - li 社区 - li Press Kit - li 宣传资料 + li + p About + p 关于 + li + p Books & Training + p 书籍与培训 + li + p Tools & Libraries + p 工具与库 + li + p Community + p 社区 + li + p Press Kit + p 宣传资料 .c2 h3.text-headline HELP @@ -37,31 +42,29 @@ div(class="main-footer" data-swiftype-index="false") ul.text-body li Stack Overflow - li Stack Overflow - li Gitter li Gitter li Google Group - li Google Group - li Report Issues - li 报告问题 - li Site Feedback - li 网站反馈 + li + p Report Issues + p 报告问题 + li + p Site Feedback + p 网站反馈 .c2 h3.text-headline COMMUNITY h3.text-headline 社区 ul.text-body - li Events - li 会议 - li Meetups + li + p Events + p 会议 li Meetups li Twitter - li Twitter li GitHub - li GitHub - li Contribute - li 做贡献 + li + p Contribute + p 做贡献 .c2 h3.text-headline LANGUAGES diff --git a/public/docs/ts/latest/cookbook/ajs-quick-reference.jade b/public/docs/ts/latest/cookbook/ajs-quick-reference.jade index 6b00e0bbd3..642bfc8fb5 100644 --- a/public/docs/ts/latest/cookbook/ajs-quick-reference.jade +++ b/public/docs/ts/latest/cookbook/ajs-quick-reference.jade @@ -13,7 +13,7 @@ a(id="top") :marked **See the Angular syntax in this **. - **可到在线例子中查看Angular语法**。 + **可到在线例子中查看Angular语法**。 ## Contents diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade index a3580c69ff..5a2fbf0bd0 100644 --- a/public/docs/ts/latest/guide/upgrade.jade +++ b/public/docs/ts/latest/guide/upgrade.jade @@ -154,7 +154,7 @@ include ../_util-fns of information about how to write and organize Angular code - and equally importantly - how **not** to write and organize Angular code. - [Angular风格指南](https://github.com/johnpapa/angular-styleguide)收集了一些已证明能写出干净且可维护的AngularJS程序的模式与实践。 + [Angular风格指南](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#single-responsibility)收集了一些已证明能写出干净且可维护的AngularJS程序的模式与实践。 它包含了很多关于如何书写和组织Angular代码的有价值信息，同样重要的是，**不应该**采用的书写和组织Angular代码的方式。 Angular is a reimagined version of the best parts of AngularJS. In that @@ -1326,13 +1326,13 @@ figure which is an important [preparation step](#following-the-angular-style-guide) before a successful upgrade. - 这确实是一个很好地起点。特别是，该结构遵循了[AngularJS 风格指南](https://github.com/johnpapa/angular-styleguide)， + 这确实是一个很好地起点。特别是，该结构遵循了[AngularJS 风格指南](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md)， 要想成功升级，这是一个很重要的[准备步骤](#following-the-angular-style-guide)。 * Each component, service, and filter is in its own source file, as per the [Rule of 1](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#single-responsibility). - 每个组件、服务和过滤器都在它自己的源文件中 —— 就像[单一规则](https://github.com/johnpapa/angular-styleguide#single-responsibility)所要求的。 + 每个组件、服务和过滤器都在它自己的源文件中 —— 就像[单一规则](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#single-responsibility)所要求的。 * The `core`, `phone-detail`, and `phone-list` modules are each in their own subdirectory. Those subdirectories contain the JavaScript code as well as @@ -1342,8 +1342,8 @@ figure rules. `core`、`phone-detail`和`phone-list`模块都在它们自己的子目录中。那些子目录除了包含HTML模板之外，还包含JavaScript代码，它们共同完成一个特性。 - 这是[按特性分目录的结构](https://github.com/johnpapa/angular-styleguide#style-y152) - 和[模块化](https://github.com/johnpapa/angular-styleguide#modularity)规则所要求的。 + 这是[按特性分目录的结构](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#style-y152) + 和[模块化](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#modularity)规则所要求的。 * Unit tests are located side-by-side with application code where they are easily found, as described in the rules for diff --git a/public/docs/ts/latest/index.jade b/public/docs/ts/latest/index.jade index 6b46279b34..42ea572660 100644 --- a/public/docs/ts/latest/index.jade +++ b/public/docs/ts/latest/index.jade @@ -37,80 +37,90 @@ h4 高级文档 ul li - a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") Angular Modules + p + a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") Angular Modules + p + a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") Angular 模块 li - a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") Angular 模块 + p + a(href="/docs/#{lang}/#{vers}/guide/animations.html") Animations + p + a(href="/docs/#{lang}/#{vers}/guide/animations.html") 动画 li - a(href="/docs/#{lang}/#{vers}/guide/animations.html") Animations + p + a(href="/docs/#{lang}/#{vers}/guide/attribute-directives.html") Attribute Directives + p + a(href="/docs/#{lang}/#{vers}/guide/attribute-directives.html") 属性型指令 li - a(href="/docs/#{lang}/#{vers}/guide/animations.html") 动画 + p + a(href="/docs/#{lang}/#{vers}/guide/browser-support.html") Browser Support + p + a(href="/docs/#{lang}/#{vers}/guide/browser-support.html") 浏览器支持 li - a(href="/docs/#{lang}/#{vers}/guide/attribute-directives.html") Attribute Directives + p + a(href="/docs/#{lang}/#{vers}/guide/component-styles.html") Component Styles + p + a(href="/docs/#{lang}/#{vers}/guide/component-styles.html") 组件样式 li - a(href="/docs/#{lang}/#{vers}/guide/attribute-directives.html") 属性型指令 - li - a(href="/docs/#{lang}/#{vers}/guide/browser-support.html") Browser Support - li - a(href="/docs/#{lang}/#{vers}/guide/browser-support.html") 浏览器支持 - li - a(href="/docs/#{lang}/#{vers}/guide/component-styles.html") Component Styles - li - a(href="/docs/#{lang}/#{vers}/guide/component-styles.html") 组件样式 - li - a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") View All... - li - a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") 查看全部…… + p + a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") View All... + p + a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") 查看全部…… .c4.secondary-content-list h4 Cookbook h4 烹饪宝典 ul li - a(href="/docs/#{lang}/#{vers}/cookbook/aot-compiler.html") Ahead-of-time Compilation + p + a(href="/docs/#{lang}/#{vers}/cookbook/aot-compiler.html") Ahead-of-time Compilation + p + a(href="/docs/#{lang}/#{vers}/cookbook/aot-compiler.html") 预编译 li - a(href="/docs/#{lang}/#{vers}/cookbook/aot-compiler.html") 预编译 + p + a(href="/docs/#{lang}/#{vers}/cookbook/ajs-quick-reference.html") AngularJS to Angular + p + a(href="/docs/#{lang}/#{vers}/cookbook/ajs-quick-reference.html") AngularJS 迁移到 Angular li - a(href="/docs/#{lang}/#{vers}/cookbook/ajs-quick-reference.html") AngularJS to Angular + p + a(href="/docs/#{lang}/#{vers}/cookbook/ngmodule-faq.html") Angular Module FAQ + p + a(href="/docs/#{lang}/#{vers}/cookbook/ngmodule-faq.html") Angular 模块 FAQ li - a(href="/docs/#{lang}/#{vers}/cookbook/a1-a2-quick-reference.html") AngularJS 迁移到 Angular + p + a(href="/docs/#{lang}/#{vers}/cookbook/component-communication.html") Component Interaction + p + a(href="/docs/#{lang}/#{vers}/cookbook/component-communication.html") 组件交互 li - a(href="/docs/#{lang}/#{vers}/cookbook/ngmodule-faq.html") Angular Module FAQ + p + a(href="/docs/#{lang}/#{vers}/cookbook/component-relative-paths.html") Component-Relative Paths + p + a(href="/docs/#{lang}/#{vers}/cookbook/component-relative-paths.html") 相对于组件的路径 li - a(href="/docs/#{lang}/#{vers}/cookbook/ngmodule-faq.html") Angular 模块 FAQ - li - a(href="/docs/#{lang}/#{vers}/cookbook/component-communication.html") Component Interaction - li - a(href="/docs/#{lang}/#{vers}/cookbook/component-communication.html") 组件交互 - li - a(href="/docs/#{lang}/#{vers}/cookbook/component-relative-paths.html") Component-Relative Paths - li - a(href="/docs/#{lang}/#{vers}/cookbook/component-relative-paths.html") 相对于组件的路径 - li - a(href="/docs/#{lang}/#{vers}/cookbook/") View All... - li - a(href="/docs/#{lang}/#{vers}/cookbook/") 查看全部... + p + a(href="/docs/#{lang}/#{vers}/cookbook/") View All... + p + a(href="/docs/#{lang}/#{vers}/cookbook/") 查看全部... .c4.secondary-content-list h4 Tools & Libraries h4 工具与库 ul - li - a(target="_blank" href="https://github.com/angular/universal") Angular Universal li a(target="_blank" href="https://github.com/angular/universal") Angular Universal li a(target="_blank" href="https://augury.angular.io/") Augury li - a(target="_blank" href="https://augury.angular.io/") Augury - li - a(target="_blank" href="https://github.com/jaxio/celerio-angular-quickstart") Celerio Angular Quickstart - li - a(target="_blank" href="https://github.com/jaxio/celerio-angular-quickstart") Celerio Angular 快速起步 + p + a(target="_blank" href="https://github.com/jaxio/celerio-angular-quickstart") Celerio Angular Quickstart + p + a(target="_blank" href="https://github.com/jaxio/celerio-angular-quickstart") Celerio Angular 快速起步 li a(target="_blank" href="https://github.com/mgechev/codelyzer") Codelyzer li a(target="_blank" href="https://github.com/johnpapa/lite-server") Lite-server li - a(target="_blank" href="/resources/") View All... - li - a(target="_blank" href="/resources/") 查看全部…… + p + a(target="_blank" href="/resources/") View All... + p + a(target="_blank" href="/resources/") 查看全部……