Skip to content

Commit 9e5a57d

Browse files
authored
Add class annotation to HTML templates for different kinds of entities (#1929)
Tools like Dashing (used to create offline docs for Dash/Zeal) use CSS descriptors to index the different entities so that they can search for them and display them in a menu. Since the library and class types now use the same CSS in dartdoc, that made it impossible to differentiate between libraries and classes. This PR adds some (empty) CSS classes in spans around the names of the entities, so that it's easy to explicitly find the name of the entity for each type in the HTML output. I didn't use the `{{kind}}` template parameter because it sometimes contains spaces. Addresses [flutter/flutter#27654](flutter/flutter#27654)
1 parent 4bf0049 commit 9e5a57d

13 files changed

+36
-37
lines changed

lib/templates/category.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind"
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<h1>{{name}} {{kind}}</h1>
11+
<h1><span class="kind-category">{{name}}</span> {{kind}}</h1>
1212
{{>documentation}}
1313

1414
{{#hasPublicLibraries}}

lib/templates/class.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-class">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
{{#clazz}}

lib/templates/constant.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{name}}} {{kind}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-constant">{{{name}}}</span> {{kind}}</h1></div>
1212
{{/self}}
1313

1414
<section class="multi-line-signature">

lib/templates/constructor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-constructor">{{{nameWithGenerics}}}</span> {{kind}}</h1></div>
1212
{{/self}}
1313

1414
{{#constructor}}

lib/templates/enum.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{name}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-enum">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
{{#eNum}}

lib/templates/function.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-function">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
{{#function}}

lib/templates/library.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind"
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{name}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-library">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
{{#library}}

lib/templates/method.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-method">{{{nameWithGenerics}}}</span> {{kind}}</h1></div>
1212
{{/self}}
1313

1414
{{#method}}

lib/templates/mixin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-mixin">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
{{#mixin}}

lib/templates/property.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{name}} {{kind}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-property">{{name}}</span> {{kind}}</h1></div>
1212
{{/self}}
1313

1414
{{#self}}

lib/templates/top_level_constant.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{name}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-top-level-constant">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
1212

13-
<section class="multi-line-signature">
14-
{{>name_summary}}
15-
=
16-
<span class="constant-value">{{{ constantValue }}}</span>
17-
{{>features}}
18-
</section>
19-
20-
{{>documentation}}
21-
{{>source_code}}
13+
<section class="multi-line-signature">
14+
{{>name_summary}}
15+
=
16+
<span class="constant-value">{{{ constantValue }}}</span>
17+
{{>features}}
18+
</section>
19+
{{>documentation}}
20+
{{>source_code}}
2221
{{/self}}
2322

2423
</div> <!-- /.main-content -->

lib/templates/top_level_property.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{name}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-top-level-property">{{{name}}}</span> {{kind}} {{>categorization}}</h1></div>
1212

13-
{{#hasNoGetterSetter}}
14-
<section class="multi-line-signature">
15-
<span class="returntype">{{{ linkedReturnType }}}</span>
16-
{{>name_summary}}
17-
{{>features}}
18-
</section>
19-
{{>documentation}}
20-
{{>source_code}}
21-
{{/hasNoGetterSetter}}
13+
{{#hasNoGetterSetter}}
14+
<section class="multi-line-signature">
15+
<span class="returntype">{{{ linkedReturnType }}}</span>
16+
{{>name_summary}}
17+
{{>features}}
18+
</section>
19+
{{>documentation}}
20+
{{>source_code}}
21+
{{/hasNoGetterSetter}}
2222

23-
{{#hasExplicitGetter}}
24-
{{>accessor_getter}}
25-
{{/hasExplicitGetter}}
23+
{{#hasExplicitGetter}}
24+
{{>accessor_getter}}
25+
{{/hasExplicitGetter}}
2626

27-
{{#hasExplicitSetter}}
28-
{{>accessor_setter}}
29-
{{/hasExplicitSetter}}
27+
{{#hasExplicitSetter}}
28+
{{>accessor_setter}}
29+
{{/hasExplicitSetter}}
3030
{{/self}}
3131
</div> <!-- /.main-content -->
3232

lib/templates/typedef.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
88

99
<div id="dartdoc-main-content" class="col-xs-12 col-sm-9 col-md-8 main-content">
1010
{{#self}}
11-
<div>{{>source_link}}<h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1></div>
11+
<div>{{>source_link}}<h1><span class="kind-typedef">{{{nameWithGenerics}}}</span> {{kind}} {{>categorization}}</h1></div>
1212
{{/self}}
1313

1414
<section class="multi-line-signature">

0 commit comments

Comments
 (0)