Index: trunk/grails-app/views/appCore/appAdmin.gsp
===================================================================
--- trunk/grails-app/views/appCore/appAdmin.gsp	(revision 165)
+++ trunk/grails-app/views/appCore/appAdmin.gsp	(revision 237)
@@ -23,7 +23,32 @@
                             </td>
                             <td valign="top" class="value">
-                                <g:link action="createBaseData">Base</g:link> - Create the base data required for the application to function.
+
+                                <g:if test="${offerBaseDataCreation}">
+                                    <g:link action="createBaseData">Base</g:link> - Create the base data required for the application to function.
+                                </g:if>
+                                <g:else>
+                                    <g:if test="${baseDataCreated}">
+                                        Base data has been created.
+                                    </g:if>
+                                </g:else>
+
                                 <br />
-                                <g:link action="createDemoData">Demo</g:link> - Create demo data for some example sites.
+
+                                <g:if test="${demoDataCreationDisabled}">
+                                    Demo data creation has been disabled.
+                                </g:if>
+                                <g:else>
+                                    <g:if test="${offerDemoDataCreation}">
+                                        <g:link action="createDemoData">Demo</g:link> - Create demo data for some example sites.
+                                        <br />
+                                        <g:link action="disableDemoDataCreation">Disable</g:link> - Disable demo data creation.
+                                    </g:if>
+                                    <g:else>
+                                        <g:if test="${demoDataCreated}">
+                                            Demo data has been created.
+                                        </g:if>
+                                    </g:else>
+                                </g:else>
+
                             </td>
                         </tr>