Differences

This shows you the differences between two versions of the page.

--- start [2019/05/16 19:21] – demoroom
+++ start [2019/05/16 19:31] (current) – demoroom
@@ Line 1: / Line 1: @@
-Welcome to the UBC Physics and Astronomy Demonstration room catalogue. Below is a listing by category of the Physics demonstrations available.
+Welcome to the UBC Physics and Astronomy Demonstration room catalogue. Below is a listing by category of the Physics demonstrations available. [[info|Here is a page with some general information.]]
 You can also view a listing of [[demos_by_tag|demonstrations by their tags]].
-====== Demonstrations by Category ======
-<nspages demonstrations -title -exclude -subns -usepictures -textpages="" -textNS="" -hideNoPages>
-====== Internal Information ======
 <ifauth @admin>
-You are logged in as an admin.
+**[[demo_room:start|Demo Room Internal Information]]**
-[[demo_room:start|Demo Room Internal Information]]
 </ifauth>
 <ifauth !@admin>
-You must be logged in with sufficient privileges to access the demo room internal site.
+You can browse demos without logging in, but you must be logged in with sufficient privileges to access the demo room internal site or edit pages.
 </ifauth>
+====== Demonstrations by Category ======
+<nspages demonstrations -title -exclude -subns -usepictures -textpages="" -textNS="" -hideNoPages>