diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 9 | ||||
| -rw-r--r-- | data/sisu/v4/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v4/cgi_sql_common.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 18 |
4 files changed, 24 insertions, 17 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 8c4a9dd1..6d0c2484 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -21,6 +21,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 4.0.21.orig.tar.xz (2013-05-06:18/1) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.21 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.21-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.21.orig.tar.xz + sisu_4.0.21.orig.tar.xz + sisu_4.0.21-1.dsc + +* v4: minor sysenv, cgi_sql_common + %% 4.0.20.orig.tar.xz (2013-04-11:14/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.20 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.20-1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index e493e313..e7499ffb 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 4.0.20 -:date_stamp: 2013w14/4 -:date: "2013-04-11" +:version: 4.0.21 +:date_stamp: 2013w18/1 +:date: "2013-05-06" :project: SiSU 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 & total cost of ownership" - [not to mention flexibility & 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 |