From 93255d4caf9af195458c48f4159fadc18d03e223 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 28 Aug 2013 18:10:49 -0400
Subject: v4 v5: manifest, output organised by, info, minor touch

---
 data/doc/sisu/CHANGELOG_v4 | 2 ++
 data/doc/sisu/CHANGELOG_v5 | 2 ++
 lib/sisu/v4/manifest.rb    | 5 +++--
 lib/sisu/v5/manifest.rb    | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 8a50f45f..9ccf61f4 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz
 
 * config files (by filetype & filename) touched
 
+* manifest, output organised by, info, minor touch
+
 %% 4.2.0.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 2bc960a6..cd4d5f89 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
 
 * config files (by filetype & filename) touched
 
+* manifest, output organised by, info, minor touch
+
 %% 5.0.13.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index eb888387..d86830e4 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -841,10 +841,11 @@ WOK
             '..'
           else '..'
           end
+          output_organised_by="(output organised by #{@env.output_dir_structure.by?})"
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
-          ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>]</p>}
-          : ''
+          ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 95112a7a..a8e6bb25 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -841,10 +841,11 @@ WOK
             '..'
           else '..'
           end
+          output_organised_by="(output organised by #{@env.output_dir_structure.by?})"
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
-          ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>]</p>}
-          : ''
+          ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">
-- 
cgit v1.2.3