MDL-7861 xhtml strict fixes

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 3e0052b7a8e589c042e751471a0039b25982c472..ce145ed8bd4d6bbae1c0d52b06012e29e613fff3 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -330,7 +330,7 @@ function data_generate_default_template(&$data, $template, $recordid=0, $form=fa
     //get all the fields for that database
     if ($fields = get_records('data_fields', 'dataid', $data->id, 'id')) {
 
-        $str = '<div style="text-align:center">';
+        $str = '<div class="defaulttemplate">';
         $str .= '<table cellpadding="5">';
 
         foreach ($fields as $field) {
@@ -843,15 +843,15 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
         $patterns[]='##delete##';
         if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) {
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d='
-                             .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
+                             .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='
-                             .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
+                             .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
         } else {
             $replacement[] = '';
             $replacement[] = '';
         }
         $patterns[]='##more##';
-        $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id.'"><img src="'.$CFG->pixpath.'/i/search.gif" height="11" width="11" border="0" alt="'.get_string('more', 'data').'" title="'.get_string('more', 'data').'" /></a>';
+        $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id.'"><img src="'.$CFG->pixpath.'/i/search.gif" height="11" width="11" alt="'.get_string('more', 'data').'" title="'.get_string('more', 'data').'" /></a>';
 
         $patterns[]='##moreurl##';
         $replacement[] = $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id;
@@ -862,7 +862,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
 
         $patterns[]='##approve##';
         if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){
-            $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/i/approve.gif" height="11" width="11" border="0" alt="'.get_string('approve').'" /></a>';
+            $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/i/approve.gif" height="11" width="11" alt="'.get_string('approve').'" /></a>';
         } else {
             $replacement[] = '';
         }
@@ -915,6 +915,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
 function data_print_preference_form($data, $perpage, $search, $sort='', $order='ASC'){
     echo '<br /><div class="datapreferences" style="text-align:center">';
     echo '<form id="options" action="view.php" method="get">';
+    echo '<fieldset class="invisiblefieldset">';
     echo '<input type="hidden" name="d" value="'.$data->id.'" />';
     echo '<label for="pref_perpage">'.get_string('pagesize','data').'</label> ';
     $pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15,
@@ -949,6 +950,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
     //print ASC or DESC
     echo '&nbsp;&nbsp;&nbsp;';
     echo '<input type="submit" value="'.get_string('savesettings','data').'" />';
+    echo '</fieldset>';
     echo '</form>';
     echo '</div>';
 }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index cd0a90faf032f8948fcb87d91afca65094d7af22..2a2c43633091ac13f22574a270ab0fab481e6fd9 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2027,7 +2027,8 @@ body#user-index .rolesform {
  *** Modules: Data
  ***/
 .fieldadd,
-.sortdefault {
+.sortdefault,
+.defaulttemplate {
   text-align:center; 
 }