From e4e85022c6fec0009c0e64f62f3cb7f781039e90 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Jul 2010 18:37:17 -0400 Subject: html, links to output formats, remove icons --- lib/sisu/v2/defaults.rb | 21 ++++++++++++++------- lib/sisu/v2/html_format.rb | 21 ++++++++++++++++----- lib/sisu/v2/sysenv.rb | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index f53ca7ce..5c10c020 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -124,6 +124,8 @@ module SiSU_Viz end def js_prev end + def js_plaintext + end def js_portrait end def js_landscape @@ -1112,12 +1114,12 @@ module SiSU_Viz end def nav_txt_homepage %{ - #{png_site} homepage  +  home  } end def nav_txt_toc_link %{ - #{png_toc}  toc  +   toc  } end def nav_txt_toc_link_verbose @@ -1127,7 +1129,7 @@ module SiSU_Viz end def nav_txt_doc_link %{ - #{png_doc} scroll  +  scroll  } end def nav_txt_manifest @@ -1149,11 +1151,16 @@ module SiSU_Viz def nav_txt_next %{   Next     >>   + } + end + def nav_txt_plaintext + %{ +   txt  } end def nav_txt_odf %{ - #{png_odf}  odt  +   odt  } end def nav_txt_pdfs @@ -1163,17 +1170,17 @@ module SiSU_Viz end def nav_txt_epub %{ - #{png_epub} epub  +  epub  } end def nav_txt_pdf_portrait %{ - #{png_pdf_portrait} pdf  +  pdf  } end def nav_txt_pdf_landscape %{ - #{png_pdf_landscape} pdf  +  pdf  } end #% banner diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index b3712690..1cd5104f 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -147,7 +147,7 @@ module SiSU_HTML_Format def home %{ - #{@vz.png_homepage} + #{@vz.nav_txt_homepage} } end @@ -198,6 +198,17 @@ module SiSU_HTML_Format else '' end end + def txt + txt=if @cf_defaults.cf_0 =~/[at]/ + %{ + + + #{@vz.nav_txt_plaintext} + +} + else '' + end + end def epub epub=if @cf_defaults.cf_0 =~/e/ %{ @@ -338,7 +349,7 @@ WOK %{ #{scroll} - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} @@ -355,7 +366,7 @@ WOK %{
#{seg} - #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} #{wgt.seg(@vz.nav_txt_toc_link)} #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} #{wgt.seg(@vz.nav_txt_toc_link)} #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf}
#{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -736,7 +747,7 @@ WOK
#{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -749,7 +760,7 @@ WOK
#{wgt.manifest} #{wgt.search} diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index f45ccdee..5b16a673 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -2210,7 +2210,7 @@ WOK and @md.cmd !~ /[hH]/ ft << @md.fn[:manifest] end - if @md.cmd =~ /a/; ft << @md.fn[:plain] + if @md.cmd =~ /[at]/; ft << @md.fn[:plain] end if @md.cmd =~ /b/; ft << @md.fn[:xhtml] end -- cgit v1.2.3