Changeset 172

Timestamp:

Feb 4, 2010, 5:50:31 PM (13 years ago)

Author:

duh

Message:

• added table-editor.js which makes tables multi editable (see the wizard subjects page and drag a selection over table rows and start editting)
• updated css and templates

Location:

trunk

Files:

• grails-app/conf/BaseFilters.groovy (modified) (2 diffs)
• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/views/wizard/index.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (2 diffs)
• web-app/css/wizard.css (modified) (2 diffs)
• web-app/js/grouping.js (added)
• web-app/js/table-editor.js (added)
• web-app/js/wizard.js (modified) (1 diff)

trunk/grails-app/conf/BaseFilters.groovy

@@ -1 +1 @@
 /**
  * Base Filters
- * @Author  Jeroen Wesbeek
- * @Since   20091026
- * @see     main.gsp
- * @see     http://grails.org/Filters
+ * @Author Jeroen Wesbeek
+ * @Since 20091026
+ * @see main.gsp
+ * @see http://grails.org/Filters
  * @Description
  *
@@ -15 +15 @@
  */
 class BaseFilters {
-    // define filters
-    def filters = {
-        defineStyle(controller:'*', action:'*') {
-            // before every execution
-            before = {
-                // set the default style in the session
-                if (!session.style) {
-                    session.style = 'default_style'
+        // define filters
+        def filters = {
+                defineStyle(controller: '*', action: '*') {
+                        // before every execution
+                        before = {
+                                // set the default style in the session
+                                if (!session.style) {
+                                        session.style = 'default_style'
+                                }
+                        }
                 }
-            }
         }
-    }
 }
 

trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

@@ -128 +128 @@
                                         error()
                                 }
+                                println params
                         }.to "groups"
                         on("previous") {

trunk/grails-app/views/wizard/index.gsp

@@ -22 +22 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.qtip-1.0.0-rc3.min.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'swfobject.js')}"></script>
+        <script type="text/javascript" src="${resource(dir: 'js', file: 'grouping.js')}"></script>
+        <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'wizard.js')}"></script>
 </head>

trunk/grails-app/views/wizard/pages/_subjects.gsp

@@ -27 +27 @@
                 <div class="column">species</div>
                 <wizard:templateColumnHeaders template="${study.template}" class="column" />
-                <wizard:templateColumnHeaders template="${study.template}" class="column" />
         </div>
 <g:each var="subject" status="i" in="${subjects}">
@@ -37 +36 @@
                 </div>
                 <wizard:templateColumns id="${i}" template="${study.template}" class="column" />
-                <wizard:templateColumns id="${i}" template="${study.template}" class="column" />
         </div>
 </g:each>

trunk/web-app/css/wizard.css

@@ -148 +148 @@
     font-weight: bold;
     width: auto;
+    height: 32px;
+    line-height: 32px;
 }
 
@@ -164 +166 @@
 .wizard .table .row {
     display: block;
-    height: 28px;
+    height: 32px;
     border-top: 1px solid #8e908f;
     width: auto;
+}
+
+.wizard .table .row input, .wizard .table .row select {
+    background-color: #fff;
+}
+
+.wizard .table .ui-selected {
+    background-color: #ffab7b;
+}
+
+.wizard .table .ui-selecting {
+    background-color: #f2e3bc;
 }
 

trunk/web-app/js/wizard.js

@@ -32 +32 @@
 // @see _wizard.gsp, _navigation.gsp, _subjects.gsp
 function onWizardPage() {
-    // attach help tooltips
-    //insertYoutubePlayers();
     attachHelpTooltips();
     attachDatePickers();
+
+    // SUBJECTS
     attachTableEvents();
-    attachGroupingEvents();
-
     resizeWizardTable();
     attachSubjectSlider();
+    new TableEditor().init('div.table','div.row','div.column');
+    
+    // GROUPING
+    //attachGroupingEvents();
 }