manifest, minitoc configurable (true/false)

3 files changed, 43 insertions, 22 deletions

diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb
index 020563e3..f53ca7ce 100644
--- a/lib/sisu/v2/defaults.rb
+++ b/lib/sisu/v2/defaults.rb
@@ -337,10 +337,10 @@ module SiSU_Viz
     #% text #changed from txt to avoid naming conflicts #FOLLOW
     def txt_generator
       %{  <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
-    <link rel="generator" href="http://www.sisudoc.org/sisu" />}
+    <link rel="generator" href="http://www.sisudoc.org/" />}
     end
     def txt_generator_comment
-      %{  <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/sisu ->}
+      %{  <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/ ->}
     end
     def txt_hp
       '&nbsp;SiSU'
@@ -359,29 +359,29 @@ module SiSU_Viz
       URI.parse(uri)
     end
     def url_sisu
-      'http://www.sisudoc.org/sisu'
+      'http://www.sisudoc.org/'
     end
     def url_sisudoc
       'http://www.sisudoc.org'
     end
     def url_footer_signature
-      'http://www.sisudoc.org/sisu'
+      'http://www.sisudoc.org/'
     end
     def url_root
       '/sisu' #watch
     end
     def url_root_http
-      'http://www.sisudoc.org/sisu' #watch
+      'http://www.sisudoc.org/' #watch
     end
     def url_home
-      'http://www.sisudoc.org/sisu' # used in pdf header
+      'http://www.sisudoc.org/' # used in pdf header
     end
     def url_site #used as stub... where there are subdirectories and is different from home
       url_home
-      #'http://www.sisudoc.org/sisu' # used in pdf header
+      #'http://www.sisudoc.org/' # used in pdf header
     end
     def url_txt
-      'www.sisudoc.org/sisu'
+      'www.sisudoc.org/'
     end
     def url_path_image_base #used for html image display
       '../_sisu/image'
@@ -1560,7 +1560,7 @@ WOK
     is software for document structuring, publishing and search,
     <br />
     <a href="#{url_sisu}" #{js_sisu}>
-      www.sisudoc.org/sisu
+      www.sisudoc.org/
     </a>
     and
     <a href="#{url_sisudoc}" #{js_sisu}>
@@ -1621,16 +1621,13 @@ WOK
     [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libré.
   <br />
     Get With the Future
-    <a href="http://www.sisudoc.org/sisu/">
+    <a href="http://www.sisudoc.org/">
       Way Better!
     </a>
   </font></p>
 </td></tr>
 WOK
     end
-    def widget_wayBetter
-      widget_way_better
-    end
     #% credits
     def credits_itl_cover_band
       %{<table summary="itl cover band" width="88%" border="0" cellpadding="0" bgcolor="blue">
@@ -1657,7 +1654,6 @@ WOK
 <table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
 <tr><td>
   #{widget_sisu}
-  #{widget_way_better}
 </table></div>}
     end
     def credits_sisu
@@ -1964,13 +1960,13 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P
 SiSU Short Description  
 </p>
 <p>
-SiSU is a comprehensive future-proofing electronic document management system.  Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format.  Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats.  Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB).  Word mapping allows you to easily create word indexes for your documents.  Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed.  All these features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing.
+SiSU is a comprehensive future-proofing electronic document management system.  Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format.  Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats.  Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB).  Word mapping allows you to easily create word indexes for your documents.  Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed.  All these and many other features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing.
 </p>
 <p>
-Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience or any organizations with a medium or large set of electronic documents to centrally manage, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats.  
+Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience, web publishers who want to provide multiple channels of access to their electronic documents, or any organizations which centrally manage a medium or large set of electronic documents, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats.
 </p>
 <p>
-SiSU is an Open Source project led by Ralph Amissah (<a href="mailto://ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted at <a href="mailto://sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>.  SiSU is licensed under the GNU General Public License. 
+SiSU is an Open Source project initiated and led by Ralph Amissah  (<a href="mailto://ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted at <a href="mailto://sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>. SiSU is licensed under the GNU General Public License.
 </p>
 <p class="bold">
   For less markup than the most elementary HTML you can have more.
diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb
index 7be18b19..aca64e40 100644
--- a/lib/sisu/v2/manifest.rb
+++ b/lib/sisu/v2/manifest.rb
@@ -589,14 +589,23 @@ module SiSU_Manifest
           banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \
           and vz.banner_home_button_only !~  /sisu\.home\.png/
 <<WOK
-<table summary="band" width="100%" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="left" bgcolor="#ffffff">#{vz.banner_band}</td><td width="60%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td width="20%">#{@env.widget_static.search_form}</td><td><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU --&gt;" /></a></td></tr>
+<table summary="band" border="0" cellpadding="3" cellspacing="0">
+<tr><td align="left"  width="15%" bgcolor="#ffffff">#{vz.banner_band}</td>
+<td width="70%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td>
+<td>#{@env.widget_static.search_form}</td></tr>
 </table>
 WOK
+#<<WOK
+#<table summary="band" width="100%" border="0" cellpadding="3" cellspacing="0">
+#<tr><td align="left" bgcolor="#ffffff">#{vz.banner_band}</td><td width="60%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td width="20%">#{@env.widget_static.search_form}</td><td><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU --&gt;" /></a></td></tr>
+#</table>
+#WOK
           else
 <<WOK
 <table summary="band" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU --&gt;" /></a></td><td><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td>#{@env.widget_static.search_form}</td></tr>
+<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU --&gt;" /></a></td>
+<td><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td>
+<td>#{@env.widget_static.search_form}</td></tr>
 </table>
 WOK
           end
@@ -616,10 +625,20 @@ SiSU manifest: #{@md.title.full}
 </head>
 <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
 #{banner_table}
+WOK
+          if @env.manifest_minitoc?
+            @manifest[:html] <<<<WOK
 <div class="toc">
 #{minitoc.to_s}
 </div>
 <div class="content">
+WOK
+          else
+            @manifest[:html] <<<<WOK
+<div>
+WOK
+          end
+          @manifest[:html] <<<<WOK
 <h1 class="small">#{@translate.manifest_description}</h1>
 <h2 class="small">#{@md.title.full}</h2>
 <p class="bold">#{@md.author}</p>
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 8f330343..f45ccdee 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -935,6 +935,13 @@ module SiSU_Env
     def defaults #multiple default directories
       @default_dir ||=@sys.default_dir #DEFAULT_DIR
     end
+    def manifest_minitoc?
+      flag=if defined? @rc['manifest']['minitoc'] \
+      and not @rc['manifest']['minitoc'].nil?
+        @rc['manifest']['minitoc']
+      else false
+      end
+    end
     def widget #needs (md) #move
       @rc=SiSU_Env::Get_init.instance.yamlrc
       @ad=SiSU_Env::Get_init.instance.ads
@@ -955,8 +962,7 @@ module SiSU_Env
         and @rc['promo'].length > 0
           @flag[:rc]=true
           true
-        else
-          false
+        else false
         end
         @flag
       end