Merge tag 'sisu_4.0.21' into debian/sid

SiSU 4.0.21

2 files changed, 12 insertions, 14 deletions

diff --git a/lib/sisu/v4/cgi_sql_common.rb b/lib/sisu/v4/cgi_sql_common.rb
index f7aab470..5e356a58 100644
--- a/lib/sisu/v4/cgi_sql_common.rb
+++ b/lib/sisu/v4/cgi_sql_common.rb
@@ -624,14 +624,6 @@ module SiSU_CGI_SQL
     </a>
     software infrastructure,
     with the usual GPL (or OSS) suspects.
-  <br />
-    Better - "performance, reliability, scalability, security  &amp; total cost of ownership"
-    [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.jus.uio.no/sisu/">
-      Way Better!
-    </a>
   </font></p>
 </td></tr>
 </table>
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 400d53b0..a8eaf1b3 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -5897,13 +5897,16 @@ WOK
       @file=SiSU_Env::FileOp.new(@md)
     end
     def html
-      %{  <link rel="stylesheet" href="#{@file.path_rel_links.html_scroll_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+      stylesheet="#{@file.path_rel_links.html_scroll_css}#{@env.path.style}/#{@css.html}"
+      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
     end
     def html_seg
-      %{  <link rel="stylesheet" href="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+      stylesheet="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}"
+      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
     end
     def html_tables
-      %{  <link rel="stylesheet" href="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+      stylesheet="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}"
+      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
     end
     def xhtml_epub
       %{  <link rel="stylesheet" href="css/xhtml.css" type="text/css" />}
@@ -5912,13 +5915,16 @@ WOK
       xhtml_epub
     end
     def xhtml
-      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xhtml_css}#{@env.path.style}/#{@css.xhtml}"?>}
+      stylesheet="#{@file.path_rel_links.xhtml_css}#{@env.path.style}/#{@css.xhtml}"
+      %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
     end
     def xml_sax
-      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_sax}"?>}
+      stylesheet="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_sax}"
+      %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
     end
     def xml_dom
-      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_dom}"?>}
+      stylesheet="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_dom}"
+      %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
     end
   end
   class CreateSite < InfoEnv