syntax hilighting (gedit), sisu rights and other info in outputs, cgi sample search improvements, see changelog

1 files changed, 31 insertions, 22 deletions

diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index ef4c9df4..6585e700 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -67,7 +67,7 @@ module SiSU_Viz
       #@css=SiSU_Env::CSS_default.new
       @fonts='verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman' # 'verdana, arial, georgia, tahoma, sans-serif, helvetica, "times new roman", times, roman'
       @dir=SiSU_Env::Info_env.new
-      @date=SiSU_Env::Info_date.new
+      @date=SiSU_Env::Info_date.new #{@date.year}
     end
     #% glyph
     def glyph_bullet # •
@@ -1306,7 +1306,6 @@ WOK
 WOK
     end
     def widget_sisu
-      #{@date.year}
       v=SiSU_Env::Info_version.new.get_version
 <<WOK
 <!-- widget sisu -->
@@ -1319,11 +1318,23 @@ WOK
 </td><td valign="top" width="45%">
 <!-- SiSU Rights -->
   <p class="tiny_left"><font color="#666666" size="2">
-    Generated by
+    Output generated by
     <a href="#{url_sisu}" #{js_sisu}>
-      SiSU
+      #{v[:project]}
     </a>
-    #{v[:project]} #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+    #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+    <br />
+    <a href="#{url_sisu}" #{js_sisu}>
+      <b>#{v[:project]}</b>
+    </a>
+    <sup>&copy;</sup> Ralph Amissah.
+    1997, current  #{@date.year_static}.
+    All Rights Reserved.
+    <br />
+    <a href="#{url_sisu}" #{js_sisu}>
+      #{v[:project]}
+    </a>
+    is software for document structuring, publishing and search,
     <br />
     <a href="#{url_sisu}" #{js_sisu}>
       www.jus.uio.no/sisu
@@ -1333,7 +1344,6 @@ WOK
       www.sisudoc.org
     </a>
   <br />
-  <br />
     <i>w3 since October 3 1993</i>
     <a href="mailto://ralph@amissah.com" #{js_mail}>
       ralph@amissah.com
@@ -1341,18 +1351,19 @@ WOK
   </font></p>
 </td><td valign="top" width="45%">
   <p class="tiny_left"><font color="#666666" size="2">
-    Using:
+    #{v[:project]} using:
     <br />Standard SiSU markup syntax,
     <br />Standard SiSU meta-markup syntax, and the
     <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
   <br />
-    <sup>&copy;</sup> Ralph Amissah 1997, current 2007.
+    <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year_static}.
     All Rights Reserved.
   </font></p>
 </td></tr>
 WOK
     end
     def widget_way_better
+      v=SiSU_Env::Info_version.new.get_version
       <<WOK
 <!-- widget way better -->
 <tr><td valign="top" width="10%">
@@ -1363,20 +1374,19 @@ WOK
   </font></p>
 </td><td valign="top" width="45%">
   <p class="tiny_left"><font color="#666666" size="2">
-    <b>SiSU</b> <sup>&copy;</sup> Ralph Amissah
-    1993, current 2007
-    All Rights Reserved.
-  <br />
-    <b>SiSU is released under
-    <a href="http://www.gnu.org/licenses/gpl.html">GPL v3</a>
-    or later</b>
+    <a href="#{url_sisu}" #{js_sisu}>
+      #{v[:project]}
+    </a>
+    is released under
+    <a href="http://www.gnu.org/licenses/gpl.html">GPLv3</a>
+    or later,
     <a href="http://www.gnu.org/licenses/gpl.html">
       http://www.gnu.org/licenses/gpl.html
     </a>
   </font></p>
 </td><td valign="top" width="45%">
   <p class="tiny_left"><font color="#666666" size="2">
-    Developed using
+    #{v[:project]}, developed using
     <a href="http://www.ruby-lang.org/en/">
       Ruby
     </a>
@@ -1385,7 +1395,7 @@ WOK
       Debian/Gnu/Linux
     </a>
     software infrastructure,
-    &amp; with the usual GPL (or OSS) suspects.
+    with the usual GPL (or OSS) suspects.
   <br />
     Better - "performance, reliability, scalability, security &amp; total cost of ownership"
     [not to mention flexibility &amp; choice]
@@ -1425,8 +1435,8 @@ WOK
     def credits_sisu
       %{#{widgets_open}
 <tr><td>
-  #{widget_way_better}
   #{widget_sisu}
+  #{widget_way_better}
 </table>}
     end
     def credits_splash
@@ -1484,8 +1494,7 @@ documents, books, digital libraries in plaintext, html, XHTML, XML,
 ODF (OpenDocument), LaTeX, PDF, SQL (PostgreSQL and SQLite), and
 for search</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="dc.title" content=
-"SiSU information Structuring Universe, Structured information Serialised Units, 2007" />
+<meta name="dc.title" content="SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
 <meta name="dc.creator" content="Ralph Amissah" />
 <meta name="dc.subject" content=
 "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
@@ -1512,7 +1521,7 @@ for search</title>
   Structured information, Serialized Units
 </h2>
 <h2 class="top_band_tiny">
-software for electronic texts, document collections, books, digital libraries, and search
+software for electronic texts, document collections, books, digital libraries, and search,
 </h2>
 <h2 class="top_band_tiny">
  with "atomic search" and text positioning system (shared text citation numbering: "<i>ocn</i>")
@@ -1846,7 +1855,7 @@ ralph.amissah@gmail.com
 </a>
 </p>
 <p class="small">
-2007
+#{@date.year_static}
 </p>
 <p class="tiny">
 w3 since October 3 1993