You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2017/01/16 23:48:14 UTC
[55/66] [abbrv] geode git commit: GEODE-2031 Edit Nanoc config/rules
to use extensions
GEODE-2031 Edit Nanoc config/rules to use extensions
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a0059231
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a0059231
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a0059231
Branch: refs/heads/develop
Commit: a0059231af748ac15bb0fe10cf0d553e49235009
Parents: ec31a26
Author: joeymcallister <jm...@pivotal.io>
Authored: Tue Jan 10 12:32:40 2017 -0800
Committer: Karen Miller <km...@pivotal.io>
Committed: Mon Jan 16 15:47:01 2017 -0800
----------------------------------------------------------------------
geode-site/website/Rules | 30 ++++++++++----------------
geode-site/website/layouts/community.html | 2 +-
geode-site/website/layouts/default.html | 4 ++--
geode-site/website/layouts/docs.html | 2 +-
geode-site/website/layouts/releases.html | 2 +-
geode-site/website/nanoc.yaml | 6 +++---
6 files changed, 19 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/Rules
----------------------------------------------------------------------
diff --git a/geode-site/website/Rules b/geode-site/website/Rules
index 46aead3..11492dd 100644
--- a/geode-site/website/Rules
+++ b/geode-site/website/Rules
@@ -30,43 +30,35 @@
# item, use the pattern \u201c/about/*/\u201d; \u201c/about/*\u201d will also select the parent,
# because \u201c*\u201d matches zero or more characters.
-passthrough /\/(bootstrap|css|font|img|js|static)\/.*/
+passthrough /\/(bootstrap|css|font|img|js|static|guide|fonts|images|javascripts|stylesheets|subnavs)\/.*/
-compile '/docs/*' do
+compile '/docs/**/*' do
@docs = true
filter :erb
- layout 'docs'
+ layout '/docs.*'
end
-compile '/community/*' do
+compile '/community/**/*' do
@community = true
filter :erb
- layout 'community'
+ layout '/community.*'
end
-compile '/releases/*' do
+compile '/releases/**/*' do
@releases = true
filter :erb
- layout 'releases'
+ layout '/releases.*'
end
-compile '*' do
+compile '/**/*' do
if item.binary?
# don\u2019t filter binary items
else
filter :erb
- layout 'default'
+ layout '/default.*'
end
end
-route '*' do
- if item.binary?
- # Write item with identifier /foo/ to /foo.ext
- item.identifier.chop + '.' + item[:extension]
- else
- # Write item with identifier /foo/ to /foo/index.html
- item.identifier + 'index.html'
- end
-end
-layout '*', :erb
+
+layout '/**/*', :erb
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/layouts/community.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/community.html b/geode-site/website/layouts/community.html
index 1111028..8f3d6f6 100644
--- a/geode-site/website/layouts/community.html
+++ b/geode-site/website/layouts/community.html
@@ -1 +1 @@
-<%= render 'default', :community => true, :content => @content, :item => @item %>
\ No newline at end of file
+<%= render '/default.*', :community => true, :content => @content, :item => @item %>
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/layouts/default.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/default.html b/geode-site/website/layouts/default.html
index 2bdf9ef..0df020a 100644
--- a/geode-site/website/layouts/default.html
+++ b/geode-site/website/layouts/default.html
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html lang="en">
-<%= render 'header', {:docs => @docs, :community => @community, :releases => @releases} %>
+<%= render '/header.*', {:docs => @docs, :community => @community, :releases => @releases} %>
<%= @content %>
-<%= render 'footer' %>
+<%= render '/footer.*' %>
</body>
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/layouts/docs.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/docs.html b/geode-site/website/layouts/docs.html
index 119b865..ddfaf8a 100644
--- a/geode-site/website/layouts/docs.html
+++ b/geode-site/website/layouts/docs.html
@@ -1 +1 @@
-<%= render 'default', :docs => true, :content => @content, :item => @item %>
\ No newline at end of file
+<%= render '/default.*', :docs => true, :content => @content, :item => @item %>
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/layouts/releases.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/releases.html b/geode-site/website/layouts/releases.html
index 9240770..fa58ee9 100644
--- a/geode-site/website/layouts/releases.html
+++ b/geode-site/website/layouts/releases.html
@@ -1 +1 @@
-<%= render 'default', :releases => true, :content => @content, :item => @item %>
+<%= render '/default.*', :releases => true, :content => @content, :item => @item %>
http://git-wip-us.apache.org/repos/asf/geode/blob/a0059231/geode-site/website/nanoc.yaml
----------------------------------------------------------------------
diff --git a/geode-site/website/nanoc.yaml b/geode-site/website/nanoc.yaml
index 25fa01b..5fcc351 100644
--- a/geode-site/website/nanoc.yaml
+++ b/geode-site/website/nanoc.yaml
@@ -34,7 +34,7 @@ index_filenames: [ 'index.html' ]
# Whether or not to generate a diff of the compiled content when compiling a
# site. The diff will contain the differences between the compiled content
# before and after the last site compilation.
-enable_output_diff: false
+enable_output_diff: true
prune:
# Whether to automatically remove files not managed by nanoc from the output
@@ -46,7 +46,7 @@ prune:
# .git, .svn etc.
exclude: [ '.git', '.hg', '.svn', 'CVS' ]
-string_pattern_type: legacy
+string_pattern_type: glob
# The data sources where nanoc loads its data from. This is an array of
# hashes; each array element represents a single data source. By default,
# there is only a single data source that reads data from the \u201ccontent/\u201d and
@@ -56,7 +56,7 @@ data_sources:
# The type is the identifier of the data source. By default, this will be
# `filesystem_unified`.
type: filesystem_unified
- identifier_type: legacy
+ identifier_type: full
# The path where items should be mounted (comparable to mount points in
# Unix-like systems). This is \u201c/\u201d by default, meaning that items will have