From 32fd8f3908bc8632e2d8ab4d872f6e4362fe031b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:52:35 -0400
Subject: v5: merge v6: remove defaults.rb & some relics related to sisu skins

---
 lib/sisu/v5/html_manifest.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'lib/sisu/v5/html_manifest.rb')

diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/v5/html_manifest.rb
index de629d61..02368111 100644
--- a/lib/sisu/v5/html_manifest.rb
+++ b/lib/sisu/v5/html_manifest.rb
@@ -63,13 +63,13 @@ module SiSU_Manifest
   require_relative 'prog_text_translation'              # prog_text_translation.rb
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
+  require_relative 'html_parts'                         # html_parts.rb
   require_relative 'html_minitoc'                       # html_minitoc.rb
   require_relative 'html'                               # html.rb
     include SiSU_HTML_Format
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'i18n'                               # i18n.rb
-  include SiSU_Viz
   class Source
     def initialize(opt)
       @opt=opt
@@ -123,6 +123,7 @@ module SiSU_Manifest
     end
     private
     class Output <Source
+      include SiSU_Parts_HTML
       def initialize(md)
         @manifest={ txt: [], html: [] }
         @md,@fns=md,md.fns
@@ -140,7 +141,6 @@ module SiSU_Manifest
         l=SiSU_Env::StandardiseLanguage.new(md.opt.lng).language
         @language=l[:n]
         @translate=SiSU_Translate::Source.new(md,@language)
-        @brace_url=SiSU_Viz::Defaults.new.url_decoration
         @stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
         @fn_lng=(@f.output_dir_structure.by_language_code?) \
         ? ''
@@ -158,9 +158,9 @@ module SiSU_Manifest
         if @o_str.dump_or_redirect?
           ''
         elsif src==:src #check
-          %{<br>#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}}
+          %{<br>#{the_url_decoration.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{the_url_decoration.xml_close}}
         else
-          %{<p class="tiny">#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}</p>}
+          %{<p class="tiny">#{the_url_decoration.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{the_url_decoration.xml_close}</p>}
         end
       end
       def summarize(id,file,pth='',rel='',url='',img='● ')
@@ -261,7 +261,7 @@ module SiSU_Manifest
       def published_languages(id)
         published_manifests?.each do |l|
           @manifest[:txt] << "#{l[:mu]} #{l[:l]}\n"
-          @manifest[:html] << %{<tr><th class="left"><p class="bold"><a href="#{l[:mu]}">#{l[:l]}</a></p></th><td><p class="norm">#{l[:l]}</p><p class="tiny">#{@brace_url.xml_open}<a href="#{l[:mu]}">#{l[:mu]}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">&nbsp;</p></td></tr>\n}
+          @manifest[:html] << %{<tr><th class="left"><p class="bold"><a href="#{l[:mu]}">#{l[:l]}</a></p></th><td><p class="norm">#{l[:l]}</p><p class="tiny">#{the_url_decoration.xml_open}<a href="#{l[:mu]}">#{l[:mu]}</a>#{the_url_decoration.xml_close}</p></td><td class="right"><p class="right">&nbsp;</p></td></tr>\n}
         end
       end
       def metadata(id,info)
@@ -273,7 +273,7 @@ module SiSU_Manifest
         elsif url =~/^\.\.\//   then url.gsub(/^\.(\.)?/,@env.url.root)
         else                         url
         end
-        @manifest[:html] << %{<tr><th class="right" width=5%><p class="norm">●</p></th><td class="left"><p class="norm"><a href="#{url}">#{lnk}</a></p><p class="tiny">&nbsp;&nbsp;#{@brace_url.xml_open}<a href="#{static}">#{static}</a>#{@brace_url.xml_close}</p></td></tr>\n}
+        @manifest[:html] << %{<tr><th class="right" width=5%><p class="norm">●</p></th><td class="left"><p class="norm"><a href="#{url}">#{lnk}</a></p><p class="tiny">&nbsp;&nbsp;#{the_url_decoration.xml_open}<a href="#{static}">#{static}</a>#{the_url_decoration.xml_close}</p></td></tr>\n}
       end
       def output_tests
         if FileTest.file?(@f.place_file.html_segtoc.dir)==true
@@ -885,7 +885,6 @@ WOK
         begin
           make=SiSU_Env::ProcessingSettings.new(@md)
           minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,data).songsheet.join("\n")
-          vz=SiSU_Viz::Defaults.new
           format_head_toc=SiSU_HTML_Format::HeadToc.new(@md)
           @manifest[:html] <<<<WOK
 <!DOCTYPE html>
@@ -1010,7 +1009,7 @@ WOK
 </div>
 <div>
 <br>
-#{vz.credits_sisu_manifest}
+#{SiSU_Proj_HTML::Bits.new.credits_sisu_manifest}
 </div>
 </body>
 </html>
-- 
cgit v1.2.3