Changeset 455 for trunk/grails-app/taglib

Timestamp:

May 24, 2010, 11:48:40 PM (13 years ago)

Author:

keesvb

Message:

Reverting Subject optimization as it breaks the study create wizard on adding Subjects, added help texts to Bootstrap and icons to study create wizard, added new text to home, added help texts to study create wizard pages

File:

• trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (9 diffs)

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -727 +727 @@
                         // render template fields
                         entity.giveFields().each() {
-                                out << '<div class="' + attrs.get('class') + '">' + it.name + '</div>'
+                                out << '<div class="' + attrs.get('class') + '">' + it.name + (it.unit ? " (${it.unit})" : '')
+                                if (it.comment) {
+                                        out << '<div class="helpIcon"></div>'
+                                        out << '<div class="helpContent">' + it.comment + '</div>'
+                                }
+                                out << '</div>'
                         }
                 }
@@ -756 +761 @@
                 def inputElement= null
 
+                String helpText
+
                 // got a template?
                 if (template) {
@@ -761 +768 @@
                         entity.giveFields().each() {
                                 def fieldValue = entity.getFieldValue(it.name)
+                                helpText = (it.comment && renderType == 'element') ? it.comment : ''
 
                                 // output column opening element?
@@ -774 +782 @@
                                                         name: prependName + it.escapedName(),
                                                         value: fieldValue
-                                                )
+                                                ){helpText}
                                                 break
                                         case 'STRINGLIST':
@@ -784 +792 @@
                                                                 from: it.listEntries,
                                                                 value: fieldValue
-                                                        )
+                                                        ){helpText}
                                                 } else {
                                                         out << '<span class="warning">no values!!</span>'
@@ -800 +808 @@
                                                                 value           : fieldValue.toString(),
                                                                 ontologies      : it.ontologies
-                                                        )
+                                                        ){helpText}
                                                 } else {
                                                         out << "$inputElement"(
@@ -806 +814 @@
                                                                 name            : prependName + it.escapedName(),
                                                                 value           : fieldValue.toString()
-                                                        )
+                                                        ){helpText}
                                                 }
                                                 break
@@ -852 +860 @@
                                                         value: fieldValue,
                                                         rel: 'date'
-                                                )
+                                                ){helpText}
                                                 break
                                         default:
@@ -860 +868 @@
                                 }
 
+                                // Render comment, if any
+                                //if (it.comment) {
+                                //      out << {"$helpText"}
+                                //}
+
                                 // output column closing element?
                                 if (renderType == 'column') {