Changeset 942 for branches/features/purchaseOrders/grails-app/taglib/CustomTagLib.groovy

Timestamp:

May 22, 2011, 12:29:29 AM (13 years ago)

Author:

gav

Message:

Svn merge -r920:r941 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (2 props)
• grails-app/taglib/CustomTagLib.groovy (modified) (2 diffs)

branches/features/purchaseOrders

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

branches/features/purchaseOrders/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.

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml