Commit f3098ba7 authored by alexeyomelchenko's avatar alexeyomelchenko Committed by Alexey Omelchenko

Bug 1650414: Eliminate MochiKit from Mahara/js: tablerender.js

* inject Pager.js differently, as per comment

behatnotneeded: same functionality

Change-Id: I81daf5db6d5f60edb1553400dfca2e861701a6bb
Signed-off-by: default avataralexeyomelchenko <alexeyomelchenko@catalyst.net.nz>
parent 552d6e93
......@@ -94,7 +94,7 @@ $form = pieform(array(
));
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->display('form.tpl');
......
......@@ -82,7 +82,7 @@ $form = pieform(array(
));
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->display('form.tpl');
......
......@@ -155,7 +155,7 @@ jQuery(function($) {
EOF;
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
......
......@@ -55,7 +55,7 @@ $form = pieform(array(
));
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->display('form.tpl');
......
......@@ -346,7 +346,7 @@ function settings_submit_delete(Pieform $form, $values) {
}
$smarty = smarty(
array('tablerenderer'),
array('tablerenderer', 'Pager'),
array(),
array(),
array(
......
......@@ -34,7 +34,7 @@ $compositetypes = array(
$inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
......
......@@ -29,7 +29,7 @@ $compositetypes = array('employmenthistory', 'educationhistory');
$inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
......
......@@ -39,7 +39,7 @@ jQuery(function($) {
});
});';
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('goals', $goals);
$smarty->assign('skills', $skills);
$smarty->assign('INLINEJAVASCRIPT', $js);
......
......@@ -50,7 +50,7 @@ $form = pieform(array(
)
));
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('heading', $group->name);
$smarty->assign('subheading', TITLE);
......
......@@ -68,7 +68,7 @@ $form = pieform(array(
)
);
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('heading', $group->name);
......
This diff is collapsed.
......@@ -80,7 +80,7 @@ else {
$javascript .= 'results.query = \'\';';
}
$smarty = smarty(array('tablerenderer'), array(), array(), array('sidebars' => true));
$smarty = smarty(array('tablerenderer', 'Pager'), array(), array(), array('sidebars' => true));
$smarty->assign('query', $query);
$smarty->assign('artefacttype', $artefacttype);
$smarty->assign('INLINEJAVASCRIPT', $javascript);
......
......@@ -63,7 +63,7 @@ $form = pieform(array(
));
$smarty = smarty(array('tablerenderer'));
$smarty = smarty(array('tablerenderer', 'Pager'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->display('form.tpl');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment