From: rich <rich>
Date: Mon, 18 Oct 2004 13:34:21 +0000 (+0000)
Subject: New "basic" theme which includes only the necessary CSS.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=7a02751aeab9d8fca3ab5cad76f364951cf2c272;hp=293aadccabc233298d2da7e240b468f5dbaf59d8;p=cocanwiki.git

New "basic" theme which includes only the necessary CSS.

Modularised the other stylesheets so that parts can be more easily
included in custom styles.

See also: http://wiki.merjis.com/_image/css_relationships.gif

Lengthened the expiry time for static things to reduce frequency of
refetches from the server.

Updated MANIFEST.
---

diff --git a/MANIFEST b/MANIFEST
index 14bcce4..fac319a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -8,7 +8,9 @@ cocanwiki.sql
 conf/cocanwiki.conf
 html/_bin/.cvsignore
 html/_css/admin.css
+html/_css/basic.css
 html/_css/broken_links.css
+html/_css/calendar.css
 html/_css/create.css
 html/_css/easytoread.css
 html/_css/easyweb.css
@@ -17,7 +19,9 @@ html/_css/files.css
 html/_css/images.css
 html/_css/login.css
 html/_css/markup.css
+html/_css/print.css
 html/_css/standard.css
+html/_css/tables.css
 html/_css/users.css
 html/_css/visualise_links.css
 html/_graphics/.cvsignore
diff --git a/conf/cocanwiki.conf b/conf/cocanwiki.conf
index 1936a6c..874a94b 100644
--- a/conf/cocanwiki.conf
+++ b/conf/cocanwiki.conf
@@ -1,5 +1,5 @@
 # Apache configuration for COCANWIKI.
-# $Id: cocanwiki.conf,v 1.14 2004/10/15 12:47:17 rich Exp $
+# $Id: cocanwiki.conf,v 1.15 2004/10/18 13:34:21 rich Exp $
 
 # Uncomment the following lines if necessary.  You will probably need
 # to adjust the paths to reflect where cocanwiki is really installed.
@@ -23,22 +23,22 @@
 
 <Location /_graphics>
   ExpiresActive On
-  ExpiresDefault "now plus 1 hour"
+  ExpiresDefault "now plus 24 hours"
 </Location>
 
 <Location /_js>
   ExpiresActive On
-  ExpiresDefault "now plus 1 hour"
+  ExpiresDefault "now plus 24 hours"
 </Location>
 
 <Location /_css>
   ExpiresActive On
-  ExpiresDefault "now plus 1 hour"
+  ExpiresDefault "now plus 24 hours"
 </Location>
 
 <Location /_static>
   ExpiresActive On
-  ExpiresDefault "now plus 1 hour"
+  ExpiresDefault "now plus 24 hours"
 </Location>
 
 # Error documents.
diff --git a/doc/CSS_relationships.fig b/doc/CSS_relationships.fig
new file mode 100644
index 0000000..82fc8fc
--- /dev/null
+++ b/doc/CSS_relationships.fig
@@ -0,0 +1,51 @@
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+A4      
+100.00
+Single
+-2
+1200 2
+6 3600 3375 5475 3900
+4 0 0 50 -1 0 16 0.0000 4 195 945 3600 3600 basic.css\001
+4 0 0 50 -1 0 12 0.0000 4 195 1830 3600 3825 (necessary styles only)\001
+-6
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 1800 1575 1800 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 2325 2775 3525 3375
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	0 0 1.00 60.00 120.00
+	 1125 2775 225 3675 225 5325 525 5325
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 225 4725 525 4725
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 225 4125 525 4125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4275 2850 4275 3375
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5775 4725 7500 4725
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 7 1 0 2
+	0 0 1.00 60.00 120.00
+	 7125 2550 4725 3375
+4 0 0 50 -1 0 16 0.0000 4 195 1350 1200 2400 standard.css\001
+4 0 0 50 -1 0 16 0.0000 4 255 1560 3600 2400 easytoread.css\001
+4 0 0 50 -1 0 16 0.0000 4 255 2175 6000 2400 (custom stylesheet)\001
+4 0 0 50 -1 0 12 0.0000 4 195 825 1200 2700 (for wikis)\001
+4 0 0 50 -1 0 12 0.0000 4 195 1800 3600 2700 (accessible stylesheet)\001
+4 0 0 50 -1 0 16 0.0000 4 255 1290 1200 1200 easyweb.css\001
+4 0 0 50 -1 0 16 0.0000 4 195 1035 600 4200 tables.css\001
+4 0 0 50 -1 0 16 0.0000 4 195 1335 600 4800 calendar.css\001
+4 0 0 50 -1 0 16 0.0000 4 255 945 600 5400 print.css\001
+4 0 0 50 -1 0 12 0.0000 4 195 1695 2100 4200 (nice-looking tables)\001
+4 0 0 50 -1 0 12 0.0000 4 195 1920 2100 4800 (for calendar extension)\001
+4 0 0 50 -1 0 12 0.0000 4 195 1320 2100 5400 (for print media)\001
+4 0 0 50 -1 0 12 0.0000 4 195 2130 1200 1500 (easy web marketing sites)\001
+4 0 0 50 -1 0 12 0.0000 4 180 720 6225 4575 @import\001
diff --git a/doc/CSS_relationships.gif b/doc/CSS_relationships.gif
new file mode 100644
index 0000000..8a54be3
Binary files /dev/null and b/doc/CSS_relationships.gif differ
diff --git a/html/_css/basic.css b/html/_css/basic.css
new file mode 100644
index 0000000..432db66
--- /dev/null
+++ b/html/_css/basic.css
@@ -0,0 +1,49 @@
+/* Minimal list of CSS required for all COCANWIKIs.
+ * $Id: basic.css,v 1.1 2004/10/18 13:34:21 rich Exp $
+ */
+
+/* Links. */
+a.external {
+  background: url(/_graphics/external.png) center right no-repeat;
+  padding-right: 13px;
+}
+
+a.newpage {
+  background: url(/_graphics/newpage.png) center right no-repeat;
+  padding-right: 13px;
+  color: #ba0000;
+}
+
+a.mailto {
+  background: url(/_graphics/mailto.png) center right no-repeat;
+  padding-right: 13px;
+}
+
+a.image_not_found {
+  background: url(/_graphics/newpage.png) center right no-repeat;
+  padding-right: 13px;
+  color: #ba0000;
+}
+
+a.file_not_found {
+  background: url(/_graphics/newpage.png) center right no-repeat;
+  padding-right: 13px;
+  color: #ba0000;
+}
+
+/* Versions. */
+div#old_version {
+  border: solid 2px #f00;
+  color: #c00;
+  padding: 4px;
+  width: 80%;
+  margin-left: 10%;
+  clear: both;
+}
+
+/* Highlighting search terms. */
+span.search_term {
+  background-color: #ff0;
+  border: 1px solid #eeb;
+}
+
diff --git a/html/_css/calendar.css b/html/_css/calendar.css
new file mode 100644
index 0000000..8c51d1c
--- /dev/null
+++ b/html/_css/calendar.css
@@ -0,0 +1,162 @@
+/* Calendar extension.
+ * $Id: calendar.css,v 1.1 2004/10/18 13:34:21 rich Exp $
+ */
+
+table.cal_month {
+  border-collapse: collapse;
+  border: 1px solid #eee;
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+table.cal_month th.cal_month_header {
+  background-color: #eef;
+}
+
+table.cal_month th.cal_month_header a.cal_month_left {
+  margin-right: 2em;
+}
+
+table.cal_month th.cal_month_header a.cal_month_right {
+  margin-left: 2em;
+}
+
+table.cal_month td.cal_month_events {
+}
+
+table.cal_month td.cal_month_events ul {
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+}
+
+table.cal_month td.cal_month_events li {
+  display: inline;
+  margin-right: 2em;
+}
+
+table.cal_month tr.cal_month_row {
+  border: 1px solid #eef;
+  font-size: 0.7em;
+}
+
+table.cal_month tr.cal_month_weekend {
+  background-color: #fef;
+}
+
+table.cal_month tr.cal_month_row th {
+  text-align: right;
+  background-color: #eef;
+  border: 1px solid #fff;
+  padding-right: 1em;
+  width: 4em;
+}
+
+table.cal_month tr.cal_month_row td {
+}
+
+table.cal_month tr.cal_month_row ul {
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+}
+
+table.cal_month tr.cal_month_row li {
+  display: inline;
+  margin-right: 2em;
+}
+
+table.cal_year {
+  border-collapse: collapse;
+  border: 1px solid #eee;
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+table.cal_year th.cal_year_header {
+  background-color: #eef;
+}
+
+table.cal_year th.cal_year_header a.cal_year_left {
+  margin-right: 2em;
+}
+
+table.cal_year th.cal_year_header a.cal_year_right {
+  margin-left: 2em;
+}
+
+table.cal_year td.cal_year_month {
+  vertical-align: top;
+}
+
+table.cal_year_1m th.cal_year_1m_header {
+  background-color: #eef;
+}
+
+table.cal_year_1m th.cal_year_1m_header_weekend {
+  background-color: #fef;
+}
+
+/*
+table.cal_year_1m tr.cal_year_1m_row td {
+  height: 1.4em;
+}
+*/
+
+table.cal_year_1m tr.cal_year_1m_row a {
+  text-decoration: none;
+}
+
+table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_weekend {
+  background-color: #fef;
+}
+
+table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_events {
+  border: 2px solid #000;
+}
+
+/*
+table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_empty {
+  background: url(/_graphics/pinkhatch.png) repeat;
+}
+*/
+
+table.cal_year td.cal_year_events ul {
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+}
+
+table.cal_year td.cal_year_events li {
+  display: inline;
+  margin-right: 2em;
+}
+
+table.cal_day {
+  border-collapse: collapse;
+  border: 1px solid #eee;
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+table.cal_day ul {
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+}
+
+table.cal_day li {
+  display: inline;
+  margin-right: 2em;
+}
+
+table.cal_day a.cal_day_left {
+  margin-right: 2em;
+}
+
+table.cal_day a.cal_day_right {
+  margin-left: 2em;
+}
diff --git a/html/_css/easytoread.css b/html/_css/easytoread.css
index c1d3b9b..ad90323 100644
--- a/html/_css/easytoread.css
+++ b/html/_css/easytoread.css
@@ -1,4 +1,9 @@
-/* Alternative, accessible stylesheet. */
+/* Alternative, accessible stylesheet.
+ * $Id: easytoread.css,v 1.2 2004/10/18 13:34:21 rich Exp $
+ */
+
+/* Based on the basic stylesheet. */
+@import url("/_css/basic.css");
 
 body {
   font-size: 200%;
diff --git a/html/_css/easyweb.css b/html/_css/easyweb.css
index 330f3ab..433c36d 100644
--- a/html/_css/easyweb.css
+++ b/html/_css/easyweb.css
@@ -1,9 +1,9 @@
 /* Stylesheet for EWM.
- * $Id: easyweb.css,v 1.5 2004/09/25 13:17:00 rich Exp $
+ * $Id: easyweb.css,v 1.6 2004/10/18 13:34:21 rich Exp $
  */
 
 /* Based on the standard stylesheet. */
-@import url("/_css/standard.css");
+@import url("standard.css");
 
 body {
   margin-top: 4em;
diff --git a/html/_css/print.css b/html/_css/print.css
new file mode 100644
index 0000000..4f12d2d
--- /dev/null
+++ b/html/_css/print.css
@@ -0,0 +1,37 @@
+/* Print media.
+ * $Id: print.css,v 1.1 2004/10/18 13:34:21 rich Exp $
+ */
+
+@media print {
+  /* Move the body up (no top menu anymore). */
+  body { margin-top: 4em; }
+
+  /* Hide the navigation. */
+  div#search_div { display: none; }
+  div#navigation_div { display: none; }
+  div#navigation_space_div { display: none; }
+  ul#topmenu { display: none; }
+  div#menu_div { display: none; }
+  p.edit_link { display: none; }
+
+  a.newpage {
+    background: none;
+    padding-right: 0px;
+  }
+
+  /* Display the target of external links. */
+  a.external {
+    background: none;
+    padding-right: 0px;
+  }
+  a.external:after {
+    content: " [" attr(href) "]";
+  }
+  a.mailto:after {
+    background: none;
+    padding-right: 0px;
+  }
+  a.mailto:after {
+    content: " [" attr(href) "]";
+  }
+}
\ No newline at end of file
diff --git a/html/_css/standard.css b/html/_css/standard.css
index b68bcfa..e8d1b87 100644
--- a/html/_css/standard.css
+++ b/html/_css/standard.css
@@ -1,7 +1,19 @@
 /* Stylesheet for COCANWIKI.
- * $Id: standard.css,v 1.16 2004/10/17 17:29:48 rich Exp $
+ * $Id: standard.css,v 1.17 2004/10/18 13:34:21 rich Exp $
  */
 
+/* Based on the basic stylesheet. */
+@import url("basic.css");
+
+/* Tables. */
+@import url("tables.css");
+
+/* Calendar extension. */
+@import url("calendar.css");
+
+/* For print media. */
+@import url("print.css");
+
 body {
   background: #fff;
   color: #000;
@@ -67,39 +79,10 @@ code {
 }
 
 /* Abbreviations should be in smallcaps. */
-abbr {
+abbr, acronym {
   font-variant: smallcaps;
 }
 
-/* Links. */
-a.external {
-  background: url(/_graphics/external.png) center right no-repeat;
-  padding-right: 13px;
-}
-
-a.newpage {
-  background: url(/_graphics/newpage.png) center right no-repeat;
-  padding-right: 13px;
-  color: #ba0000;
-}
-
-a.mailto {
-  background: url(/_graphics/mailto.png) center right no-repeat;
-  padding-right: 13px;
-}
-
-a.image_not_found {
-  background: url(/_graphics/newpage.png) center right no-repeat;
-  padding-right: 13px;
-  color: #ba0000;
-}
-
-a.file_not_found {
-  background: url(/_graphics/newpage.png) center right no-repeat;
-  padding-right: 13px;
-  color: #ba0000;
-}
-
 /* Preformatted text. */
 pre {
   margin-left: 1em;
@@ -222,68 +205,6 @@ ul#history span.date {
   width: 8.5em;
 }
 
-/* Versions. */
-div#old_version {
-  border: solid 2px #f00;
-  color: #c00;
-  padding: 4px;
-  width: 80%;
-  margin-left: 10%;
-  clear: both;
-}
-
-/* Tables. */
-table.top_table {
-  border-collapse: collapse;
-  border: 1px solid #eee;
-}
-
-table.top_table th {
-  vertical-align: top;
-}
-
-table.top_table td {
-  vertical-align: top;
-}
-
-table.top_table td.number {
-  text-align: right;
-}
-
-table.top_table th.divider {
-  text-align: center;
-  padding: 6px;
-  border-top: 1px solid #eee;
-  border-bottom: 1px solid #eee;
-}
-
-table.left_table {
-  border-collapse: collapse;
-  border: 1px solid #eee;
-}
-
-table.left_table th {
-  text-align: right;
-  vertical-align: top;
-  padding-right: 1em;
-}
-
-table.left_table td {
-  vertical-align: top;
-  padding: 3px;
-}
-
-table.left_table td.number {
-  text-align: right;
-}
-
-table.left_table th.divider {
-  text-align: center;
-  padding: 6px;
-  border-top: 1px solid #eee;
-  border-bottom: 1px solid #eee;
-}
-
 /* Forms. */
 form > table {
   margin-left: auto;
@@ -298,12 +219,6 @@ textarea:focus {
   background-color: #eef;
 }
 
-/* Highlighting search terms. */
-span.search_term {
-  background-color: #ff0;
-  border: 1px solid #eeb;
-}
-
 /* Search box. */
 div#search_div {
   position: absolute;
@@ -361,198 +276,3 @@ div#navigation_div ul {
   margin-left: 3em;
   padding-left: 0px;
 }
-
-/* Calendar extension. */
-table.cal_month {
-  border-collapse: collapse;
-  border: 1px solid #eee;
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
-}
-
-table.cal_month th.cal_month_header {
-  background-color: #eef;
-}
-
-table.cal_month th.cal_month_header a.cal_month_left {
-  margin-right: 2em;
-}
-
-table.cal_month th.cal_month_header a.cal_month_right {
-  margin-left: 2em;
-}
-
-table.cal_month td.cal_month_events {
-}
-
-table.cal_month td.cal_month_events ul {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-table.cal_month td.cal_month_events li {
-  display: inline;
-  margin-right: 2em;
-}
-
-table.cal_month tr.cal_month_row {
-  border: 1px solid #eef;
-  font-size: 0.7em;
-}
-
-table.cal_month tr.cal_month_weekend {
-  background-color: #fef;
-}
-
-table.cal_month tr.cal_month_row th {
-  text-align: right;
-  background-color: #eef;
-  border: 1px solid #fff;
-  padding-right: 1em;
-  width: 4em;
-}
-
-table.cal_month tr.cal_month_row td {
-}
-
-table.cal_month tr.cal_month_row ul {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-table.cal_month tr.cal_month_row li {
-  display: inline;
-  margin-right: 2em;
-}
-
-table.cal_year {
-  border-collapse: collapse;
-  border: 1px solid #eee;
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
-}
-
-table.cal_year th.cal_year_header {
-  background-color: #eef;
-}
-
-table.cal_year th.cal_year_header a.cal_year_left {
-  margin-right: 2em;
-}
-
-table.cal_year th.cal_year_header a.cal_year_right {
-  margin-left: 2em;
-}
-
-table.cal_year td.cal_year_month {
-  vertical-align: top;
-}
-
-table.cal_year_1m th.cal_year_1m_header {
-  background-color: #eef;
-}
-
-table.cal_year_1m th.cal_year_1m_header_weekend {
-  background-color: #fef;
-}
-
-/*
-table.cal_year_1m tr.cal_year_1m_row td {
-  height: 1.4em;
-}
-*/
-
-table.cal_year_1m tr.cal_year_1m_row a {
-  text-decoration: none;
-}
-
-table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_weekend {
-  background-color: #fef;
-}
-
-table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_events {
-  border: 2px solid #000;
-}
-
-/*
-table.cal_year_1m tr.cal_year_1m_row td.cal_year_1m_empty {
-  background: url(/_graphics/pinkhatch.png) repeat;
-}
-*/
-
-table.cal_year td.cal_year_events ul {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-table.cal_year td.cal_year_events li {
-  display: inline;
-  margin-right: 2em;
-}
-
-table.cal_day {
-  border-collapse: collapse;
-  border: 1px solid #eee;
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
-}
-
-table.cal_day ul {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-table.cal_day li {
-  display: inline;
-  margin-right: 2em;
-}
-
-table.cal_day a.cal_day_left {
-  margin-right: 2em;
-}
-
-table.cal_day a.cal_day_right {
-  margin-left: 2em;
-}
-
-/* For print media. */
-@media print {
-  /* Move the body up (no top menu anymore). */
-  body { margin-top: 4em; }
-
-  /* Hide the navigation. */
-  div#search_div { display: none; }
-  div#navigation_div { display: none; }
-  div#navigation_space_div { display: none; }
-  ul#topmenu { display: none; }
-  div#menu_div { display: none; }
-  p.edit_link { display: none; }
-
-  a.newpage {
-    background: none;
-    padding-right: 0px;
-  }
-
-  /* Display the target of external links. */
-  a.external {
-    background: none;
-    padding-right: 0px;
-  }
-  a.external:after {
-    content: " [" attr(href) "]";
-  }
-  a.mailto:after {
-    background: none;
-    padding-right: 0px;
-  }
-  a.mailto:after {
-    content: " [" attr(href) "]";
-  }
-}
\ No newline at end of file
diff --git a/html/_css/tables.css b/html/_css/tables.css
new file mode 100644
index 0000000..e42948d
--- /dev/null
+++ b/html/_css/tables.css
@@ -0,0 +1,56 @@
+/* CSS for nice-looking tables.
+ * $Id: tables.css,v 1.1 2004/10/18 13:34:21 rich Exp $
+ */
+
+table.top_table {
+  border-collapse: collapse;
+}
+
+table.top_table th {
+  vertical-align: top;
+  padding: 3px;
+  border-bottom: 1px solid #ddd;
+}
+
+table.top_table td {
+  vertical-align: top;
+  padding: 3px;
+}
+
+table.top_table td.number {
+  text-align: right;
+}
+
+table.top_table th.divider {
+  text-align: center;
+  padding: 6px;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+}
+
+table.left_table {
+  border-collapse: collapse;
+}
+
+table.left_table th {
+  text-align: right;
+  vertical-align: top;
+  padding: 3px;
+  padding-right: 1em;
+}
+
+table.left_table td {
+  vertical-align: top;
+  padding: 3px;
+}
+
+table.left_table td.number {
+  text-align: right;
+}
+
+table.left_table th.divider {
+  text-align: center;
+  padding: 6px;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
+}