diff --git a/harp.json b/harp.json index cdf29e4aff..52d435255c 100644 --- a/harp.json +++ b/harp.json @@ -3,6 +3,24 @@ "title": "Angular", "description": "Angular is a modern javascript framework for building professional web applications.", "jsLatest": "2.0.0-alpha.11", - "dartLatest": "2.0.0-alpha.11" + "dartLatest": "2.0.0-alpha.11", + + "bios": { + "misko": { + "name": "Miško Hevery", + "picture": "/resources/images/bios/misko.jpg", + "twitter": "mhevery", + "website": "http://misko.hevery.com", + "bio": "Miško Hevery is the creator of AngularJS framework. He has passion for making complex things simple. He currently works at Google, but has previously worked at Adobe, Sun Microsystems, Intel, and Xerox, where he became an expert in building web applications in web related technologies such as Java, JavaScript, Flex and ActionScript." + }, + + "igor": { + "name": "Igor Minar", + "picture": "/resources/images/bios/igor-minar.jpg", + "twitter": "IgorMinar", + "website": "https://google.com/+IgorMinar", + "bio": "Igor is a software engineer at Google. He is a lead on the Angular project, practitioner of test driven development, open source enthusiast, hacker. In his free time, Igor enjoys spending time with his wife and two kids, doing outdoor activities (including but not limited to sports, gardening and building retaining walls)." + } + } } } \ No newline at end of file diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade index 6a94e76042..55185faf7b 100644 --- a/public/_includes/_version-dropdown.jade +++ b/public/_includes/_version-dropdown.jade @@ -4,11 +4,11 @@ title = "Some Version" if language == 'js' if version == "latest" - title = jsLatest + title = 'Javascript ' + jsLatest if language == 'dart' if version == "latest" - title = dartLatest + title = 'Dart ' + dartLatest h2.hero-subtitle.text-subhead button(md-button ng-click="showVersionMenu($event)") #{title} diff --git a/public/about/_data.json b/public/about/_data.json index 83522e89b9..ac1654aef7 100644 --- a/public/about/_data.json +++ b/public/about/_data.json @@ -1,7 +1,7 @@ { "index": { "title": "Moving the Web Foward", - "subtitle": "The Vision For Angular" + "subtitle": "The Angular Core Team" }, "presskit": { diff --git a/public/about/index.jade b/public/about/index.jade index 69984ae3df..6dc7296438 100644 --- a/public/about/index.jade +++ b/public/about/index.jade @@ -1 +1,32 @@ -h1 About \ No newline at end of file +.grid-fluid.l-space-bottom-8 + .c2   + + .c8.text-center + h3.text-headline.text-uppercase Building For the Future + p.text-body. + Angular is built by a team of engineers who share a passion for + making making web development feel effortless. We believe that writing + beautiful apps should be joyful and fun. We're building a + platform for the future. + + .c2   + .clear + +.grid-fluid.l-space-bottom-8 + h3.text-headline.text-uppercase.text-center Current Contributors + for person, name in bios + div.c3 + md-card.bio-card + img(src="#{person.picture}" class="md-card-image") + md-card-content + h3.text-headline #{person.name} + a(href="https://twitter.com/#{person.twitter}" class="bio-card-twitter") #{person.twitter} + p(class="text-body" ng-click="showBio($event)") #{person.bio} + + a(href="#{person.website}" class="button" md-button) Website + +md-dialog + md-content + md-subheader(class="md-sticky-no-effect") Mango + p The mango is a juicy stone fruit belonging to the genus Mangifera, consisting of numerous tropical fruiting trees, cultivated mostly for edible fruit. The majority of these species are found in nature as wild mangoes. They all belong to the flowering plant family Anacardiaceae. The mango is native to South and Southeast Asia, from where it has been distributed worldwide to become one of the most cultivated fruits in the tropics. + diff --git a/public/docs/js/_quickstart.jade b/public/docs/js/_quickstart.jade index 11bb8b2a27..6deedf14fe 100644 --- a/public/docs/js/_quickstart.jade +++ b/public/docs/js/_quickstart.jade @@ -41,8 +41,7 @@ p. Create a file named app.es6 at the root of the project. The .es6 extension signifies that the file uses ES6 syntax. - - p Using the ES6 module syntax you can import the required modules from Angular2. + Using the ES6 module syntax you can import the required modules from Angular2. pre.prettyprint.linenums code import {Component, Template, bootstrap} from 'angular2/angular2'; diff --git a/public/docs/js/latest/index.jade b/public/docs/js/latest/index.jade index ef1410afe0..1e87776524 100644 --- a/public/docs/js/latest/index.jade +++ b/public/docs/js/latest/index.jade @@ -2,7 +2,7 @@ div.c4 md-card md-card-content - h2.text-headline.text-uppercase Quickstart + h3.text-headline.text-uppercase Quickstart p.text-body Learn in 5 minutes footer @@ -12,7 +12,7 @@ div.c4 div.c4 md-card md-card-content - h2.text-headline.text-uppercase Resources + h3.text-headline.text-uppercase Resources p.text-body Preview of v2.0 footer @@ -22,7 +22,7 @@ div.c4 div.c4 md-card md-card-content - h2.text-headline.text-uppercase API Proposal + h3.text-headline.text-uppercase API Preview p.text-body Proposal for v2.0 API footer diff --git a/public/docs/js/latest/resources.jade b/public/docs/js/latest/resources.jade index 9516dd6160..8044bddb5b 100644 --- a/public/docs/js/latest/resources.jade +++ b/public/docs/js/latest/resources.jade @@ -1 +1,14 @@ -h1 resources \ No newline at end of file +.l-main-section + h2 Victor Savkin's blog posts: + ul + li Change Detection http://victorsavkin.com/post/110170125256/change-detection-in-angular-2 + li Functional programming + li dependency injection http://victorsavkin.com/post/110170125256/change-detection-in-angular-2 + +Video: David East's intro to the todo app +GDEs: https://developers.google.com/experts/all/technology/angular-js + +Other videos +ng-europe playlist of videos on angular 2 and future of angular https://www.youtube.com/watch?v=lGdnh8QSPPk&list=PLhc_bKwZngxW_ZlY0NkaGkvKpiA_pzcZ- +soon: playlist of video from ng-conf 2015 +Anders Hejlsberg's talk on TypeScript from December https://www.youtube.com/watch?v=Ut694dsIa8w diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss index c08322bc61..8115d631e5 100644 --- a/public/resources/css/main.scss +++ b/public/resources/css/main.scss @@ -25,6 +25,7 @@ @import 'module/buttons'; @import 'module/code'; @import 'module/sticker'; +@import 'module/bio-card'; /* diff --git a/public/resources/css/module/_bio-card.scss b/public/resources/css/module/_bio-card.scss new file mode 100644 index 0000000000..d898e7a3e2 --- /dev/null +++ b/public/resources/css/module/_bio-card.scss @@ -0,0 +1,24 @@ +.bio-card { + h3 { + margin: 0; + } + + .bio-card-twitter { + margin-bottom: $unit * 2; + font-size: 16px; + text-decoration: none; + display: block; + } + + img { + width: 100%; + } + + p { + max-height: 72px; + overflow: hidden; + cursor: pointer; + font-size: 14px; + line-height: 24px; + } +} \ No newline at end of file diff --git a/public/resources/images/bios/alex-eagle.jpg b/public/resources/images/bios/alex-eagle.jpg new file mode 100644 index 0000000000..cfa1085745 Binary files /dev/null and b/public/resources/images/bios/alex-eagle.jpg differ diff --git a/public/resources/images/bios/alex-wolfe.jpg b/public/resources/images/bios/alex-wolfe.jpg new file mode 100644 index 0000000000..63d0d6a6bb Binary files /dev/null and b/public/resources/images/bios/alex-wolfe.jpg differ diff --git a/public/resources/images/bios/brad-green.jpg b/public/resources/images/bios/brad-green.jpg new file mode 100644 index 0000000000..0a6c290999 Binary files /dev/null and b/public/resources/images/bios/brad-green.jpg differ diff --git a/public/resources/images/bios/brian-ford.jpg b/public/resources/images/bios/brian-ford.jpg new file mode 100644 index 0000000000..67a4bd8950 Binary files /dev/null and b/public/resources/images/bios/brian-ford.jpg differ diff --git a/public/resources/images/bios/chirayu.jpg b/public/resources/images/bios/chirayu.jpg new file mode 100644 index 0000000000..7a1a13cd1c Binary files /dev/null and b/public/resources/images/bios/chirayu.jpg differ diff --git a/public/resources/images/bios/david-east.jpg b/public/resources/images/bios/david-east.jpg new file mode 100644 index 0000000000..145076d1ec Binary files /dev/null and b/public/resources/images/bios/david-east.jpg differ diff --git a/public/resources/images/bios/igor-minar.jpg b/public/resources/images/bios/igor-minar.jpg new file mode 100644 index 0000000000..da4e386159 Binary files /dev/null and b/public/resources/images/bios/igor-minar.jpg differ diff --git a/public/resources/images/bios/jeff-cross.jpg b/public/resources/images/bios/jeff-cross.jpg new file mode 100644 index 0000000000..7a1ff116b4 Binary files /dev/null and b/public/resources/images/bios/jeff-cross.jpg differ diff --git a/public/resources/images/bios/jelbourn.jpg b/public/resources/images/bios/jelbourn.jpg new file mode 100644 index 0000000000..d66992bb5b Binary files /dev/null and b/public/resources/images/bios/jelbourn.jpg differ diff --git a/public/resources/images/bios/julie-ralph.jpg b/public/resources/images/bios/julie-ralph.jpg new file mode 100644 index 0000000000..62aef7a36e Binary files /dev/null and b/public/resources/images/bios/julie-ralph.jpg differ diff --git a/public/resources/images/bios/misko.jpg b/public/resources/images/bios/misko.jpg new file mode 100644 index 0000000000..5d15719a19 Binary files /dev/null and b/public/resources/images/bios/misko.jpg differ diff --git a/public/resources/images/bios/naomi.jpg b/public/resources/images/bios/naomi.jpg new file mode 100644 index 0000000000..a1ce6a94b6 Binary files /dev/null and b/public/resources/images/bios/naomi.jpg differ diff --git a/public/resources/images/bios/rado.jpg b/public/resources/images/bios/rado.jpg new file mode 100644 index 0000000000..f3d0c4870e Binary files /dev/null and b/public/resources/images/bios/rado.jpg differ diff --git a/public/resources/images/bios/tobias.jpg b/public/resources/images/bios/tobias.jpg new file mode 100644 index 0000000000..e4b3daef4e Binary files /dev/null and b/public/resources/images/bios/tobias.jpg differ diff --git a/public/resources/images/bios/victor.jpg b/public/resources/images/bios/victor.jpg new file mode 100644 index 0000000000..466faa374c Binary files /dev/null and b/public/resources/images/bios/victor.jpg differ diff --git a/public/resources/js/site.js b/public/resources/js/site.js index 4280d745e6..a4a4a98409 100644 --- a/public/resources/js/site.js +++ b/public/resources/js/site.js @@ -14,7 +14,7 @@ var angularIO = angular.module('angularIOApp', ['ngMaterial']) }); }); -angularIO.controller('AppCtrl', ['$scope', '$mdSidenav', function($scope, $mdSidenav){ +angularIO.controller('AppCtrl', ['$scope', '$mdSidenav', '$mdDialog', function($scope, $mdSidenav, $mdDialog){ $scope.toggleSidenav = function(menuId) { $mdSidenav(menuId).toggle(); }; @@ -23,6 +23,20 @@ angularIO.controller('AppCtrl', ['$scope', '$mdSidenav', function($scope, $mdSid alert('hi'); }; + $scope.showBio = function (event) { + var bio = angular.element(event.currentTarget).text(); + console.log(bio); + + $mdDialog.show( + $mdDialog.alert() + .title('This is an alert title') + .content(bio) + .ariaLabel('Password notification') + .ok('Done') + .targetEvent(event) + ); + }; + prettyPrint(); }]);