From: nicolasconnault <nicolasconnault>
Date: Thu, 20 Aug 2009 08:44:14 +0000 (+0000)
Subject: MDL-19807 upgraded calls to print_table, print_single_button, print_user_picture... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c3aa5bd3deeccf12371e63c2632bc488ebe3c344;p=moodle.git

MDL-19807 upgraded calls to print_table, print_single_button, print_user_picture, print_container* and notice_yesno
---

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index afda4ad3a1..2368e66a8b 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -86,12 +86,12 @@
         //button "export to excel"
         //echo '<div class="mdl-align">';
         // echo '<div class="feedback_centered_button">';
-        echo '<div class="form-buttons">';
+        echo $OUTPUT->container_start('form-buttons');
         $export_button_link = 'analysis_to_excel.php';
         $export_button_options = array('sesskey'=>sesskey(), 'id'=>$id);
         $export_button_label = get_string('export_to_excel', 'feedback');
-        print_single_button($export_button_link, $export_button_options, $export_button_label, 'post');
-        echo '</div>';
+        echo $OUTPUT->button(html_form::make_button($export_button_link, $export_button_options, $export_button_label));
+        echo $OUTPUT->container_end();
     }
 
     //get completed feedbacks
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 7f02393aa9..e69b9ad49c 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -69,12 +69,12 @@
 
     if( $capabilities->viewreports ) {
         //button "export to excel"
-        echo '<div class="mdl-align">';
+        echo $OUTPUT->container_start('mdl-align');
         $export_button_link = 'analysis_to_excel.php';
         $export_button_options = array('sesskey'=>sesskey(), 'id'=>$id, 'coursefilter'=>$coursefilter);
         $export_button_label = get_string('export_to_excel', 'feedback');
-        print_single_button($export_button_link, $export_button_options, $export_button_label, 'post');
-        echo '</div>';
+        echo $OUTPUT->button(html_form::make_button($export_button_link, $export_button_options, $export_button_label));
+        echo $OUTPUT->container_end();
     }
 
     //get the groupid
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 6aa4031302..3267b2b0f8 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -136,9 +136,9 @@
 
      <?php
 
-    echo '<div class="mdl-align">';
-    print_single_button('edit.php', array('id'=>$id, 'do_show'=>'templates'), get_string('cancel'));
-    echo '</div>';
+    echo $OUTPUT->container_start('mdl-align');
+    echo $OUTPUT->button(html_form::make_button('edit.php', array('id'=>$id, 'do_show'=>'templates'), get_string('cancel')));
+    echo $OUTPUT->container_end();
     echo $OUTPUT->footer();
 
     function feedback_load_xml_data($filename) {
diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index fc310d6b32..dcef4b5844 100644
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -50,6 +50,8 @@
     $strtopic  = get_string("topic");
     $strresponses = get_string('responses', 'feedback');
 
+    $table = new html_table();
+
     if ($course->format == "weeks") {
         if($capabilities->viewreports) {
             $table->head  = array ($strweek, $strname, $strresponses);
@@ -107,7 +109,7 @@
 
     echo "<br />";
 
-    print_table($table);
+    echo $OUTPUT->table($table);
 
     /// Finish the page
 
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 13f72ed693..1b4b9ab921 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -329,7 +329,7 @@ function feedback_print_recent_mod_activity($activity, $courseid, $detail, $modn
     echo '<table border="0" cellpadding="3" cellspacing="0" class="forum-recent">';
 
     echo "<tr><td class=\"userpicture\" valign=\"top\">";
-    print_user_picture($activity->user->userid, $courseid, $activity->user->picture);
+    echo $OUTPUT->user_picture(moodle_user_picture::make($activity->user, $courseid));
     echo "</td><td>";
 
     if ($detail) {
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 5a93c32530..62eed2f528 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -145,7 +145,7 @@
                         <table width="100%">
                             <tr>
                                 <td align="left">
-                                    <?php echo print_user_picture($student->id, $course->id, $student->picture, false, true);?>
+                                    <?php echo $OUTPUT->user_picture(moodle_user_picture::make($student, $course->id));?>
                                 </td>
                                 <td align="left">
                                     <?php echo fullname($student);?>
@@ -155,7 +155,7 @@
                                     $show_button_link = $ME;
                                     $show_button_options = array('sesskey'=>sesskey(), 'userid'=>$student->id, 'do_show'=>'showoneentry', 'id'=>$id);
                                     $show_button_label = get_string('show_entries', 'feedback');
-                                    print_single_button($show_button_link, $show_button_options, $show_button_label, 'post');
+                                    echo $OUTPUT->button(html_form::make_button($show_button_link, $show_button_options, $show_button_label));
                                 ?>
                                 </td>
                     <?php
@@ -166,7 +166,7 @@
                                     $delete_button_link = 'delete_completed.php';
                                     $delete_button_options = array('sesskey'=>sesskey(), 'completedid'=>$feedbackcompleted->id, 'do_show'=>'showoneentry', 'id'=>$id);
                                     $delete_button_label = get_string('delete_entry', 'feedback');
-                                    print_single_button($delete_button_link, $delete_button_options, $delete_button_label, 'post');
+                                    echo $OUTPUT->button(html_form::make_button($delete_button_link, $delete_button_options, $delete_button_label));
                                 ?>
                                 </td>
                     <?php
@@ -190,7 +190,7 @@
                             $show_anon_button_link = 'show_entries_anonym.php';
                             $show_anon_button_options = array('sesskey'=>sesskey(), 'userid'=>0, 'do_show'=>'showoneentry', 'id'=>$id);
                             $show_anon_button_label = get_string('show_entries', 'feedback');
-                            print_single_button($show_anon_button_link, $show_anon_button_options, $show_anon_button_label, 'post');
+                            echo $OUTPUT->button(html_form::make_button($show_anon_button_link, $show_anon_button_options, $show_anon_button_label));
                         ?>
                     </td>
                 </tr>