Changeset 1136

Timestamp:

Nov 15, 2010, 11:06:45 AM (12 years ago)

Author:

robert@…

Message:

Improved template editor to show field details when a field is selected for use in a template. See ticket 179

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/views/templateEditor/elements/_liFieldSelected.gsp (modified) (2 diffs)
• grails-app/views/templateEditor/template.gsp (modified) (3 diffs)
• web-app/css/templateEditor.css (modified) (2 diffs)
• web-app/js/templateEditor.js (modified) (2 diffs)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
 #Tue Oct 26 16:55:24 CEST 2010
-app.grails.version=1.3.4
+app.grails.version=1.3.5
 app.name=gscf
 app.servlet.version=2.4
@@ -14 +14 @@
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.grom=0.1.15
+plugins.grom=0.1.11
 plugins.hibernate=1.3.4
 plugins.jquery=1.4.3.2

trunk/grails-app/views/templateEditor/elements/_liFieldSelected.gsp

@@ -1 +1 @@
 <span class="listButtons">
+  <img onClick="showTemplateFieldForm( 'templateField_' + ${templateField.id}); this.blur(); return false;" src="${createLinkTo( dir: 'images/icons', file: 'application_edit.png', plugin: 'famfamfam' )}" alt="Show template field properties" title="Show template field properties">
+
   <g:if test="${template.inUse()}">
         <img class="disabled" src="${createLinkTo( dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam' )}" alt="This field can not be removed from the template, as the template is still in use." title="This field can not be removed from the template, as the template is still in use.">
@@ -11 +13 @@
   <b>${templateField.name}</b>
   (<g:if test="${templateField.unit}">${templateField.unit}, </g:if><g:render template="elements/${templateField.type.toString().toLowerCase().replaceAll(/ /,'_')}" model="[templateField: templateField]"/>)
-    
 
+  <form class="templateField_form" id="templateField_${templateField.id}_form">
+          <g:render template="elements/disabledFieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
+          <div class="templateFieldButtons">
+                  <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField.id} );">
+          </div>
+  </form>

trunk/grails-app/views/templateEditor/template.gsp

@@ -47 +47 @@
                                         remove: removeTemplateFieldEvent,
                                         start: savePosition
-                                }).disableSelection();
+                                });
 
 
@@ -55 +55 @@
                                         connectWith: '.templateFields',
                                         start: savePosition
-                                }).disableSelection();
-
+                                });
 
                                 $("#ontologyDialog").dialog({
@@ -96 +95 @@
                                         <% /* NB: this empty field should always be the last in the list! */ %>
                                         <li class="empty ui-state-default" <g:if test="${template.fields?.size() > 0 }">style='display: none;'</g:if>>This template does not yet contain any fields. Drag a field to this list or use the 'Add field button'.</li>
+                                <input type="text" name="xxxas">
                                 </ol>
                         </div>

trunk/web-app/css/templateEditor.css

@@ -27 +27 @@
  */
 .templateFields { list-style-type: none;  margin: 0; padding: 0; width: 330px; }
-.templateFields li { margin: 0 5px 3px 5px; padding: 3px 5px; }
+.templateFields li { margin: 0 5px 3px 5px; padding: 3px 5px; display: block; }
 html>body .templateFields li { line-height: 16px; vertical-align: center; }
 .ui-state-highlight { height: 17px; }
@@ -88 +88 @@
         MozOpacity: 0.5;
         -khtml-opacity:.50;
-        -ms-filter:”alpha(opacity=50)”;
+        -ms-filter:"alpha(opacity=50)";
         -moz-opacity:.50;
         filter:alpha(opacity=50);

trunk/web-app/js/templateEditor.js

@@ -224 +224 @@
                 // Disable all other listitems
                 $( '#availableTemplateFields li:not(#' + list_item_id + ')').addClass( 'ui-state-disabled' );
+                $( '#selectedTemplateFields li:not(#' + list_item_id + ')').addClass( 'ui-state-disabled' );
 
                 if( list_item_id != 'templateField_new' ) {
@@ -240 +241 @@
     // Enable all other listitems
     $( '#availableTemplateFields li:not(#templateField_' + id + ')').removeClass( 'ui-state-disabled' );
+        $( '#selectedTemplateFields li:not(#' + id + ')').removeClass( 'ui-state-disabled' );
         $( '#addNew').removeClass( 'ui-state-disabled' );