From e54d00b5d0e4c974619dd919697894825e6ecdc4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 29 Nov 2010 13:37:21 -0500 Subject: html & css: ocn (object numbers) now link to themselves * jumps to top of browser * provides link url (requested, Ben Armstrong (live-manual)) --- lib/sisu/v2/html_format.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v2/html_format.rb') diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index c4758c5f..89ee812f 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -82,7 +82,7 @@ module SiSU_HTML_Format else ocn_class='ocn' @ocn.gsub(/^(\d+|)$/, - %{}) + %{}) end end def name -- cgit v1.2.3 From f0f647e331cf162d86bfe064e8710f3e29b8408e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Dec 2010 23:47:08 -0500 Subject: html, link to "document manifest" remains (individual output links removed) --- lib/sisu/v2/html_format.rb | 117 ++++----------------------------------------- 1 file changed, 10 insertions(+), 107 deletions(-) (limited to 'lib/sisu/v2/html_format.rb') diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 89ee812f..66f9bc05 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -145,29 +145,13 @@ module SiSU_HTML_Format @cf_defaults=SiSU_Env::Info_processing_flag.new end def home - %{ - - #{@vz.nav_txt_homepage} - -} + '' end def scroll(text) - if @md.fns =~ /\.(?:-|ssm\.)?sst$/ - scroll=%{ - - #{text} - - -} - end + '' end def seg(text) - %{ - - #{text} - - -} + '' end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -181,66 +165,19 @@ module SiSU_HTML_Format } end def pdf - pdf=if @md.programs[:pdf] \ - and @cf_defaults.cf_0 =~/p/ - %{ - - - #{@vz.nav_txt_pdf_portrait} - - - - - #{@vz.nav_txt_pdf_landscape} - - -} - 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/ - %{ - - - #{@vz.nav_txt_epub} - -} - else '' - end + '' end def odf - odf=if @cf_defaults.cf_0 =~/o/ - %{ - - - #{@vz.nav_txt_odf} - -} - else '' - end + '' end def concordance(text) - if @md.concord_make \ - and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file - %{ - - #{text} - - } - else '' - end + '' end end class XML @@ -307,23 +244,7 @@ WOK

} end def seg_head_navigation_band_bottom(type='') - if type=~/pdf/ - @tocband_segtoc=make_scroll_seg_pdf - end - firstseg=%{ - #{@vz.png_nav_nxt} - } if @md.firstseg =~/\S+/ - %{ - - - +} end def scroll(text) - '' + if @md.fns =~ /\.(?:-|ssm\.)?sst$/ + scroll=%{ +} + end end def seg(text) - '' + %{ +} end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -164,20 +190,67 @@ module SiSU_HTML_Format } end - def pdf - '' + def pdf #retired 2.7.9 + pdf=if @md.programs[:pdf] \ + and @cf_defaults.cf_0 =~/p/ + %{ + + +} + else '' + end end - def txt - '' + def txt #retired 2.7.9 + txt=if @cf_defaults.cf_0 =~/[at]/ + %{ +} + else '' + end end - def epub - '' + def epub #retired 2.7.9 + epub=if @cf_defaults.cf_0 =~/e/ + %{ +} + else '' + end end - def odf - '' + def odf #retired 2.7.9 + odf=if @cf_defaults.cf_0 =~/o/ + %{ +} + else '' + end end - def concordance(text) - '' + def concordance(text) #retired 2.7.9 + if @md.concord_make \ + and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file + %{} + else '' + end end end class XML @@ -186,7 +259,6 @@ module SiSU_HTML_Format def initialize(md) super(md) @md=md - @tocband_scroll,@tocband_segtoc=make_scroll,make_seg end def scroll_head_navigation_band pdf=if @md.programs[:pdf] @@ -207,16 +279,10 @@ WOK

} end def concordance_navigation_band(type='') - if type=~/pdf/ - @tocband_concordance=make_concordance - end %{

-   - - #{@tocband_segtoc} - -  #{firstseg}  -#{@vz.table_close} -

} + '' end def manifest_link(text) %{ @@ -331,14 +252,7 @@ WOK } end def concordance_link(text) - if @md.concord_make - %{ - - #{text} - - } - else '' - end + '' end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -348,12 +262,8 @@ WOK } %{ - #{scroll} - #{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} - #{wgt.home}
} end def make_scroll_seg_pdf @@ -365,13 +275,9 @@ WOK } %{ - #{seg} - #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def make_concordance @@ -379,12 +285,9 @@ WOK wgt=Widget.new(@md) %{ - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def head -- cgit v1.2.3 From 74f7e0adab199936fd943b535f40359b08d40324 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 4 Dec 2010 12:43:58 -0500 Subject: html, link to "document manifest" & search form reviewed (testing required) --- lib/sisu/v2/html_format.rb | 175 +++++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 62 deletions(-) (limited to 'lib/sisu/v2/html_format.rb') diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 66f9bc05..06d6d352 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -108,7 +108,17 @@ module SiSU_HTML_Format @seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || []) @index='index' @metalink='#metadata' - @tocband_scroll,@tocband_segtoc=nil,nil + end + def doc_types #used in toc & seg_nav_band + scroll=seg='' + wgt=Widget.new(@md) + %{ + + +
+ #{wgt.manifest} + #{wgt.search} +
} end def rdf SiSU_XML_tags::RDF.new(md) @@ -145,13 +155,29 @@ module SiSU_HTML_Format @cf_defaults=SiSU_Env::Info_processing_flag.new end def home - '' + %{

 + + #{@vz.nav_txt_homepage} + + + #{text} + + + + #{text} + + + + #{@vz.nav_txt_pdf_portrait} + + + + #{@vz.nav_txt_pdf_landscape} + + + + #{@vz.nav_txt_plaintext} + + + + #{@vz.nav_txt_epub} + + + + #{@vz.nav_txt_odf} + + + + #{text} + +
-
#{@vz.banner_band} - #{@tocband_concordance} -   #{@vz.png_nav_toc} @@ -225,6 +291,22 @@ WOK

} end def seg_head_navigation_band(type='') + firstseg=%{ + #{@vz.png_nav_nxt} + } if @md.firstseg =~/\S+/ + %{ + + +
+ #{@vz.banner_band} + + #{doc_types} + +  #{firstseg}  +#{@vz.table_close} +

} + end + def seg_head_navigation_band_bottom(type='') #retired 2.7.9 if type=~/pdf/ @tocband_segtoc=make_scroll_seg_pdf end @@ -233,7 +315,7 @@ WOK } if @md.firstseg =~/\S+/ %{
- #{@vz.banner_band} +   #{@tocband_segtoc} @@ -243,16 +325,20 @@ WOK #{@vz.table_close}

} end - def seg_head_navigation_band_bottom(type='') - '' - end def manifest_link(text) %{ #{text} } end - def concordance_link(text) - '' + def concordance_link(text) #retired 2.7.9 + if @md.concord_make + %{ + + #{text} + + } + else '' + end end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -467,11 +553,6 @@ WOK -
#{@vz.banner_band} - -
- #{@tocband_segtoc} -

 

@@ -636,36 +717,6 @@ WOK else '' end end - def doc_types #used in seg_nav_band ### - scroll=seg='' - wgt=Widget.new(@md) - x=if @md.concord_make - %{ - - - #{wgt.seg(@vz.nav_txt_toc_link)} - #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} -
- #{wgt.concordance(@vz.nav_txt_concordance)} - #{wgt.manifest} - #{wgt.search} - #{wgt.home} -
} - else - %{ - - - #{wgt.seg(@vz.nav_txt_toc_link)} - #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} -
- #{wgt.manifest} - #{wgt.search} - #{wgt.home} -
} - end - end def navigation_table %{ -
-- cgit v1.2.3 From 67b6edcf9cde716d8370a5e7f88c11fc01d30f84 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 7 Dec 2010 09:36:10 -0500 Subject: document manifest link (plaintext, odf) * plaintext, link to "document manifest" fix(links to individual output types removed) * odf, manifest link fix * html, cosmetic touch --- lib/sisu/v2/html_format.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v2/html_format.rb') diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 06d6d352..8074a7ee 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -298,7 +298,7 @@ WOK
#{@vz.banner_band} + #{doc_types} -- cgit v1.2.3