The following commit has been merged in the master branch: commit f9c8fe940ddef60304b6a2c2b0cb90fcb7ae12a8 Author: Andreas Tille <ti...@debian.org> Date: Wed Jul 10 13:18:00 2013 +0200
Use global style sheat instead of including style into every single thermometer file diff --git a/htdocs/inc/style.css b/htdocs/inc/style.css index 587796c..8eb1b42 100644 --- a/htdocs/inc/style.css +++ b/htdocs/inc/style.css @@ -1044,3 +1044,55 @@ td.outdated { font-weight:bold; border-top:1px solid #8C0000; } + +table.pkg { + border-collapse: collapse; +} +.pkg th, .pkg td { + text-align: left; + border: 1px solid black; + padding: 0.2em; +} +.pkg thead { + background-color: silver; + color: #000000; +} +table.pkg tr.title { + color: #ffffff; + background-color: #df0451; +} + +/* orange */ +table.pkg tr.ubuntuOutOfDate { + color: #000000; + background-color: #f09005; +} + +/* white */ +table.pkg tr.unpackaged { + color: #000000; + background-color: #ffffff; +} + +/* yellow */ +table.pkg tr.debianOutOfDate { + color: #000000; + background-color: #f0f005; +} + +/* green */ +table.pkg tr.upToDate { + color: #000000; + background-color: #a0f005; +} + +/* red */ +table.pkg tr.obsolete { + color: #000000; + background-color: #f03000; +} +table.pkg tr.othered { + color: #000000; + background-color: #dc5858; +} +/* end copy from GIS package thermometer */ diff --git a/webtools/templates/thermometer.xhtml b/webtools/templates/thermometer.xhtml index 4aae544..21fdcf5 100644 --- a/webtools/templates/thermometer.xhtml +++ b/webtools/templates/thermometer.xhtml @@ -3,60 +3,6 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:py="http://genshi.edgewall.org/"> - <style type="text/css"> -<!-- -table.pkg { - border-collapse: collapse; -} -.pkg th, .pkg td { - text-align: left; - border: 1px solid black; - padding: 0.2em; -} -.pkg thead { - background-color: silver; - color: #000000; -} -table.pkg tr.title { - color: #ffffff; - background-color: #df0451; -} - -/* orange */ -table.pkg tr.ubuntuOutOfDate { - color: #000000; - background-color: #f09005; -} - -/* white */ -table.pkg tr.unpackaged { - color: #000000; - background-color: #ffffff; -} - -/* yellow */ -table.pkg tr.debianOutOfDate { - color: #000000; - background-color: #f0f005; -} - -/* green */ -table.pkg tr.upToDate { - color: #000000; - background-color: #a0f005; -} - -/* red */ -table.pkg tr.obsolete { - color: #000000; - background-color: #f03000; -} -table.pkg tr.othered { - color: #000000; - background-color: #dc5858; -} ---> -</style> <head> <title>$projectname Thermometer</title> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/> diff --git a/webtools/templates/uthermometer.xhtml b/webtools/templates/uthermometer.xhtml index db223b8..0c7e3fe 100644 --- a/webtools/templates/uthermometer.xhtml +++ b/webtools/templates/uthermometer.xhtml @@ -3,60 +3,6 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:py="http://genshi.edgewall.org/"> - <style type="text/css"> -<!-- -table.pkg { - border-collapse: collapse; -} -.pkg th, .pkg td { - text-align: left; - border: 1px solid black; - padding: 0.2em; -} -.pkg thead { - background-color: silver; - color: #000000; -} -table.pkg tr.title { - color: #ffffff; - background-color: #df0451; -} - -/* orange */ -table.pkg tr.ubuntuOutOfDate { - color: #000000; - background-color: #f09005; -} - -/* white */ -table.pkg tr.unpackaged { - color: #000000; - background-color: #ffffff; -} - -/* yellow */ -table.pkg tr.debianOutOfDate { - color: #000000; - background-color: #f0f005; -} - -/* green */ -table.pkg tr.upToDate { - color: #000000; - background-color: #a0f005; -} - -/* red */ -table.pkg tr.obsolete { - color: #000000; - background-color: #f03000; -} -table.pkg tr.othered { - color: #000000; - background-color: #dc5858; -} ---> -</style> <head> <title>Ubuntu $projectname Thermometer</title> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/> -- Static and dynamic websites for Debian Pure Blends _______________________________________________ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit