From ef48ee0a0a48db132488d1d3939ac36d8249327d Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Fri, 27 Jan 2017 14:51:41 +0000 Subject: [PATCH] build(aio): remove formatting and styles from dgeni templates Much of the formatting was hardcoded and copied from the old anguar.io jade files. This gives us a clean start. Also, more use has been made of include files to make the templates easier to understand and manage. --- docs/templates/README.md | 144 +++++++++++++++ docs/templates/class.template.html | 167 +----------------- docs/templates/decorator.template.html | 45 +---- docs/templates/directive.template.html | 61 +------ docs/templates/function.template.html | 31 +--- docs/templates/includes/_annotations.html | 13 ++ docs/templates/includes/_class-overview.html | 40 +++++ docs/templates/includes/_constructor.html | 16 ++ .../_deprecated-notes.html | 0 docs/templates/includes/_description.html | 9 + docs/templates/includes/_export-as.html | 10 ++ docs/templates/includes/_how-to-use.html | 9 + docs/templates/includes/_info-bar.html | 18 ++ docs/templates/includes/_inputs.html | 13 ++ .../includes/_interface-overview.html | 19 ++ docs/templates/includes/_members.html | 19 ++ docs/templates/includes/_metadata.html | 17 ++ .../{layout => includes}/_ng-module.html | 0 docs/templates/includes/_outputs.html | 13 ++ .../{layout => includes}/_security-notes.html | 0 docs/templates/includes/_selectors.html | 12 ++ docs/templates/includes/_statics.html | 23 +++ docs/templates/includes/_title.html | 6 + docs/templates/includes/_what-it-does.html | 3 + docs/templates/interface.template.html | 74 +------- docs/templates/layout/_how-to-use.html | 10 -- docs/templates/layout/_what-it-does.html | 10 -- docs/templates/layout/api-base.template.html | 11 ++ docs/templates/layout/base.template.html | 5 +- docs/templates/module.template.html | 2 - docs/templates/pipe.template.html | 31 +--- docs/templates/var.template.html | 34 +--- 32 files changed, 430 insertions(+), 435 deletions(-) create mode 100644 docs/templates/README.md create mode 100644 docs/templates/includes/_annotations.html create mode 100644 docs/templates/includes/_class-overview.html create mode 100644 docs/templates/includes/_constructor.html rename docs/templates/{layout => includes}/_deprecated-notes.html (100%) create mode 100644 docs/templates/includes/_description.html create mode 100644 docs/templates/includes/_export-as.html create mode 100644 docs/templates/includes/_how-to-use.html create mode 100644 docs/templates/includes/_info-bar.html create mode 100644 docs/templates/includes/_inputs.html create mode 100644 docs/templates/includes/_interface-overview.html create mode 100644 docs/templates/includes/_members.html create mode 100644 docs/templates/includes/_metadata.html rename docs/templates/{layout => includes}/_ng-module.html (100%) create mode 100644 docs/templates/includes/_outputs.html rename docs/templates/{layout => includes}/_security-notes.html (100%) create mode 100644 docs/templates/includes/_selectors.html create mode 100644 docs/templates/includes/_statics.html create mode 100644 docs/templates/includes/_title.html create mode 100644 docs/templates/includes/_what-it-does.html delete mode 100644 docs/templates/layout/_how-to-use.html delete mode 100644 docs/templates/layout/_what-it-does.html create mode 100644 docs/templates/layout/api-base.template.html diff --git a/docs/templates/README.md b/docs/templates/README.md new file mode 100644 index 0000000000..68bed6350b --- /dev/null +++ b/docs/templates/README.md @@ -0,0 +1,144 @@ +This folder contains the dgeni templates that are used to generate the API docs + +Generally there is a template for each docType. Templates can extend and/or include +other templates. Templates can also import macros from other template files. + +# Template inheritance + +When extending a template, parent must declare blocks that can be overridden by the +child. The template extension hierarchy looks like this (with declared blocks in parentheses): + +- layout/base.template.html (base) + - module.template.html + - layout/api-base.template.html (jumpNav, jumpNavLinks, whatItDoes, infoBar, securityConsiderations, deprecationNotes, howToUse, details) + - class.template.html + - directive.template.html + - enum.template.html + - var.template.html + - const.template.html + - let.template.html + - decorator.template.html + - function.template.html + - interface.template.html + - type-alias.template.html + - pipe.template.html + +# Doc Properties + +It is useful to know what properties are available on each doc type when working with the templates. +Here is an overview: + +## class + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented +- members + +## directive + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented +- members + +## enum + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## var + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## const + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## let + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## decorator + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented +- members + +## function + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## interface + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented +- members + +## type-alias + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + +## pipe + +- docType +- name +- id +- moduleDoc +- path +- description +- notYetDocumented + diff --git a/docs/templates/class.template.html b/docs/templates/class.template.html index dbd548b4f7..307823df42 100644 --- a/docs/templates/class.template.html +++ b/docs/templates/class.template.html @@ -1,161 +1,12 @@ -{% import "lib/githubLinks.html" as github -%} {% import "lib/paramList.html" as params -%} -{% extends 'layout/base.template.html' -%} +{% extends 'layout/api-base.template.html' -%} -{% block body %} - - -{% include "layout/_what-it-does.html" %} - -{% include "layout/_security-notes.html" %} - -{% include "layout/_deprecated-notes.html" %} - -{% include "layout/_how-to-use.html" %} - -
-
-

Class Overview

-
-
- class {$ doc.name $} { - {% if doc.statics.length %} -
- {% for member in doc.statics %}{% if not member.internal %} - 
static
-          
-            {$ member.name | indent(6, false) | trim $}
-          
-          
-            {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-          
-      {% endif %}{% endfor %}
-    {% endif %}
-    {% if doc.constructorDoc.name %}
-    

-      
-        
-          {$ doc.constructorDoc.name $}
-        
-        
-          {$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
-        
-    {% endif %}
-    {% if doc.members.length %}
-    

-      {% for member in doc.members %}{% if not member.internal %}
-        
-          
-            {$ member.name | indent(6, false) | trim $}
-          
-          {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-        

-      {% endif %}{% endfor %}
-    {% endif %}
-    

-      }
-    

-
-{% block additional %}
-{% endblock %}
-
-

-  

-    
Class Description

-  

-  

-    {%- if doc.description.length > 2 %}
-    {$ doc.description | trimBlankLines | marked $}
-    {% endif %}
-  

-
-{%- if doc.decorators.length %}
-{% block annotations %}
-

-  

-    
Annotations

-  

-  

-    {%- for decorator in doc.decorators %}
-      
-        
-          @{$ decorator.name $}{$ params.paramList(decorator.arguments) | indent(10, false) $}
-        
-      

-      {%- if not decorator.notYetDocumented %}
-      {$ decorator.description | indentForMarkdown(8) | trimBlankLines | marked $}
-      {% endif %}
-    {% endfor %}
-  

-{% endblock %}
-{% endif %}
-
-{%- if doc.constructorDoc and not doc.constructorDoc.internal %}
-

-  

-    
Constructor

-  

-  

-    
-    
-      
-        {$ doc.constructorDoc.name $}{$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
-      
-    

-    {%- if not doc.constructorDoc.notYetDocumented %}
-    {$ doc.constructorDoc.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-    {% endif %}
-{% endif %}
-
-{% if doc.statics.length %}
-

-  

-    
Static Members

-  

-  

-  {% for member in doc.statics %}{% if not member.internal %}
-    
-    
-      
-        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-      
-    

-    {%- if not member.notYetDocumented %}
-    {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-    {% endif %}
-
-    {% if not loop.last %}
-    

-    {% endif %}
-
-  {% endif %}{% endfor %}
-{% endif %}
-
-{% if doc.members.length %}
-

-  

-    
Class Details

-  

-  

-    {% for member in doc.members %}{% if not member.internal %}
-    
-    
-      
-        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-      
-    

-    {%- if not member.notYetDocumented %}
-    {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
-    {% endif -%}
-
-    {% if not loop.last %}
-    

-    {% endif %}
-  {% endif %}{% endfor %}
-{% endif %}
-
-

-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} },
-  defined in {$ github.githubViewLink(doc, versionInfo) $}
-

+{% block details %}
+  {% include "includes/_class-overview.html" %}
+  {% block additional %}{% endblock %}
+  {% include "includes/_description.html" %}
+  {% include "includes/_annotations.html" %}
+  {% include "includes/_constructor.html" %}
+  {% include "includes/_statics.html" %}
+  {% include "includes/_members.html" %}
 {% endblock %}
diff --git a/docs/templates/decorator.template.html b/docs/templates/decorator.template.html
index d90a10fd37..5c012ced97 100644
--- a/docs/templates/decorator.template.html
+++ b/docs/templates/decorator.template.html
@@ -1,44 +1,7 @@
-{% import "lib/githubLinks.html" as github -%}
 {% import "lib/paramList.html" as params -%}
-{% extends 'layout/base.template.html' %}
+{% extends 'layout/api-base.template.html' %}
 
-{% block body %}
-
-
-{% include "layout/_what-it-does.html" %}
-
-{% include "layout/_security-notes.html" %}
-
-{% include "layout/_deprecated-notes.html" %}
-
-{% include "layout/_how-to-use.html" %}
-
-

-  

-    
Description

-  

-    {%- if not doc.notYetDocumented %}{$ doc.description | trimBlankLines | marked $}{% endif %}
-  

-

-{% if doc.metadataDoc and doc.metadataDoc.members.length %}
-

-  

-    
Metadata Properties

-  

-  

-    {% for metadata in doc.metadataDoc.members %}{% if not metadata.internal %}
-    
-    
-      
-        {$ metadata.name $}{$ params.paramList(metadata.parameters) | indent(8, false) | trim $}{$ params.returnType(metadata.returnType) $}
-      
-    

-    {%- if not metadata.notYetDocumented %}{$ metadata.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}{% endif -%}
-    {% if not loop.last %}
{% endif %}
-  {% endif %}{% endfor %}
-{% endif %}
-
-

-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ github.githubViewLink(doc, versionInfo) $}
-

+{% block main %}
+  {% include "includes/_description.html" %}
+  {% include "includes/_metadata.html" %}
 {% endblock %}
diff --git a/docs/templates/directive.template.html b/docs/templates/directive.template.html
index aed19ca17a..9eda197279 100644
--- a/docs/templates/directive.template.html
+++ b/docs/templates/directive.template.html
@@ -1,62 +1,9 @@
-{% import "lib/githubLinks.html" as github -%}
 {% import "lib/paramList.html" as params -%}
 {% extends 'class.template.html' -%}
 
-{% block annotations %}
-{% endblock %}
-
 {% block additional -%}
-
-{%- if doc.directiveOptions.selector.split(',').length %}
-

-  

-    
Selectors

-  

-    {% for selector in doc.directiveOptions.selector.split(',') %}
-    

-      {$ selector $}
-    

-    {% endfor %}
-{% endif %}
-
-{% if doc.outputs %}
-

-  

-    
Outputs

-  

-  

-  {% for binding, property in doc.outputs %}
-    

-      {$ property.bindingName $} bound to 
-      {$ property.memberDoc.classDoc.name $}.{$ property.propertyName $}
-    {$ property.memberDoc.description | trimBlankLines | marked $}
-  

-  {% endfor %}
-

-{% endif %}
-
-{% if doc.inputs %}
-

-  

-    
Inputs

-  

-    {% for binding, property in doc.inputs %}
-    

-      {$ property.bindingName $} bound to 
-      {$ property.memberDoc.classDoc.name $}.{$ property.propertyName $}
-    {$ property.memberDoc.description | trimBlankLines | marked $}
-    {% endfor %}
-{% endif %}
-
-{%- if doc.directiveOptions.exportAs %}
-

-  

-    
Exported as

-  

-  

-    

-      {$ doc.directiveOptions.exportAs $}
-    

-{% endif %}
+  {% include "includes/_selectors.html" %}
+  {% include "includes/_outputs.html" %}
+  {% include "includes/_inputs.html" %}
+  {% include "includes/_export-as.html" %}
 {% endblock %}
diff --git a/docs/templates/function.template.html b/docs/templates/function.template.html
index 555b4e0e95..ab3663e1b7 100644
--- a/docs/templates/function.template.html
+++ b/docs/templates/function.template.html
@@ -1,31 +1,6 @@
-{% import "lib/githubLinks.html" as github -%}
 {% import "lib/paramList.html" as params -%}
-{% extends 'layout/base.template.html' -%}
+{% extends 'layout/api-base.template.html' -%}
 
-{% block body %}
-
-
-{% include "layout/_what-it-does.html" %}
-
-{% include "layout/_security-notes.html" %}
-
-{% include "layout/_deprecated-notes.html" %}
-
-{% include "layout/_how-to-use.html" %}
-
-

-  

-    
Class Export

-  

-  

-    
-      
-        export {$ doc.name $}{$ params.paramList(doc.parameters) | indent(8, true) | trim $}{$ params.returnType(doc.returnType) $}
-      
-    

-    {%- if not doc.notYetDocumented %}{$ doc.description | trimBlankLines | marked $}{% endif %}
-
-

-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ github.githubViewLink(doc, versionInfo) $}
-

+{% block main %}
+  {% include "includes/_description.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/docs/templates/includes/_annotations.html b/docs/templates/includes/_annotations.html
new file mode 100644
index 0000000000..769fbf71c7
--- /dev/null
+++ b/docs/templates/includes/_annotations.html
@@ -0,0 +1,13 @@
+{%- if doc.decorators.length %}
+

+  
Annotations

+  

+    {%- for decorator in doc.decorators %}
+      
+        @{$ decorator.name $}{$ params.paramList(decorator.arguments) | indent(10, false) $}
+      

+      {%- if not decorator.notYetDocumented %}{$ decorator.description | marked $}{% endif %}
+    {% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/includes/_class-overview.html b/docs/templates/includes/_class-overview.html
new file mode 100644
index 0000000000..3aa26f7c23
--- /dev/null
+++ b/docs/templates/includes/_class-overview.html
@@ -0,0 +1,40 @@
+

+  
Class Overview

+  

+
+    class {$ doc.name $} {
+
+    {% if doc.statics.length %}
+    

+      {% for member in doc.statics %}{% if not member.internal %}
+        
static
+          {$ member.name | indent(6, false) | trim $}
+          {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
+        

+      {% endif %}{% endfor %}
+    

+    {% endif %}
+
+
+    {% if doc.constructorDoc.name %}
+    

+      

+        {$ doc.constructorDoc.name $}
+          {$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
+      

+    

+    {% endif %}
+
+    {% if doc.members.length %}
+    

+      {% for member in doc.members %}{% if not member.internal %}
+        

+          {$ member.name | indent(6, false) | trim $}
+          {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
+        

+      {% endif %}{% endfor %}
+    {% endif %}
+
+    }
+  

+

\ No newline at end of file
diff --git a/docs/templates/includes/_constructor.html b/docs/templates/includes/_constructor.html
new file mode 100644
index 0000000000..b0b57209dd
--- /dev/null
+++ b/docs/templates/includes/_constructor.html
@@ -0,0 +1,16 @@
+{%- if doc.constructorDoc and not doc.constructorDoc.internal %}
+

+  
Constructor

+  

+    
+    
+      
+        {$ doc.constructorDoc.name $}{$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
+      
+    

+    {%- if not doc.constructorDoc.notYetDocumented %}
+    {$ doc.constructorDoc.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
+    {% endif %}
+  

+

+{% endif %}
diff --git a/docs/templates/layout/_deprecated-notes.html b/docs/templates/includes/_deprecated-notes.html
similarity index 100%
rename from docs/templates/layout/_deprecated-notes.html
rename to docs/templates/includes/_deprecated-notes.html
diff --git a/docs/templates/includes/_description.html b/docs/templates/includes/_description.html
new file mode 100644
index 0000000000..627b93df2c
--- /dev/null
+++ b/docs/templates/includes/_description.html
@@ -0,0 +1,9 @@
+

+  

+    Description
+    link
+  

+  {%- if doc.description.length > 2 %}
+  {$ doc.description | trimBlankLines | marked $}
+  {% endif %}
+

diff --git a/docs/templates/includes/_export-as.html b/docs/templates/includes/_export-as.html
new file mode 100644
index 0000000000..de0796f098
--- /dev/null
+++ b/docs/templates/includes/_export-as.html
@@ -0,0 +1,10 @@
+{%- if doc.directiveOptions.exportAs %}
+

+  
Exported as

+  

+    

+      {$ doc.directiveOptions.exportAs $}
+    

+  

+

+{% endif %}
diff --git a/docs/templates/includes/_how-to-use.html b/docs/templates/includes/_how-to-use.html
new file mode 100644
index 0000000000..b244ce60e1
--- /dev/null
+++ b/docs/templates/includes/_how-to-use.html
@@ -0,0 +1,9 @@
+{%- if doc.howToUse %}
+  
+  

+    
How To Use

+    

+      {$ doc.howToUse | marked $}
+    

+  

+{% endif %}
diff --git a/docs/templates/includes/_info-bar.html b/docs/templates/includes/_info-bar.html
new file mode 100644
index 0000000000..522773a183
--- /dev/null
+++ b/docs/templates/includes/_info-bar.html
@@ -0,0 +1,18 @@
+{% import "lib/githubLinks.html" as github -%}
+
+
+

+  
+    npm package: {$ doc.package $}
+  
+
+  
+    NgModule: {$ doc.moduleDoc.name $}
+  
+
+  
+    {$ github.githubViewLink(doc, versionInfo) $}
+  
+
+  create
+

\ No newline at end of file
diff --git a/docs/templates/includes/_inputs.html b/docs/templates/includes/_inputs.html
new file mode 100644
index 0000000000..d923f34f92
--- /dev/null
+++ b/docs/templates/includes/_inputs.html
@@ -0,0 +1,13 @@
+{% if doc.inputs %}
+

+  
Inputs

+  

+    {% for binding, property in doc.inputs %}
+    

+      {$ property.bindingName $} bound to {$ property.memberDoc.classDoc.name $}.{$ property.propertyName $}
+      {$ property.memberDoc.description | trimBlankLines | marked $}
+    

+    {% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/includes/_interface-overview.html b/docs/templates/includes/_interface-overview.html
new file mode 100644
index 0000000000..2c91bbda36
--- /dev/null
+++ b/docs/templates/includes/_interface-overview.html
@@ -0,0 +1,19 @@
+

+  
Interface Overview

+  

+
+    interface {$ doc.name $} {
+
+    {% if doc.members.length %}
+    

+      {% for member in doc.members %}{% if not member.internal %}
+        

+          {$ member.name | indent(6, false) | trim $}
+          {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
+        

+      {% endif %}{% endfor %}
+    {% endif %}
+
+    }
+  

+

\ No newline at end of file
diff --git a/docs/templates/includes/_members.html b/docs/templates/includes/_members.html
new file mode 100644
index 0000000000..1c0bb8b988
--- /dev/null
+++ b/docs/templates/includes/_members.html
@@ -0,0 +1,19 @@
+{% if doc.members.length %}
+

+  
Class Details

+  

+    {% for member in doc.members %}{% if not member.internal %}
+    

+      
+      
+      {$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}
+      

+      {%- if not member.notYetDocumented %}
+      {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
+      {% endif -%}
+    

+    {% if not loop.last %}
{% endif %}
+  {% endif %}{% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/includes/_metadata.html b/docs/templates/includes/_metadata.html
new file mode 100644
index 0000000000..f9c7e3abc1
--- /dev/null
+++ b/docs/templates/includes/_metadata.html
@@ -0,0 +1,17 @@
+{% if doc.metadataDoc and doc.metadataDoc.members.length %}
+

+  
Metadata Properties

+  

+    {% for metadata in doc.metadataDoc.members %}{% if not metadata.internal %}
+    

+      
+      
+        {$ metadata.name $}{$ params.paramList(metadata.parameters) | trim $}{$ params.returnType(metadata.returnType) $}
+      

+      {%- if not metadata.notYetDocumented %}{$ metadata.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}{% endif -%}
+    

+    {% if not loop.last %}
{% endif %}
+  {% endif %}{% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/layout/_ng-module.html b/docs/templates/includes/_ng-module.html
similarity index 100%
rename from docs/templates/layout/_ng-module.html
rename to docs/templates/includes/_ng-module.html
diff --git a/docs/templates/includes/_outputs.html b/docs/templates/includes/_outputs.html
new file mode 100644
index 0000000000..a1b313a9d4
--- /dev/null
+++ b/docs/templates/includes/_outputs.html
@@ -0,0 +1,13 @@
+{% if doc.outputs %}
+

+  
Outputs

+  

+  {% for binding, property in doc.outputs %}
+    

+      {$ property.bindingName $} bound to {$ property.memberDoc.classDoc.name $}.{$ property.propertyName $}
+      {$ property.memberDoc.description | trimBlankLines | marked $}
+    

+  {% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/layout/_security-notes.html b/docs/templates/includes/_security-notes.html
similarity index 100%
rename from docs/templates/layout/_security-notes.html
rename to docs/templates/includes/_security-notes.html
diff --git a/docs/templates/includes/_selectors.html b/docs/templates/includes/_selectors.html
new file mode 100644
index 0000000000..fbdab157a6
--- /dev/null
+++ b/docs/templates/includes/_selectors.html
@@ -0,0 +1,12 @@
+{%- if doc.directiveOptions.selector.split(',').length %}
+

+  
Selectors

+  

+    {% for selector in doc.directiveOptions.selector.split(',') %}
+    

+      {$ selector $}
+    

+    {% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/includes/_statics.html b/docs/templates/includes/_statics.html
new file mode 100644
index 0000000000..d8ded2cec7
--- /dev/null
+++ b/docs/templates/includes/_statics.html
@@ -0,0 +1,23 @@
+{% if doc.statics.length %}
+

+  
Static Members

+  

+  {% for member in doc.statics %}{% if not member.internal %}
+    

+      
+      
+        {$ member.name $}{$ params.paramList(member.parameters) | trim $}{$ params.returnType(member.returnType) $}
+      

+      {%- if not member.notYetDocumented %}
+      {$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}
+      {% endif %}
+    

+
+    {% if not loop.last %}
+    

+    {% endif %}
+
+  {% endif %}{% endfor %}
+  

+

+{% endif %}
diff --git a/docs/templates/includes/_title.html b/docs/templates/includes/_title.html
new file mode 100644
index 0000000000..0057c04114
--- /dev/null
+++ b/docs/templates/includes/_title.html
@@ -0,0 +1,6 @@
+
+

+  
{$ doc.name $}

+  
{$ doc.docType $}

+  {$ angular.version $}
+

diff --git a/docs/templates/includes/_what-it-does.html b/docs/templates/includes/_what-it-does.html
new file mode 100644
index 0000000000..9ed426f6fe
--- /dev/null
+++ b/docs/templates/includes/_what-it-does.html
@@ -0,0 +1,3 @@
+{%- if doc.whatItDoes %}
+
{$ doc.whatItDoes | marked $}

+{% endif %}
\ No newline at end of file
diff --git a/docs/templates/interface.template.html b/docs/templates/interface.template.html
index ff413cb599..b176df5955 100644
--- a/docs/templates/interface.template.html
+++ b/docs/templates/interface.template.html
@@ -1,72 +1,8 @@
-{% import "lib/githubLinks.html" as github -%}
 {% import "lib/paramList.html" as params -%}
-{% extends 'layout/base.template.html' -%}
+{% extends 'layout/api-base.template.html' -%}
 
-{% block body %}
-
-
-{% include "layout/_what-it-does.html" %}
-
-{% include "layout/_security-notes.html" %}
-
-{% include "layout/_deprecated-notes.html" %}
-
-{% include "layout/_how-to-use.html" %}
-
-

-  

-    
Interface Overview

-  

-  

-    interface {$ doc.name $} {
-
-    {% if doc.members.length %}
-    

-      {% for member in doc.members %}{% if not member.internal %}
-        
-          
-            {$ member.name | indent(6, false) | trim $}
-            {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-          
-        

-      {% endif %}{% endfor %}
-    {% endif %}
-    

-      }
-    

-
-{% block additional %}
-{% endblock %}
-
-

-  

-    
Interface Description

-  

-  

-    {%- if doc.description.length > 2 %}{$ doc.description | trimBlankLines | marked $}{% endif %}
-  

-{% if doc.members.length %}
-

-  

-    
Interface Details

-  

-  

-    {% for member in doc.members %}{% if not member.internal %}
-    
-    
-      
-        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
-      
-    

-    {%- if not member.notYetDocumented %}{$ member.description | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines | marked $}{% endif -%}
-    {% if not loop.last %}
{% endif %}
-  

-  {% endif %}{% endfor %}
-

-{% endif %}
-
-

-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} },
-  defined in {$ github.githubViewLink(doc, versionInfo) $}
-

+{% block main %}
+  {% include "includes/_interface-overview.html" %}
+  {% include "includes/_description.html" %}
+  {% include "includes/_members.html" %}
 {% endblock %}
diff --git a/docs/templates/layout/_how-to-use.html b/docs/templates/layout/_how-to-use.html
deleted file mode 100644
index 2fb251a0d6..0000000000
--- a/docs/templates/layout/_how-to-use.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- if doc.howToUse %}
-

-  

-    
How to use

-  

-  

-    {$ doc.howToUse | marked $}
-  

-

-{% endif %}
\ No newline at end of file
diff --git a/docs/templates/layout/_what-it-does.html b/docs/templates/layout/_what-it-does.html
deleted file mode 100644
index 14b800004b..0000000000
--- a/docs/templates/layout/_what-it-does.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- if doc.whatItDoes %}
-

-  

-    
What it does

-  

-  

-    {$ doc.whatItDoes | marked $}
-  

-

-{% endif %}
\ No newline at end of file
diff --git a/docs/templates/layout/api-base.template.html b/docs/templates/layout/api-base.template.html
new file mode 100644
index 0000000000..db5146a987
--- /dev/null
+++ b/docs/templates/layout/api-base.template.html
@@ -0,0 +1,11 @@
+{% extends 'layout/base.template.html' -%}
+
+{% block body %}
+  
+  {% include "includes/_what-it-does.html" %}
+  {% include "includes/_info-bar.html" %}
+  {% include "includes/_security-notes.html" %}
+  {% include "includes/_deprecated-notes.html" %}
+  {% include "includes/_how-to-use.html" %}
+  {% block details %}{% endblock %}
+{% endblock %}
diff --git a/docs/templates/layout/base.template.html b/docs/templates/layout/base.template.html
index 16a0d9dc96..6ceff4e61c 100644
--- a/docs/templates/layout/base.template.html
+++ b/docs/templates/layout/base.template.html
@@ -1 +1,4 @@
-{% block body %}{% endblock %}
\ No newline at end of file
+

+  {% include "includes/_title.html" %}
+  {% block body %}{% endblock %}
+

\ No newline at end of file
diff --git a/docs/templates/module.template.html b/docs/templates/module.template.html
index 4c632fb454..df154e3b71 100644
--- a/docs/templates/module.template.html
+++ b/docs/templates/module.template.html
@@ -1,8 +1,6 @@
-{% import "lib/githubLinks.html" as github -%}
 {% extends 'layout/base.template.html' -%}
 
 {% block body -%}
-
defined in {$ github.githubViewLink(doc, versionInfo) $}

 
    
   {% for page in doc.childPages -%}
   
  • 
diff --git a/docs/templates/pipe.template.html b/docs/templates/pipe.template.html
index d328b8578d..bd6d7e0e0c 100644
--- a/docs/templates/pipe.template.html
+++ b/docs/templates/pipe.template.html
@@ -1,30 +1,5 @@
-{% import "lib/githubLinks.html" as github -%}
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/base.template.html' -%}
+{% extends 'layout/api-base.template.html' -%}
 
-{% block body %}
-
-
-{% include "layout/_what-it-does.html" %}
-
-{% include "layout/_security-notes.html" %}
-
-{% include "layout/_deprecated-notes.html" %}
-
-{% include "layout/_how-to-use.html" %}
-
-{% include "layout/_ng-module.html" %}
-
-
    
-  
    
-    
    Description
    
-  
    
-  
    
-    {%- if doc.description.length > 2 %}{$ doc.description | trimBlankLines | marked $}{% endif %}
-  
    
-
    
-
    
-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }
-  defined in {$ github.githubViewLink(doc, versionInfo) $}
-
    
+{% block details %}
+  {% include "includes/_description.html" %}
 {% endblock %}
diff --git a/docs/templates/var.template.html b/docs/templates/var.template.html
index 99037091e6..56149893e8 100644
--- a/docs/templates/var.template.html
+++ b/docs/templates/var.template.html
@@ -1,33 +1,5 @@
-{% import "lib/githubLinks.html" as github -%}
-{% import "lib/paramList.html" as params -%}
-{% extends 'layout/base.template.html' %}
+{% extends 'layout/api-base.template.html' %}
 
-{% block body %}
-
-
-{% include "layout/_what-it-does.html" %}
-
-{% include "layout/_security-notes.html" %}
-
-{% include "layout/_deprecated-notes.html" %}
-
-{% include "layout/_how-to-use.html" %}
-
-
    
-  
    
-    
    Variable Export
    
-  
    
-  
    
-    
    -      
-        export {$ doc.name $}
-      
-    
    
-    {%- if not doc.notYetDocumented %}{$ doc.description | trimBlankLines | marked $}{% endif %}
-  
    
-
    
-
    
-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }
-  defined in {$ github.githubViewLink(doc, versionInfo) $}
-
    
+{% block details %}
+  {% include "includes/_description.html" %}
 {% endblock %}