diff options
Diffstat (limited to 'lib/sisu/v0/html_format.rb')
| -rw-r--r-- | lib/sisu/v0/html_format.rb | 67 |
1 files changed, 37 insertions, 30 deletions
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb index 5e261649..8b6fc28a 100644 --- a/lib/sisu/v0/html_format.rb +++ b/lib/sisu/v0/html_format.rb @@ -78,19 +78,15 @@ module SiSU_HTML_Format or @skin_no_ocn ocn_class='ocn_off' @paranum.gsub(/^(\d+|)$/, - %{ <p class="#{ocn_class}"> - - </p>}) + %{<label class="#{ocn_class}"> </label>}) else ocn_class='ocn' @paranum.gsub(/^(\d+|)$/, - %{ <p class="#{ocn_class}"> - \\1 - </p>}) + %{<label class="#{ocn_class}"><a name="#@paranum">\\1</a></label>}) end end def name - %{<a name="#@paranum" />} + %{<a name="#@paranum"></a>} end def id #w3c? "tidy" complains about numbers as identifiers ! annoying %{id="o#@paranum"} @@ -414,7 +410,8 @@ WOK end def links_guide_vertical_open #??? url=(defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/ ? @vz.url_hp : @vz.url_home - %{<div id="vertical_links"> + %{ +<div id="vertical_links"> <ul id="vertical"> <li class="refbold"> <a href="#{url}" #{@vz.js_home}> @@ -433,7 +430,8 @@ WOK end def links_guide_horizontal_open #??? url=(defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/ ? @vz.url_hp : @vz.url_home - %{<div id="horizontal_links"> + %{ +<div id="horizontal_links"> <ul id="horizontal"> <li class="refbold"> <a href="#{url}" #{@vz.js_home}> @@ -475,7 +473,8 @@ WOK </a> </li> </ul> -</div>} +</div> +} end %{ #{insert} <!- quick ref -!>} @@ -577,7 +576,7 @@ WOK <a name="stop" id="stop"></a> <a name="credits"></a>} end - def scroll_tail + def scroll_tail #debug nav=scroll_head_navigation_band %{#{nav} #{@vz.credits_splash} @@ -587,7 +586,8 @@ WOK <a name="end" id="end"></a> <a name="finish" id="finish"></a> <a name="stop" id="stop"></a> -<a name="credits"></a>} +<a name="credits"></a> +</div></div>} end def seg_navigation_tail #this is a bug area, look up and "tidy" #nav=scroll_head_navigation_band @@ -879,7 +879,9 @@ WOK <a name="end" id="end"></a> <a name="finish" id="finish"></a> <a name="stop" id="stop"></a> -<a name="credits" id="credits"></a></div>} +<a name="credits" id="credits"></a> +</div> +} end def navigation_band(segtocband,seg_table_top_control) #change name to navigaion_band_banner %{<table summary="segment navigation band with banner" bgcolor=#{@vz.color_band1} width="100%"><tr> @@ -896,18 +898,21 @@ WOK #{seg_table_top_control}} end def navigation_band_bottom(segtocband,seg_table_top_control) #change name to navigaion_band_bannerless - %{<div class="substance"> + %{ +<div class="substance"> <p class="content"> -<table summary="segment navigation band" bgcolor=#{@vz.color_band1} width="100%"><tr> -<td width="70%" align="center"> - #{doc_types} -</td> -<td width="30%" align="right"> - #{segtocband} -</td></tr> -</table> -#{seg_table_top_control} -</p></div>} + <table summary="segment navigation band" bgcolor=#{@vz.color_band1} width="100%"><tr> + <td width="70%" align="center"> + #{doc_types} + </td> + <td width="30%" align="right"> + #{segtocband} + </td></tr> + </table> + #{seg_table_top_control} +</p> +</div> +} end def endnote_mark %{<p class="center" id="endnotes"> @@ -951,9 +956,10 @@ WOK def para_form_css(tag,attrib) # regular paragraphs shaped here ul=ulc='' ul,ulc="<ul>\n ","\n </ul>" if @tag =~/li/ - %{<div class="substance"> + %{ +<div class="substance"> #{@p_num.ocn_display} -#{ul}<#{tag} class="#{attrib}" #{@p_num.id}>#{@p_num.name} + #{ul}<#{tag} class="#{attrib}" #{@p_num.id}> #@parablock </#{tag}>#{ulc} </div> @@ -986,10 +992,11 @@ WOK </div>' end def no_paranum - %{<div class="substance"> -<p class="ocn"> </p> -<p class="norm"> - #@one #@two + %{ +<div class="substance"> + <label class="ocn"> </label> + <p class="norm"> + #@one #@two </p> </div> } |