diff --git a/public/docs/_data.json b/public/docs/_data.json index daade7e3ea..121e4db32f 100644 --- a/public/docs/_data.json +++ b/public/docs/_data.json @@ -3,17 +3,5 @@ "title": "Angular Docs", "subtitle": "Choose a language for Angular", "layout": "../_layout" - }, - - "search": { - "title": "Docs Search Results", - "layout": "../_layout" - }, - - "styleguide": { - "title": "Docs Style Guide", - "subtitle": "Design & Layout Patterns For Documentation", - "layout": "../_layout", - "autoformat": "true" } } diff --git a/public/docs/_includes/_side-nav.jade b/public/docs/_includes/_side-nav.jade index b63c021c1d..374acc5215 100644 --- a/public/docs/_includes/_side-nav.jade +++ b/public/docs/_includes/_side-nav.jade @@ -17,13 +17,15 @@ - var item = data[prop]; - item.slug = prop; - if (prop[0] !== '_' && !item.hide && selector(item)) { -- var file = prop === 'index' ? '' : prop + '.html'; +- var file = pro +- var ext = prop.lastIndexOf('/') === prop.length-1 ? '' : '.html'; +- var file = prop === 'index' ? '' : prop + ext; - var href = prefix + file; - item.class = cur === href ? 'is-selected' : ''; - item.file = file; - item.href = href; - item.navTitle = item.navTitle || item.title; -- item.tooltip = item.description || item.intro || ''; +- item.tooltip = item.description || item.intro || item.title || ''; - section.push(item); - } - } @@ -36,7 +38,6 @@ - var guide = sections('guide', function(item) { return !item.basics; }); - var qs = sections('', function(item) { return item.slug === 'quickstart'; })[0] || {}; - var reference = sections('', function(item) { return item.reference; }); -- var resources = sections('', function(item) { return item.resources; }); nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav // SEARCH BAR @@ -84,14 +85,6 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav ul each item in reference li(class="#{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{item.navTitle} - - .nav-blocks - .nav-title Resources - .nav-unordered-lists - ul - each item in resources - li(class="#{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{item.navTitle} - script. // Could put in appCtrl but only needed here and clear here diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json index 8dd7a5e313..8c221c6385 100644 --- a/public/docs/dart/latest/_data.json +++ b/public/docs/dart/latest/_data.json @@ -30,7 +30,7 @@ "banner": "How to solve common implementation challenges." }, - "api": { + "api/": { "icon": "book", "title": "API Preview", "reference": true @@ -59,5 +59,10 @@ "icon": "chat", "title": "Help & Support", "resources": true + }, + + "styleguide": { + "title": "Docs Style Guide", + "intro": "Design & Layout Patterns For Documentation" } } diff --git a/public/docs/dart/latest/testing/_data.json b/public/docs/dart/latest/tutorial/testing/_data.json similarity index 100% rename from public/docs/dart/latest/testing/_data.json rename to public/docs/dart/latest/tutorial/testing/_data.json diff --git a/public/docs/dart/latest/testing/application-under-test.jade b/public/docs/dart/latest/tutorial/testing/application-under-test.jade similarity index 100% rename from public/docs/dart/latest/testing/application-under-test.jade rename to public/docs/dart/latest/tutorial/testing/application-under-test.jade diff --git a/public/docs/dart/latest/testing/first-app-tests.jade b/public/docs/dart/latest/tutorial/testing/first-app-tests.jade similarity index 100% rename from public/docs/dart/latest/testing/first-app-tests.jade rename to public/docs/dart/latest/tutorial/testing/first-app-tests.jade diff --git a/public/docs/dart/latest/testing/index.jade b/public/docs/dart/latest/tutorial/testing/index.jade similarity index 100% rename from public/docs/dart/latest/testing/index.jade rename to public/docs/dart/latest/tutorial/testing/index.jade diff --git a/public/docs/dart/latest/testing/jasmine-testing-101.jade b/public/docs/dart/latest/tutorial/testing/jasmine-testing-101.jade similarity index 100% rename from public/docs/dart/latest/testing/jasmine-testing-101.jade rename to public/docs/dart/latest/tutorial/testing/jasmine-testing-101.jade diff --git a/public/docs/dart/latest/testing/testing-an-angular-pipe.jade b/public/docs/dart/latest/tutorial/testing/testing-an-angular-pipe.jade similarity index 100% rename from public/docs/dart/latest/testing/testing-an-angular-pipe.jade rename to public/docs/dart/latest/tutorial/testing/testing-an-angular-pipe.jade diff --git a/public/docs/index.jade b/public/docs/index.jade index 9d71df89fc..7b2e524ff8 100644 --- a/public/docs/index.jade +++ b/public/docs/index.jade @@ -1,12 +1,14 @@ .l-main-section .l-sub-section + h3 TypeScript + + p: Angular 2 TS - Latest Version + h3 JavaScript - ul - li Angular 2 JS - Latest Version + p Angular 2 JS - Latest Version h3 Dart - ul - li Angular 2 Dart - Latest Version \ No newline at end of file + p: Angular 2 Dart - Latest Version \ No newline at end of file diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index 8dd7a5e313..8c221c6385 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -30,7 +30,7 @@ "banner": "How to solve common implementation challenges." }, - "api": { + "api/": { "icon": "book", "title": "API Preview", "reference": true @@ -59,5 +59,10 @@ "icon": "chat", "title": "Help & Support", "resources": true + }, + + "styleguide": { + "title": "Docs Style Guide", + "intro": "Design & Layout Patterns For Documentation" } } diff --git a/public/docs/ts/latest/_data.json b/public/docs/ts/latest/_data.json index 8dd7a5e313..8c221c6385 100644 --- a/public/docs/ts/latest/_data.json +++ b/public/docs/ts/latest/_data.json @@ -30,7 +30,7 @@ "banner": "How to solve common implementation challenges." }, - "api": { + "api/": { "icon": "book", "title": "API Preview", "reference": true @@ -59,5 +59,10 @@ "icon": "chat", "title": "Help & Support", "resources": true + }, + + "styleguide": { + "title": "Docs Style Guide", + "intro": "Design & Layout Patterns For Documentation" } }