diff --git a/harp.json b/harp.json
index 35b1f2bfeb..16050d8e57 100644
--- a/harp.json
+++ b/harp.json
@@ -67,7 +67,7 @@
"picture": "/resources/images/bios/thomas.jpg",
"twitter": "ThomasBurleson",
"website": "http://www.solutionOptimist.com",
- "bio": "Thomas is a software architect for commercial & open-source web solutions. With over 15 years working on thin-client RUX [using Flex and Angular], Thomas is passionate about software excellence, and distributed team-development. Thomas is the Team Lead for Google's Angular Material OSS. His mission is to work with a fantastic team and help deliver a framework of UX components for the AngularJS frameworks (v1.x and v2). He previously worked at SiriusXM as a UX and Principal Architect for their Internet Radio applications.",
+ "bio": "Angular Material 1.x Team Lead. Thomas works with the Angular core teams and helps deliver the Angular-native UX framework (v1.x and v2) based on Google's Material Design.",
"type": "Lead"
},
@@ -499,6 +499,13 @@
"website": "https://github.com/brandonroberts",
"bio": "Brandon is a front-end developer for a game studio developing web applications for STEM-based learning games. He is also a natural born troubleshooter who helps solve Angular issues on Github and Gitter support channels, particularly dealing with routing. He is also a member of the Angular docs team.",
"type": "Community"
+ },
+ "crisbeto": {
+ "name": "Kristiyan Kostadinov",
+ "picture": "/resources/images/bios/crisbeto.jpg",
+ "website": "http://crisbeto.com/",
+ "bio": "Kristiyan is a front-end developer, passionate open-source contributor and a core team member on Angular Material.",
+ "type": "Community"
}
}
}
diff --git a/package.json b/package.json
index 4a582d893a..e6d82ff58e 100644
--- a/package.json
+++ b/package.json
@@ -31,16 +31,18 @@
"browser-sync": "^2.9.3",
"canonical-path": "0.0.2",
"cheerio": "^0.20.0",
- "cross-spawn": "^4.0.0",
"codelyzer": "0.0.22",
+ "cross-spawn": "^4.0.0",
"del": "^2.2.0",
"dgeni": "^0.4.0",
"dgeni-packages": "^0.13.1",
"diff": "^2.1.3",
"fs-extra": "^0.30.0",
"globby": "^4.0.0",
+ "grunt-sass": "^1.2.0",
"gulp": "^3.5.6",
"gulp-env": "0.4.0",
+ "gulp-sass": "^2.3.2",
"gulp-task-listing": "^1.0.1",
"gulp-tslint": "^5.0.0",
"gulp-util": "^3.0.6",
diff --git a/public/_includes/_hero-home.jade b/public/_includes/_hero-home.jade
index 031ba6affc..93f4fe7113 100644
--- a/public/_includes/_hero-home.jade
+++ b/public/_includes/_hero-home.jade
@@ -5,3 +5,10 @@ header(class="background-sky")
.hero-cta
a(href="/docs/ts/latest/quickstart.html" class="md-raised button button-large button-plain" md-button) 开始吧！
+
+ .banner.banner-floaty
+ .banner-ng-annoucement
+ div(class="banner-text" align="center")
+ p Join us for AngularConnect in London, UK this September!
+ div(class="banner-button")
+ a(href="http://angularconnect.com/?utm_source=angular&utm_medium=banner&utm_campaign=angular-banner" target="_blank" class="button md-button") Register now
diff --git a/public/docs/_examples/dependency-injection/ts/app/heroes/heroes.component.1.ts b/public/docs/_examples/dependency-injection/ts/app/heroes/heroes.component.1.ts
index 9d25972eb0..b089dba80f 100644
--- a/public/docs/_examples/dependency-injection/ts/app/heroes/heroes.component.1.ts
+++ b/public/docs/_examples/dependency-injection/ts/app/heroes/heroes.component.1.ts
@@ -6,11 +6,11 @@ import { Component } from '@angular/core';
import { HeroListComponent } from './hero-list.component.2';
import { HeroService } from './hero.service.1';
/*
-// #docregion full
+// #docregion full, v1
import { HeroListComponent } from './hero-list.component';
-// #docregion v1
+// #enddocregion v1
import { HeroService } from './hero.service';
-// #enddocregion full, v1
+// #enddocregion full
*/
// #docregion full, v1
diff --git a/public/docs/_examples/toh-5/ts/app/app.component.1.ts b/public/docs/_examples/toh-5/ts/app/app.component.1.ts
index 2f0e3506dd..789e14d9be 100644
--- a/public/docs/_examples/toh-5/ts/app/app.component.1.ts
+++ b/public/docs/_examples/toh-5/ts/app/app.component.1.ts
@@ -1,4 +1,3 @@
-/* tslint:disable no-unused-variables */
// #docplaster
// #docregion
import { Component } from '@angular/core';
@@ -7,9 +6,6 @@ import { HeroService } from './hero.service';
import { HeroesComponent } from './heroes.component';
// #enddocregion
-// For testing only
-import { ROUTER_DIRECTIVES } from '@angular/router';
-
// #docregion
@Component({
selector: 'my-app',
diff --git a/public/docs/_examples/toh-6/ts/app/dashboard.component.ts b/public/docs/_examples/toh-6/ts/app/dashboard.component.ts
index f7b4100cee..82a817fa5a 100644
--- a/public/docs/_examples/toh-6/ts/app/dashboard.component.ts
+++ b/public/docs/_examples/toh-6/ts/app/dashboard.component.ts
@@ -1,5 +1,6 @@
// #docplaster
// #docregion
+// #docregion hero-search-component
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
@@ -13,6 +14,7 @@ import { HeroSearchComponent } from './hero-search.component';
styleUrls: ['app/dashboard.component.css'],
directives: [HeroSearchComponent]
})
+// #enddocregion hero-search-component
export class DashboardComponent implements OnInit {
heroes: Hero[] = [];
diff --git a/public/docs/_examples/typings.json b/public/docs/_examples/typings.json
index 3385926d1f..a4bf5572aa 100644
--- a/public/docs/_examples/typings.json
+++ b/public/docs/_examples/typings.json
@@ -2,6 +2,6 @@
"globalDependencies": {
"core-js": "registry:dt/core-js#0.0.0+20160602141332",
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
- "node": "registry:dt/node#6.0.0+20160621231320"
+ "node": "registry:dt/node#6.0.0+20160720070758"
}
}
diff --git a/public/docs/ts/latest/guide/animations.jade b/public/docs/ts/latest/guide/animations.jade
index 0793559c9d..f73fa03074 100644
--- a/public/docs/ts/latest/guide/animations.jade
+++ b/public/docs/ts/latest/guide/animations.jade
@@ -361,7 +361,7 @@ figure.image-display
* `'3em'`
* `'100%'`
- For most dimensinal properties we can also just define a number which is then assumed to be
+ For most dimensional properties we can also just define a number which is then assumed to be
in pixels:
对大多数尺寸类属性而言，还能只定义一个数字，那就表示它使用的是像素(px)数：
diff --git a/public/docs/ts/latest/guide/architecture.jade b/public/docs/ts/latest/guide/architecture.jade
index aabbfdf87b..12496e2730 100644
--- a/public/docs/ts/latest/guide/architecture.jade
+++ b/public/docs/ts/latest/guide/architecture.jade
@@ -207,10 +207,11 @@ block angular-library-modules
`@angular/core`库是主要的Angular模块库，从这里能获得大部分需要的东西。
- There are other important Angular libraries too, such as `!{_at_angular}/common`, `!{_at_angular}/router`, and `!{_at_angular}/animate`.
+
+ There are other important Angular libraries too, such as `!{_at_angular}/common`, `!{_at_angular}/router`, and `!{_at_angular}/http`.
We import what we need from an Angular !{_library_module}.
- 还有另一些重要的Angular模块库，比如`@angular/common`、`@angular/router` 和 `@angular/animate`。我们从一个Angular的!{_library_module}导入我们需要的模块。
+ 还有另一些重要的Angular模块库，比如`@angular/common`、`@angular/router` 和 `@angular/http`。我们从一个Angular的!{_library_module}导入我们需要的模块。
block angular-imports
:marked
diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade
index 3a0304c184..90b39fd24e 100644
--- a/public/docs/ts/latest/tutorial/toh-pt6.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt6.jade
@@ -847,14 +847,30 @@ block observables-section
我们在`AppComponent`中导入`rxjs-extensions`就可以一次性加载它们。
- +makeExample('toh-6/ts/app/app.component.ts', 'rxjs-extensions', 'app/app/app.component.ts')(format=".")
-
+ +makeExample('toh-6/ts/app/app.component.ts', 'rxjs-extensions', 'app/app.component.ts')(format=".")
+
+ :marked
+ ### Adding the search component to the dashboard
+
+ ### 添加搜索组件到Dashboard
+
+ We add the `HeroSearchComponent` to the bottom of the `DashboardComponent` template.
+
+ 将`HeroSearchComponent`添加到`DashboardComponent`的模版的最后面。
+
+ +makeExample('toh-6/ts/app/dashboard.component.html', null, 'dashboard.component.html')
+
+ :marked
+ And finally, we import the `HeroSearchComponent` and add it to the `directives` array.
+
+ 最后，导入`HeroSearchComponent`并将其添加到`directives`数组中。
+
+ +makeExcerpt('app/dashboard.component.ts', 'hero-search-component')
+
:marked
- Finally, we add the `HeroSearchComponent` to the bottom of the `DashboardComponent`.
Run the app again, go to the *Dashboard*, and enter some text in the search box below the hero tiles.
At some point it might look like this.
- 最后，我们把`HeroSearchComponent`添加到`DashboardComponent`的地步。
再次运行该应用，跳转到*Dashboard*，并在英雄下方的搜索框里输入一些文本。
看起来就像这样：
diff --git a/public/events.jade b/public/events.jade
index 2c0acabad0..c200e36ee9 100644
--- a/public/events.jade
+++ b/public/events.jade
@@ -7,17 +7,6 @@ table.is-full-width
tbody
-
- tr
- th
- a(
- target="_blank"
- href="https://skillsmatter.com/conferences/7278-fullstack-2016-the-conference-on-javascript-node-and-internet-of-things"
- ) FullStack
- td London, UK
- td July 13-15, 2016
-
-
tr
th
diff --git a/public/news.jade b/public/news.jade
index 9f1c60923c..591c1fe559 100644
--- a/public/news.jade
+++ b/public/news.jade
@@ -6,29 +6,30 @@
.grid-fluid
.c6
.article-card
- .date July 11, 2016
+ .date July 29, 2016
.title
a(
target="_blank"
- href="http://angularjs.blogspot.com/2016/07/angular-in-china-and-beyond-introducing.html"
- ) Angular in China and beyond: Introducing angular.cn
- p We're excited to share the newly-launched angular.cn with you! Read on to learn how we did it, and how you can get involved in bringing Angular to your locale....
+ href="http://angularjs.blogspot.com/2016/07/fresh-guides-from-victor-savkin.html"
+ ) Fresh Guides from Victor Savkin
+ p Victor just refreshed his older posts with the latest and greatest from the current release candidate, at a new location on vsavkin.com...
+ .author
+ img(src="/resources/images/bios/stephenfluin.jpg")
+ .posted Posted by Stephen Fluin
+
+ .c6
+ .article-card
+ .date July 20, 2016
+ .title
+ a(
+ target="_blank"
+ href="http://angularjs.blogspot.com/2016/07/a-dedicated-team-for-angulardart.html"
+ ) A dedicated team for AngularDart
+ p We are splitting the Angular 2 codebase into two flavors—a Dart version and a TypeScript/JavaScript version—and creating a dedicated Angular Dart team...
.author
img(src="/resources/images/bios/naomi.jpg")
.posted Posted by Naomi Black
- .c6
- .article-card
- .date June 30, 2016
- .title
- a(
- target="_blank"
- href="http://angularjs.blogspot.com/2016/06/rc4-now-available.html"
- ) RC4 Now Available
- p Today we’re happy to announce that we are shipping Angular 2.0.0-rc4. This release begins to lay the foundation for improved Angular Compilation, and makes improvements to testing....
- .author
- img(src="/resources/images/bios/stephenfluin.jpg")
- .posted Posted by Stephen Fluin
.grid-fluid.l-space-bottom-2.l-space-top-4
.c12.text-center
diff --git a/public/resources/images/bios/crisbeto.jpg b/public/resources/images/bios/crisbeto.jpg
new file mode 100644
index 0000000000..e6f1eacb7c
Binary files /dev/null and b/public/resources/images/bios/crisbeto.jpg differ
diff --git a/public/resources/images/bios/thomas.jpg b/public/resources/images/bios/thomas.jpg
index 9557a2392e..b648e62617 100644
Binary files a/public/resources/images/bios/thomas.jpg and b/public/resources/images/bios/thomas.jpg differ