Actually commit the changes this time.

buttons/Makefile

@@ -1,4 +1,5 @@
 FILES = about.png events.png gitweb.png home.png mailman.png media.png \
-	office.png services.png stats.png webmail.png wiki.png gallery.png
+	office.png services.png stats.png webmail.png wiki.png gallery.png \
+	library.png
 RELDIR = buttons/
 include ../common.mk

library/index.cgi

@@ -16,7 +16,7 @@ $in = $ENV{'QUERY_STRING'};
 @pairs = split(/[&=]/,$in);
 %fields = @pairs;
 chomp(%fields);
-$webroot = "..";
+$webroot = "../../..";
 
 print <<END;
 
@@ -36,19 +36,45 @@ print <<END;
 <a href="./"><img src="$webroot/logos/csc_logo.png" alt="Computer Science Club" width="420" height="79"/></a>
 </div></div>
 <div class="dirheader">
-<a class="diritem" href="$webroot/"><b>HOME</b></a>
-<a class="diritem" href="$webroot/services/">Services</a>
-<a class="diritem" href="$webroot/office/">Office</a>
-<a class="diritem" href="$webroot/events/">Events</a>
-<a class="diritem" href="$webroot/media/">Media</a>
-<a class="diritem" href="http://wiki.csclub.uwaterloo.ca/">Wiki</a>
-<a class="diritem" href="https://mail.csclub.uwaterloo.ca/">Webmail</a>
-<a class="diritem" href="$webroot/gallery2/">Gallery</a>
-<a class="diritem" href="$webroot/stats">Stats</a>
-<br><br><br>
 
 END
 
+
+open(DIR,"/users/www/www/directory.xml") or print "Couldn't open file\n";
+@items = <DIR>;
+close(MENU);
+
+shift @items;
+shift @items;
+shift @items;
+shift @items;
+shift @items;
+$items[-1] = undef;
+
+foreach $item (@items){
+    if($item){
+        
+	$item =~ s/[<>]//g;
+        $item =~ s/\/$//g;
+        $item =~ s/menuitem//g;
+	$item =~ s/ //;
+        @pairs = split(/[ =]/,$item);
+	shift @pairs;
+        %fields = @pairs;
+	
+	$fields{'href'} =~ s/"//g;
+        
+	chomp($fields{'href'});
+	
+	$fields{'title'} =~ s/"//g;
+	
+	print "<a class=\"diritem\" href=\"$fields{'title'}\">$fields{'title'}</a>\n";
+	
+    }
+}
+
+print "<br><br><br>\n";
+
 #display the search form
 if($fields{'do'} eq "home" || $fields{'do'} eq ""){
 

menu.xml

@@ -10,5 +10,5 @@
  <menuitem title="Mailman" icon="mailman" absolute="true" href="/mailman/"/>
  <menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca/"/>
  <menuitem title="Gallery" icon="gallery" absolute="true" href="/gallery2/"/>
- <menuitem title="Library" icon="gallery" absolute="true" href="http://csclub.uwaterloo.ca/library" />
+ <menuitem title="Library" icon="library" absolute="true" href="http://csclub.uwaterloo.ca/library" />
 </menudefs>