Changeset 11977

Timestamp:

2006-06-29T14:37:44+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added "private residence" as an option to the "Browse places by function" page.

File:

• trunk/cic-hcap/macros/extra.dm (modified) (3 diffs)

trunk/cic-hcap/macros/extra.dm

@@ -649 +649 @@
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsacademicdepartmentbuilding">Academic department building</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsgymnasium">Gymnasium</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsinfirmary">Infirmary</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsadministration">Administration</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsinfirmary">Infirmary</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionslibrary">Library</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsadmissionsoffice">Admissions office</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionslibrary">Library</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmasterplancampus">Master plan (campus)</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsalumnicenter">Alumni center</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmasterplancampus">Master plan (campus)</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmasterplanlandscape">Master plan (landscape)</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsarboretum">Arboretum</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmasterplanlandscape">Master plan (landscape)</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmemorialsite">Memorial site</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsarchaeologicalsite">Archaeological site</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmemorialsite">Memorial site</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmuseum">Museum</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsauditorium">Auditorium</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsmuseum">Museum</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsobservatory">Observatory</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsbelltower">Bell tower</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsobservatory">Observatory</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsoldmain">Old main</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionschapel">Chapel</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsoldmain">Old main</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsoutdoorspace">Outdoor space</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsclassrooms">Classroom(s)</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsoutdoorspace">Outdoor space</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionspresidentshouse">President's house</a></div></td>
 </tr>
 <tr>
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsdebatingsociety">Debating society</a></div></td>
-<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionspresidentshouse">President's house</a></div></td>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsprivateresidence">Private residence</a></div></td>
 </tr>
 <tr>
@@ -711 +711 @@
 <td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsother">Other</a></div></td>
 </tr>
+<tr>
+<td width="50%"><div class="cictexthalf"><a href="_gwcgi_?a=p&p=functionsgymnasium">Gymnasium</a></div></td>
+<td width="50%">&nbsp;</td>
+</tr>
 </table>
 }
@@ -794 +798 @@
 package functionspresidentshouse
 _cicpagecontent_ { <div class="cicheading">President's house</div><br />_cicstaticbrowser_ }
+
+package functionsprivateresidence
+_cicpagecontent_ { <div class="cicheading">Private residence</div><br />_cicstaticbrowser_ }
 
 package functionsresidencehall