aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-05-06 18:35:21 -0400
committerRalph Amissah <ralph@amissah.com>2013-05-06 18:35:21 -0400
commit4b97aba3b963e81354e42474bb062c67b655390e (patch)
tree7247ede39f3a5acf9ae2ca5df756bcbcb13913f8
parentv4: version & changelog (diff)
v4: minor sysenv, cgi_sql_commonsisu_4.0.21
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--lib/sisu/v4/cgi_sql_common.rb8
-rw-r--r--lib/sisu/v4/sysenv.rb18
3 files changed, 14 insertions, 14 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index f655ccd6..6d0c2484 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -28,6 +28,8 @@ 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/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