moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44482-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Marina Glancy 2014-05-26 14:46:47 +08:00
commit 25f6bc111d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/lti/locallib.php
View file

@ -360,7 +360,7 @@ function lti_get_tool_table($tools, $id) {
"; ";
foreach ($tools as $type) { foreach ($tools as $type) {
$date = userdate($type->timecreated); $date = userdate($type->timecreated, get_string('strftimedatefullshort', 'core_langconfig'));
$accept = get_string('accept', 'lti'); $accept = get_string('accept', 'lti');
$update = get_string('update', 'lti'); $update = get_string('update', 'lti');
$delete = get_string('delete', 'lti'); $delete = get_string('delete', 'lti');

4
mod/lti/settings.php
View file

@ -144,7 +144,7 @@ if ($ADMIN->fulltree) {
var configuredColumns = [ var configuredColumns = [
{key:'name', label:'$typename', sortable:true}, {key:'name', label:'$typename', sortable:true},
{key:'baseURL', label:'$baseurl', sortable:true}, {key:'baseURL', label:'$baseurl', sortable:true},
{key:'timecreated', label:'$createdon', sortable:true, formatter:Y.YUI2.widget.DataTable.formatDate}, {key:'timecreated', label:'$createdon', sortable:true},
{key:'action', label:'$action'} {key:'action', label:'$action'}
]; ];
@ -153,7 +153,7 @@ if ($ADMIN->fulltree) {
fields: [ fields: [
{key:'name'}, {key:'name'},
{key:'baseURL'}, {key:'baseURL'},
{key:'timecreated', parser:'date'}, {key:'timecreated'},
{key:'action'} {key:'action'}
] ]
}; };