Fixed up some styles and pagepath for field-editing pages

diff --git a/mod/data/field/checkbox/mod.html b/mod/data/field/checkbox/mod.html
index bdd691cb3fea68dee8853c2facf9b85bd479f979..d65576ec11bcebb3b986e7c90947d22a0784002b 100755 (executable)
--- a/mod/data/field/checkbox/mod.html
+++ b/mod/data/field/checkbox/mod.html
@@ -1,14 +1,14 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
     </tr>
     <tr>
-        <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
+        <td class="c0" valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
+        <td class="c1"><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
     </tr>
 </table>

diff --git a/mod/data/field/file/mod.html b/mod/data/field/file/mod.html
index d4b51d5a213313c6b8b0ab5ced7e3f0a5f3128f3..7caf63271033386cdb732153652ddb6214b2952a 100755 (executable)
--- a/mod/data/field/file/mod.html
+++ b/mod/data/field/file/mod.html
@@ -1,15 +1,10 @@
 <table width="100%">
     <tr>
-        <td>
-            <?php echo get_string('fieldname', 'data'); ?>:
-        </td>
-        <td>
-            <input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" />
-        </td>
+        <td class="c0"> <?php echo get_string('fieldname', 'data'); ?>: </td>
+        <td class="c1"> <input class="fieldname" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td>
-            <?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" />
-        </td>
+        <td class="c0"> <?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" /></td>
     </tr>
 </table>

diff --git a/mod/data/field/menu/mod.html b/mod/data/field/menu/mod.html
index c29f4264c099533f44ccf47965a203aea853859d..37da4bb9c685643d37d0977f0801fc5131039e0b 100755 (executable)
--- a/mod/data/field/menu/mod.html
+++ b/mod/data/field/menu/mod.html
@@ -1,14 +1,14 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" /></td>
     </tr>
     <tr>
-        <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
+        <td class="c0" valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
+        <td class="c1"><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
     </tr>
 </table>

diff --git a/mod/data/field/multimenu/mod.html b/mod/data/field/multimenu/mod.html
index 8c242017b052d2ec857e01d5b954f3d6ac7a4511..4eec87939ef4b99755920356b4350e324b5c3941 100755 (executable)
--- a/mod/data/field/multimenu/mod.html
+++ b/mod/data/field/multimenu/mod.html
@@ -1,14 +1,14 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
     </tr>
     <tr>
-        <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?></td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
+        <td class="c0" valign="top"><?php echo get_string('fieldoptions', 'data'); ?></td>
+        <td class="c1"><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
     </tr>
 </table>

diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html
index 0cda00854db3a228eb4f3434991331c45ba9b56f..a5ef9274a08a51c45c7b8ec7a3c93dda0c0c9f42 100755 (executable)
--- a/mod/data/field/picture/mod.html
+++ b/mod/data/field/picture/mod.html
@@ -1,51 +1,54 @@
 <table width="100%">
     <tr>
-        <td>
-            <?php echo get_string('fieldname', 'data');?>:</td><td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" />
+        <td class="c0">
+            <?php echo get_string('fieldname', 'data');?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" />
         </td>
     </tr>
     <tr>
-        <td>
+        <td class="c0">
             <?php echo get_string('fielddescription', 'data');?>:
         </td>
-        <td>
-            <input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" />
+        <td class="c1">
+            <input class="fielddescription" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" />
         </td>
     </tr>
     <tr>
-        <td>
+        <td class="c0">
             <?php echo get_string('fieldwidthsingleview', 'data');?>:
         </td>
-        <td>
+        <td class="c1">
             <input style="width:70px;" type="text" name="param1" id="param1" value = "<?php if (!empty($this->field->param1)) echo $this->field->param1; ?>" />
         </td>
     </tr>
     <tr>
-        <td>
+        <td class="c0">
             <?php echo get_string('fieldheightsingleview', 'data');?>:
         </td>
-        <td>
+        <td class="c1">
             <input style="width:70px;" type="text" name="param2" id="param2" value = "<?php if (!empty($this->field->param2)) echo $this->field->param2; ?>" />
         </td>
     </tr>
     <tr>
-        <td>
-            <?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<?php if (!empty($this->field->param4)) echo $this->field->param4; ?>" />
+        <td class="c0">
+            <?php echo get_string('fieldwidthlistview', 'data');?>:
+        </td>
+        <td class="c1"><input style="width:70px;" type="text" name="param4" id="param4" value = "<?php if (!empty($this->field->param4)) echo $this->field->param4; ?>" />
         </td>
     </tr>
     <tr>
-        <td>
+        <td class="c0">
             <?php echo get_string('fieldheightlistview', 'data');?>:
         </td>
-        <td>
+        <td class="c1">
             <input style="width:70px;" type="text" name="param5" id="param5" value = "<?php if (!empty($this->field->param5)) echo $this->field->param5; ?>" />
         </td>
     </tr>
     <tr>
-        <td>
+        <td class="c0">
             <?php echo get_string('maxsize', 'data'); ?>:
         </td>
-        <td>
+        <td class="c1">
             <?php
                 $course->maxbytes = get_field('course', 'maxbytes', 'id', $this->data->course);
                 $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);

diff --git a/mod/data/field/radiobutton/mod.html b/mod/data/field/radiobutton/mod.html
index bdd691cb3fea68dee8853c2facf9b85bd479f979..d65576ec11bcebb3b986e7c90947d22a0784002b 100755 (executable)
--- a/mod/data/field/radiobutton/mod.html
+++ b/mod/data/field/radiobutton/mod.html
@@ -1,14 +1,14 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
     </tr>
     <tr>
-        <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
+        <td class="c0" valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
+        <td class="c1"><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($this->field->param1) {echo $this->field->param1;} ?></textarea></td>
     </tr>
 </table>

diff --git a/mod/data/field/text/mod.html b/mod/data/field/text/mod.html
index d49b15c68f9a33c3eb90f1ebf204b8f03d842af2..a39f4b83ba41262bf00322b8ea68f17505de6154 100755 (executable)
--- a/mod/data/field/text/mod.html
+++ b/mod/data/field/text/mod.html
@@ -1,14 +1,14 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fieldallowautolink', 'data'); ?>:</td>
-        <td><input type="checkbox" name="param1" id="param1" <?php if($this->field->param1) {echo 'checked="checked"';} ?> value="1" /></td>
+        <td class="c0"><?php echo get_string('fieldallowautolink', 'data'); ?>:</td>
+        <td class="c1"><input type="checkbox" name="param1" id="param1" <?php if($this->field->param1) {echo 'checked="checked"';} ?> value="1" /></td>
     </tr>
 </table>

diff --git a/mod/data/field/textarea/mod.html b/mod/data/field/textarea/mod.html
index 2595ce0c13c42f526f4c1eac00c1ff33ff3bd122..262c120b3c646ea285292285f85021e41b2c3d63 100755 (executable)
--- a/mod/data/field/textarea/mod.html
+++ b/mod/data/field/textarea/mod.html
@@ -1,18 +1,18 @@
 <table width="100%">
     <tr>
-        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
+        <td class="c0"><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td class="c1"><input class="fieldname" type="text" name="name" id="name" value="<?php echo($this->field->name); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
+        <td class="c0"><?php echo get_string('fielddescription', 'data'); ?>:</td>
+        <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php echo($this->field->description); ?>" /></td>
     </tr>
     <tr>
-        <td><?php echo get_string('fieldwidth', 'data'); ?>:</td>
-        <td><input style="width:50px;" type="text" name="param2" id="width" value="<?php echo($this->field->param2); ?>" /> columns</td>
+        <td class="c0"><?php echo get_string('fieldwidth', 'data'); ?>:</td>
+        <td class="c1"><input style="width:50px;" type="text" name="param2" id="width" value="<?php echo($this->field->param2); ?>" /> columns</td>
     </tr>
     <tr>
-        <td><?php echo get_string('fieldheight', 'data'); ?>:</td>
-        <td><input style="width:50px;" type="text" name="param3" id="height" value="<?php echo($this->field->param3); ?>" /> rows</td>
+        <td class="c0"><?php echo get_string('fieldheight', 'data'); ?>:</td>
+        <td class="c1"><input style="width:50px;" type="text" name="param3" id="height" value="<?php echo($this->field->param3); ?>" /> rows</td>
     </tr>
 </table>

diff --git a/mod/data/field/url/mod.html b/mod/data/field/url/mod.html
index 4fe3592fe1c056c89d49a2fe243404772204aefa..b105c27331f0b57a27ef209d21997fde9d85780e 100755 (executable)
--- a/mod/data/field/url/mod.html
+++ b/mod/data/field/url/mod.html
@@ -1,18 +1,10 @@
 <table width="100%">
     <tr>
-        <td>
-            <?php echo get_string('fieldname', 'data'); ?>:
-        </td>
-        <td>
-            <input style="width:350px;" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" />
-        </td>
+        <td class="c0"> <?php echo get_string('fieldname', 'data'); ?>: </td>
+        <td class="c1"> <input class="fieldname" type="text" name="name" id="name" value = "<?php echo($this->field->name); ?>" /> </td>
     </tr>
     <tr>
-        <td>
-            <?php echo get_string('fielddescription', 'data'); ?>:
-        </td>
-        <td>
-            <input style="width:350px;" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" />
-        </td>
+        <td class="c0"> <?php echo get_string('fielddescription', 'data'); ?>: </td>
+        <td class="c1"> <input class="fielddescription" type="text" name="description" id="description" value = "<?php echo ($this->field->description);?>" /> </td>
     </tr>
 </table>

diff --git a/mod/data/fields.php b/mod/data/fields.php
index d31550f52044405444388a9ba217d65aec4d18a5..dff4227c3ffec757ce499bc40b9a4230572f66c0 100755 (executable)
--- a/mod/data/fields.php
+++ b/mod/data/fields.php
@@ -60,18 +60,12 @@
         error(get_string('noaccess','data'));
     }
 
-    $strdata = get_string('modulenameplural','data');
-
-    print_header_simple($data->name, '', "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name", 
-                                     '', '', true, '', navmenu($course, $cm));
-
-    print_heading(format_string($data->name));
     
     
     /************************************
      *        Data Processing           *
      ***********************************/
-    switch ($mode){
+    switch ($mode) {
 
         case 'add':    ///add a new field
             if (confirm_sesskey() and $fieldinput = data_submitted($CFG->wwwroot.'/mod/data/fields.php')){
@@ -136,8 +130,10 @@
 
         case 'delete':    // Delete a field
             if (confirm_sesskey()){
+
                 if ($confirm = optional_param('confirm', 0, PARAM_INT)) {
 
+
                     // Delete the field completely
                     if ($field = data_get_field_from_id($fid, $data)) {
                         $field->delete_field();
@@ -152,6 +148,9 @@
                     }
 
                 } else {
+
+                    data_fields_print_header($course,$cm,$data, false);
+
                     // Print confirmation message.
                     $field = data_get_field_from_id($fid, $data);
 
@@ -169,10 +168,7 @@
             break;
     }
 
-/// Print the tabs
 
-    $currenttab = 'fields';
-    include('tabs.php'); 
 
 /// Print the browsing interface
     
@@ -185,21 +181,25 @@
     }
     asort($menufield);    //sort in alphabetical order
     
-    if (!empty($displaynoticegood)) {
-        notify($displaynoticegood, 'notifysuccess');    // good (usually green)
-    } else if (!empty($displaynoticebad)) {
-        notify($displaynoticebad);                     // bad (usuually red)
-    }
 
     if (($mode == 'new') && confirm_sesskey()) {          ///  Adding a new field
+        $CFG->pagepath='mod/data/field/'.$newtype;
+        data_fields_print_header($course,$cm,$data);
+
         $field = data_get_field_new($newtype, $data);
         $field->display_edit_field();
 
     } else if ($mode == 'display' && confirm_sesskey()) { /// Display/edit existing field
+        $CFG->pagepath='mod/data/field/'.$newtype;
+        data_fields_print_header($course,$cm,$data);
+
         $field = data_get_field_from_id($fid, $data);
         $field->display_edit_field();
 
     } else {                                              /// Display the main listing of all fields
+
+        $CFG->pagepath='mod/data/field/'.$newtype;
+        data_fields_print_header($course,$cm,$data);
       
         
         if (!record_exists('data_fields','dataid',$data->id)) {
@@ -251,4 +251,32 @@
 /// Finish the page
     print_footer($course);
 
+
+    function data_fields_print_header($course,$cm,$data,$showtabs=true) {
+
+        global $CFG, $displaynoticegood, $displaynoticebad;
+
+        $strdata = get_string('modulenameplural','data');
+
+        print_header_simple($data->name, '', "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name", 
+                '', '', true, '', navmenu($course, $cm));
+
+        print_heading(format_string($data->name));
+
+        /// Print the tabs
+
+        if ($showtabs) {
+            $currenttab = 'fields';
+            include_once('tabs.php'); 
+        }
+
+        /// Print any notices
+
+        if (!empty($displaynoticegood)) {
+            notify($displaynoticegood, 'notifysuccess');    // good (usually green)
+        } else if (!empty($displaynoticebad)) {
+            notify($displaynoticebad);                     // bad (usuually red)
+        }
+    }
+
 ?>

diff --git a/mod/data/styles.php b/mod/data/styles.php
index 7e14bea620a42862d679fc5b18bcc6f0a6177ec4..3eeaa1d7e8eae45e120c16ea8dafc41a460efd64 100644 (file)
--- a/mod/data/styles.php
+++ b/mod/data/styles.php
@@ -1,3 +1,15 @@
 #mod-data-view #sortsearch .c0 {
   text-align: right;
 }
+
+.mod-data-field .c0 {
+  text-align: right;
+}
+
+.mod-data-field .fieldname {
+  width:300px;
+}
+
+.mod-data-field .fielddescription {
+  width:300px;
+}