L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-34741 use 2in3 in mod_lti

Browse Source
This commit is contained in:
Petr Škoda
2012-08-11 20:40:06 +02:00
parent 12fff124d2
commit 426f2d5bcc
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lti/grade.php
+1 -3
View File
@@ -80,14 +80,12 @@ $PAGE->set_url($url);
$module = array(
'name' => 'mod_lti_submissions',
'fullpath' => '/mod/lti/submissions.js',
'requires' => array('base'),
'requires' => array('base', 'yui2-datatable'),
'strings' => array(),
);
$PAGE->requires->js_init_call('M.mod_lti.submissions.init', array(), true, $module);
$PAGE->requires->yui2_lib('datatable');
$submissionquery = '
SELECT s.id, u.firstname, u.lastname, u.id AS userid, s.datesubmitted, s.gradepercent
FROM {lti_submission} s
mod/lti/settings.php
+8 -12
View File
@@ -134,27 +134,27 @@ if ($ADMIN->fulltree) {
<script type=\"text/javascript\">
//<![CDATA[
(function(){
YUI().use('yui2-tabview', 'yui2-datatable', function(Y) {
//If javascript is disabled, they will just see the three tabs one after another
var lti_tab_heading = document.getElementById('lti_tab_heading');
lti_tab_heading.style.display = '';
new YAHOO.widget.TabView('lti_tabs');
new Y.YUI2.widget.TabView('lti_tabs');
var setupTools = function(id, sort){
var lti_tools = YAHOO.util.Dom.get(id + '_tools');
var lti_tools = Y.YUI2.util.Dom.get(id + '_tools');
if(lti_tools){
var dataSource = new YAHOO.util.DataSource(lti_tools);
var dataSource = new Y.YUI2.util.DataSource(lti_tools);
var configuredColumns = [
{key:'name', label:'$typename', sortable:true},
{key:'baseURL', label:'$baseurl', sortable:true},
{key:'timecreated', label:'$createdon', sortable:true, formatter:YAHOO.widget.DataTable.formatDate},
{key:'timecreated', label:'$createdon', sortable:true, formatter:Y.YUI2.widget.DataTable.formatDate},
{key:'action', label:'$action'}
];
dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
dataSource.responseType = Y.YUI2.util.DataSource.TYPE_HTMLTABLE;
dataSource.responseSchema = {
fields: [
{key:'name'},
@@ -164,7 +164,7 @@ if ($ADMIN->fulltree) {
]
};
new YAHOO.widget.DataTable(id + '_container', configuredColumns, dataSource,
new Y.YUI2.widget.DataTable(id + '_container', configuredColumns, dataSource,
{
sortedBy: sort
}
@@ -175,13 +175,9 @@ if ($ADMIN->fulltree) {
setupTools('lti_configured', {key:'name', dir:'asc'});
setupTools('lti_pending', {key:'timecreated', dir:'desc'});
setupTools('lti_rejected', {key:'timecreated', dir:'desc'});
})();
});
//]]
</script>
";
global $PAGE; // TODO: Move to YUI3 ASAP
$PAGE->requires->yui2_lib('tabview');
$PAGE->requires->yui2_lib('datatable');
$settings->add(new admin_setting_heading('lti_types', get_string('external_tool_types', 'lti') . $OUTPUT->help_icon('main_admin', 'lti'), $template));
}
mod/lti/submissions.js
+4 -4
View File
@@ -37,9 +37,9 @@
},
setupTable: function(){
var lti_submissions_table = YAHOO.util.Dom.get('lti_submissions_table');
var lti_submissions_table = Y.YUI2.util.Dom.get('lti_submissions_table');
var dataSource = new YAHOO.util.DataSource(lti_submissions_table);
var dataSource = new Y.YUI2.util.DataSource(lti_submissions_table);
var configuredColumns = [
{ key: "user", label: "User", sortable:true },
@@ -53,7 +53,7 @@
}
];
dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
dataSource.responseType = Y.YUI2.util.DataSource.TYPE_HTMLTABLE;
dataSource.responseSchema = {
fields: [
{ key: "user" },
@@ -62,7 +62,7 @@
]
};
new YAHOO.widget.DataTable("lti_submissions_table_container", configuredColumns, dataSource,
new Y.YUI2.widget.DataTable("lti_submissions_table_container", configuredColumns, dataSource,
{
sortedBy: {key:"date", dir:"desc"}
}
mod/lti/view.php
+3 -3
View File
@@ -124,11 +124,11 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
$resize = '
<script type="text/javascript">
//<![CDATA[
(function(){
YUI().use("yui2-dom", function(Y) {
//Take scrollbars off the outer document to prevent double scroll bar effect
document.body.style.overflow = "hidden";
var dom = YAHOO.util.Dom;
var dom = Y.YUI2.util.Dom;
var frame = document.getElementById("contentframe");
var padding = 15; //The bottom of the iframe wasn\'t visible on some themes. Probably because of border widths, etc.
@@ -149,7 +149,7 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
resize();
setInterval(resize, 250);
})();
});
//]]
</script>
';