diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-07-30 21:42:02 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-07-30 21:42:02 -0400 |
| commit | d15713b728f0c923837e6c417d095e5e1fe2d443 (patch) | |
| tree | b293b1310a352fb99b5bd7a3b6fed46ba49b9a46 /lib/sisu/v5/html.rb | |
| parent | debian/changelog (4.1.7-1) (diff) | |
| parent | v5: cgi helper script, sample search form, single form, monolingual option (diff) | |
Merge tag 'sisu_4.1.8' into debian/sid
SiSU 4.1.8
Diffstat (limited to 'lib/sisu/v5/html.rb')
| -rw-r--r-- | lib/sisu/v5/html.rb | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb index ff4d149d..f7e2b813 100644 --- a/lib/sisu/v5/html.rb +++ b/lib/sisu/v5/html.rb @@ -418,14 +418,23 @@ WOK linkname,ocn=dob.obj.strip,dob.ocn p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) if ocn if dob.ln ==4 - seg_link=%{ <a href="#{dob.name}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> + fnh={ + fn: dob.name, + lng: @md.lang_code_insert + } + f=@md.file.base_filename.html_seg(fnh) + seg_link=%{ <a href="#{f}" target="_top"> #{dob.obj} </a> } @@seg_url=dob.name elsif dob.obj =~/\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+/ - seg_link=dob.obj.gsub(/^(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/, - %{<a href="\\1#{@md.lang_code_insert}#{Sfx[:html]}" } + - %{target="_top">\\1 \\2</a> }) + fn,hd=/^(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/.match(dob.obj)[1,2] + fnh={ + fn: fn, + lng: @md.lang_code_insert + } + f=@md.file.base_filename.html_seg(fnh) + seg_link=%{<a href="#{f}" target="_top">#{fn} #{hd}</a> } end p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) if ocn @file=SiSU_Env::FileOp.new(@md) if @md @@ -459,8 +468,13 @@ WOK toc={} if ocn \ and ocn !~/#/ + fnh={ + fn: @@seg_url, + lng: @md.lang_code_insert + } + f=@md.file.base_filename.html_seg(fnh) p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) - lnk_n_txt=%{ <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}"> + lnk_n_txt=%{ <a href="#{f}##{ocn}"> #{linkname} </a>} txt_obj={ txt: lnk_n_txt } @@ -480,8 +494,13 @@ WOK toc={} if ocn \ and ocn !~/#/ + fnh={ + fn: @@seg_url, + lng: @md.lang_code_insert + } + f=@md.file.base_filename.html_seg(fnh) p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn) - lnk_n_txt=%{ <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}"> + lnk_n_txt=%{ <a href="#{f}##{ocn}"> #{linkname} </a>} txt_obj={ txt: lnk_n_txt } |