From 72c5f68e02eb24093716b705de4c5ade81b2f2ba Mon Sep 17 00:00:00 2001 From: Jay Huber Date: Tue, 11 Dec 2012 14:05:23 -0600 Subject: [PATCH] Moodle 2.4 Remarked out 2.4 YUI commands --- lang/en/attforblock.php | 16 ++++++++++++---- renderer.php | 4 ++-- version.php | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lang/en/attforblock.php b/lang/en/attforblock.php index 706c634..ff36453 100644 --- a/lang/en/attforblock.php +++ b/lang/en/attforblock.php @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +$string['attforblock:addinstance'] = 'Add a new attendance activity'; $string['Aacronym'] = 'A'; $string['Afull'] = 'Absent'; $string['Eacronym'] = 'E'; @@ -174,12 +175,19 @@ $string['startofperiod'] = 'Start of period'; $string['status'] = 'Status'; $string['statuses'] = 'Statuses'; $string['statusdeleted'] = 'Status deleted'; -$string['strftimedm'] = '%d.%m'; -$string['strftimedmy'] = '%d.%m.%Y'; + +$string['strftimedm'] = '%m.%d'; +$string['strftimedmy'] = '%m.%d.%Y'; +$string['strftimedmyw'] = '%m.%d.%y (%a)'; +$string['strftimeshortdate'] = '%m.%d.%Y'; +$string['strftimedmyhm'] = '%m.%d.%Y %H.%M'; + +//$string['strftimedm'] = '%d.%m'; +//$string['strftimedmy'] = '%d.%m.%Y'; $string['strftimedmyhm'] = '%d.%m.%Y %H.%M'; // line added to allow multiple sessions in the same day -$string['strftimedmyw'] = '%d.%m.%y (%a)'; +//$string['strftimedmyw'] = '%d.%m.%y (%a)'; $string['strftimehm'] = '%H:%M'; //line added to allow display of time -$string['strftimeshortdate'] = '%d.%m.%Y'; +//$string['strftimeshortdate'] = '%d.%m.%Y'; $string['studentid'] = 'Student ID'; $string['takeattendance'] = 'Take attendance'; $string['thiscourse'] = 'This course'; diff --git a/renderer.php b/renderer.php index fe298cf..c3003e7 100644 --- a/renderer.php +++ b/renderer.php @@ -106,8 +106,8 @@ class mod_attforblock_renderer extends plugin_renderer_base { 'cal_cur_date' => $fcontrols->curdate); $curdate_controls = html_writer::script(js_writer::set_variable('M.attforblock', $jsvals)); - $this->page->requires->yui2_lib('container'); - $this->page->requires->yui2_lib('calendar'); + //$this->page->requires->yui2_lib('container'); + //$this->page->requires->yui2_lib('calendar'); $this->page->requires->js('/mod/attforblock/calendar.js'); $curdate_controls .= html_writer::link($fcontrols->url(array('curdate' => $fcontrols->prevcur)), $this->output->larrow()); diff --git a/version.php b/version.php index 5792216..1550508 100644 --- a/version.php +++ b/version.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$module->version = 2011071601; // The current module version (Date: YYYYMMDDXX) +$module->version = 2012120700; // The current module version (Date: YYYYMMDDXX) $module->release = '2.4.0'; $module->cron = 0; // Period for cron to check this module (secs) $module->component = 'mod_attforblock'; // Full name of the plugin (used for diagnostics)