Changeset 932 for trunk/grails-app

Timestamp:

May 19, 2011, 1:38:23 AM (13 years ago)

Author:

gav

Message:

Configure demo mode.

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (3 diffs)
• taglib/CustomTagLib.groovy (modified) (2 diffs)
• views/layouts/main.gsp (modified) (1 diff)
• views/login/auth.gsp (modified) (3 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ +1 @@
+import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
+
 class BootStrap
 {
@@ -15 +17 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
+                CH.config.demoMode.enabled = true
                 createDataService.createDemoData()
                 createDataService.startSearchableIndex()
@@ -28 +31 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
+                if(CH.config.demoMode.enabled) createDataService.createDemoData()
                 createDataService.startSearchableIndex()
             }

trunk/grails-app/taglib/CustomTagLib.groovy

@@ -174 +174 @@
 //             def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource")
 //             def locale = RCU.getLocale(request)
-// 
+//
 //             title = messageSource.getMessage(titleKey, null, title, locale)
 //         }
@@ -374 +374 @@
 
     /**
+     * Returns the correct headerId for the main header div.
+     */
+    def headerId = { attrs, body ->
+        def headerId = ''
+        if(grails.util.Environment.isDevelopmentMode()) headerId = 'HeaderDev'
+        else if(grailsApplication.config.demoMode.enabled) headerId = 'HeaderDemo'
+        else headerId = 'Header'
+        out << headerId
+    }
+
+    /**
     * Determine if a supplied string is considered a url or not.
     * The scheme/protocol can be adjusted, file:// has been excluded here.

trunk/grails-app/views/layouts/main.gsp

@@ -34 +34 @@
                     <g:message code="ajax.default.could.not.perform.operation" />
                 </div>
-                <g:if env="production">
-                    <div id="Header">
-                        <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
-                    </div>
-                </g:if>
-                <g:else>
-                    <div id="HeaderDev">
-                        <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
-                    </div>
-                </g:else>
+                <div id="${custom.headerId()}">
+                    <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
+                </div>
 
                 <g:isLoggedIn>

trunk/grails-app/views/login/auth.gsp

@@ -72 +72 @@
         <h1>Welcome to gnuMims please log in</h1>
 
-        <g:if env="development">
+        <g:if test="${grailsApplication.config.demoMode.enabled}">
         The demo users are <b>user</b>, <b>manager</b> and  <b>admin</b> all having the password: <b>pass</b>
         </g:if>
@@ -85 +85 @@
                     <label for='j_username'>Login ID</label>
 
-                    <g:if env="production">
-                        <input type='text' class='text_' name='j_username' id='j_username'/>
+                    <g:if test="${grailsApplication.config.demoMode.enabled}">
+                        <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
                     </g:if>
                     <g:else >
-                        <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
+                        <input type='text' class='text_' name='j_username' id='j_username'/>
                     </g:else >
 
@@ -96 +96 @@
                     <label for='j_password'>Password</label>
 
-                    <g:if env="production">
-                        <input type='password' class='text_' name='j_password' id='j_password' />
+                    <g:if test="${grailsApplication.config.demoMode.enabled}">
+                        <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
                     </g:if>
                     <g:else >
-                        <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
+                        <input type='password' class='text_' name='j_password' id='j_password' />
                     </g:else >
                 </p>