diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-02-16 18:11:35 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-02-16 18:11:35 -0500 |
commit | 4f364a330d70715125ada9a3818ce9575be6db38 (patch) | |
tree | c3ce9e651014dfff1610a23510527ceadb10eea0 /lib/sisu/v3/manifest.rb | |
parent | debian/changelog 3.0.0-1 (diff) | |
parent | changelogs, gitweb urls: debian release tags (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/manifest.rb')
-rw-r--r-- | lib/sisu/v3/manifest.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index c9fb8e04..58b78c76 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -82,9 +82,9 @@ module SiSU_Manifest SiSU_Env::Info_skin.new(@md).select xbrowser=@env.program.web_browser browser=@env.program.console_web_browser - webserv_url=@env.path.url.output_tell +# webserv_url=@env.path.url.output_tell #fix in sysenv unless @opt.cmd =~/q/ - url_html="#{webserv_url}/#{@md.fnb}/#{@md.fn[:manifest]}" + url_html="file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi @@ -646,8 +646,8 @@ SiSU manifest: #{@md.title.full} #{banner_table} WOK if @env.manifest_minitoc? - if @env.by_language? \ - or @env.by_filetype? + if @env.output_dir_structure.by_language_code? \ + or @env.output_dir_structure.by_filetype? minitoc.gsub!(/<a href="(\S+?)"/m,%{<a href="../html/#{@md.fnb}/\\1"}) minitoc.gsub!(/<a href="\.\.\/html\/#{@md.fnb}\/(?:sisu_manifest\.html|#{@md.file.base_filename.manifest})"/m, %{<a href="#{@md.file.base_filename.manifest}"}) |