MDL-6234 - reworked available tags when editing database templates

diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index 3eb147cde1564d0683496c63a6065c7dd3dcf5e2..13b869b9d4811034e956158a22a7eb307db5c314 100644 (file)
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -19,6 +19,7 @@ $string['availablefromdate'] = 'Available from';
 $string['availabletags'] = 'Available tags';
 $string['availabletodate'] = 'Available to';
 $string['blank'] = 'Blank';
+$string['buttons'] = 'Buttons';
 $string['bynameondate'] = 'by $a->name - $a->date';
 $string['cancel'] = 'Cancel';
 $string['checkbox'] = 'Checkbox';
@@ -107,7 +108,7 @@ $string['insufficiententries'] = 'more entries needed to view this database';
 $string['intro'] = 'Introduction';
 $string['invalidfieldname'] = 'Please choose another name for this field';
 $string['invalidurl'] = 'The URL you just entered is not valid';
-$string['jstemplate'] = 'Javascript Template';
+$string['jstemplate'] = 'Javascript template';
 $string['latitude'] = 'Latitude';
 $string['latlong'] = 'Latitude/longitude';
 $string['latlongdownloadallhint'] = 'Download link for all entries as KML';

diff --git a/mod/data/templates.php b/mod/data/templates.php
index 453a97e167114a71085dde976c905062c289d0d8..7530ac97bc814cab06d06f0553406b332089a769 100755 (executable)
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -195,19 +195,21 @@
     echo '">';
     
     $fields = get_records('data_fields', 'dataid', $data->id);
+    echo '<optgroup label="'.get_string('fields', 'data').'">';
     foreach ($fields as $field) {
-        echo '<option value="[['.$field->name.']]">'.$field->name.'</option>';
+        echo '<option value="[['.$field->name.']]" title="'.$field->description.'">'.$field->name.' - [['.$field->name.']]</option>';
     }
     
     // Print special tags. fix for MDL-7031
     if ($mode != 'addtemplate') {
-        echo '<option value="##edit##">##' .get_string('edit', 'data'). '##</option>';
-        echo '<option value="##more##">##' .get_string('more', 'data'). '##</option>';
-        echo '<option value="##moreurl##">##' .get_string('moreurl', 'data'). '##</option>';
-        echo '<option value="##delete##">##' .get_string('delete', 'data'). '##</option>';
-        echo '<option value="##approve##">##' .get_string('approve', 'data'). '##</option>';
-        echo '<option value="##comments##">##' .get_string('comments', 'data'). '##</option>';
-        echo '<option value="##user##">##' .get_string('user'). '##</option>';
+        echo '<optgroup label="'.get_string('buttons', 'data').'">';
+        echo '<option value="##edit##">' .get_string('edit', 'data'). ' - ##edit##</option>';
+        echo '<option value="##more##">' .get_string('more', 'data'). ' - ##more##</option>';
+        echo '<option value="##moreurl##">' .get_string('moreurl', 'data'). ' - ##moreurl##</option>';
+        echo '<option value="##delete##">' .get_string('delete', 'data'). ' - ##delete##</option>';
+        echo '<option value="##approve##">' .get_string('approve', 'data'). ' - ##approve##</option>';
+        echo '<option value="##comments##">' .get_string('comments', 'data'). ' - ##comments##</option>';
+        echo '<option value="##user##">' .get_string('user'). ' - ##user##</option>';
     }
     echo '</select>';
     echo '<br /><br /><br /><br /><input type="submit" name="defaultform" value="'.get_string('resettemplate','data').'" />';