martinsik · Jun 8, 2018 · Jun 8, 2018 · Jun 9, 2018 · Jun 9, 2018 · lacolaco
diff --git a/aio/tests/e2e/app.e2e-spec.ts b/aio/tests/e2e/app.e2e-spec.ts
@@ -179,4 +179,25 @@ describe('site App', function() {
       expect(results).toContain('Router');
     });
   });
+
+  describe('suggest edit link', () => {
+    it('should be present on all docs pages', () => {
+      page.navigateTo('tutorial/toh-pt1');
+      expect(page.ghLinks.count()).toEqual(1);
+      /* tslint:disable:max-line-length */
+      expect(page.ghLinks.get(0).getAttribute('href'))
+        .toMatch(/https:\/\/github\.com\/angular\/angular\/edit\/master\/aio\/content\/tutorial\/toh-pt1\.md\?message=docs%3A%20describe%20your%20change\.\.\./);
+
+      page.navigateTo('guide/http');
+      expect(page.ghLinks.count()).toEqual(1);
+      /* tslint:disable:max-line-length */
+      expect(page.ghLinks.get(0).getAttribute('href'))
+        .toMatch(/https:\/\/github\.com\/angular\/angular\/edit\/master\/aio\/content\/guide\/http\.md\?message=docs%3A%20describe%20your%20change\.\.\./);
+    });
+
+    it('should not be present on top level pages', () => {
+      page.navigateTo('features');
+      expect(page.ghLinks.count()).toEqual(0);
+    });
+  });
 });
diff --git a/aio/tools/transforms/angular-content-package/index.js b/aio/tools/transforms/angular-content-package/index.js
@@ -43,7 +43,7 @@ module.exports = new Package('angular-content', [basePackage, contentPackage])
     readFilesProcessor.sourceFiles = readFilesProcessor.sourceFiles.concat([
       {
         basePath: CONTENTS_PATH,
-        include: CONTENTS_PATH + '/{cookbook,guide,tutorial}/**/*.md',
+        include: CONTENTS_PATH + '/{guide,tutorial}/**/*.md',
         fileReader: 'contentFileReader'
       },
       {

diff --git a/aio/tools/transforms/templates/api/base.template.html b/aio/tools/transforms/templates/api/base.template.html
@@ -1,4 +1,4 @@
-{% import "lib/githubLinks.html" as github -%}
+{% import "../lib/githubLinks.html" as github -%}
 {% set comma = joiner(',') %}
 {% set breadcrumbDelimiter = joiner('&gt;') %}
 <article>

diff --git a/aio/tools/transforms/templates/api/includes/info-bar.html b/aio/tools/transforms/templates/api/includes/info-bar.html
@@ -1,4 +1,4 @@
-{% import "lib/githubLinks.html" as github -%}
+{% import "../../lib/githubLinks.html" as github -%}
 
 <!-- INFO BAR -->
 <section class="info-bar">

diff --git a/aio/tools/transforms/templates/api/lib/githubLinks.html b/aio/tools/transforms/templates/api/lib/githubLinks.html
diff --git a/aio/tools/transforms/templates/content.template.html b/aio/tools/transforms/templates/content.template.html
@@ -1,4 +1,12 @@
+{% import "lib/githubLinks.html" as github -%}
+
+{% set relativePath = doc.fileInfo.relativePath %}
 {% if doc.title %}{$ ('# ' + doc.title.trim()) | marked $}{% endif %}
+{% if 'guide/' in relativePath or 'tutorial/' in relativePath or 'docs.md' in relativePath %}
+  <div class="github-links">
+    {$ github.githubEditLink(doc, versionInfo) $}
+  </div>
+{% endif %}
 <div class="content">
 {$ doc.description | marked $}
-</div>
+</div>
diff --git a/aio/tools/transforms/templates/lib/githubLinks.html b/aio/tools/transforms/templates/lib/githubLinks.html
@@ -0,0 +1,31 @@
+{% macro projectRelativePath(fileInfo) -%}
+{$ fileInfo.realProjectRelativePath if fileInfo.realProjectRelativePath else fileInfo.projectRelativePath $}
+{%- endmacro %}
+
+{% macro githubViewHref(doc, versionInfo) -%}
+https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/tree/{$ versionInfo.currentVersion.isSnapshot and versionInfo.currentVersion.SHA or versionInfo.currentVersion.raw $}/packages/{$ doc.fileInfo.realProjectRelativePath $}#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}
+{%- endmacro %}
+
+{% macro githubEditHref(doc, versionInfo) -%}
+https://github.com/{$ versionInfo.gitRepoInfo.owner $}/{$ versionInfo.gitRepoInfo.repo $}/edit/master{$ '/packages' if doc.docType !== 'content' $}/{$ projectRelativePath(doc.fileInfo) $}?message=docs
+  {%- if doc.moduleDoc %}({$ doc.moduleDoc.id.split('/')[0] $})
+  {%- elseif doc.docType === 'module' %}({$ doc.id.split('/')[0] $})
+  {%- elseif doc.docType === 'content' %}
+  {%- else %}(...){%- endif -%}
+%3A%20describe%20your%20change...{% if doc.docType !== 'content' %}#L{$ doc.startingLine + 1 $}-L{$ doc.endingLine + 1 $}{% endif %}
+{%- endmacro %}
+
+{% macro githubEditLink(doc, versionInfo) -%}
+<a href="{$ githubEditHref(doc, versionInfo) $}" aria-label="Suggest Edits" title="Suggest Edits"><i class="material-icons" aria-hidden="true" role="img">mode_edit</i></a>
+{%- endmacro %}
+
+{% macro githubViewLink(doc, versionInfo) -%}
+<a href="{$ githubViewHref(doc, versionInfo) $}" aria-label="View Source" title="View Source"><i class="material-icons" aria-hidden="true" role="img">code</i></a>
+{%- endmacro %}
+
+{% macro githubLinks(doc, versionInfo) -%}
+<div class="github-links">
+  {$ githubEditLink(doc, versionInfo) $}
+  {$ githubViewLink(doc, versionInfo) $}
+</div>
+{%- endmacro -%}
diff --git a/aio/tools/transforms/templates/overview-dump.template.html b/aio/tools/transforms/templates/overview-dump.template.html
@@ -1,4 +1,4 @@
-{% import "api/lib/githubLinks.html" as github -%}
+{% import "lib/githubLinks.html" as github -%}
 {% import "api/lib/memberHelpers.html" as members -%}
 {% macro goToCode(doc) %}<a href="{$ github.githubViewHref(doc, versionInfo) $}" class="go-to-code" title="Go to source code"><i class="material-icons" aria-hidden="true" role="img">code</i></a>{% endmacro %}
 {% macro label(test, class, text) %}{% if test %}<label class="{$ class $}">{$ text $}</label>{% endif %}{% endmacro %}