portfolio - MDL-20850 - updates to use $PAGE better

diff --git a/portfolio/type/download/file.php b/portfolio/type/download/file.php
index 0ae8307d9098aece1b0bb37c6a44ac3fafe03770..9ed312b00a6cff08d5c6028c3969b4a0fe3f3c88 100644 (file)
--- a/portfolio/type/download/file.php
+++ b/portfolio/type/download/file.php
@@ -15,6 +15,7 @@ $PAGE->requires->yui_lib('dom');
 $id = required_param('id', PARAM_INT);
 
 require_login();
+$PAGE->set_url('/portfolio/type/download/file.php', array('id' => $id));
 
 $exporter = portfolio_exporter::rewaken_object($id);
 $exporter->verify_rewaken();
@@ -23,18 +24,16 @@ $exporter->print_header(get_string('downloading', 'portfolio_download'), false);
 $returnurl = $exporter->get('caller')->get_return_url();
 echo $OUTPUT->notification('<a href="' . $returnurl . '">' . get_string('returntowhereyouwere', 'portfolio') . '</a><br />');
 
+$PAGE->requires->js('/portfolio/type/download/helper.js');
+$PAGE->requires->js_function_call('submit_download_form')->on_dom_ready();
+
 // if they don't have javascript, they can submit the form here to get the file.
 // if they do, it does it nicely for them.
 echo '<div id="redirect">
     <form action="' . $exporter->get('instance')->get_base_file_url() . '" method="post" id="redirectform">
       <input type="submit" value="' . get_string('downloadfile', 'portfolio_download') . '" />
     </form>
-    <script language="javascript">
-        f = YAHOO.util.Dom.get("redirectform");
-        YAHOO.util.Dom.addClass(f.parentNode, "hide");
-        f.submit();
-    </script>';
-
+';
 echo $OUTPUT->footer();
 
 

diff --git a/portfolio/type/download/helper.js b/portfolio/type/download/helper.js
new file mode 100644 (file)
index 0000000..d93a07c
--- /dev/null
+++ b/portfolio/type/download/helper.js
@@ -0,0 +1,5 @@
+function submit_download_form() {
+    f = YAHOO.util.Dom.get("redirectform");
+    YAHOO.util.Dom.addClass(f.parentNode, "hide");
+    f.submit();
+}