diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-09-05 22:57:26 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-09-05 23:14:30 -0400 |
| commit | 57c8b068358e785f80879a87e3f456ad24366ecf (patch) | |
| tree | 56fd2248a45974241521c8df650717983a8f5ba3 | |
| parent | v5 v6: xml xhtml outputs, & issues (diff) | |
v5 v6: (for html) set default to navigation bar off
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/hub_options.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/se_processing.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/hub_options.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/se_processing.rb | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 443f07bf..41443428 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.5.orig.tar.xz sisu_5.6.5.orig.tar.xz sisu_5.6.5-1.dsc +* (for html) set default to navigation bar off + * xml xhtml outputs, & issues * shared_metadata, requires xml_shared diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 22b9d305..783899f1 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.6.orig.tar.xz sisu_6.2.6.orig.tar.xz sisu_6.2.6-1.dsc +* (for html) set default to navigation bar off + * xml xhtml outputs, & issues * shared_metadata, requires xml_shared diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/v5/hub_options.rb index d871c9c3..676577fb 100644 --- a/lib/sisu/v5/hub_options.rb +++ b/lib/sisu/v5/hub_options.rb @@ -960,7 +960,7 @@ module SiSU_Commandline =~/"--(?:exc|no)-html-navigation-bar"|"--(?:exc|no)-navigation-bar"/ \ || act[:switch][:off].inspect =~/"html_navigation_bar"|"navbar"/ { bool: false, set: :off } - else { bool: true, set: :na } + else { bool: false, set: :na } end act[:segsubtoc]=if select_arr.inspect \ =~/"--inc-segsubtoc"/ diff --git a/lib/sisu/v5/se_processing.rb b/lib/sisu/v5/se_processing.rb index 35fa72c2..33b4a4ed 100644 --- a/lib/sisu/v5/se_processing.rb +++ b/lib/sisu/v5/se_processing.rb @@ -309,7 +309,7 @@ module SiSU_Processing_Settings elsif env_rc.build.html_navigation_bar? ==:off false else - true + false end end def search_form? diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/v6/hub_options.rb index 336f0d93..6f9543d3 100644 --- a/lib/sisu/v6/hub_options.rb +++ b/lib/sisu/v6/hub_options.rb @@ -960,7 +960,7 @@ module SiSU_Commandline =~/"--(?:exc|no)-html-navigation-bar"|"--(?:exc|no)-navigation-bar"/ \ || act[:switch][:off].inspect =~/"html_navigation_bar"|"navbar"/ { bool: false, set: :off } - else { bool: true, set: :na } + else { bool: false, set: :na } end act[:segsubtoc]=if select_arr.inspect \ =~/"--inc-segsubtoc"/ diff --git a/lib/sisu/v6/se_processing.rb b/lib/sisu/v6/se_processing.rb index 32b2490a..15db8cff 100644 --- a/lib/sisu/v6/se_processing.rb +++ b/lib/sisu/v6/se_processing.rb @@ -309,7 +309,7 @@ module SiSU_Processing_Settings elsif env_rc.build.html_navigation_bar? ==:off false else - true + false end end def search_form? |