From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 3 Oct 2012 10:03:45 +0000 (+0200)
Subject: Keep archives specific stylesheets in /media-archive/
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=a23a977fb42b6ce8b2b3acf344fb1d03ecae412d;p=pgarchives.git

Keep archives specific stylesheets in /media-archive/

this allows us to fallback on the main website stylesheets
---

diff --git a/django/archives/mailarchives/templates/base.html b/django/archives/mailarchives/templates/base.html
index b68b994..240f247 100644
--- a/django/archives/mailarchives/templates/base.html
+++ b/django/archives/mailarchives/templates/base.html
@@ -6,17 +6,15 @@
   <meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8" />
 {%block meta%}{%endblock%} {# used for custom meta tags such as description which we don't want for every page #}
   <meta name="copyright" content="The PostgreSQL Global Development Group" />
-  <style type="text/css" media="screen" title="Normal Text">@import url("/media/css/base.css");</style>
+  <style type="text/css" media="screen" title="Normal Text">@import url("/media-archives/css/archives.css");</style>
   <link rel="shortcut icon" href="/favicon.ico" />
-  <link rel="alternate stylesheet" type="text/css" media="screen" title="Large Text" href="/media/css/docs_large.css" />
   <link rel="alternate" type="application/rss+xml" title="PostgreSQL News" href="http://www.postgresql.org/news.rss" />
   <link rel="alternate" type="application/rss+xml" title="PostgreSQL Events" href="http://www.postgresql.org/events.rss" />
-  <script type="text/javascript" src="/media/js/styleswitcher.js"></script>
   <link rel="stylesheet" type="text/css" media="screen" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/ui-lightness/jquery-ui.css" />
   <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.js"></script>
   <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.21/jquery-ui.js"></script>
-  <script type="text/javascript" src="/media/js/jquery/jquery.ui.selectmenu.js"></script>
-  <link rel="stylesheet" type="text/css" media="screen" href="/media/css/jquery/jquery.ui.selectmenu.css" />
+  <script type="text/javascript" src="/media-archives/js/jquery/jquery.ui.selectmenu.js"></script>
+  <link rel="stylesheet" type="text/css" media="screen" href="/media-archives/css/jquery/jquery.ui.selectmenu.css" />
   <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-1345454-1']);
diff --git a/django/archives/urls.py b/django/archives/urls.py
index 609d2df..14b01cd 100644
--- a/django/archives/urls.py
+++ b/django/archives/urls.py
@@ -35,5 +35,9 @@ urlpatterns = patterns('',
     # Normally served by the webserver, but needed for development installs
     (r'^media/(.*)$', 'django.views.static.serve', {
 			'document_root': '../media',
-    })
+    }),
+    (r'^media-archives/(.*)$', 'django.views.static.serve', {
+			'document_root': '../media',
+    }),
+
 )
diff --git a/django/media/css/archives.css b/django/media/css/archives.css
new file mode 100644
index 0000000..f53f093
--- /dev/null
+++ b/django/media/css/archives.css
@@ -0,0 +1,69 @@
+/* replacement for base.css used on archives */
+@import url("/media/css/global.css");
+@import url("/media/css/layout.css");
+@import url("/media/css/text.css");
+@import url("/media/css/navigation.css");
+@import url("/media/css/table.css");
+
+@import url("/media/css/iefixes.css");
+
+
+a                               { text-decoration: underline; }
+
+a:link                          { color:#0085B0; }
+a:visited                       { color:#004E66; }
+a:active                        { color:#0085B0; }
+a:hover                         { color:#000000; }
+
+select a                        { text-decoration: none }
+
+#pgFooter a                     { color:#666; }
+#pgFooter a:hover               { color:#000; }
+
+#txtFrontUserName a             { color:#666; }
+#txtFrontUserName a:hover       { color:#000; }
+
+.bodywrapper a:visited	        { color:#00536E; }
+.bodywrapper pre,
+.bodywrapper tt {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  font-size: 1.2em;
+  padding: 1em 0 1em 2em;
+  border-width: 2px 0;
+  border-color: lightGray;
+  border-style: solid;
+}
+
+
+table.message th,
+table.message td
+{
+	vertical-align: top;
+}
+table.message th
+{
+	width: 8em;
+}
+
+table.message
+{
+	width: 100%;
+}
+
+table.message select
+{
+	width: 100%;
+}
+
+table.message span.listname
+{
+	line-height: 1.4em;
+	float: left;
+}
+
+.msgwrap table.message
+{
+	border-width: 0;
+}
+
diff --git a/django/media/css/base.css b/django/media/css/base.css
deleted file mode 100644
index 66eec85..0000000
--- a/django/media/css/base.css
+++ /dev/null
@@ -1,7 +0,0 @@
-@import url("global.css");
-@import url("layout.css");
-@import url("text.css");
-@import url("navigation.css");
-@import url("table.css");
-
-@import url("iefixes.css");
diff --git a/django/media/css/docs.css b/django/media/css/docs.css
deleted file mode 100644
index 3b272f6..0000000
--- a/django/media/css/docs.css
+++ /dev/null
@@ -1,448 +0,0 @@
-/* PostgreSQL.org Documentation Style */
-
-@import url("global.css");
-@import url("table.css");
-@import url("text.css");
-
-body {
-  font-size: 76%;
-}
-
-div.NAVHEADER table {
-  margin-left: 0;
-}
-
-/* Container Definitions */
-
-#docContainerWrap {
-  text-align: center; /* Win IE5 */
-}
-
-#docContainer {
-  margin: 0 auto;
-  width: 90%;
-  padding-bottom: 2em;
-  display: block;
-  text-align: left; /* Win IE5 */
-}
-
-#docHeader {
-  background-image: url("/media/img/docs/bg_hdr.png");
-  height: 83px;
-  margin: 0px;
-  padding: 0px;
-  display: block;
-}
-
-#docHeaderLogo {
-  position: relative;
-  width: 206px;
-  height: 83px;
-  border: 0px;
-  padding: 0px;
-  margin: 0 0 0 20px;
-}
-
-#docHeaderLogo img {
-  border: 0px;
-}
-
-#docNavSearchContainer {
-  padding-bottom: 2px;
-}
-
-#docNav, #docVersions {
-  position: relative;
-  text-align: left;
-  margin-left: 10px;
-  margin-top: 5px;
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch {
-  position: relative;
-  text-align: right;
-  padding: 0;
-  margin: 0;
-  color: #666;
-}
-
-#docTextSize {
-  text-align: right;
-  white-space: nowrap;
-  margin-top: 7px;
-  font-size: 0.95em;
-}
-
-#docSearch form {
-  position: relative;
-  top: 5px;
-  right: 0;
-  margin: 0; /* need for IE 5.5 OSX */
-  text-align: right; /* need for IE 5.5 OSX */
-  white-space: nowrap; /* for Opera */
-}
-
-#docSearch form label {
-  color: #666;
-  font-size: 0.95em;
-}
-
-#docSearch form input {
-  font-size: 0.95em;
-}
-  
-#docSearch form #submit {
-  font-size: 0.95em;
-  background: #7A7A7A;
-  color: #fff;
-  border: 1px solid #7A7A7A;
-  padding: 1px 4px;
-}
-  
-#docSearch form #q {
-  width: 170px;
-  font-size: 0.95em;
-  border:  1px solid #7A7A7A;
-  background: #E1E1E1;
-  color: #000000;
-  padding: 2px;
-}
-
-.frmDocSearch {
-  padding: 0;
-  margin: 0;
-  display: inline;
-}
-
-.inpDocSearch {
-  padding: 0;
-  margin: 0;
-  color: #000;
-}
-
-#docContent {
-  position: relative;
-  margin-left: 10px;
-  margin-right: 10px;
-  margin-top: 40px;
-}
-
-#docFooter {
-  position: relative;
-  font-size: 0.9em; 
-  color: #666; 
-  line-height: 1.3em; 
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-#docComments {
-  margin-top: 10px;
-}
-
-#docClear {
-  clear: both;
-  margin: 0;
-  padding: 0;
-}
-
-/* Heading Definitions */
-
-h1, h2, h3 {
-  font-weight: bold;
-  margin-top: 2ex;
-}
-
-h1 {
-  font-size: 1.4em;
-}
-
-h2 {
-  font-size: 1.2em !important;
-}
-
-h3 {
-  font-size: 1.1em;
-}
-
-h1 a:hover {
-  color: #EC5800;
-  text-decoration: none;
-}
-
-h2 a:hover,
-h3 a:hover,
-h4 a:hover {
-  color: #666666;
-  text-decoration: none;
-}
-
-/* Text Styles */
-
-div.SECT2 {
-  margin-top: 4ex;
-}
-
-div.SECT3 {
-  margin-top: 3ex;
-  margin-left: 3ex;
-}
-
-.txtCurrentLocation {
-  font-weight: bold;
-}
-
-p, ol, ul, li {
-  line-height: 1.5em;
-}
-
-.txtCommentsWrap {
-  border: 2px solid #F5F5F5; 
-  width: 100%;
-}
-
-.txtCommentsContent {
-  background: #F5F5F5;
-  padding: 3px;
-}
-
-.txtCommentsPoster {
-  float: left;
-}
-
-.txtCommentsDate {
-  float: right;
-}
-
-.txtCommentsComment {
-  padding: 3px;
-}
-
-#docContainer pre code,
-#docContainer pre tt,
-#docContainer pre pre,
-#docContainer tt tt,
-#docContainer tt code,
-#docContainer tt pre {
-  font-size: 1em;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP,
-table.CALSTABLE {
-  -moz-box-shadow: 3px 3px 5px #DFDFDF;
-  -webkit-box-shadow: 3px 3px 5px #DFDFDF;
-  -khtml-box-shadow: 3px 3px 5px #DFDFDF;
-  -o-box-shadow: 3px 3px 5px #DFDFDF;
-  box-shadow: 3px 3px 5px #DFDFDF;
-}
-
-pre.LITERALLAYOUT,
-.SCREEN,
-.SYNOPSIS,
-.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-table.CAUTION,
-table.WARNING,
-blockquote.NOTE,
-blockquote.TIP {
-  color: black;
-  border-width: 1px;
-  border-style: solid;
-  padding: 2ex;
-  margin: 2ex 0 2ex 2ex;
-  overflow: auto;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-}
-
-pre.LITERALLAYOUT,
-pre.SYNOPSIS,
-pre.PROGRAMLISTING,
-.REFSYNOPSISDIV p,
-.SCREEN {
-  border-color: #CFCFCF;
-  background-color: #F7F7F7;
-}
-
-blockquote.NOTE,
-blockquote.TIP {
-  border-color: #DBDBCC;
-  background-color: #EEEEDD;
-  padding: 14px;
-  width: 572px;
-}
-
-blockquote.NOTE,
-blockquote.TIP,
-table.CAUTION,
-table.WARNING {
-  margin: 4ex auto;
-}
-
-blockquote.NOTE p,
-blockquote.TIP p {
-  margin: 0;
-}
-
-blockquote.NOTE pre,
-blockquote.NOTE code,
-blockquote.TIP pre,
-blockquote.TIP code {
-  margin-left: 0;
-  margin-right: 0;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -khtml-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-}
-
-.emphasis,
-.c2 {
-  font-weight: bold;
-}
-
-.REPLACEABLE {
-  font-style: italic;
-}
-
-/* Table Styles */
-
-table {
-  margin-left: 2ex;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th,
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-style: solid;
-}
-
-table.CALSTABLE,
-table.CAUTION,
-table.WARNING {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-table.CALSTABLE
-{
-  margin: 2ex 0 2ex 2ex;
-  background-color: #E0ECEF;
-  border: 2px solid #A7C6DF;
-}
-
-table.CALSTABLE tr:hover td
-{
-  background-color: #EFEFEF;
-}
-
-table.CALSTABLE td {
-  background-color: #FFF;
-}
-
-table.CALSTABLE td,
-table.CALSTABLE th {
-  border: 1px solid #A7C6DF;
-  padding: 0.5ex 0.5ex;
-}
-
-table.CAUTION,
-table.WARNING {
-  border-collapse: separate;
-  display: block;
-  padding: 0;
-  max-width: 600px;
-}
-
-table.CAUTION {
-  background-color: #F5F5DC;
-  border-color: #DEDFA7;
-}
-
-table.WARNING {
-  background-color: #FFD7D7;
-  border-color: #DF421E;
-}
-
-table.CAUTION td,
-table.CAUTION th,
-table.WARNING td,
-table.WARNING th {
-  border-width: 0;
-  padding-left: 2ex;
-  padding-right: 2ex;
-}
-
-table.CAUTION td,
-table.CAUTION th {
-  border-color: #F3E4D5
-}
-
-table.WARNING td,
-table.WARNING th {
-  border-color: #FFD7D7;
-}
-
-td.c1,
-td.c2,
-td.c3,
-td.c4,
-td.c5,
-td.c6 {
-  font-size: 1.1em;
-  font-weight: bold;
-  border-bottom: 0px solid #FFEFEF;
-  padding: 1ex 2ex 0;
-}
-
-/* Link Styles */
-
-#docNav a {
-  font-weight: bold;
-}
-
-a:link,
-a:visited,
-a:active,
-a:hover {
-  text-decoration: underline;
-}
-
-a:link,
-a:active {
-  color:#0066A2;
-}
-
-a:visited {
-  color:#004E66;
-}
-
-a:hover {
-  color:#000000;
-}
-
-#docFooter a:link,
-#docFooter a:visited,
-#docFooter a:active {
-  color:#666;
-}
-
-#docContainer code.FUNCTION tt {
-  font-size: 1em;
-}
diff --git a/django/media/css/docs_large.css b/django/media/css/docs_large.css
deleted file mode 100644
index f4f5393..0000000
--- a/django/media/css/docs_large.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* PostgreSQL Documentation Style - Large Text Version */
-
-@import url("docs.css");
-
-body {
-	font-size: 93%;
-}
diff --git a/django/media/css/table.css b/django/media/css/table.css
index d468dd6..c8ac492 100644
--- a/django/media/css/table.css
+++ b/django/media/css/table.css
@@ -99,35 +99,3 @@ div.tblBasic table td.colLastRT {
         text-align: right;
         vertical-align: top;
 }
-
-table.message th,
-table.message td
-{
-	vertical-align: top;
-}
-table.message th
-{
-	width: 8em;
-}
-
-table.message
-{
-	width: 100%;
-}
-
-table.message select
-{
-	width: 100%;
-}
-
-table.message span.listname
-{
-	line-height: 1.4em;
-	float: left;
-}
-
-.msgwrap table.message
-{
-	border-width: 0;
-}
-
diff --git a/django/media/css/text.css b/django/media/css/text.css
index 089c3b8..902a118 100644
--- a/django/media/css/text.css
+++ b/django/media/css/text.css
@@ -128,33 +128,24 @@ h4 {
 
 /* Link Styles */
 
-
-a                               { text-decoration: underline; }
-
-a:link                          { color:#0085B0; }
-a:visited                       { color:#004E66; }
-a:active                        { color:#0085B0; }
-a:hover                         { color:#000000; }
-
-select a                        { text-decoration: none }
-
-#pgFooter a                     { color:#666; }
-#pgFooter a:hover               { color:#000; }
-
-#txtFrontUserName a             { color:#666; }
-#txtFrontUserName a:hover       { color:#000; }
-
-.bodywrapper a:visited	        { color:#00536E; }
-.bodywrapper pre,
-.bodywrapper tt {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  font-size: 1.2em;
-  padding: 1em 0 1em 2em;
-  border-width: 2px 0;
-  border-color: lightGray;
-  border-style: solid;
-}
+a:link                          { color:#0085B0; text-decoration: underline; }
+a:visited                       { color:#004E66; text-decoration: underline; }
+a:active                        { color:#0085B0; text-decoration: underline; }
+a:hover                         { color:#000000; text-decoration: underline; }
+
+#pgFooter a:link                { color:#666; text-decoration: underline; }
+#pgFooter a:visited             { color:#666; text-decoration: underline; }
+#pgFooter a:active              { color:#666; text-decoration: underline; }
+#pgFooter a:hover               { color:#000000; text-decoration: underline; }
+
+#txtFrontUserName a:link                { color:#666; text-decoration: underline; }
+#txtFrontUserName a:visited             { color:#666; text-decoration: underline; }
+#txtFrontUserName a:active              { color:#666; text-decoration: underline; }
+#txtFrontUserName a:hover               { color:#000; text-decoration: underline; }
+
+#txtArchives a:visited	{ color:#00536E; text-decoration: underline; }
+#txtArchives pre 	{ word-wrap: break-word; font-size: 150%; }
+#txtArchives tt 	{ word-wrap: break-word; font-size: 150%; }
 
 #pgFrontUSSContainer h2, #pgFrontUSSContainer h3 {
   margin: 0;
diff --git a/django/media/js/styleswitcher.js b/django/media/js/styleswitcher.js
deleted file mode 100644
index f238b27..0000000
--- a/django/media/js/styleswitcher.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/* http://www.alistapart.com/articles/alternate/ */
-
-function
-setActiveStyleSheet (title)
-{
-  var i, a, main;
-  for (i = 0; (a = document.getElementsByTagName ("link")[i]); i++)
-    {
-      if (a.getAttribute ("rel").indexOf ("style") != -1
-	  && a.getAttribute ("title"))
-	{
-	  a.disabled = true;
-	  if (a.getAttribute ("title").indexOf(title) != -1)
-	    a.disabled = false;
-	}
-    }
-}
-
-function
-getActiveStyleSheet ()
-{
-  var i, a;
-  for (i = 0; (a = document.getElementsByTagName ("link")[i]); i++)
-    {
-      if (a.getAttribute ("rel").indexOf ("style") != -1
-	  && a.getAttribute ("title") && !a.disabled)
-	return a.getAttribute ("title");
-    }
-  return null;
-}
-
-function
-getPreferredStyleSheet ()
-{
-  var i, a;
-  for (i = 0; (a = document.getElementsByTagName ("link")[i]); i++)
-    {
-      if (a.getAttribute ("rel").indexOf ("style") != -1
-	  && a.getAttribute ("rel").indexOf ("alt") == -1
-	  && a.getAttribute ("title"))
-	return a.getAttribute ("title");
-    }
-  return null;
-}
-
-function
-createCookie (name, value, days)
-{
-  if (days)
-    {
-      var date = new Date ();
-      date.setTime (date.getTime () + (days * 24 * 60 * 60 * 1000));
-      var expires = "; expires=" + date.toGMTString ();
-    }
-  else
-    expires = "";
-  document.cookie = name + "=" + value + expires + "; path=/";
-}
-
-function
-readCookie (name)
-{
-  var nameEQ = name + "=";
-  var ca = document.cookie.split (';');
-  for (var i = 0; i < ca.length; i++)
-    {
-      var c = ca[i];
-      while (c.charAt (0) == ' ')
-	c = c.substring (1, c.length);
-      if (c.indexOf (nameEQ) == 0)
-	return c.substring (nameEQ.length, c.length);
-    }
-  return null;
-}
-
-window.onload = function (e)
-{
-  var cookie = readCookie ("style");
-  var title = cookie ? cookie : getPreferredStyleSheet ();
-  setActiveStyleSheet (title);
-}
-
-window.onunload = function (e)
-{
-  var title = getActiveStyleSheet ();
-  createCookie ("style", title, 365);
-}
-
-var cookie = readCookie ("style");
-var title = cookie ? cookie : getPreferredStyleSheet ();
-setActiveStyleSheet (title);