v5 v6: link/path fixes
authorRalph Amissah <ralph@amissah.com>
Sat, 6 Sep 2014 02:45:07 +0000 (22:45 -0400)
committerRalph Amissah <ralph@amissah.com>
Sat, 6 Sep 2014 03:12:49 +0000 (23:12 -0400)
* manifest, link where no "document harvest"
* html, home button links url (remove slash)
* harvest_authors, by_filetype, manifest path

data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/harvest_authors.rb
lib/sisu/v5/html_format.rb
lib/sisu/v5/manifest.rb
lib/sisu/v6/harvest_authors.rb
lib/sisu/v6/html_format.rb
lib/sisu/v6/manifest.rb

index d72b17679d5f91b2f4bcf12ea07f747c6f6c5af5..089f9a5ff18d309b39ded9746562598b10038919 100644 (file)
@@ -38,6 +38,11 @@ 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
 
+* link/path fixes,
+  * manifest, link where no "document harvest"
+  * html, home button links url (remove slash)
+  * harvest_authors, by_filetype, manifest path
+
 %% 5.6.4.orig.tar.xz (2014-09-01:35/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1
index 5fba6a127f263833d0f4945469b88cc91799e8c5..2222fc858611fa16bcffa56d8025e28ac14640b9 100644 (file)
@@ -28,6 +28,11 @@ 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
 
+* link/path fixes,
+  * manifest, link where no "document harvest"
+  * html, home button links url (remove slash)
+  * harvest_authors, by_filetype, manifest path
+
 %% 6.2.5.orig.tar.xz (2014-09-01:35/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1
index 26a0a9e35ce442c768181597e4f7d959596c5100..c43733ee2e738056cb9e1c47f338c092f9969d9c 100644 (file)
@@ -433,9 +433,9 @@ WOK
               manifest_at=if @env.output_dir_structure.by? == :language
                 i[:file] + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filetype
-                i[:file] + '.' + lang_code_insert + Sfx[:html]
+                i[:file] + lang_code_insert + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filename
-                "./#{i[:file]}/#{i[:page]}"
+                './' + i[:file] + '/' + i[:page]
               else '' #error
               end
               work=[
index 7731464abcc7c69e0e6342dd545325ccaffab60c..16120d88e673757c71c1a841c54e5fd0e1d1de12 100644 (file)
@@ -198,7 +198,7 @@ module SiSU_HTML_Format
         button +=%{   <p class="tiny_left"><a href="#{@md.make.home_button_image[:link]}" target="_top"><img border="0" src="#{image_path}/#{@md.make.home_button_image[:home_button]}"  width="#{@md.make.home_button_image[:w]}" height="#{@md.make.home_button_image[:h]}" alt="home icon --&gt;" /></a></p>\n}
       elsif @md.home_button_links.is_a?(Array)
         @md.home_button_links.each do |links|
-          button +=%{  <p class="tiny_left"><a href="#{links[:url]}/" target="_top">\n    #{links[:say]}\n  </a></p>\n}
+          button +=%{  <p class="tiny_left"><a href="#{links[:url]}" target="_top">\n    #{links[:say]}\n  </a></p>\n}
         end
       end
       button +=%{ </td></tr>\n </table>}
index f19f8b38ab1e38d9ebfc8044b6626019c3fee51e..b6c7bc6356d485af2d1566fd6b0d519af8702571 100644 (file)
@@ -947,7 +947,7 @@ WOK
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
           ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
-          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}">#{output_organised_by}</a></p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">
index 762545c610933a75f5c2f7b027ca04cd3b9a798f..b27cf599cd129d043bff980acd9455fc9860cb68 100644 (file)
@@ -433,9 +433,9 @@ WOK
               manifest_at=if @env.output_dir_structure.by? == :language
                 i[:file] + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filetype
-                i[:file] + '.' + lang_code_insert + Sfx[:html]
+                i[:file] + lang_code_insert + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filename
-                "./#{i[:file]}/#{i[:page]}"
+                './' + i[:file] + '/' + i[:page]
               else '' #error
               end
               work=[
index b2476719c1a737c9b64a62ad13857cf2a7d427b8..febfc30e31eaba9410e4bb562bdf581131c94c01 100644 (file)
@@ -198,7 +198,7 @@ module SiSU_HTML_Format
         button +=%{   <p class="tiny_left"><a href="#{@md.make.home_button_image[:link]}" target="_top"><img border="0" src="#{image_path}/#{@md.make.home_button_image[:home_button]}"  width="#{@md.make.home_button_image[:w]}" height="#{@md.make.home_button_image[:h]}" alt="home icon --&gt;" /></a></p>\n}
       elsif @md.home_button_links.is_a?(Array)
         @md.home_button_links.each do |links|
-          button +=%{  <p class="tiny_left"><a href="#{links[:url]}/" target="_top">\n    #{links[:say]}\n  </a></p>\n}
+          button +=%{  <p class="tiny_left"><a href="#{links[:url]}" target="_top">\n    #{links[:say]}\n  </a></p>\n}
         end
       end
       button +=%{ </td></tr>\n </table>}
index a0d4102fb6fa5bf1a583f03c2322242902699300..5863ddb971c3ca21b20db5f59064489763b94c07 100644 (file)
@@ -947,7 +947,7 @@ WOK
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
           ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
-          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}">#{output_organised_by}</a></p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">