From: davyd <davyd>
Date: Thu, 12 May 2005 09:42:35 +0000 (+0000)
Subject: 2005-05-12  Davyd Madeley  <davyd@madeley.id.au>
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=db27278f66a4cde57cfa271859cc6d1376a16825;p=planet-ucc.git

2005-05-12  Davyd Madeley  <davyd@madeley.id.au>

        * header.html: layout
        * feedlist: new feeds
        * launch-planet-update.sh: don't recall...
---

diff --git a/Changelog b/Changelog
index 6175c97..33923da 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+2005-05-12  Davyd Madeley  <davyd@madeley.id.au>
+
+	* header.html: layout
+	* feedlist: new feeds
+	* launch-planet-update.sh: don't recall...
+
 2004-11-02  Davyd Madeley  <davyd@madeley.id.au>
 
 	* ChangeLog: move to new format
diff --git a/feedlist b/feedlist
index 4446675..24c09a6 100644
--- a/feedlist
+++ b/feedlist
@@ -7,8 +7,10 @@ Davyd Madeley		http://www.livejournal.com/users/davyd/data/rss
 Ian McKellar		http://www.livejournal.com/users/loic/data/rss
 Grahame Bowland		http://www.advogato.org/person/gbowland/rss.xml
 Grahame Bowland		http://www.livejournal.com/users/grahame/data/rss
+Grahame Bowland		http://grahame.angrygoats.net/wordpress/wp-rss2.php
 Adam Wright		http://www.livejournal.com/users/hipikat/data/rss
 Adrian Chadd		http://blog.cacheboy.net/blogs/cacheboy/index.rdf
+Adrian Chadd		http://www.livejournal.com/users/erikarn/data/rss
 Trent Lloyd		http://www.livejournal.com/users/lathiat/data/rss
 Matt Johnston		http://matt.ucc.asn.au/ramble/index.rdf
 David Basden		http://www.livejournal.com/users/shigawire/data/rss
@@ -18,7 +20,7 @@ James Cox		http://www.livejournal.com/users/coxymla/data/rss
 Mark Tearle		http://www.advogato.org/person/mtearle/rss.xml
 Thomas Castiglione	http://www.livejournal.com/users/zharradan/data/rss
 Elaine Walker		http://ariaflame.blogspot.com/atom.xml
-James Andrewartha	http://www.advogato.com/person/trs80/rss.xml
+James Andrewartha	http://www.advogato.org/person/trs80/rss.xml
 Chris Bobridge		http://www.livejournal.com/users/maelkann/data/rss
 Aaron Alderman		http://www.livejournal.com/users/palaceboy/data/rss
 Brad Wake		http://www.livejournal.com/users/thebmw/data/rss
@@ -58,7 +60,12 @@ Thomas Pope		http://www.livejournal.com/users/tomtim/data/rss
 Stephen Griffiths	http://www.livejournal.com/users/utopos/data/rss
 David Adam		http://zanchey.ucc.asn.au/zanchey.rss
 Antony N. Lord		http://www.livejournal.com/users/antonylord/data/rss
-James French		http://frenchie.ucc.asn.au/frenchie.rss
-Shay Telfer		http://www.earthyself.com/blog/index.rdf
+James French		http://www.frenchie.id.au/feeds/frenchie.rss
+James French		http://www.livejournal.com/users/frenchiephish/data/rss
+Shay Telfer		http://www.earthyself.com/blog/wp-atom.php
 Oliver Mailes		http://www.livejournal.com/users/oliverm/data/rss
 Tim Duheaume		http://www.livejournal.com/users/squimmy/data/rss
+Duncan Sargeant		http://www.livejournal.com/users/dunq/data/rss
+Duncan Sargeant		http://www.livejournal.com/users/dunc_the_punk/data/rss
+Sarah Quail		http://www.livejournal.com/users/nephron/data/rss
+Byron Pogson		http://www.greenmonkeylair.com/blog/wp-rss2.php
diff --git a/header.html b/header.html
index d1412c9..360c0ad 100644
--- a/header.html
+++ b/header.html
@@ -1,3 +1,25 @@
 <img src="pucc_logo.gif" alt="Planet UCC" id="pucc_logo" />
 <img src="cam_collage.jpg" alt="UCC Webcam Collage" id="pucc_banner1" />
 <img src="cam_collage.gif" alt="UCC Webcam Collage" id="pucc_banner2" />
+<div id="globalnav-wrapper">
+ <ul id="portal-globalnav">
+  <li id="portaltab-index_html" class="plain">
+   <a href="http://www.ucc.asn.au/">Home</a>
+  </li>
+  <li id="portaltab-aboutucc" class="plain">
+   <a href="http://www.ucc.asn.au/aboutucc/">About Us</a>
+  </li>
+  <li id="portaltab-infobase" class="plain">
+   <a href="http://www.ucc.asn.au/infobase/">Information</a>
+  </li>
+  <li id="portaltab-services" class="plain">
+   <a href="http://www.ucc.asn.au/services/">Services</a>
+  </li>
+  <li id="portaltab-events" class="plain">
+   <a href="http://www.ucc.asn.au/infobase/events/">Events</a>
+  </li>
+  <li id="portaltab-planetucc" class="selected">
+   <a href="http://planet.ucc.asn.au/">Planet UCC</a>
+  </li>     
+ </ul>
+</div>
diff --git a/launch-update-planet.sh b/launch-update-planet.sh
index ce1bc33..2f11ba3 100755
--- a/launch-update-planet.sh
+++ b/launch-update-planet.sh
@@ -12,7 +12,7 @@ cd $HOME/projects/planetucc/
 ./update-planet
 EXITSTATUS=$?
 if [ "$1" == "force"  ] || [ $EXITSTATUS -eq 0 ]; then
-	scp planet.html planet@mussel.waix.ucc.gu.uwa.edu.au:public-html/index.html
-	scp {rss1,rss2,foaf,opml}.xml planet@mussel.waix.ucc.gu.uwa.edu.au:public-html/
+	scp planet.html planet@mooneye.ucc.gu.uwa.edu.au:public-html/index.html
+	scp {rss1,rss2,foaf,opml}.xml planet@mooneye.ucc.gu.uwa.edu.au:public-html/
 fi
 cd $OLDPWD