diff options
| -rw-r--r-- | lib/generators/site.js | 6 | ||||
| -rw-r--r-- | theme/templates/ebook/summary.html | 3 | ||||
| -rw-r--r-- | theme/templates/website/includes/summary.html | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/generators/site.js b/lib/generators/site.js index 242e153..ffcd005 100644 --- a/lib/generators/site.js +++ b/lib/generators/site.js @@ -179,10 +179,10 @@ Generator.prototype._writeTemplate = function(tpl, options, output, interpolate) title: that.options.title, description: that.options.description, - glossary: that.options.glossary, + glossary: that.book.glossary, - summary: that.options.summary, - allNavigation: that.options.navigation, + summary: that.book.summary, + allNavigation: that.book.navigation, plugins: that.plugins, pluginsConfig: JSON.stringify(that.options.pluginsConfig), diff --git a/theme/templates/ebook/summary.html b/theme/templates/ebook/summary.html index 9a67d28..2e540a6 100644 --- a/theme/templates/ebook/summary.html +++ b/theme/templates/ebook/summary.html @@ -4,10 +4,9 @@ {% macro articles(_articles) %} {% for item in _articles %} - {% set externalLink = item.path|isExternalLink %} <li> {% if item.path %} - {% if !externalLink %} + {% if item.external %} <a href="{{ basePath }}/{{ item.path|contentLink }}">{{ item.title }}</a> {% else %} <a target="_blank" href="{{ item.path }}">{{ item.title }}</a> diff --git a/theme/templates/website/includes/summary.html b/theme/templates/website/includes/summary.html index ffe9f16..39f5295 100644 --- a/theme/templates/website/includes/summary.html +++ b/theme/templates/website/includes/summary.html @@ -1,9 +1,8 @@ {% macro articles(_articles) %} {% for item in _articles %} - {% set externalLink = item.path|isExternalLink %} - <li class="chapter {% if item.path == _input %}active{% endif %}" data-level="{{ item.level }}" {% if item.path and not externalLink %}data-path="{{ item.path|contentLink }}"{% endif %}> + <li class="chapter {% if item.path == _input %}active{% endif %}" data-level="{{ item.level }}" {% if item.path and not item.external %}data-path="{{ item.path|contentLink }}"{% endif %}> {% if item.path %} - {% if not externalLink %} + {% if not item.external %} <a href="{{ basePath }}/{{ item.path|contentLink }}"> <i class="fa fa-check"></i> {% if item.level != "0" %} |