From b476d455b180254d34ef1bf234bf9e739a072c42 Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Thu, 14 Feb 2002 21:55:02 +0000 Subject: [PATCH] - main page now generated automatically - latest news included in main page - improved layout - changed colours - fix for IE (dismissed blockquote everywhere) --- helm/mowgli/home/html/Makefile | 12 +++++-- helm/mowgli/home/style/mowgli.css | 12 +++---- helm/mowgli/home/templates/home.html.bot | 22 +++++++++++++ .../templates/{home.html => home.html.top} | 32 ++----------------- helm/mowgli/home/templates/index.html | 2 +- helm/mowgli/home/templates/menu.html | 29 +++++++++++------ helm/mowgli/home/xml/news.xml | 10 ++++++ helm/mowgli/home/xsl/common.xsl | 2 ++ helm/mowgli/home/xsl/consortium.xsl | 2 -- helm/mowgli/home/xsl/deliverable.xsl | 2 -- helm/mowgli/home/xsl/latest-news.xsl | 16 ++++++++++ helm/mowgli/home/xsl/news.xsl | 6 ++-- helm/mowgli/home/xsl/person.xsl | 2 -- helm/mowgli/home/xsl/project.xsl | 2 -- helm/mowgli/home/xsl/publication.xsl | 2 -- helm/mowgli/home/xsl/site.xsl | 2 -- helm/mowgli/home/xsl/work-package.xsl | 2 -- helm/mowgli/home/xsl/work-packages_index.xsl | 2 -- 18 files changed, 90 insertions(+), 69 deletions(-) create mode 100644 helm/mowgli/home/templates/home.html.bot rename helm/mowgli/home/templates/{home.html => home.html.top} (56%) create mode 100644 helm/mowgli/home/xsl/latest-news.xsl diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile index 4c48dbbd5..30c581c4d 100644 --- a/helm/mowgli/home/html/Makefile +++ b/helm/mowgli/home/html/Makefile @@ -1,5 +1,6 @@ -DESTDIR = /projects/mowgli/public_html +#DESTDIR = /projects/mowgli/public_html +DESTDIR = /tmp/mowgli TEMPLATESROOT = ../templates XMLROOT = ../xml @@ -105,8 +106,12 @@ DOCUMENTS = \ all: $(DOCUMENTS) -home.html: $(TEMPLATESROOT)/home.html - cp $< $@ +home.html: $(TEMPLATESROOT)/home.html.top $(TEMPLATESROOT)/home.html.bot \ + $(XMLROOT)/news.xml \ + $(XSLROOT)/latest-news.xsl + cat $(TEMPLATESROOT)/home.html.top >$@ + xsltproc $(XSLROOT)/latest-news.xsl $(XMLROOT)/news.xml >>$@ + cat $(TEMPLATESROOT)/home.html.bot >>$@ index.html: $(TEMPLATESROOT)/index.html cp $< $@ @@ -175,5 +180,6 @@ uninstall: rm -rf $(DESTDIR)/* $(XSLROOT)/%.xsl : $(XSLROOT)/common.xsl +$(XSLROOT)/latest-news.xsl : $(XSLROOT)/news.xsl $(DOCUMENTS) : $(XSLROOT)/common.xsl diff --git a/helm/mowgli/home/style/mowgli.css b/helm/mowgli/home/style/mowgli.css index 1dbc93020..4a32870fa 100644 --- a/helm/mowgli/home/style/mowgli.css +++ b/helm/mowgli/home/style/mowgli.css @@ -1,10 +1,10 @@ table.menuborder { - background-color: #663300; + background-color: #003377; } td.menutitle { - background-color: #cc9966; + background-color: #ffeeaa; color: black; font-family: sans-serif; font-weight: bold; @@ -12,7 +12,7 @@ td.menutitle { } td.menuentries { - background-color: #ffcc99; + background-color: #ccddff; color: black; font-family: sans-serif; font-size: smaller; @@ -58,12 +58,12 @@ body.content { } a { - color: #990033; + color: #003377; } a:hover { - background-color: #cc9966; - color: black; + background-color: #ffeeaa; + color: #003377; } a:visited { diff --git a/helm/mowgli/home/templates/home.html.bot b/helm/mowgli/home/templates/home.html.bot new file mode 100644 index 000000000..1955b4830 --- /dev/null +++ b/helm/mowgli/home/templates/home.html.bot @@ -0,0 +1,22 @@ + + +
+ + + + + + +
+
+ This pages are hosted by the + Department of Computer Science, + University of Bologna. +
+
+ IST Logo Small +
+
+ + + diff --git a/helm/mowgli/home/templates/home.html b/helm/mowgli/home/templates/home.html.top similarity index 56% rename from helm/mowgli/home/templates/home.html rename to helm/mowgli/home/templates/home.html.top index d7e3fbaf5..c56cec233 100644 --- a/helm/mowgli/home/templates/home.html +++ b/helm/mowgli/home/templates/home.html.top @@ -10,7 +10,7 @@ -
+
diff --git a/helm/mowgli/home/xml/news.xml b/helm/mowgli/home/xml/news.xml index eeecc2444..b0aa2310f 100644 --- a/helm/mowgli/home/xml/news.xml +++ b/helm/mowgli/home/xml/news.xml @@ -13,6 +13,16 @@ + + February 14, 2002 +
Valentine's Day
+ + New fancy colours, improved layout, especially for I.E. (bleah), main page + generated automatically. + + +
+ February 12, 2002 diff --git a/helm/mowgli/home/xsl/common.xsl b/helm/mowgli/home/xsl/common.xsl index 847be68b8..b124be0bb 100644 --- a/helm/mowgli/home/xsl/common.xsl +++ b/helm/mowgli/home/xsl/common.xsl @@ -5,6 +5,7 @@ +
@@ -34,32 +34,4 @@

Latest News

-
-
January 19, 2002
-
first web pages created (lp).
- -
???, 2001
-
The MoWGLI project was born -
-
- -
- -
- - - - - -
- This pages are hosted by the - Department of Computer Science, - University of Bologna. - - IST Logo Small -
-
- - - - +
diff --git a/helm/mowgli/home/templates/index.html b/helm/mowgli/home/templates/index.html index 30a32119c..7a2929c03 100644 --- a/helm/mowgli/home/templates/index.html +++ b/helm/mowgli/home/templates/index.html @@ -11,7 +11,7 @@ - + diff --git a/helm/mowgli/home/templates/menu.html b/helm/mowgli/home/templates/menu.html index f40a5721f..d6ec60e01 100644 --- a/helm/mowgli/home/templates/menu.html +++ b/helm/mowgli/home/templates/menu.html @@ -73,15 +73,26 @@
@@ -41,6 +42,7 @@
+
diff --git a/helm/mowgli/home/xsl/consortium.xsl b/helm/mowgli/home/xsl/consortium.xsl index f4a210c5e..f42274f9b 100644 --- a/helm/mowgli/home/xsl/consortium.xsl +++ b/helm/mowgli/home/xsl/consortium.xsl @@ -15,7 +15,6 @@ -
@@ -23,7 +22,6 @@ -
diff --git a/helm/mowgli/home/xsl/deliverable.xsl b/helm/mowgli/home/xsl/deliverable.xsl index 47ba47e93..2721a5ff0 100644 --- a/helm/mowgli/home/xsl/deliverable.xsl +++ b/helm/mowgli/home/xsl/deliverable.xsl @@ -19,7 +19,6 @@ -
@@ -27,7 +26,6 @@ -
diff --git a/helm/mowgli/home/xsl/latest-news.xsl b/helm/mowgli/home/xsl/latest-news.xsl new file mode 100644 index 000000000..dbbd9f0d2 --- /dev/null +++ b/helm/mowgli/home/xsl/latest-news.xsl @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/helm/mowgli/home/xsl/news.xsl b/helm/mowgli/home/xsl/news.xsl index 87bd02da9..7ce85ac1a 100644 --- a/helm/mowgli/home/xsl/news.xsl +++ b/helm/mowgli/home/xsl/news.xsl @@ -15,7 +15,6 @@ -
@@ -26,7 +25,6 @@ -
@@ -34,10 +32,10 @@
- + - +
diff --git a/helm/mowgli/home/xsl/person.xsl b/helm/mowgli/home/xsl/person.xsl index 75019f247..bc2736357 100644 --- a/helm/mowgli/home/xsl/person.xsl +++ b/helm/mowgli/home/xsl/person.xsl @@ -24,7 +24,6 @@ -
@@ -32,7 +31,6 @@ -
diff --git a/helm/mowgli/home/xsl/project.xsl b/helm/mowgli/home/xsl/project.xsl index df1d3e913..5588c763d 100644 --- a/helm/mowgli/home/xsl/project.xsl +++ b/helm/mowgli/home/xsl/project.xsl @@ -15,7 +15,6 @@ -
@@ -23,7 +22,6 @@ -
diff --git a/helm/mowgli/home/xsl/publication.xsl b/helm/mowgli/home/xsl/publication.xsl index 50fbd0416..b00df28c6 100644 --- a/helm/mowgli/home/xsl/publication.xsl +++ b/helm/mowgli/home/xsl/publication.xsl @@ -15,7 +15,6 @@ -
@@ -23,7 +22,6 @@ -
diff --git a/helm/mowgli/home/xsl/site.xsl b/helm/mowgli/home/xsl/site.xsl index fa8b319a8..d488bacdc 100644 --- a/helm/mowgli/home/xsl/site.xsl +++ b/helm/mowgli/home/xsl/site.xsl @@ -15,7 +15,6 @@ -
@@ -23,7 +22,6 @@ -
diff --git a/helm/mowgli/home/xsl/work-package.xsl b/helm/mowgli/home/xsl/work-package.xsl index 7046ddfdd..b013b8808 100644 --- a/helm/mowgli/home/xsl/work-package.xsl +++ b/helm/mowgli/home/xsl/work-package.xsl @@ -20,7 +20,6 @@ -
@@ -28,7 +27,6 @@ -
diff --git a/helm/mowgli/home/xsl/work-packages_index.xsl b/helm/mowgli/home/xsl/work-packages_index.xsl index 2c7ed8ee4..629009dae 100644 --- a/helm/mowgli/home/xsl/work-packages_index.xsl +++ b/helm/mowgli/home/xsl/work-packages_index.xsl @@ -15,7 +15,6 @@ -
@@ -23,7 +22,6 @@ -
-- 2.39.2