Alex 11 years ago
parent
commit
f0226bc0e5
51 changed files with 3826 additions and 720 deletions
  1. 0 125
      .hgignore
  2. 80 0
      main/inc/lib/formvalidator/Element/DateTimePicker.php
  3. 5 4
      main/inc/lib/formvalidator/FormValidator.class.php
  4. 17 0
      main/inc/lib/javascript/datetimepicker/.jshintrc
  5. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-af.js
  6. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-am.js
  7. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-bg.js
  8. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ca.js
  9. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-cs.js
  10. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-da.js
  11. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-de.js
  12. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-el.js
  13. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-es.js
  14. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-et.js
  15. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-eu.js
  16. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-fi.js
  17. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-fr.js
  18. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-gl.js
  19. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-he.js
  20. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-hr.js
  21. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-hu.js
  22. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-id.js
  23. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-it.js
  24. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ja.js
  25. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ko.js
  26. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-lt.js
  27. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-nl.js
  28. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-no.js
  29. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pl.js
  30. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pt-BR.js
  31. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pt.js
  32. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ro.js
  33. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ru.js
  34. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sk.js
  35. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sr-RS.js
  36. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sr-YU.js
  37. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sv.js
  38. 18 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-th.js
  39. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-tr.js
  40. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-uk.js
  41. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-vi.js
  42. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-zh-CN.js
  43. 21 0
      main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-zh-TW.js
  44. 91 0
      main/inc/lib/javascript/datetimepicker/jquery-ui-sliderAccess.js
  45. 11 0
      main/inc/lib/javascript/datetimepicker/jquery-ui-timepicker-addon.css
  46. 2151 0
      main/inc/lib/javascript/datetimepicker/jquery-ui-timepicker-addon.js
  47. 0 13
      main/inc/lib/javascript/jqgrid/css/ellipsis-xbl.xml
  48. 425 427
      main/inc/lib/javascript/jqgrid/js/jquery.jqGrid.min.js
  49. 153 151
      main/install/install.lib.php
  50. 44 0
      main/template/default/work/comments.tpl
  51. 33 0
      main/work/show_file.php

+ 0 - 125
.hgignore

@@ -1,125 +0,0 @@
-#
-#ignoring some file
-syntax: glob
-main/inc/conf
-#main/inc/conf/*
-#!main/inc/conf/index.html
-#!main/inc/conf/*.dist.*
-
-#temp dokeos directories
-archive/*
-!archive/.htaccess
-courses/*
-!courses/index.html
-main/garbage/*
-!main/garbage/index.html
-!main/garbage/Serializer
-
-#Home
-home/*
-#!home/default_platform_document
-#!home/faq.html
-#!home/home_menu.html
-#!home/home_news.html
-#!home/home_notice.html
-#!home/home_top.html
-#!home/index.html
-#!home/large_dokeos_logo.gif
-
-#garbage directory
-
-#Avatar images
-main/upload/users/*
-!main/upload/users/index.html
-
-#Images uploaded by user
-#main/default_course_document/images/*
-#!main/default_course_document/images/board.jpg
-#!main/default_course_document/images/bookcase.jpg
-#!main/default_course_document/images/book_highlight.jpg
-#!main/default_course_document/images/book.jpg
-#!main/default_course_document/images/computer.jpg
-#!main/default_course_document/images/diagrams
-#!main/default_course_document/images/emot_happy.jpg
-#!main/default_course_document/images/emot_neutral.jpg
-#!main/default_course_document/images/emot_sad.jpg
-#!main/default_course_document/images/emot_wink.jpg
-#!main/default_course_document/images/female.jpg
-#!main/default_course_document/images/geometry.jpg
-#!main/default_course_document/images/homework.jpg
-#!main/default_course_document/images/idea.jpg
-#!main/default_course_document/images/interaction.jpg
-#!main/default_course_document/images/logo_dokeos.png
-#!main/default_course_document/images/male.jpg
-#!main/default_course_document/images/maths.jpg
-#!main/default_course_document/images/mechanism.jpg
-#!main/default_course_document/images/mouse.jpg
-#!main/default_course_document/images/mr_dokeos
-#!main/default_course_document/images/newspaper.jpg
-#!main/default_course_document/images/note.jpg
-#!main/default_course_document/images/pencil.png
-#!main/default_course_document/images/presentation.jpg
-#!main/default_course_document/images/redlight.jpg
-#!main/default_course_document/images/science.jpg
-#!main/default_course_document/images/servicesgather.png
-#!main/default_course_document/images/silhouette.png
-#!main/default_course_document/images/small
-#!main/default_course_document/images/speech.jpg
-#!main/default_course_document/images/time.jpg
-#!main/default_course_document/images/trainer
-#!main/default_course_document/images/tutorial.jpg
-#!main/default_course_document/images/twopeople.png
-#!main/default_course_document/images/world.jpg
-#!main/default_course_document/images/write.jpg
-
-#css
-#main/css/*
-#*.css
-#!main/css/academica
-#!main/css/baby_orange
-#!main/css/blue_lagoon
-#!main/css/cool_blue
-#!main/css/corporate
-#!main/css/cosmic_campus
-#!main/css/csshover3.htc
-#!main/css/delicious_bordeaux
-#!main/css/dokeos_blue
-#!main/css/dokeos_classic
-#!main/css/dokeos_classic_2D
-#!main/css/empire_green
-#!main/css/fruity_orange
-#!main/css/index.html
-#!main/css/medical
-#!main/css/public_admin
-#!main/css/royal_purple
-#!main/css/silver_line
-#!main/css/sober_brown
-#!main/css/steel_grey
-#!main/css/tasty_olive
-
-#plugins
-#plugin/*
-#!plugin/date
-#!plugin/index.html
-#!plugin/search
-
-#PHP Storm settings directory
-.idea/*
-.idea/cssxfire.xml
-.idea
-
-# Xapian indexes directory
-searchdb/*
-!searchdb/index.html
-
-main/inc/cache/*
-test_laurent.php
-*.orig
-main/auth/shibboleth/config.php
-syntax: regexp
-^main/upload/users$
-
-syntax: regexp
-^\.settings$
-
-nbproject/*

+ 80 - 0
main/inc/lib/formvalidator/Element/DateTimePicker.php

@@ -0,0 +1,80 @@
+<?php
+/* For licensing terms, see /license.txt */
+require_once 'HTML/QuickForm/date.php';
+
+/**
+ * Form element to select a date and hour (with popup datepicker)
+ */
+class DateTimePicker extends HTML_QuickForm_text
+{
+    public $addLibrary = false;
+	/**
+	 * Constructor
+	 */
+	public function DateTimePicker($elementName = null, $elementLabel = null, $attributes = null)
+	{
+        if (!isset($attributes['id'])) {
+            $attributes['id'] = $elementName;
+        }
+
+		HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
+		$this->_appendName = true;
+		$this->_type = 'datetimepicker';
+	}
+
+	/**
+	 * HTML code to display this datepicker
+	 */
+	public function toHtml()
+	{
+		$js = $this->getElementJS();
+		return $js.parent::toHtml();
+	}
+
+    function setValue($value)
+    {
+        $value = substr($value, 0, 16);
+        $this->updateAttributes(
+            array(
+                'value'=>$value
+            )
+        );
+    }
+
+	/**
+	 * Get the necessary javascript for this datepicker
+	 */
+	private function getElementJS()
+	{
+        $js = null;
+
+        if ($this->addLibrary == true) {
+            $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.js" type="text/javascript"></script>';
+            $js .='<link  href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.css" rel="stylesheet" type="text/css" />';
+
+            $isocode = api_get_language_isocode();
+            if ($isocode != 'en') {
+                $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/i18n/jquery-ui-timepicker-'.$isocode.'.js" type="text/javascript"></script>';
+
+                $js .= api_get_js('jquery-ui/jquery-ui-i18n.min.js');
+                $js .= '<script>
+                $(function(){
+                    $.datepicker.setDefaults($.datepicker.regional["'.$isocode.'"]);
+                });
+                </script>';
+            }
+        }
+
+        $id = $this->getAttribute('id');
+        //timeFormat: 'hh:mm'
+        $js .= "<script>
+            $(function() {
+                $('#$id').datetimepicker({
+                    dateFormat: 'yy-mm-dd'
+                });
+            });
+        </script>";
+		return $js;
+	}
+
+}

+ 5 - 4
main/inc/lib/formvalidator/FormValidator.class.php

@@ -1,8 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once api_get_path(LIBRARY_PATH) . 'pear/HTML/QuickForm.php';
-require_once api_get_path(LIBRARY_PATH) . 'pear/HTML/QuickForm/advmultiselect.php';
+require_once api_get_path(LIBRARY_PATH).'pear/HTML/QuickForm.php';
+require_once api_get_path(LIBRARY_PATH).'pear/HTML/QuickForm/advmultiselect.php';
 
 /**
  * Filter
@@ -125,6 +125,8 @@ class FormValidator extends HTML_QuickForm
         // Load some custom elements and rules
         $dir = api_get_path(LIBRARY_PATH) . 'formvalidator/';
         $this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
+
+        $this->registerElementType('datetimepicker', $dir . 'Element/DateTimePicker.php', 'DateTimePicker');
         $this->registerElementType('datepicker', $dir . 'Element/datepicker.php', 'HTML_QuickForm_datepicker');
         $this->registerElementType('datepickerdate', $dir . 'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
         $this->registerElementType('receivers', $dir . 'Element/receivers.php', 'HTML_QuickForm_receivers');
@@ -234,7 +236,7 @@ EOT;
     }
 
     /**
-     * Adds a textfield to the form.
+     * Adds a text field to the form.
      * A trim-filter is attached to the field.
      * @param string $label						The label for the form-element
      * @param string $name						The element name
@@ -433,7 +435,6 @@ EOT;
      */
     function add_real_progress_bar($upload_id, $element_after, $delay = 2, $wait_after_upload = false)
     {
-
         if (!function_exists('uploadprogress_get_info')) {
             $this->add_progress_bar($delay);
             return;

+ 17 - 0
main/inc/lib/javascript/datetimepicker/.jshintrc

@@ -0,0 +1,17 @@
+{
+	"evil": true,
+	"curly": true,
+	"eqeqeq": true,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"sub": true,
+	"undef": true,
+	"unused": false,
+	"loopfunc": true,
+	"boss": true,
+	"eqnull": true,
+	"browser": true,
+	"predef": ["jQuery"]
+}

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-af.js

@@ -0,0 +1,21 @@
+/* Afrikaans translation for the jQuery Timepicker Addon */
+/* Written by Deon Heyns */
+(function($) {
+	$.timepicker.regional['af'] = {
+		timeOnlyTitle: 'Kies Tyd',
+		timeText: 'Tyd ',
+		hourText: 'Ure ',
+		minuteText: 'Minute',
+		secondText: 'Sekondes',
+		millisecText: 'Millisekondes',
+		microsecText: 'Mikrosekondes',
+		timezoneText: 'Tydsone',
+		currentText: 'Huidige Tyd',
+		closeText: 'Klaar',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['af']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-am.js

@@ -0,0 +1,21 @@
+/* Armenian translation for the jQuery Timepicker Addon */
+/* Written by Artavazd Avetisyan artavazda@hotmail.com */
+(function($) {
+	$.timepicker.regional['am'] = {
+		timeOnlyTitle: 'Ընտրեք ժամանակը',
+		timeText: 'Ժամանակը',
+		hourText: 'Ժամ',
+		minuteText: 'Րոպե',
+		secondText: 'Վարկյան',
+		millisecText: 'Միլիվարկյան',
+		microsecText: 'Միկրովարկյան',
+		timezoneText: 'Ժամային գոտին',
+		currentText: 'Այժմ',
+		closeText: 'Փակել',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['am']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-bg.js

@@ -0,0 +1,21 @@
+/* Bulgarian translation for the jQuery Timepicker Addon */
+/* Written by Plamen Kovandjiev */
+(function($) {
+	$.timepicker.regional['bg'] = {
+		timeOnlyTitle: 'Изберете време',
+		timeText: 'Време',
+		hourText: 'Час',
+		minuteText: 'Минути',
+		secondText: 'Секунди',
+		millisecText: 'Милисекунди',
+		microsecText: 'Микросекунди',
+		timezoneText: 'Часови пояс',
+		currentText: 'Сега',
+		closeText: 'Затвори',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['bg']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ca.js

@@ -0,0 +1,21 @@
+/* Catalan translation for the jQuery Timepicker Addon */
+/* Written by Sergi Faber */
+(function($) {
+	$.timepicker.regional['ca'] = {
+		timeOnlyTitle: 'Escollir una hora',
+		timeText: 'Hora',
+		hourText: 'Hores',
+		minuteText: 'Minuts',
+		secondText: 'Segons',
+		millisecText: 'Milisegons',
+		microsecText: 'Microsegons',
+		timezoneText: 'Fus horari',
+		currentText: 'Ara',
+		closeText: 'Tancar',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['ca']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-cs.js

@@ -0,0 +1,21 @@
+/* Czech translation for the jQuery Timepicker Addon */
+/* Written by Ondřej Vodáček */
+(function($) {
+	$.timepicker.regional['cs'] = {
+		timeOnlyTitle: 'Vyberte čas',
+		timeText: 'Čas',
+		hourText: 'Hodiny',
+		minuteText: 'Minuty',
+		secondText: 'Vteřiny',
+		millisecText: 'Milisekundy',
+		microsecText: 'Mikrosekundy',
+		timezoneText: 'Časové pásmo',
+		currentText: 'Nyní',
+		closeText: 'Zavřít',
+		timeFormat: 'HH:mm',
+		amNames: ['dop.', 'AM', 'A'],
+		pmNames: ['odp.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['cs']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-da.js

@@ -0,0 +1,21 @@
+/* Danish translation for the jQuery Timepicker Addon */
+/* Written by Lars H. Jensen (http://www.larshj.dk) */
+(function ($) {
+    $.timepicker.regional['da'] = {
+        timeOnlyTitle: 'Vælg tid',
+        timeText: 'Tid',
+        hourText: 'Time',
+        minuteText: 'Minut',
+        secondText: 'Sekund',
+        millisecText: 'Millisekund',
+        microsecText: 'Mikrosekund',
+        timezoneText: 'Tidszone',
+        currentText: 'Nu',
+        closeText: 'Luk',
+        timeFormat: 'HH:mm',
+        amNames: ['am', 'AM', 'A'],
+        pmNames: ['pm', 'PM', 'P'],
+        isRTL: false
+    };
+    $.timepicker.setDefaults($.timepicker.regional['da']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-de.js

@@ -0,0 +1,21 @@
+/* German translation for the jQuery Timepicker Addon */
+/* Written by Marvin */
+(function($) {
+	$.timepicker.regional['de'] = {
+		timeOnlyTitle: 'Zeit Wählen',
+		timeText: 'Zeit',
+		hourText: 'Stunde',
+		minuteText: 'Minute',
+		secondText: 'Sekunde',
+		millisecText: 'Millisekunde',
+		microsecText: 'Mikrosekunde',
+		timezoneText: 'Zeitzone',
+		currentText: 'Jetzt',
+		closeText: 'Fertig',
+		timeFormat: 'HH:mm',
+		amNames: ['vorm.', 'AM', 'A'],
+		pmNames: ['nachm.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['de']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-el.js

@@ -0,0 +1,21 @@
+/* Hellenic translation for the jQuery Timepicker Addon */
+/* Written by Christos Pontikis */
+(function($) {
+	$.timepicker.regional['el'] = {
+		timeOnlyTitle: 'Επιλογή ώρας',
+		timeText: 'Ώρα',
+		hourText: 'Ώρες',
+		minuteText: 'Λεπτά',
+		secondText: 'Δευτερόλεπτα',
+		millisecText: 'μιλιδευτερόλεπτο',
+		microsecText: 'Microseconds',
+		timezoneText: 'Ζώνη ώρας',
+		currentText: 'Τώρα',
+		closeText: 'Κλείσιμο',
+		timeFormat: 'HH:mm',
+		amNames: ['π.μ.', 'AM', 'A'],
+		pmNames: ['μ.μ.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['el']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-es.js

@@ -0,0 +1,21 @@
+/* Spanish translation for the jQuery Timepicker Addon */
+/* Written by Ianaré Sévi */
+(function($) {
+	$.timepicker.regional['es'] = {
+		timeOnlyTitle: 'Elegir una hora',
+		timeText: 'Hora',
+		hourText: 'Horas',
+		minuteText: 'Minutos',
+		secondText: 'Segundos',
+		millisecText: 'Milisegundos',
+		microsecText: 'Microsegundos',
+		timezoneText: 'Huso horario',
+		currentText: 'Ahora',
+		closeText: 'Cerrar',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['es']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-et.js

@@ -0,0 +1,21 @@
+/* Estonian translation for the jQuery Timepicker Addon */
+/* Written by Karl Sutt (karl@sutt.ee) */
+(function($) {
+	$.timepicker.regional['et'] = {
+		timeOnlyTitle: 'Vali aeg',
+		timeText: 'Aeg',
+		hourText: 'Tund',
+		minuteText: 'Minut',
+		secondText: 'Sekund',
+		millisecText: 'Millisekundis',
+		microsecText: 'Mikrosekundis',
+		timezoneText: 'Ajavöönd',
+		currentText: 'Praegu',
+		closeText: 'Valmis',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['et']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-eu.js

@@ -0,0 +1,21 @@
+/* Basque trannslation for JQuery Timepicker Addon
+/* Translated by Xabi Fer */
+(function($) {
+	$.timepicker.regional['eu'] = {
+		timeOnlyTitle: 'Aukeratu ordua',
+		timeText: 'Ordua',
+		hourText: 'Orduak',
+		minuteText: 'Minutuak',
+		secondText: 'Segunduak',
+		millisecText: 'Milisegunduak',
+		microsecText: 'Mikrosegundotan',
+		timezoneText: 'Ordu-eremua',
+		currentText: 'Orain',
+		closeText: 'Itxi',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['eu']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-fi.js

@@ -0,0 +1,21 @@
+/* Finnish translation for the jQuery Timepicker Addon */
+/* Written by Juga Paazmaya (http://github.com/paazmaya) */
+(function($) {
+	$.timepicker.regional['fi'] = {
+		timeOnlyTitle: 'Valitse aika',
+		timeText: 'Aika',
+		hourText: 'Tunti',
+		minuteText: 'Minuutti',
+		secondText: 'Sekunti',
+		millisecText: 'Millisekunnin',
+		microsecText: 'Mikrosekuntia',
+		timezoneText: 'Aikavyöhyke',
+		currentText: 'Nyt',
+		closeText: 'Sulje',
+		timeFormat: 'HH:mm',
+		amNames: ['ap.', 'AM', 'A'],
+		pmNames: ['ip.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['fi']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-fr.js

@@ -0,0 +1,21 @@
+/* French translation for the jQuery Timepicker Addon */
+/* Written by Thomas Lété */
+(function($) {
+	$.timepicker.regional['fr'] = {
+		timeOnlyTitle: 'Choisir une heure',
+		timeText: 'Heure',
+		hourText: 'Heures',
+		minuteText: 'Minutes',
+		secondText: 'Secondes',
+		millisecText: 'Millisecondes',
+		microsecText: 'Microsecondes',
+		timezoneText: 'Fuseau horaire',
+		currentText: 'Maintenant',
+		closeText: 'Terminé',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['fr']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-gl.js

@@ -0,0 +1,21 @@
+/* Galician translation for the jQuery Timepicker Addon */
+/* Written by David Barral */
+(function($) {
+	$.timepicker.regional['gl'] = {
+		timeOnlyTitle: 'Elixir unha hora',
+		timeText: 'Hora',
+		hourText: 'Horas',
+		minuteText: 'Minutos',
+		secondText: 'Segundos',
+		millisecText: 'Milisegundos',
+		microsecText: 'Microssegundos',
+		timezoneText: 'Fuso horario',
+		currentText: 'Agora',
+		closeText: 'Pechar',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['gl']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-he.js

@@ -0,0 +1,21 @@
+/* Hebrew translation for the jQuery Timepicker Addon */
+/* Written by Lior Lapid */
+(function($) {
+	$.timepicker.regional["he"] = {
+		timeOnlyTitle: "בחירת זמן",
+		timeText: "שעה",
+		hourText: "שעות",
+		minuteText: "דקות",
+		secondText: "שניות",
+		millisecText: "אלפית השנייה",
+		microsecText: "מיקרו",
+		timezoneText: "אזור זמן",
+		currentText: "עכשיו",
+		closeText:"סגור",
+		timeFormat: "HH:mm",
+		amNames: ['לפנה"צ', 'AM', 'A'],
+		pmNames: ['אחה"צ', 'PM', 'P'],
+		isRTL: true
+	};
+	$.timepicker.setDefaults($.timepicker.regional["he"]);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-hr.js

@@ -0,0 +1,21 @@
+/* Croatian translation for the jQuery Timepicker Addon */
+/* Written by Mladen */
+(function($) {
+	$.timepicker.regional['hr'] = {
+		timeOnlyTitle: 'Odaberi vrijeme',
+		timeText: 'Vrijeme',
+		hourText: 'Sati',
+		minuteText: 'Minute',
+		secondText: 'Sekunde',
+		millisecText: 'Milisekunde',
+		microsecText: 'Mikrosekunde',
+		timezoneText: 'Vremenska zona',
+		currentText: 'Sada',
+		closeText: 'Gotovo',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['hr']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-hu.js

@@ -0,0 +1,21 @@
+/* Hungarian translation for the jQuery Timepicker Addon */
+/* Written by Vas Gábor */
+(function($) {
+	$.timepicker.regional['hu'] = {
+		timeOnlyTitle: 'Válasszon időpontot',
+		timeText: 'Idő',
+		hourText: 'Óra',
+		minuteText: 'Perc',
+		secondText: 'Másodperc',
+		millisecText: 'Milliszekundumos',
+		microsecText: 'Ezredmásodperc',
+		timezoneText: 'Időzóna',
+		currentText: 'Most',
+		closeText: 'Kész',
+		timeFormat: 'HH:mm',
+		amNames: ['de.', 'AM', 'A'],
+		pmNames: ['du.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['hu']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-id.js

@@ -0,0 +1,21 @@
+/* Indonesian translation for the jQuery Timepicker Addon */
+/* Written by Nia */
+(function($) {
+	$.timepicker.regional['id'] = {
+		timeOnlyTitle: 'Pilih Waktu',
+		timeText: 'Waktu',
+		hourText: 'Pukul',
+		minuteText: 'Menit',
+		secondText: 'Detik',
+		millisecText: 'Milidetik',
+		microsecText: 'Mikrodetik',
+		timezoneText: 'Zona Waktu',
+		currentText: 'Sekarang',
+		closeText: 'OK',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['id']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-it.js

@@ -0,0 +1,21 @@
+/* Italian translation for the jQuery Timepicker Addon */
+/* Written by Marco "logicoder" Del Tongo */
+(function($) {
+    $.timepicker.regional['it'] = {
+        timeOnlyTitle: 'Scegli orario',
+        timeText: 'Orario',
+        hourText: 'Ora',
+        minuteText: 'Minuti',
+        secondText: 'Secondi',
+        millisecText: 'Millisecondi',
+        microsecText: 'Microsecondi',
+        timezoneText: 'Fuso orario',
+        currentText: 'Adesso',
+        closeText: 'Chiudi',
+        timeFormat: 'HH:mm',
+        amNames: ['m.', 'AM', 'A'],
+        pmNames: ['p.', 'PM', 'P'],
+        isRTL: false
+    };
+    $.timepicker.setDefaults($.timepicker.regional['it']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ja.js

@@ -0,0 +1,21 @@
+/* Japanese translation for the jQuery Timepicker Addon */
+/* Written by Jun Omae */
+(function($) {
+	$.timepicker.regional['ja'] = {
+		timeOnlyTitle: '時間を選択',
+		timeText: '時間',
+		hourText: '時',
+		minuteText: '分',
+		secondText: '秒',
+		millisecText: 'ミリ秒',
+		microsecText: 'マイクロ秒',
+		timezoneText: 'タイムゾーン',
+		currentText: '現時刻',
+		closeText: '閉じる',
+		timeFormat: 'HH:mm',
+		amNames: ['午前', 'AM', 'A'],
+		pmNames: ['午後', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['ja']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ko.js

@@ -0,0 +1,21 @@
+/* Korean translation for the jQuery Timepicker Addon */
+/* Written by Genie */
+(function($) {
+	$.timepicker.regional['ko'] = {
+		timeOnlyTitle: '시간 선택',
+		timeText: '시간',
+		hourText: '시',
+		minuteText: '분',
+		secondText: '초',
+		millisecText: '밀리초',
+		microsecText: '마이크로',
+		timezoneText: '표준 시간대',
+		currentText: '현재 시각',
+		closeText: '닫기',
+		timeFormat: 'tt h:mm',
+		amNames: ['오전', 'AM', 'A'],
+		pmNames: ['오후', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['ko']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-lt.js

@@ -0,0 +1,21 @@
+/* Lithuanian translation for the jQuery Timepicker Addon */
+/* Written by Irmantas Šiupšinskas */
+(function($) {
+	$.timepicker.regional['lt'] = {
+		timeOnlyTitle: 'Pasirinkite laiką',
+		timeText: 'Laikas',
+		hourText: 'Valandos',
+		minuteText: 'Minutės',
+		secondText: 'Sekundės',
+		millisecText: 'Milisekundės',
+		microsecText: 'Mikrosekundės',
+		timezoneText: 'Laiko zona',
+		currentText: 'Dabar',
+		closeText: 'Uždaryti',
+		timeFormat: 'HH:mm',
+		amNames: ['priešpiet', 'AM', 'A'],
+		pmNames: ['popiet', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['lt']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-nl.js

@@ -0,0 +1,21 @@
+/* Dutch translation for the jQuery Timepicker Addon */
+/* Written by Martijn van der Lee */
+(function($) {
+	$.timepicker.regional['nl'] = {
+		timeOnlyTitle: 'Tijdstip',
+		timeText: 'Tijd',
+		hourText: 'Uur',
+		minuteText: 'Minuut',
+		secondText: 'Seconde',
+		millisecText: 'Milliseconde',
+		microsecText: 'Microseconde',
+		timezoneText: 'Tijdzone',
+		currentText: 'Vandaag',
+		closeText: 'Sluiten',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['nl']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-no.js

@@ -0,0 +1,21 @@
+/* Norwegian translation for the jQuery Timepicker Addon */
+/* Written by Morten Hauan (http://hauan.me) */
+(function($) {
+	$.timepicker.regional['no'] = {
+		timeOnlyTitle: 'Velg tid',
+		timeText: 'Tid',
+		hourText: 'Time',
+		minuteText: 'Minutt',
+		secondText: 'Sekund',
+		millisecText: 'Millisekund',
+		microsecText: 'mikrosekund',
+		timezoneText: 'Tidssone',
+		currentText: 'Nå',
+		closeText: 'Lukk',
+		timeFormat: 'HH:mm',
+		amNames: ['am', 'AM', 'A'],
+		pmNames: ['pm', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['no']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pl.js

@@ -0,0 +1,21 @@
+/* Polish translation for the jQuery Timepicker Addon */
+/* Written by Michał Pena */
+(function($) {
+	$.timepicker.regional['pl'] = {
+		timeOnlyTitle: 'Wybierz godzinę',
+		timeText: 'Czas',
+		hourText: 'Godzina',
+		minuteText: 'Minuta',
+		secondText: 'Sekunda',
+		millisecText: 'Milisekunda',
+		microsecText: 'Mikrosekunda',
+		timezoneText: 'Strefa czasowa',
+		currentText: 'Teraz',
+		closeText: 'Gotowe',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['pl']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pt-BR.js

@@ -0,0 +1,21 @@
+/* Brazilian Portuguese translation for the jQuery Timepicker Addon */
+/* Written by Diogo Damiani (diogodamiani@gmail.com) */
+(function ($) {
+	$.timepicker.regional['pt-BR'] = {
+		timeOnlyTitle: 'Escolha o horário',
+		timeText: 'Horário',
+		hourText: 'Hora',
+		minuteText: 'Minutos',
+		secondText: 'Segundos',
+		millisecText: 'Milissegundos',
+		microsecText: 'Microssegundos',
+		timezoneText: 'Fuso horário',
+		currentText: 'Agora',
+		closeText: 'Fechar',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['pt-BR']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-pt.js

@@ -0,0 +1,21 @@
+/* Portuguese translation for the jQuery Timepicker Addon */
+/* Written by Luan Almeida */
+(function($) {
+	$.timepicker.regional['pt'] = {
+		timeOnlyTitle: 'Escolha uma hora',
+		timeText: 'Hora',
+		hourText: 'Horas',
+		minuteText: 'Minutos',
+		secondText: 'Segundos',
+		millisecText: 'Milissegundos',
+		microsecText: 'Microssegundos',
+		timezoneText: 'Fuso horário',
+		currentText: 'Agora',
+		closeText: 'Fechar',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['pt']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ro.js

@@ -0,0 +1,21 @@
+/* Romanian translation for the jQuery Timepicker Addon */
+/* Written by Romeo Adrian Cioaba */
+(function($) {
+	$.timepicker.regional['ro'] = {
+		timeOnlyTitle: 'Alegeţi o oră',
+		timeText: 'Timp',
+		hourText: 'Ore',
+		minuteText: 'Minute',
+		secondText: 'Secunde',
+		millisecText: 'Milisecunde',
+		microsecText: 'Microsecunde',
+		timezoneText: 'Fus orar',
+		currentText: 'Acum',
+		closeText: 'Închide',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['ro']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-ru.js

@@ -0,0 +1,21 @@
+/* Russian translation for the jQuery Timepicker Addon */
+/* Written by Trent Richardson */
+(function($) {
+	$.timepicker.regional['ru'] = {
+		timeOnlyTitle: 'Выберите время',
+		timeText: 'Время',
+		hourText: 'Часы',
+		minuteText: 'Минуты',
+		secondText: 'Секунды',
+		millisecText: 'Миллисекунды',
+		microsecText: 'Микросекунды',
+		timezoneText: 'Часовой пояс',
+		currentText: 'Сейчас',
+		closeText: 'Закрыть',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['ru']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sk.js

@@ -0,0 +1,21 @@
+/* Slovak translation for the jQuery Timepicker Addon */
+/* Written by David Vallner */
+(function($) {
+	$.timepicker.regional['sk'] = {
+		timeOnlyTitle: 'Zvoľte čas',
+		timeText: 'Čas',
+		hourText: 'Hodiny',
+		minuteText: 'Minúty',
+		secondText: 'Sekundy',
+		millisecText: 'Milisekundy',
+		microsecText: 'Mikrosekundy',
+		timezoneText: 'Časové pásmo',
+		currentText: 'Teraz',
+		closeText: 'Zavrieť',
+		timeFormat: 'H:m',
+		amNames: ['dop.', 'AM', 'A'],
+		pmNames: ['pop.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sk']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sr-RS.js

@@ -0,0 +1,21 @@
+/* Serbian cyrilic translation for the jQuery Timepicker Addon */
+/* Written by Vladimir Jelovac */
+(function($) {
+	$.timepicker.regional['sr-RS'] = {
+		timeOnlyTitle: 'Одаберите време',
+		timeText: 'Време',
+		hourText: 'Сати',
+		minuteText: 'Минути',
+		secondText: 'Секунде',
+		millisecText: 'Милисекунде',
+		microsecText: 'Микросекунде',
+		timezoneText: 'Временска зона',
+		currentText: 'Сада',
+		closeText: 'Затвори',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sr-RS']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sr-YU.js

@@ -0,0 +1,21 @@
+/* Serbian latin translation for the jQuery Timepicker Addon */
+/* Written by Vladimir Jelovac */
+(function($) {
+	$.timepicker.regional['sr-YU'] = {
+		timeOnlyTitle: 'Odaberite vreme',
+		timeText: 'Vreme',
+		hourText: 'Sati',
+		minuteText: 'Minuti',
+		secondText: 'Sekunde',
+		millisecText: 'Milisekunde',
+		microsecText: 'Mikrosekunde',
+		timezoneText: 'Vremenska zona',
+		currentText: 'Sada',
+		closeText: 'Zatvori',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sr-YU']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-sv.js

@@ -0,0 +1,21 @@
+/* Swedish translation for the jQuery Timepicker Addon */
+/* Written by Nevon */
+(function($) {
+	$.timepicker.regional['sv'] = {
+		timeOnlyTitle: 'Välj en tid',
+		timeText: 'Tid',
+		hourText: 'Timme',
+		minuteText: 'Minut',
+		secondText: 'Sekund',
+		millisecText: 'Millisekund',
+		microsecText: 'Mikrosekund',
+		timezoneText: 'Tidszon',
+		currentText: 'Nu',
+		closeText: 'Stäng',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sv']);
+})(jQuery);

+ 18 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-th.js

@@ -0,0 +1,18 @@
+/* Thai translation for the jQuery Timepicker Addon */
+/* Written by Yote Wachirapornpongsa */
+(function($) {
+	$.timepicker.regional['th'] = {
+		timeOnlyTitle: 'เลือกเวลา',
+		timeText: 'เวลา ',
+		hourText: 'ชั่วโมง ',
+		minuteText: 'นาที',
+		secondText: 'วินาที',
+		millisecText: 'มิลลิวินาที',
+		microsecText: 'ไมโคริวินาที',
+		timezoneText: 'เขตเวลา',
+		currentText: 'เวลาปัจจุบัน',
+		closeText: 'ปิด',
+		timeFormat: 'hh:mm tt'
+	};
+	$.timepicker.setDefaults($.timepicker.regional['th']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-tr.js

@@ -0,0 +1,21 @@
+/* Turkish translation for the jQuery Timepicker Addon */
+/* Written by Fehmi Can Saglam, Edited by Goktug Ozturk */
+(function($) {
+	$.timepicker.regional['tr'] = {
+		timeOnlyTitle: 'Zaman Seçiniz',
+		timeText: 'Zaman',
+		hourText: 'Saat',
+		minuteText: 'Dakika',
+		secondText: 'Saniye',
+		millisecText: 'Milisaniye',
+		microsecText: 'Mikrosaniye',
+		timezoneText: 'Zaman Dilimi',
+		currentText: 'Şu an',
+		closeText: 'Tamam',
+		timeFormat: 'HH:mm',
+		amNames: ['ÖÖ', 'Ö'],
+		pmNames: ['ÖS', 'S'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['tr']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-uk.js

@@ -0,0 +1,21 @@
+/* Ukrainian translation for the jQuery Timepicker Addon */
+/* Written by Sergey Noskov */
+(function($) {
+	$.timepicker.regional['uk'] = {
+		timeOnlyTitle: 'Виберіть час',
+		timeText: 'Час',
+		hourText: 'Години',
+		minuteText: 'Хвилини',
+		secondText: 'Секунди',
+		millisecText: 'Мілісекунди',
+		microsecText: 'Мікросекунди',
+		timezoneText: 'Часовий пояс',
+		currentText: 'Зараз',
+		closeText: 'Закрити',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['uk']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-vi.js

@@ -0,0 +1,21 @@
+/* Vietnamese translation for the jQuery Timepicker Addon */
+/* Written by Nguyen Dinh Trung */
+(function($) {
+	$.timepicker.regional['vi'] = {
+		timeOnlyTitle: 'Chọn giờ',
+		timeText: 'Thời gian',
+		hourText: 'Giờ',
+		minuteText: 'Phút',
+		secondText: 'Giây',
+		millisecText: 'Phần nghìn giây',
+		microsecText: 'Miligiây',
+		timezoneText: 'Múi giờ',
+		currentText: 'Hiện thời',
+		closeText: 'Đóng',
+		timeFormat: 'H:m',
+		amNames: ['SA', 'AM', 'A'],
+		pmNames: ['CH', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['vi']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-zh-CN.js

@@ -0,0 +1,21 @@
+/* Simplified Chinese translation for the jQuery Timepicker Addon /
+/ Written by Will Lu */
+(function($) {
+	$.timepicker.regional['zh-CN'] = {
+		timeOnlyTitle: '选择时间',
+		timeText: '时间',
+		hourText: '小时',
+		minuteText: '分钟',
+		secondText: '秒钟',
+		millisecText: '微秒',
+		microsecText: '微秒',
+		timezoneText: '时区',
+		currentText: '现在时间',
+		closeText: '关闭',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['zh-CN']);
+})(jQuery);

+ 21 - 0
main/inc/lib/javascript/datetimepicker/i18n/jquery-ui-timepicker-zh-TW.js

@@ -0,0 +1,21 @@
+/* Chinese translation for the jQuery Timepicker Addon */
+/* Written by Alang.lin */
+(function($) {
+	$.timepicker.regional['zh-TW'] = {
+		timeOnlyTitle: '選擇時分秒',
+		timeText: '時間',
+		hourText: '時',
+		minuteText: '分',
+		secondText: '秒',
+		millisecText: '毫秒',
+		microsecText: '微秒',
+		timezoneText: '時區',
+		currentText: '現在時間',
+		closeText: '確定',
+		timeFormat: 'HH:mm',
+		amNames: ['上午', 'AM', 'A'],
+		pmNames: ['下午', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['zh-TW']);
+})(jQuery);

+ 91 - 0
main/inc/lib/javascript/datetimepicker/jquery-ui-sliderAccess.js

@@ -0,0 +1,91 @@
+/*
+ * jQuery UI Slider Access
+ * By: Trent Richardson [http://trentrichardson.com]
+ * Version 0.3
+ * Last Modified: 10/20/2012
+ * 
+ * Copyright 2011 Trent Richardson
+ * Dual licensed under the MIT and GPL licenses.
+ * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+ * 
+ */
+ (function($){
+
+	$.fn.extend({
+		sliderAccess: function(options){
+			options = options || {};
+			options.touchonly = options.touchonly !== undefined? options.touchonly : true; // by default only show it if touch device
+
+			if(options.touchonly === true && !("ontouchend" in document)){
+				return $(this);
+			}
+				
+			return $(this).each(function(i,obj){
+						var $t = $(this),
+							o = $.extend({},{ 
+											where: 'after',
+											step: $t.slider('option','step'), 
+											upIcon: 'ui-icon-plus', 
+											downIcon: 'ui-icon-minus',
+											text: false,
+											upText: '+',
+											downText: '-',
+											buttonset: true,
+											buttonsetTag: 'span',
+											isRTL: false
+										}, options),
+							$buttons = $('<'+ o.buttonsetTag +' class="ui-slider-access">'+
+											'<button data-icon="'+ o.downIcon +'" data-step="'+ (o.isRTL? o.step : o.step*-1) +'">'+ o.downText +'</button>'+
+											'<button data-icon="'+ o.upIcon +'" data-step="'+ (o.isRTL? o.step*-1 : o.step) +'">'+ o.upText +'</button>'+
+										'</'+ o.buttonsetTag +'>');
+
+						$buttons.children('button').each(function(j, jobj){
+							var $jt = $(this);
+							$jt.button({ 
+											text: o.text, 
+											icons: { primary: $jt.data('icon') }
+										})
+								.click(function(e){
+											var step = $jt.data('step'),
+												curr = $t.slider('value'),
+												newval = curr += step*1,
+												minval = $t.slider('option','min'),
+												maxval = $t.slider('option','max'),
+												slidee = $t.slider("option", "slide") || function(){},
+												stope = $t.slider("option", "stop") || function(){};
+
+											e.preventDefault();
+											
+											if(newval < minval || newval > maxval){
+												return;
+											}
+											
+											$t.slider('value', newval);
+
+											slidee.call($t, null, { value: newval });
+											stope.call($t, null, { value: newval });
+										});
+						});
+						
+						// before or after					
+						$t[o.where]($buttons);
+
+						if(o.buttonset){
+							$buttons.removeClass('ui-corner-right').removeClass('ui-corner-left').buttonset();
+							$buttons.eq(0).addClass('ui-corner-left');
+							$buttons.eq(1).addClass('ui-corner-right');
+						}
+
+						// adjust the width so we don't break the original layout
+						var bOuterWidth = $buttons.css({
+									marginLeft: ((o.where === 'after' && !o.isRTL) || (o.where === 'before' && o.isRTL)? 10:0), 
+									marginRight: ((o.where === 'before' && !o.isRTL) || (o.where === 'after' && o.isRTL)? 10:0)
+								}).outerWidth(true) + 5;
+						var tOuterWidth = $t.outerWidth(true);
+						$t.css('display','inline-block').width(tOuterWidth-bOuterWidth);
+					});		
+		}
+	});
+
+})(jQuery);

+ 11 - 0
main/inc/lib/javascript/datetimepicker/jquery-ui-timepicker-addon.css

@@ -0,0 +1,11 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }

+ 2151 - 0
main/inc/lib/javascript/datetimepicker/jquery-ui-timepicker-addon.js

@@ -0,0 +1,2151 @@
+/*
+ * jQuery Timepicker Addon
+ * By: Trent Richardson [http://trentrichardson.com]
+ *
+ * Copyright 2013 Trent Richardson
+ * You may use this project under MIT license.
+ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+ */
+
+(function ($) {
+
+	/*
+	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+	*/
+	$.ui.timepicker = $.ui.timepicker || {};
+	if ($.ui.timepicker.version) {
+		return;
+	}
+
+	/*
+	* Extend jQueryUI, get it started with our version number
+	*/
+	$.extend($.ui, {
+		timepicker: {
+			version: "@@version"
+		}
+	});
+
+	/* 
+	* Timepicker manager.
+	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+	* Settings for (groups of) time pickers are maintained in an instance object,
+	* allowing multiple different settings on the same page.
+	*/
+	var Timepicker = function () {
+		this.regional = []; // Available regional settings, indexed by language code
+		this.regional[''] = { // Default regional settings
+			currentText: 'Now',
+			closeText: 'Done',
+			amNames: ['AM', 'A'],
+			pmNames: ['PM', 'P'],
+			timeFormat: 'HH:mm',
+			timeSuffix: '',
+			timeOnlyTitle: 'Choose Time',
+			timeText: 'Time',
+			hourText: 'Hour',
+			minuteText: 'Minute',
+			secondText: 'Second',
+			millisecText: 'Millisecond',
+			microsecText: 'Microsecond',
+			timezoneText: 'Time Zone',
+			isRTL: false
+		};
+		this._defaults = { // Global defaults for all the datetime picker instances
+			showButtonPanel: true,
+			timeOnly: false,
+			showHour: null,
+			showMinute: null,
+			showSecond: null,
+			showMillisec: null,
+			showMicrosec: null,
+			showTimezone: null,
+			showTime: true,
+			stepHour: 1,
+			stepMinute: 1,
+			stepSecond: 1,
+			stepMillisec: 1,
+			stepMicrosec: 1,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			microsec: 0,
+			timezone: null,
+			hourMin: 0,
+			minuteMin: 0,
+			secondMin: 0,
+			millisecMin: 0,
+			microsecMin: 0,
+			hourMax: 23,
+			minuteMax: 59,
+			secondMax: 59,
+			millisecMax: 999,
+			microsecMax: 999,
+			minDateTime: null,
+			maxDateTime: null,
+			onSelect: null,
+			hourGrid: 0,
+			minuteGrid: 0,
+			secondGrid: 0,
+			millisecGrid: 0,
+			microsecGrid: 0,
+			alwaysSetTime: true,
+			separator: ' ',
+			altFieldTimeOnly: true,
+			altTimeFormat: null,
+			altSeparator: null,
+			altTimeSuffix: null,
+			pickerTimeFormat: null,
+			pickerTimeSuffix: null,
+			showTimepicker: true,
+			timezoneList: null,
+			addSliderAccess: false,
+			sliderAccessArgs: null,
+			controlType: 'slider',
+			defaultValue: null,
+			parse: 'strict'
+		};
+		$.extend(this._defaults, this.regional['']);
+	};
+
+	$.extend(Timepicker.prototype, {
+		$input: null,
+		$altInput: null,
+		$timeObj: null,
+		inst: null,
+		hour_slider: null,
+		minute_slider: null,
+		second_slider: null,
+		millisec_slider: null,
+		microsec_slider: null,
+		timezone_select: null,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		microsec: 0,
+		timezone: null,
+		hourMinOriginal: null,
+		minuteMinOriginal: null,
+		secondMinOriginal: null,
+		millisecMinOriginal: null,
+		microsecMinOriginal: null,
+		hourMaxOriginal: null,
+		minuteMaxOriginal: null,
+		secondMaxOriginal: null,
+		millisecMaxOriginal: null,
+		microsecMaxOriginal: null,
+		ampm: '',
+		formattedDate: '',
+		formattedTime: '',
+		formattedDateTime: '',
+		timezoneList: null,
+		units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
+		support: {},
+		control: null,
+
+		/* 
+		* Override the default settings for all instances of the time picker.
+		* @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
+		* @return {Object} the manager object
+		*/
+		setDefaults: function (settings) {
+			extendRemove(this._defaults, settings || {});
+			return this;
+		},
+
+		/*
+		* Create a new Timepicker instance
+		*/
+		_newInst: function ($input, opts) {
+			var tp_inst = new Timepicker(),
+				inlineSettings = {},
+				fns = {},
+				overrides, i;
+
+			for (var attrName in this._defaults) {
+				if (this._defaults.hasOwnProperty(attrName)) {
+					var attrValue = $input.attr('time:' + attrName);
+					if (attrValue) {
+						try {
+							inlineSettings[attrName] = eval(attrValue);
+						} catch (err) {
+							inlineSettings[attrName] = attrValue;
+						}
+					}
+				}
+			}
+
+			overrides = {
+				beforeShow: function (input, dp_inst) {
+					if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
+						return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
+					}
+				},
+				onChangeMonthYear: function (year, month, dp_inst) {
+					// Update the time as well : this prevents the time from disappearing from the $input field.
+					tp_inst._updateDateTime(dp_inst);
+					if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
+						tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+					}
+				},
+				onClose: function (dateText, dp_inst) {
+					if (tp_inst.timeDefined === true && $input.val() !== '') {
+						tp_inst._updateDateTime(dp_inst);
+					}
+					if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
+						tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
+					}
+				}
+			};
+			for (i in overrides) {
+				if (overrides.hasOwnProperty(i)) {
+					fns[i] = opts[i] || null;
+				}
+			}
+
+			tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
+				evnts: fns,
+				timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+			});
+			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
+				return val.toUpperCase();
+			});
+			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
+				return val.toUpperCase();
+			});
+
+			// detect which units are supported
+			tp_inst.support = detectSupport(
+					tp_inst._defaults.timeFormat + 
+					(tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
+					(tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
+
+			// controlType is string - key to our this._controls
+			if (typeof(tp_inst._defaults.controlType) === 'string') {
+				if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
+					tp_inst._defaults.controlType = 'select';
+				}
+				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
+			}
+			// controlType is an object and must implement create, options, value methods
+			else {
+				tp_inst.control = tp_inst._defaults.controlType;
+			}
+
+			// prep the timezone options
+			var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
+					0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
+			if (tp_inst._defaults.timezoneList !== null) {
+				timezoneList = tp_inst._defaults.timezoneList;
+			}
+			var tzl = timezoneList.length, tzi = 0, tzv = null;
+			if (tzl > 0 && typeof timezoneList[0] !== 'object') {
+				for (; tzi < tzl; tzi++) {
+					tzv = timezoneList[tzi];
+					timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
+				}
+			}
+			tp_inst._defaults.timezoneList = timezoneList;
+
+			// set the default units
+			tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
+							((new Date()).getTimezoneOffset() * -1);
+			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
+							tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
+			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
+							tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
+			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
+							tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
+			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
+							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
+			tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
+							tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
+			tp_inst.ampm = '';
+			tp_inst.$input = $input;
+
+			if (tp_inst._defaults.altField) {
+				tp_inst.$altInput = $(tp_inst._defaults.altField).css({
+					cursor: 'pointer'
+				}).focus(function () {
+					$input.trigger("focus");
+				});
+			}
+
+			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+				tp_inst._defaults.minDate = new Date();
+			}
+			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+				tp_inst._defaults.maxDate = new Date();
+			}
+
+			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+			}
+			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+			}
+			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+			}
+			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+			}
+			tp_inst.$input.bind('focus', function () {
+				tp_inst._onFocus();
+			});
+
+			return tp_inst;
+		},
+
+		/*
+		* add our sliders to the calendar
+		*/
+		_addTimePicker: function (dp_inst) {
+			var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
+
+			this.timeDefined = this._parseTime(currDT);
+			this._limitMinMaxDateTime(dp_inst, false);
+			this._injectTimePicker();
+		},
+
+		/*
+		* parse the time string from input value or _setTime
+		*/
+		_parseTime: function (timeString, withDate) {
+			if (!this.inst) {
+				this.inst = $.datepicker._getInst(this.$input[0]);
+			}
+
+			if (withDate || !this._defaults.timeOnly) {
+				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+				try {
+					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+					if (!parseRes.timeObj) {
+						return false;
+					}
+					$.extend(this, parseRes.timeObj);
+				} catch (err) {
+					$.timepicker.log("Error parsing the date/time string: " + err +
+									"\ndate/time string = " + timeString +
+									"\ntimeFormat = " + this._defaults.timeFormat +
+									"\ndateFormat = " + dp_dateFormat);
+					return false;
+				}
+				return true;
+			} else {
+				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+				if (!timeObj) {
+					return false;
+				}
+				$.extend(this, timeObj);
+				return true;
+			}
+		},
+
+		/*
+		* generate and inject html for timepicker into ui datepicker
+		*/
+		_injectTimePicker: function () {
+			var $dp = this.inst.dpDiv,
+				o = this.inst.settings,
+				tp_inst = this,
+				litem = '',
+				uitem = '',
+				show = null,
+				max = {},
+				gridSize = {},
+				size = null,
+				i = 0,
+				l = 0;
+
+			// Prevent displaying twice
+			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+				var noDisplay = ' style="display:none;"',
+					html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+								'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
+
+				// Create the markup
+				for (i = 0, l = this.units.length; i < l; i++) {
+					litem = this.units[i];
+					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+					// Added by Peter Medeiros:
+					// - Figure out what the hour/minute/second max should be based on the step values.
+					// - Example: if stepMinute is 15, then minMax is 45.
+					max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
+					gridSize[litem] = 0;
+
+					html += '<dt class="ui_tpicker_' + litem + '_label"' + (show ? '' : noDisplay) + '>' + o[litem + 'Text'] + '</dt>' +
+								'<dd class="ui_tpicker_' + litem + '"><div class="ui_tpicker_' + litem + '_slider"' + (show ? '' : noDisplay) + '></div>';
+
+					if (show && o[litem + 'Grid'] > 0) {
+						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+						if (litem === 'hour') {
+							for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
+								gridSize[litem]++;
+								var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
+								html += '<td data-for="' + litem + '">' + tmph + '</td>';
+							}
+						}
+						else {
+							for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
+								gridSize[litem]++;
+								html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
+							}
+						}
+
+						html += '</tr></table></div>';
+					}
+					html += '</dd>';
+				}
+				
+				// Timezone
+				var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
+				html += '<dt class="ui_tpicker_timezone_label"' + (showTz ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+				html += '<dd class="ui_tpicker_timezone" ' + (showTz ? '' : noDisplay) + '></dd>';
+
+				// Create the elements from string
+				html += '</dl></div>';
+				var $tp = $(html);
+
+				// if we only want time picker...
+				if (o.timeOnly === true) {
+					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+				}
+				
+				// add sliders, adjust grids, add events
+				for (i = 0, l = tp_inst.units.length; i < l; i++) {
+					litem = tp_inst.units[i];
+					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+					// add the slider
+					tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
+
+					// adjust the grid and add click event
+					if (show && o[litem + 'Grid'] > 0) {
+						size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
+						$tp.find('.ui_tpicker_' + litem + ' table').css({
+							width: size + "%",
+							marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
+							marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
+							borderCollapse: 'collapse'
+						}).find("td").click(function (e) {
+								var $t = $(this),
+									h = $t.html(),
+									n = parseInt(h.replace(/[^0-9]/g), 10),
+									ap = h.replace(/[^apm]/ig),
+									f = $t.data('for'); // loses scope, so we use data-for
+
+								if (f === 'hour') {
+									if (ap.indexOf('p') !== -1 && n < 12) {
+										n += 12;
+									}
+									else {
+										if (ap.indexOf('a') !== -1 && n === 12) {
+											n = 0;
+										}
+									}
+								}
+								
+								tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
+
+								tp_inst._onTimeChange();
+								tp_inst._onSelectHandler();
+							}).css({
+								cursor: 'pointer',
+								width: (100 / gridSize[litem]) + '%',
+								textAlign: 'center',
+								overflow: 'hidden'
+							});
+					} // end if grid > 0
+				} // end for loop
+
+				// Add timezone options
+				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+				$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function (val, idx) {
+					return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
+				}));
+				if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
+					var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
+					if (local_timezone === this.timezone) {
+						selectLocalTimezone(tp_inst);
+					} else {
+						this.timezone_select.val(this.timezone);
+					}
+				} else {
+					if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
+						this.timezone_select.val(o.timezone);
+					} else {
+						selectLocalTimezone(tp_inst);
+					}
+				}
+				this.timezone_select.change(function () {
+					tp_inst._onTimeChange();
+					tp_inst._onSelectHandler();
+				});
+				// End timezone options
+				
+				// inject timepicker into datepicker
+				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+				if ($buttonPanel.length) {
+					$buttonPanel.before($tp);
+				} else {
+					$dp.append($tp);
+				}
+
+				this.$timeObj = $tp.find('.ui_tpicker_time');
+
+				if (this.inst !== null) {
+					var timeDefined = this.timeDefined;
+					this._onTimeChange();
+					this.timeDefined = timeDefined;
+				}
+
+				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+				if (this._defaults.addSliderAccess) {
+					var sliderAccessArgs = this._defaults.sliderAccessArgs,
+						rtl = this._defaults.isRTL;
+					sliderAccessArgs.isRTL = rtl;
+						
+					setTimeout(function () { // fix for inline mode
+						if ($tp.find('.ui-slider-access').length === 0) {
+							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+							// fix any grids since sliders are shorter
+							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+							if (sliderAccessWidth) {
+								$tp.find('table:visible').each(function () {
+									var $g = $(this),
+										oldWidth = $g.outerWidth(),
+										oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
+										newWidth = oldWidth - sliderAccessWidth,
+										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
+										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
+									css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
+									$g.css(css);
+								});
+							}
+						}
+					}, 10);
+				}
+				// end slideAccess integration
+
+				tp_inst._limitMinMaxDateTime(this.inst, true);
+			}
+		},
+
+		/*
+		* This function tries to limit the ability to go outside the
+		* min/max date range
+		*/
+		_limitMinMaxDateTime: function (dp_inst, adjustSliders) {
+			var o = this._defaults,
+				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+			if (!this._defaults.showTimepicker) {
+				return;
+			} // No time so nothing to check here
+
+			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
+					this.hourMinOriginal = o.hourMin;
+					this.minuteMinOriginal = o.minuteMin;
+					this.secondMinOriginal = o.secondMin;
+					this.millisecMinOriginal = o.millisecMin;
+					this.microsecMinOriginal = o.microsecMin;
+				}
+
+				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
+					this._defaults.hourMin = minDateTime.getHours();
+					if (this.hour <= this._defaults.hourMin) {
+						this.hour = this._defaults.hourMin;
+						this._defaults.minuteMin = minDateTime.getMinutes();
+						if (this.minute <= this._defaults.minuteMin) {
+							this.minute = this._defaults.minuteMin;
+							this._defaults.secondMin = minDateTime.getSeconds();
+							if (this.second <= this._defaults.secondMin) {
+								this.second = this._defaults.secondMin;
+								this._defaults.millisecMin = minDateTime.getMilliseconds();
+								if (this.millisec <= this._defaults.millisecMin) {
+									this.millisec = this._defaults.millisecMin;
+									this._defaults.microsecMin = minDateTime.getMicroseconds();
+								} else {
+									if (this.microsec < this._defaults.microsecMin) {
+										this.microsec = this._defaults.microsecMin;
+									}
+									this._defaults.microsecMin = this.microsecMinOriginal;
+								}
+							} else {
+								this._defaults.millisecMin = this.millisecMinOriginal;
+								this._defaults.microsecMin = this.microsecMinOriginal;
+							}
+						} else {
+							this._defaults.secondMin = this.secondMinOriginal;
+							this._defaults.millisecMin = this.millisecMinOriginal;
+							this._defaults.microsecMin = this.microsecMinOriginal;
+						}
+					} else {
+						this._defaults.minuteMin = this.minuteMinOriginal;
+						this._defaults.secondMin = this.secondMinOriginal;
+						this._defaults.millisecMin = this.millisecMinOriginal;
+						this._defaults.microsecMin = this.microsecMinOriginal;
+					}
+				} else {
+					this._defaults.hourMin = this.hourMinOriginal;
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+					this._defaults.microsecMin = this.microsecMinOriginal;
+				}
+			}
+
+			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
+					this.hourMaxOriginal = o.hourMax;
+					this.minuteMaxOriginal = o.minuteMax;
+					this.secondMaxOriginal = o.secondMax;
+					this.millisecMaxOriginal = o.millisecMax;
+					this.microsecMaxOriginal = o.microsecMax;
+				}
+
+				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
+					this._defaults.hourMax = maxDateTime.getHours();
+					if (this.hour >= this._defaults.hourMax) {
+						this.hour = this._defaults.hourMax;
+						this._defaults.minuteMax = maxDateTime.getMinutes();
+						if (this.minute >= this._defaults.minuteMax) {
+							this.minute = this._defaults.minuteMax;
+							this._defaults.secondMax = maxDateTime.getSeconds();
+							if (this.second >= this._defaults.secondMax) {
+								this.second = this._defaults.secondMax;
+								this._defaults.millisecMax = maxDateTime.getMilliseconds();
+								if (this.millisec >= this._defaults.millisecMax) {
+									this.millisec = this._defaults.millisecMax;
+									this._defaults.microsecMax = maxDateTime.getMicroseconds();
+								} else {
+									if (this.microsec > this._defaults.microsecMax) {
+										this.microsec = this._defaults.microsecMax;
+									}
+									this._defaults.microsecMax = this.microsecMaxOriginal;
+								}
+							} else {
+								this._defaults.millisecMax = this.millisecMaxOriginal;
+								this._defaults.microsecMax = this.microsecMaxOriginal;
+							}
+						} else {
+							this._defaults.secondMax = this.secondMaxOriginal;
+							this._defaults.millisecMax = this.millisecMaxOriginal;
+							this._defaults.microsecMax = this.microsecMaxOriginal;
+						}
+					} else {
+						this._defaults.minuteMax = this.minuteMaxOriginal;
+						this._defaults.secondMax = this.secondMaxOriginal;
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+						this._defaults.microsecMax = this.microsecMaxOriginal;
+					}
+				} else {
+					this._defaults.hourMax = this.hourMaxOriginal;
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+					this._defaults.microsecMax = this.microsecMaxOriginal;
+				}
+			}
+
+			if (adjustSliders !== undefined && adjustSliders === true) {
+				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
+					microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
+
+				if (this.hour_slider) {
+					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax });
+					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
+				}
+				if (this.minute_slider) {
+					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax });
+					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
+				}
+				if (this.second_slider) {
+					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax });
+					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
+				}
+				if (this.millisec_slider) {
+					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax });
+					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
+				}
+				if (this.microsec_slider) {
+					this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax });
+					this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
+				}
+			}
+
+		},
+
+		/*
+		* when a slider moves, set the internal time...
+		* on time change is also called when the time is updated in the text field
+		*/
+		_onTimeChange: function () {
+			if (!this._defaults.showTimepicker) {
+                                return;
+			}
+			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
+				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
+				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
+				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
+				microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
+				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+				o = this._defaults,
+				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
+				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
+
+			if (typeof(hour) === 'object') {
+				hour = false;
+			}
+			if (typeof(minute) === 'object') {
+				minute = false;
+			}
+			if (typeof(second) === 'object') {
+				second = false;
+			}
+			if (typeof(millisec) === 'object') {
+				millisec = false;
+			}
+			if (typeof(microsec) === 'object') {
+				microsec = false;
+			}
+			if (typeof(timezone) === 'object') {
+				timezone = false;
+			}
+
+			if (hour !== false) {
+				hour = parseInt(hour, 10);
+			}
+			if (minute !== false) {
+				minute = parseInt(minute, 10);
+			}
+			if (second !== false) {
+				second = parseInt(second, 10);
+			}
+			if (millisec !== false) {
+				millisec = parseInt(millisec, 10);
+			}
+			if (microsec !== false) {
+				microsec = parseInt(microsec, 10);
+			}
+			if (timezone !== false) {
+				timezone = timezone.toString();
+			}
+
+			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+			// If the update was done in the input field, the input field should not be updated.
+			// If the update was done using the sliders, update the input field.
+			var hasChanged = (
+						hour !== parseInt(this.hour,10) || // sliders should all be numeric
+						minute !== parseInt(this.minute,10) || 
+						second !== parseInt(this.second,10) || 
+						millisec !== parseInt(this.millisec,10) || 
+						microsec !== parseInt(this.microsec,10) || 
+						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || 
+						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
+					);
+
+			if (hasChanged) {
+
+				if (hour !== false) {
+					this.hour = hour;
+				}
+				if (minute !== false) {
+					this.minute = minute;
+				}
+				if (second !== false) {
+					this.second = second;
+				}
+				if (millisec !== false) {
+					this.millisec = millisec;
+				}
+				if (microsec !== false) {
+					this.microsec = microsec;
+				}
+				if (timezone !== false) {
+					this.timezone = timezone;
+				}
+
+				if (!this.inst) {
+					this.inst = $.datepicker._getInst(this.$input[0]);
+				}
+
+				this._limitMinMaxDateTime(this.inst, true);
+			}
+			if (this.support.ampm) {
+				this.ampm = ampm;
+			}
+
+			// Updates the time within the timepicker
+			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
+			if (this.$timeObj) {
+				if (pickerTimeFormat === o.timeFormat) {
+					this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
+				}
+				else {
+					this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+				}
+			}
+
+			this.timeDefined = true;
+			if (hasChanged) {
+				this._updateDateTime();
+				this.$input.focus();
+			}
+		},
+
+		/*
+		* call custom onSelect.
+		* bind to sliders slidestop, and grid click.
+		*/
+		_onSelectHandler: function () {
+			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+			var inputEl = this.$input ? this.$input[0] : null;
+			if (onSelect && inputEl) {
+				onSelect.apply(inputEl, [this.formattedDateTime, this]);
+			}
+		},
+
+		/*
+		* update our input with the new date time..
+		*/
+		_updateDateTime: function (dp_inst) {
+			dp_inst = this.inst || dp_inst;
+			var dtTmp = (dp_inst.currentYear > 0? 
+							new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) : 
+							new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				dt = $.datepicker._daylightSavingAdjust(dtTmp),
+				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
+				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+				formatCfg = $.datepicker._getFormatConfig(dp_inst),
+				timeAvailable = dt !== null && this.timeDefined;
+			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+			var formattedDateTime = this.formattedDate;
+			
+			// if a slider was changed but datepicker doesn't have a value yet, set it
+			if (dp_inst.lastVal === "") {
+                dp_inst.currentYear = dp_inst.selectedYear;
+                dp_inst.currentMonth = dp_inst.selectedMonth;
+                dp_inst.currentDay = dp_inst.selectedDay;
+            }
+
+			/*
+			* remove following lines to force every changes in date picker to change the input value
+			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
+			* If the user manually empty the value in the input field, the date picker will never change selected value.
+			*/
+			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+			//	return;
+			//}
+
+			if (this._defaults.timeOnly === true) {
+				formattedDateTime = this.formattedTime;
+			} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+			}
+
+			this.formattedDateTime = formattedDateTime;
+
+			if (!this._defaults.showTimepicker) {
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
+				this.$altInput.val(this.formattedTime);
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput) {
+				this.$input.val(formattedDateTime);
+				var altFormattedDateTime = '',
+					altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
+					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
+				
+				if (!this._defaults.timeOnly) {
+					if (this._defaults.altFormat) {
+						altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+					}
+					else {
+						altFormattedDateTime = this.formattedDate;
+					}
+
+					if (altFormattedDateTime) {
+						altFormattedDateTime += altSeparator;
+					}
+				}
+
+				if (this._defaults.altTimeFormat) {
+					altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+				}
+				else {
+					altFormattedDateTime += this.formattedTime + altTimeSuffix;
+				}
+				this.$altInput.val(altFormattedDateTime);
+			} else {
+				this.$input.val(formattedDateTime);
+			}
+
+			this.$input.trigger("change");
+		},
+
+		_onFocus: function () {
+			if (!this.$input.val() && this._defaults.defaultValue) {
+				this.$input.val(this._defaults.defaultValue);
+				var inst = $.datepicker._getInst(this.$input.get(0)),
+					tp_inst = $.datepicker._get(inst, 'timepicker');
+				if (tp_inst) {
+					if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+						try {
+							$.datepicker._updateDatepicker(inst);
+						} catch (err) {
+							$.timepicker.log(err);
+						}
+					}
+				}
+			}
+		},
+
+		/*
+		* Small abstraction to control types
+		* We can add more, just be sure to follow the pattern: create, options, value
+		*/
+		_controls: {
+			// slider methods
+			slider: {
+				create: function (tp_inst, obj, unit, val, min, max, step) {
+					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
+					return obj.prop('slide', null).slider({
+						orientation: "horizontal",
+						value: rtl ? val * -1 : val,
+						min: rtl ? max * -1 : min,
+						max: rtl ? min * -1 : max,
+						step: step,
+						slide: function (event, ui) {
+							tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
+							tp_inst._onTimeChange();
+						},
+						stop: function (event, ui) {
+							tp_inst._onSelectHandler();
+						}
+					});	
+				},
+				options: function (tp_inst, obj, unit, opts, val) {
+					if (tp_inst._defaults.isRTL) {
+						if (typeof(opts) === 'string') {
+							if (opts === 'min' || opts === 'max') {
+								if (val !== undefined) {
+									return obj.slider(opts, val * -1);
+								}
+								return Math.abs(obj.slider(opts));
+							}
+							return obj.slider(opts);
+						}
+						var min = opts.min, 
+							max = opts.max;
+						opts.min = opts.max = null;
+						if (min !== undefined) {
+							opts.max = min * -1;
+						}
+						if (max !== undefined) {
+							opts.min = max * -1;
+						}
+						return obj.slider(opts);
+					}
+					if (typeof(opts) === 'string' && val !== undefined) {
+						return obj.slider(opts, val);
+					}
+					return obj.slider(opts);
+				},
+				value: function (tp_inst, obj, unit, val) {
+					if (tp_inst._defaults.isRTL) {
+						if (val !== undefined) {
+							return obj.slider('value', val * -1);
+						}
+						return Math.abs(obj.slider('value'));
+					}
+					if (val !== undefined) {
+						return obj.slider('value', val);
+					}
+					return obj.slider('value');
+				}
+			},
+			// select methods
+			select: {
+				create: function (tp_inst, obj, unit, val, min, max, step) {
+					var sel = '<select class="ui-timepicker-select" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
+						format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
+
+					for (var i = min; i <= max; i += step) {
+						sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
+						if (unit === 'hour') {
+							sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
+						}
+						else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
+						else {sel += '0' + i.toString(); }
+						sel += '</option>';
+					}
+					sel += '</select>';
+
+					obj.children('select').remove();
+
+					$(sel).appendTo(obj).change(function (e) {
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					});
+
+					return obj;
+				},
+				options: function (tp_inst, obj, unit, opts, val) {
+					var o = {},
+						$t = obj.children('select');
+					if (typeof(opts) === 'string') {
+						if (val === undefined) {
+							return $t.data(opts);
+						}
+						o[opts] = val;	
+					}
+					else { o = opts; }
+					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+				},
+				value: function (tp_inst, obj, unit, val) {
+					var $t = obj.children('select');
+					if (val !== undefined) {
+						return $t.val(val);
+					}
+					return $t.val();
+				}
+			}
+		} // end _controls
+
+	});
+
+	$.fn.extend({
+		/*
+		* shorthand just to use timepicker.
+		*/
+		timepicker: function (o) {
+			o = o || {};
+			var tmp_args = Array.prototype.slice.call(arguments);
+
+			if (typeof o === 'object') {
+				tmp_args[0] = $.extend(o, {
+					timeOnly: true
+				});
+			}
+
+			return $(this).each(function () {
+				$.fn.datetimepicker.apply($(this), tmp_args);
+			});
+		},
+
+		/*
+		* extend timepicker to datepicker
+		*/
+		datetimepicker: function (o) {
+			o = o || {};
+			var tmp_args = arguments;
+
+			if (typeof(o) === 'string') {
+				if (o === 'getDate') {
+					return $.fn.datepicker.apply($(this[0]), tmp_args);
+				} else {
+					return this.each(function () {
+						var $t = $(this);
+						$t.datepicker.apply($t, tmp_args);
+					});
+				}
+			} else {
+				return this.each(function () {
+					var $t = $(this);
+					$t.datepicker($.timepicker._newInst($t, o)._defaults);
+				});
+			}
+		}
+	});
+
+	/*
+	* Public Utility to parse date and time
+	*/
+	$.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+		if (parseRes.timeObj) {
+			var t = parseRes.timeObj;
+			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+			parseRes.date.setMicroseconds(t.microsec);
+		}
+
+		return parseRes.date;
+	};
+
+	/*
+	* Public utility to parse time
+	*/
+	$.datepicker.parseTime = function (timeFormat, timeString, options) {
+		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
+			iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
+
+		// Strict parse requires the timeString to match the timeFormat exactly
+		var strictParse = function (f, s, o) {
+
+			// pattern for standard and localized AM/PM markers
+			var getPatternAmpm = function (amNames, pmNames) {
+				var markers = [];
+				if (amNames) {
+					$.merge(markers, amNames);
+				}
+				if (pmNames) {
+					$.merge(markers, pmNames);
+				}
+				markers = $.map(markers, function (val) {
+					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+				});
+				return '(' + markers.join('|') + ')?';
+			};
+
+			// figure out position of time elements.. cause js cant do named captures
+			var getFormatPositions = function (timeFormat) {
+				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
+					orders = {
+						h: -1,
+						m: -1,
+						s: -1,
+						l: -1,
+						c: -1,
+						t: -1,
+						z: -1
+					};
+
+				if (finds) {
+					for (var i = 0; i < finds.length; i++) {
+						if (orders[finds[i].toString().charAt(0)] === -1) {
+							orders[finds[i].toString().charAt(0)] = i + 1;
+						}
+					}
+				}
+				return orders;
+			};
+
+			var regstr = '^' + f.toString()
+					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+							var ml = match.length;
+							switch (match.charAt(0).toLowerCase()) {
+							case 'h':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 'm':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 's':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 'l':
+								return '(\\d?\\d?\\d)';
+							case 'c':
+								return '(\\d?\\d?\\d)';
+							case 'z':
+								return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
+							case 't':
+								return getPatternAmpm(o.amNames, o.pmNames);
+							default:    // literal escaped in quotes
+								return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
+							}
+						})
+					.replace(/\s/g, '\\s?') +
+					o.timeSuffix + '$',
+				order = getFormatPositions(f),
+				ampm = '',
+				treg;
+
+			treg = s.match(new RegExp(regstr, 'i'));
+
+			var resTime = {
+				hour: 0,
+				minute: 0,
+				second: 0,
+				millisec: 0,
+				microsec: 0
+			};
+
+			if (treg) {
+				if (order.t !== -1) {
+					if (treg[order.t] === undefined || treg[order.t].length === 0) {
+						ampm = '';
+						resTime.ampm = '';
+					} else {
+						ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
+						resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
+					}
+				}
+
+				if (order.h !== -1) {
+					if (ampm === 'AM' && treg[order.h] === '12') {
+						resTime.hour = 0; // 12am = 0 hour
+					} else {
+						if (ampm === 'PM' && treg[order.h] !== '12') {
+							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+						} else {
+							resTime.hour = Number(treg[order.h]);
+						}
+					}
+				}
+
+				if (order.m !== -1) {
+					resTime.minute = Number(treg[order.m]);
+				}
+				if (order.s !== -1) {
+					resTime.second = Number(treg[order.s]);
+				}
+				if (order.l !== -1) {
+					resTime.millisec = Number(treg[order.l]);
+				}
+				if (order.c !== -1) {
+					resTime.microsec = Number(treg[order.c]);
+				}
+				if (order.z !== -1 && treg[order.z] !== undefined) {
+					resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
+				}
+
+
+				return resTime;
+			}
+			return false;
+		};// end strictParse
+
+		// First try JS Date, if that fails, use strictParse
+		var looseParse = function (f, s, o) {
+			try {
+				var d = new Date('2012-01-01 ' + s);
+				if (isNaN(d.getTime())) {
+					d = new Date('2012-01-01T' + s);
+					if (isNaN(d.getTime())) {
+						d = new Date('01/01/2012 ' + s);
+						if (isNaN(d.getTime())) {
+							throw "Unable to parse time with native Date: " + s;
+						}
+					}
+				}
+
+				return {
+					hour: d.getHours(),
+					minute: d.getMinutes(),
+					second: d.getSeconds(),
+					millisec: d.getMilliseconds(),
+					microsec: d.getMicroseconds(),
+					timezone: d.getTimezoneOffset() * -1
+				};
+			}
+			catch (err) {
+				try {
+					return strictParse(f, s, o);
+				}
+				catch (err2) {
+					$.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
+				}				
+			}
+			return false;
+		}; // end looseParse
+		
+		if (typeof o.parse === "function") {
+			return o.parse(timeFormat, timeString, o);
+		}
+		if (o.parse === 'loose') {
+			return looseParse(timeFormat, timeString, o);
+		}
+		return strictParse(timeFormat, timeString, o);
+	};
+
+	/**
+	 * Public utility to format the time
+	 * @param {string} format format of the time
+	 * @param {Object} time Object not a Date for timezones
+	 * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
+	 * @returns {string} the formatted time
+	 */
+	$.datepicker.formatTime = function (format, time, options) {
+		options = options || {};
+		options = $.extend({}, $.timepicker._defaults, options);
+		time = $.extend({
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			microsec: 0,
+			timezone: null
+		}, time);
+
+		var tmptime = format,
+			ampmName = options.amNames[0],
+			hour = parseInt(time.hour, 10);
+
+		if (hour > 11) {
+			ampmName = options.pmNames[0];
+		}
+
+		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+			switch (match) {
+			case 'HH':
+				return ('0' + hour).slice(-2);
+			case 'H':
+				return hour;
+			case 'hh':
+				return ('0' + convert24to12(hour)).slice(-2);
+			case 'h':
+				return convert24to12(hour);
+			case 'mm':
+				return ('0' + time.minute).slice(-2);
+			case 'm':
+				return time.minute;
+			case 'ss':
+				return ('0' + time.second).slice(-2);
+			case 's':
+				return time.second;
+			case 'l':
+				return ('00' + time.millisec).slice(-3);
+			case 'c':
+				return ('00' + time.microsec).slice(-3);
+			case 'z':
+				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
+			case 'Z':
+				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
+			case 'T':
+				return ampmName.charAt(0).toUpperCase();
+			case 'TT':
+				return ampmName.toUpperCase();
+			case 't':
+				return ampmName.charAt(0).toLowerCase();
+			case 'tt':
+				return ampmName.toLowerCase();
+			default:
+				return match.replace(/'/g, "");
+			}
+		});
+
+		return tmptime;
+	};
+
+	/*
+	* the bad hack :/ override datepicker so it doesn't close on select
+	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+	*/
+	$.datepicker._base_selectDate = $.datepicker._selectDate;
+	$.datepicker._selectDate = function (id, dateStr) {
+		var inst = this._getInst($(id)[0]),
+			tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			tp_inst._limitMinMaxDateTime(inst, true);
+			inst.inline = inst.stay_open = true;
+			//This way the onSelect handler called from calendarpicker get the full dateTime
+			this._base_selectDate(id, dateStr);
+			inst.inline = inst.stay_open = false;
+			this._notifyChange(inst);
+			this._updateDatepicker(inst);
+		} else {
+			this._base_selectDate(id, dateStr);
+		}
+	};
+
+	/*
+	* second bad hack :/ override datepicker so it triggers an event when changing the input field
+	* and does not redraw the datepicker on every selectDate event
+	*/
+	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+	$.datepicker._updateDatepicker = function (inst) {
+
+		// don't popup the datepicker if there is another instance already opened
+		var input = inst.input[0];
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
+			return;
+		}
+
+		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+			this._base_updateDatepicker(inst);
+
+			// Reload the time control when changing something in the input text field.
+			var tp_inst = this._get(inst, 'timepicker');
+			if (tp_inst) {
+				tp_inst._addTimePicker(inst);
+			}
+		}
+	};
+
+	/*
+	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
+	*/
+	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+	$.datepicker._doKeyPress = function (event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if ($.datepicker._get(inst, 'constrainInput')) {
+				var ampm = tp_inst.support.ampm,
+					tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
+					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+					datetimeChars = tp_inst._defaults.timeFormat.toString()
+											.replace(/[hms]/g, '')
+											.replace(/TT/g, ampm ? 'APM' : '')
+											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+											.replace(/tT/g, ampm ? 'AaPpMm' : '')
+											.replace(/T/g, ampm ? 'AP' : '')
+											.replace(/tt/g, ampm ? 'apm' : '')
+											.replace(/t/g, ampm ? 'ap' : '') + 
+											" " + tp_inst._defaults.separator + 
+											tp_inst._defaults.timeSuffix + 
+											(tz ? tp_inst._defaults.timezoneList.join('') : '') + 
+											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
+											dateChars,
+					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+			}
+		}
+
+		return $.datepicker._base_doKeyPress(event);
+	};
+
+	/*
+	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
+	* Update any alternate field to synchronise with the main field.
+	*/
+	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+	$.datepicker._updateAlternate = function (inst) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var altField = tp_inst._defaults.altField;
+			if (altField) { // update alternate field too
+				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+					date = this._getDate(inst),
+					formatCfg = $.datepicker._getFormatConfig(inst),
+					altFormattedDateTime = '', 
+					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
+					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
+					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
+				
+				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
+				if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
+					if (tp_inst._defaults.altFormat) {
+						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+					}
+					else {
+						altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+					}
+				}
+				$(altField).val(altFormattedDateTime);
+			}
+		}
+		else {
+			$.datepicker._base_updateAlternate(inst);
+		}
+	};
+
+	/*
+	* Override key up event to sync manual input changes.
+	*/
+	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+	$.datepicker._doKeyUp = function (event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+				try {
+					$.datepicker._updateDatepicker(inst);
+				} catch (err) {
+					$.timepicker.log(err);
+				}
+			}
+		}
+
+		return $.datepicker._base_doKeyUp(event);
+	};
+
+	/*
+	* override "Today" button to also grab the time.
+	*/
+	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+	$.datepicker._gotoToday = function (id) {
+		var inst = this._getInst($(id)[0]),
+			$dp = inst.dpDiv;
+		this._base_gotoToday(id);
+		var tp_inst = this._get(inst, 'timepicker');
+		selectLocalTimezone(tp_inst);
+		var now = new Date();
+		this._setTime(inst, now);
+		$('.ui-datepicker-today', $dp).click();
+	};
+
+	/*
+	* Disable & enable the Time in the datetimepicker
+	*/
+	$.datepicker._disableTimepickerDatepicker = function (target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			inst.settings.showTimepicker = false;
+			tp_inst._defaults.showTimepicker = false;
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	$.datepicker._enableTimepickerDatepicker = function (target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			inst.settings.showTimepicker = true;
+			tp_inst._defaults.showTimepicker = true;
+			tp_inst._addTimePicker(inst); // Could be disabled on page load
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create our own set time function
+	*/
+	$.datepicker._setTime = function (inst, date) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var defaults = tp_inst._defaults;
+
+			// calling _setTime with no date sets time to defaults
+			tp_inst.hour = date ? date.getHours() : defaults.hour;
+			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
+			tp_inst.second = date ? date.getSeconds() : defaults.second;
+			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
+			tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
+
+			//check if within min/max times.. 
+			tp_inst._limitMinMaxDateTime(inst, true);
+
+			tp_inst._onTimeChange();
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create new public method to set only time, callable as $().datepicker('setTime', date)
+	*/
+	$.datepicker._setTimeDatepicker = function (target, date, withDate) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			this._setDateFromField(inst);
+			var tp_date;
+			if (date) {
+				if (typeof date === "string") {
+					tp_inst._parseTime(date, withDate);
+					tp_date = new Date();
+					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+					tp_date.setMicroseconds(tp_inst.microsec);
+				} else {
+					tp_date = new Date(date.getTime());
+					tp_date.setMicroseconds(date.getMicroseconds());
+				}
+				if (tp_date.toString() === 'Invalid Date') {
+					tp_date = undefined;
+				}
+				this._setTime(inst, tp_date);
+			}
+		}
+
+	};
+
+	/*
+	* override setDate() to allow setting time too within Date object
+	*/
+	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+	$.datepicker._setDateDatepicker = function (target, date) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		if (typeof(date) === 'string') {
+			date = new Date(date);
+			if (!date.getTime()) {
+				$.timepicker.log("Error creating Date object from string.");
+			}
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		var tp_date;
+		if (date instanceof Date) {
+			tp_date = new Date(date.getTime());
+			tp_date.setMicroseconds(date.getMicroseconds());
+		} else {
+			tp_date = date;
+		}
+		
+		// This is important if you are using the timezone option, javascript's Date 
+		// object will only return the timezone offset for the current locale, so we 
+		// adjust it accordingly.  If not using timezone option this won't matter..
+		// If a timezone is different in tp, keep the timezone as is
+		if (tp_inst && tp_date) {
+			// look out for DST if tz wasn't specified
+			if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+				tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
+			}
+			date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+			tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
+		}
+
+		this._updateDatepicker(inst);
+		this._base_setDateDatepicker.apply(this, arguments);
+		this._setTimeDatepicker(target, tp_date, true);
+	};
+
+	/*
+	* override getDate() to allow getting time too within Date object
+	*/
+	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+	$.datepicker._getDateDatepicker = function (target, noDefault) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			// if it hasn't yet been defined, grab from field
+			if (inst.lastVal === undefined) {
+				this._setDateFromField(inst, noDefault);
+			}
+
+			var date = this._getDate(inst);
+			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+				date.setMicroseconds(tp_inst.microsec);
+
+				// This is important if you are using the timezone option, javascript's Date 
+				// object will only return the timezone offset for the current locale, so we 
+				// adjust it accordingly.  If not using timezone option this won't matter..
+				if (tp_inst.timezone != null) {
+					// look out for DST if tz wasn't specified
+					if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+						tp_inst.timezone = date.getTimezoneOffset() * -1;
+					}
+					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+				}
+			}
+			return date;
+		}
+		return this._base_getDateDatepicker(target, noDefault);
+	};
+
+	/*
+	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+	* An option in datapicker to ignore extra format characters would be nicer.
+	*/
+	$.datepicker._base_parseDate = $.datepicker.parseDate;
+	$.datepicker.parseDate = function (format, value, settings) {
+		var date;
+		try {
+			date = this._base_parseDate(format, value, settings);
+		} catch (err) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+			if (err.indexOf(":") >= 0) {
+				date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
+				$.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
+			} else {
+				throw err;
+			}
+		}
+		return date;
+	};
+
+	/*
+	* override formatDate to set date with time to the input
+	*/
+	$.datepicker._base_formatDate = $.datepicker._formatDate;
+	$.datepicker._formatDate = function (inst, day, month, year) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			tp_inst._updateDateTime(inst);
+			return tp_inst.$input.val();
+		}
+		return this._base_formatDate(inst);
+	};
+
+	/*
+	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+	*/
+	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+	$.datepicker._optionDatepicker = function (target, name, value) {
+		var inst = this._getInst(target),
+			name_clone;
+		if (!inst) {
+			return null;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var min = null,
+				max = null,
+				onselect = null,
+				overrides = tp_inst._defaults.evnts,
+				fns = {},
+				prop;
+			if (typeof name === 'string') { // if min/max was set with the string
+				if (name === 'minDate' || name === 'minDateTime') {
+					min = value;
+				} else if (name === 'maxDate' || name === 'maxDateTime') {
+					max = value;
+				} else if (name === 'onSelect') {
+					onselect = value;
+				} else if (overrides.hasOwnProperty(name)) {
+					if (typeof (value) === 'undefined') {
+						return overrides[name];
+					}
+					fns[name] = value;
+					name_clone = {}; //empty results in exiting function after overrides updated
+				}
+			} else if (typeof name === 'object') { //if min/max was set with the JSON
+				if (name.minDate) {
+					min = name.minDate;
+				} else if (name.minDateTime) {
+					min = name.minDateTime;
+				} else if (name.maxDate) {
+					max = name.maxDate;
+				} else if (name.maxDateTime) {
+					max = name.maxDateTime;
+				}
+				for (prop in overrides) {
+					if (overrides.hasOwnProperty(prop) && name[prop]) {
+						fns[prop] = name[prop];
+					}
+				}
+			}
+			for (prop in fns) {
+				if (fns.hasOwnProperty(prop)) {
+					overrides[prop] = fns[prop];
+					if (!name_clone) { name_clone = $.extend({}, name); }
+					delete name_clone[prop];
+				}
+			}
+			if (name_clone && isEmptyObject(name_clone)) { return; }
+			if (min) { //if min was set
+				if (min === 0) {
+					min = new Date();
+				} else {
+					min = new Date(min);
+				}
+				tp_inst._defaults.minDate = min;
+				tp_inst._defaults.minDateTime = min;
+			} else if (max) { //if max was set
+				if (max === 0) {
+					max = new Date();
+				} else {
+					max = new Date(max);
+				}
+				tp_inst._defaults.maxDate = max;
+				tp_inst._defaults.maxDateTime = max;
+			} else if (onselect) {
+				tp_inst._defaults.onSelect = onselect;
+			}
+		}
+		if (value === undefined) {
+			return this._base_optionDatepicker.call($.datepicker, target, name);
+		}
+		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+	};
+	
+	/*
+	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
+	* it will return false for all objects
+	*/
+	var isEmptyObject = function (obj) {
+		var prop;
+		for (prop in obj) {
+			if (obj.hasOwnProperty(prop)) {
+				return false;
+			}
+		}
+		return true;
+	};
+
+	/*
+	* jQuery extend now ignores nulls!
+	*/
+	var extendRemove = function (target, props) {
+		$.extend(target, props);
+		for (var name in props) {
+			if (props[name] === null || props[name] === undefined) {
+				target[name] = props[name];
+			}
+		}
+		return target;
+	};
+
+	/*
+	* Determine by the time format which units are supported
+	* Returns an object of booleans for each unit
+	*/
+	var detectSupport = function (timeFormat) {
+		var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
+			isIn = function (f, t) { // does the format contain the token?
+					return f.indexOf(t) !== -1 ? true : false;
+				};
+		return {
+				hour: isIn(tf, 'h'),
+				minute: isIn(tf, 'm'),
+				second: isIn(tf, 's'),
+				millisec: isIn(tf, 'l'),
+				microsec: isIn(tf, 'c'),
+				timezone: isIn(tf, 'z'),
+				ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
+				iso8601: isIn(timeFormat, 'Z')
+			};
+	};
+
+	/*
+	* Converts 24 hour format into 12 hour
+	* Returns 12 hour without leading 0
+	*/
+	var convert24to12 = function (hour) {
+		hour %= 12;
+
+		if (hour === 0) {
+			hour = 12;
+		}
+
+		return String(hour);
+	};
+
+	var computeEffectiveSetting = function (settings, property) {
+		return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
+	};
+
+	/*
+	* Splits datetime string into date and time substrings.
+	* Throws exception when date can't be parsed
+	* Returns {dateString: dateString, timeString: timeString}
+	*/
+	var splitDateTime = function (dateTimeString, timeSettings) {
+		// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
+		// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+		var separator = computeEffectiveSetting(timeSettings, 'separator'),
+			format = computeEffectiveSetting(timeSettings, 'timeFormat'),
+			timeParts = format.split(separator), // how many occurrences of separator may be in our format?
+			timePartsLen = timeParts.length,
+			allParts = dateTimeString.split(separator),
+			allPartsLen = allParts.length;
+
+		if (allPartsLen > 1) {
+			return {
+				dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+				timeString: allParts.splice(0, timePartsLen).join(separator)
+			};
+		}
+
+		return {
+			dateString: dateTimeString,
+			timeString: ''
+		};
+	};
+
+	/*
+	* Internal function to parse datetime interval
+	* Returns: {date: Date, timeObj: Object}, where
+	*   date - parsed date without time (type Date)
+	*   timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
+	*/
+	var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var date,
+			parts,
+			parsedTime;
+
+		parts = splitDateTime(dateTimeString, timeSettings);
+		date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
+
+		if (parts.timeString === '') {
+			return {
+				date: date
+			};
+		}
+
+		parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
+
+		if (!parsedTime) {
+			throw 'Wrong time format';
+		}
+
+		return {
+			date: date,
+			timeObj: parsedTime
+		};
+	};
+
+	/*
+	* Internal function to set timezone_select to the local timezone
+	*/
+	var selectLocalTimezone = function (tp_inst, date) {
+		if (tp_inst && tp_inst.timezone_select) {
+			var now = date || new Date();
+			tp_inst.timezone_select.val(-now.getTimezoneOffset());
+		}
+	};
+
+	/*
+	* Create a Singleton Instance
+	*/
+	$.timepicker = new Timepicker();
+
+	/**
+	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+	 * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
+	 * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
+	 * @return {string}
+	 */
+	$.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
+		if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
+			return tzMinutes;
+		}
+
+		var off = tzMinutes,
+			minutes = off % 60,
+			hours = (off - minutes) / 60,
+			iso = iso8601 ? ':' : '',
+			tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
+		
+		if (tz === '+00:00') {
+			return 'Z';
+		}
+		return tz;
+	};
+
+	/**
+	 * Get the number in minutes that represents a timezone string
+	 * @param  {string} tzString formatted like "+0500", "-1245", "Z"
+	 * @return {number} the offset minutes or the original string if it doesn't match expectations
+	 */
+	$.timepicker.timezoneOffsetNumber = function (tzString) {
+		var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
+
+		if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
+			return 0;
+		}
+
+		if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
+			return tzString;
+		}
+
+		return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
+					((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
+					parseInt(normalized.substr(3, 2), 10))); // minutes
+	};
+
+	/**
+	 * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
+	 * @param  {Date} date
+	 * @param  {string} toTimezone formatted like "+0500", "-1245"
+	 * @return {Date}
+	 */
+	$.timepicker.timezoneAdjust = function (date, toTimezone) {
+		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
+		if (!isNaN(toTz)) {
+			date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
+		}
+		return date;
+	};
+
+	/**
+	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * n.b. The input value must be correctly formatted (reformatting is not supported)
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the timepicker() call
+	 * @return {jQuery}
+	 */
+	$.timepicker.timeRange = function (startTime, endTime, options) {
+		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  {string} method Can be used to specify the type of picker to be added
+	 * @return {jQuery}
+	 */
+	$.timepicker.datetimeRange = function (startTime, endTime, options) {
+		$.timepicker.handleRange('datetimepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return {jQuery}
+	 */
+	$.timepicker.dateRange = function (startTime, endTime, options) {
+		$.timepicker.handleRange('datepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {string} method Can be used to specify the type of picker to be added
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return {jQuery}
+	 */
+	$.timepicker.handleRange = function (method, startTime, endTime, options) {
+		options = $.extend({}, {
+			minInterval: 0, // min allowed interval in milliseconds
+			maxInterval: 0, // max allowed interval in milliseconds
+			start: {},      // options for start picker
+			end: {}         // options for end picker
+		}, options);
+
+		function checkDates(changed, other) {
+			var startdt = startTime[method]('getDate'),
+				enddt = endTime[method]('getDate'),
+				changeddt = changed[method]('getDate');
+
+			if (startdt !== null) {
+				var minDate = new Date(startdt.getTime()),
+					maxDate = new Date(startdt.getTime());
+
+				minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
+				maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
+
+				if (options.minInterval > 0 && minDate > enddt) { // minInterval check
+					endTime[method]('setDate', minDate);
+				}
+				else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
+					endTime[method]('setDate', maxDate);
+				}
+				else if (startdt > enddt) {
+					other[method]('setDate', changeddt);
+				}
+			}
+		}
+
+		function selected(changed, other, option) {
+			if (!changed.val()) {
+				return;
+			}
+			var date = changed[method].call(changed, 'getDate');
+			if (date !== null && options.minInterval > 0) {
+				if (option === 'minDate') {
+					date.setMilliseconds(date.getMilliseconds() + options.minInterval);
+				}
+				if (option === 'maxDate') {
+					date.setMilliseconds(date.getMilliseconds() - options.minInterval);
+				}
+			}
+			if (date.getTime) {
+				other[method].call(other, 'option', option, date);
+			}
+		}
+
+		$.fn[method].call(startTime, $.extend({
+			onClose: function (dateText, inst) {
+				checkDates($(this), endTime);
+			},
+			onSelect: function (selectedDateTime) {
+				selected($(this), endTime, 'minDate');
+			}
+		}, options, options.start));
+		$.fn[method].call(endTime, $.extend({
+			onClose: function (dateText, inst) {
+				checkDates($(this), startTime);
+			},
+			onSelect: function (selectedDateTime) {
+				selected($(this), startTime, 'maxDate');
+			}
+		}, options, options.end));
+
+		checkDates(startTime, endTime);
+		selected(startTime, endTime, 'minDate');
+		selected(endTime, startTime, 'maxDate');
+		return $([startTime.get(0), endTime.get(0)]);
+	};
+
+	/**
+	 * Log error or data to the console during error or debugging
+	 * @param  {Object} err pass any type object to log to the console during error or debugging
+	 * @return {void}
+	 */
+	$.timepicker.log = function (err) {
+		if (window.console) {
+			window.console.log(err);
+		}
+	};
+
+	/*
+	 * Add util object to allow access to private methods for testability.
+	 */
+	$.timepicker._util = {
+		_extendRemove: extendRemove,
+		_isEmptyObject: isEmptyObject,
+		_convert24to12: convert24to12,
+		_detectSupport: detectSupport,
+		_selectLocalTimezone: selectLocalTimezone,
+		_computeEffectiveSetting: computeEffectiveSetting,
+		_splitDateTime: splitDateTime,
+		_parseDateTimeInternal: parseDateTimeInternal
+	};
+
+	/*
+	* Microsecond support
+	*/
+	if (!Date.prototype.getMicroseconds) {
+		Date.prototype.microseconds = 0;
+		Date.prototype.getMicroseconds = function () { return this.microseconds; };
+		Date.prototype.setMicroseconds = function (m) {
+			this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
+			this.microseconds = m % 1000;
+			return this;
+		};
+	}
+
+	/*
+	* Keep up with the version
+	*/
+	$.timepicker.version = "@@version";
+
+})(jQuery);

+ 0 - 13
main/inc/lib/javascript/jqgrid/css/ellipsis-xbl.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <binding id="ellipsis">
-        <content>
-            <xul:window><!-- xul:window tag required for FF2 -->
-                <xul:description crop="end" xbl:inherits="value=xbl:text"><children/></xul:description>
-            </xul:window>
-        </content>
-    </binding>
-</bindings>

File diff suppressed because it is too large
+ 425 - 427
main/inc/lib/javascript/jqgrid/js/jquery.jqGrid.min.js


+ 153 - 151
main/install/install.lib.php

@@ -38,7 +38,7 @@ function is_already_installed_system() {
         return false; // Configuration file does not exist, install the system.
     }
     require $current_config_file;
-    
+
     $current_version = null;
     if (isset($_configuration['dokeos_version'])) {
         $current_version = trim($_configuration['dokeos_version']);
@@ -89,7 +89,7 @@ function check_php_setting($php_setting, $recommended_value, $return_success = f
     if ($current_php_value == $recommended_value) {
         return Display::label($current_php_value.' '.$return_success, 'success');
     } else {
-        return Display::label($current_php_value.' '.$return_success, 'important');        
+        return Display::label($current_php_value.' '.$return_success, 'important');
     }
 }
 
@@ -102,7 +102,7 @@ function check_php_setting_exists($php_setting) {
         return ini_get($php_setting);
     }
     return false;
-} 
+}
 
 
 /**
@@ -232,13 +232,13 @@ function detect_browser_language() {
  * This function checks if the given folder is writable
  */
 function check_writable($folder, $suggestion = false) {
-    if (is_writable(api_get_path(SYS_CODE_PATH).$folder)) {
+    if (is_writable($folder)) {
         return Display::label(get_lang('Writable'), 'success');
     } else {
         if ($suggestion) {
-            return Display::label(get_lang('NotWritable'), 'info');            
+            return Display::label(get_lang('NotWritable'), 'info');
         } else {
-            return Display::label(get_lang('NotWritable'), 'important');            
+            return Display::label(get_lang('NotWritable'), 'important');
         }
     }
 }
@@ -319,8 +319,8 @@ function write_system_config_file($path) {
     $config['{DATABASE_PASSWORD}']      = $dbPassForm;
     $config['TRACKING_ENABLED']         = true_false($enableTrackingForm);
     $config['SINGLE_DATABASE']          = true_false($singleDbForm);
-    $config['{COURSE_TABLE_PREFIX}']    = ($singleDbForm ? 'crs_' : '');    
-    $config['{DATABASE_GLUE}']          = ($singleDbForm ? '_' : '`.`');  
+    $config['{COURSE_TABLE_PREFIX}']    = ($singleDbForm ? 'crs_' : '');
+    $config['{DATABASE_GLUE}']          = ($singleDbForm ? '_' : '`.`');
     $config['{DATABASE_PREFIX}']        = '';
     $config['{DATABASE_MAIN}']          = $dbNameForm;
     $config['{DATABASE_STATS}']         = $dbNameForm;
@@ -453,7 +453,7 @@ function get_config_param($param, $updatePath = '') {
     }
 
     if (file_exists($updatePath.$updateFromConfigFile) && !is_dir($updatePath.$updateFromConfigFile)) {
-     
+
         // The parameter was not found among the global variables, so look into the old configuration file.
 
         // Make sure the installedVersion file is read first so it is overwritten
@@ -623,27 +623,27 @@ function database_server_connect() {
 /**
  * Database exists for the MYSQL user
  * @param type $database_name
- * @return boolean 
+ * @return boolean
  */
-function database_exists($database_name) {    
+function database_exists($database_name) {
     if (empty($database_name)) {
         return false;
-    }    
-    $select_database = @Database::select_db($database_name);    
-    $show_database = false;    
-    $sql = "SHOW DATABASES LIKE '".addslashes($database_name)."'";    
+    }
+    $select_database = @Database::select_db($database_name);
+    $show_database = false;
+    $sql = "SHOW DATABASES LIKE '".addslashes($database_name)."'";
     $result = @Database::query($sql);
     if (Database::num_rows($result)) {
         $show_database = true;
-    }    
+    }
     return $select_database || $show_database;
 }
 
 /**
- * In step 3. Tests establishing connection to the database server. 
- * If it's a single database environment the function checks if the database exist. 
- * If the database doesn't exist we check the creation permissions. 
- * 
+ * In step 3. Tests establishing connection to the database server.
+ * If it's a single database environment the function checks if the database exist.
+ * If the database doesn't exist we check the creation permissions.
+ *
  * @return int      1 when there is no problem;
  *                  0 when a new database is impossible to be created, then the single/multiple database configuration is impossible too
  *                 -1 when there is no connection established.
@@ -652,10 +652,10 @@ function test_db_connect($dbHostForm, $dbUsernameForm, $dbPassForm, $singleDbFor
     $dbConnect = -1;
     //Checking user credentials
     if (@Database::connect(array('server' => $dbHostForm, 'username' => $dbUsernameForm, 'password' => $dbPassForm)) !== false) {
-        $dbConnect = 1; 
+        $dbConnect = 1;
     } else {
         $dbConnect = -1;
-    }    
+    }
     return $dbConnect; //return 1, if no problems, "0" if, in case we can't create a new DB and "-1" if there is no connection.
 }
 
@@ -690,7 +690,7 @@ function load_main_database($installation_settings, $db_script = '') {
             $sql_text = file_get_contents($db_script);
         }
     } else {
-        $db_script = api_get_path(SYS_CODE_PATH).'install/'.SYSTEM_MAIN_DATABASE_FILE;        
+        $db_script = api_get_path(SYS_CODE_PATH).'install/'.SYSTEM_MAIN_DATABASE_FILE;
         if (file_exists($db_script)) {
             $sql_text = file_get_contents($db_script);
         }
@@ -699,7 +699,7 @@ function load_main_database($installation_settings, $db_script = '') {
     //replace symbolic parameters with user-specified values
     foreach ($installation_settings as $key => $value) {
         $sql_text = str_replace($key, Database::escape_string($value), $sql_text);
-    }    
+    }
     parse_sql_queries($sql_text);
 }
 
@@ -719,7 +719,7 @@ function parse_sql_queries($sql_text) {
 
     //split in array of sql strings
     $sql_instructions = array();
-    split_sql_file($sql_instructions, $sql_text);    
+    split_sql_file($sql_instructions, $sql_text);
 
     //execute the sql instructions
     $count = count($sql_instructions);
@@ -728,12 +728,12 @@ function parse_sql_queries($sql_text) {
         Database::query($this_sql_query);
         //UTF8 fix see #5678
         /*
-        if (strpos(strtolower($this_sql_query), 'create table') === false) {            
+        if (strpos(strtolower($this_sql_query), 'create table') === false) {
             Database::query($this_sql_query);
         } else {
-            //$this_sql_query .= substr($this_sql_query, strlen($this_sql_query), strlen($this_sql_query)-1); 
-            $this_sql_query .= ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci ';            
-            Database::query($this_sql_query);            
+            //$this_sql_query .= substr($this_sql_query, strlen($this_sql_query), strlen($this_sql_query)-1);
+            $this_sql_query .= ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci ';
+            Database::query($this_sql_query);
         }*/
     }
 }
@@ -1060,7 +1060,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
     echo '<div class="RequirementText">';
     echo '<strong>'.get_lang('ReadThoroughly').'</strong><br />';
     echo get_lang('MoreDetails').' <a href="../../documentation/installation_guide.html" target="_blank">'.get_lang('ReadTheInstallGuide').'</a>.<br />'."\n";
-    
+
     if ($installType == 'update')  {
         echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'<br />';
     }
@@ -1068,12 +1068,12 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
 
     //  SERVER REQUIREMENTS
     echo '<div class="RequirementHeading"><h2>'.get_lang('ServerRequirements').'</h2>';
-    
+
     $timezone = check_php_setting_exists("date.timezone");
     if (!$timezone) {
         echo "<div class='warning-message'>".Display::return_icon('warning.png',get_lang('Warning'),'',ICON_SIZE_MEDIUM).get_lang("DateTimezoneSettingNotSet")."</div>";
     }
-    
+
     echo '<div class="RequirementText">'.get_lang('ServerRequirementsInfo').'</div>';
     echo '<div class="RequirementContent">';
     echo '<table class="table">
@@ -1135,7 +1135,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
                 <td class="requirements-item"><a href="http://xapian.org/" target="_blank">Xapian</a> '.get_lang('support').' ('.get_lang('Optional').')</td>
                 <td class="requirements-value">'.check_extension('xapian', get_lang('Yes'), get_lang('No'), true).'</td>
             </tr>
-            
+
             <tr>
                 <td class="requirements-item"><a href="http://php.net/manual/en/book.curl.php" target="_blank">cURL</a> '.get_lang('support').' ('.get_lang('Optional').')</td>
                 <td class="requirements-value">'.check_extension('curl', get_lang('Yes'), get_lang('No'), true).'</td>
@@ -1211,7 +1211,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
                 <td class="requirements-item"><a href="http://php.net/manual/ini.core.php#ini.post-max-size">Maximum post size</a></td>
                 <td class="requirements-recommended">'.Display::label('>= '.REQUIRED_MIN_POST_MAX_SIZE.'M', 'success').'</td>
                 <td class="requirements-value">'.compare_setting_values(ini_get('post_max_size'), REQUIRED_MIN_POST_MAX_SIZE).'</td>
-            </tr>            
+            </tr>
             <tr>
                 <td class="requirements-item"><a href="http://www.php.net/manual/en/ini.core.php#ini.memory-limit">Memory Limit</a></td>
                 <td class="requirements-recommended">'.Display::label('>= '.REQUIRED_MIN_MEMORY_LIMIT.'M', 'success').'</td>
@@ -1225,102 +1225,102 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
     echo '<div class="RequirementHeading"><h2>'.get_lang('DirectoryAndFilePermissions').'</h2>';
     echo '<div class="RequirementText">'.get_lang('DirectoryAndFilePermissionsInfo').'</div>';
     echo '<div class="RequirementContent">';
-    
+
     $course_attempt_name = '__XxTestxX__';
-    $course_dir = api_get_path(SYS_COURSE_PATH).$course_attempt_name;    
-    
+    $course_dir = api_get_path(SYS_COURSE_PATH).$course_attempt_name;
+
     //Just in case
     @unlink($course_dir.'/test.php');
     @rmdir($course_dir);
-    
+
     $perms_dir = array(0777, 0755, 0775, 0770, 0750, 0700);
     $perms_fil = array(0666, 0644, 0664, 0660, 0640, 0600);
-    
+
     $course_test_was_created = false;
-    
+
     $dir_perm_verified = 0777;
     foreach ($perms_dir as $perm) {
-        $r = @mkdir($course_dir, $perm);        
-        if ($r === true) { 
+        $r = @mkdir($course_dir, $perm);
+        if ($r === true) {
             $dir_perm_verified = $perm;
             $course_test_was_created = true;
             break;
         }
     }
-    
+
     $fil_perm_verified = 0666;
     $file_course_test_was_created = false;
 
-    if (is_dir($course_dir)) {    
+    if (is_dir($course_dir)) {
         foreach ($perms_fil as $perm) {
             if ($file_course_test_was_created == true) {
                 break;
             }
             $r = @touch($course_dir.'/test.php',$perm);
-            if ($r === true) { 
+            if ($r === true) {
                 $fil_perm_verified = $perm;
                 if (check_course_script_interpretation($course_dir, $course_attempt_name, 'test.php')) {
                     $file_course_test_was_created = true;
                 }
             }
         }
-    }   
-    
+    }
+
     @unlink($course_dir.'/test.php');
     @rmdir($course_dir);
-    
+
     $_SESSION['permissions_for_new_directories'] = $_setting['permissions_for_new_directories'] = $dir_perm_verified;
     $_SESSION['permissions_for_new_files']       = $_setting['permissions_for_new_files'] = $fil_perm_verified;
-    
+
     $dir_perm = Display::label('0'.decoct($dir_perm_verified), 'info');
     $file_perm = Display::label('0'.decoct($fil_perm_verified), 'info');
-    
-    $course_test_was_created  = ($course_test_was_created == true && $file_course_test_was_created == true) ? Display::label(get_lang('Yes'), 'success') : Display::label(get_lang('No'), 'warning');
+
+    $course_test_was_created  = ($course_test_was_created == true && $file_course_test_was_created == true) ? Display::label(get_lang('Yes'), 'success') : Display::label(get_lang('No'), 'important');
 
     echo '<table class="table">
             <tr>
-                <td class="requirements-item">chamilo/main/inc/conf/</td>
-                <td class="requirements-value">'.check_writable('inc/conf/').'</td>
+                <td class="requirements-item">'.api_get_path(SYS_CODE_PATH).'inc/conf/</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'inc/conf/').'</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/main/upload/users/</td>
-                <td class="requirements-value">'.check_writable('upload/users/').'</td>
+                <td class="requirements-item">'.api_get_path(SYS_CODE_PATH).'upload/users/</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'upload/users/').'</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/main/default_course_document/images/</td>
-                <td class="requirements-value">'.check_writable('default_course_document/images/').'</td>
+                <td class="requirements-item">'.api_get_path(SYS_CODE_PATH).'default_course_document/images/</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'default_course_document/images/').'</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/archive/</td>
-                <td class="requirements-value">'.check_writable('../archive/').'</td>
+                <td class="requirements-item">'.api_get_path(SYS_ARCHIVE_PATH).'</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_ARCHIVE_PATH)).'</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/courses/</td>
-                <td class="requirements-value">'.check_writable('../courses/').' </td>
-            </tr>            
+                <td class="requirements-item">'.api_get_path(SYS_COURSE_PATH).'</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_COURSE_PATH)).' </td>
+            </tr>
             <tr>
                 <td class="requirements-item">'.get_lang('CourseTestWasCreated').'</td>
                 <td class="requirements-value">'.$course_test_was_created.' </td>
-            </tr>            
+            </tr>
             <tr>
                 <td class="requirements-item">'.get_lang('PermissionsForNewDirs').'</td>
                 <td class="requirements-value">'.$dir_perm.' </td>
-            </tr>            
+            </tr>
             <tr>
                 <td class="requirements-item">'.get_lang('PermissionsForNewFiles').'</td>
                 <td class="requirements-value">'.$file_perm.' </td>
-            </tr>            
+            </tr>
             <tr>
                 <td class="requirements-item">chamilo/home/</td>
-                <td class="requirements-value">'.check_writable('../home/').'</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'home/').'</td>
             </tr>
             <tr>
                 <td class="requirements-item">chamilo/main/css/</td>
-                <td class="requirements-value">'.check_writable('css/', true).' ('.get_lang('SuggestionOnlyToEnableCSSUploadFeature').')</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'css/', true).' ('.get_lang('SuggestionOnlyToEnableCSSUploadFeature').')</td>
             </tr>
             <tr>
                 <td class="requirements-item">chamilo/main/lang/</td>
-                <td class="requirements-value">'.check_writable('lang/', true).' ('.get_lang('SuggestionOnlyToEnableSubLanguageFeature').')</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'lang/', true).' ('.get_lang('SuggestionOnlyToEnableSubLanguageFeature').')</td>
             </tr>'.
             //'<tr>
             //    <td class="requirements-item">chamilo/searchdb/</td>
@@ -1365,7 +1365,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
     } else {
         $error = false;
         // First, attempt to set writing permissions if we don't have them yet
-        $perm = api_get_permissions_for_new_directories();        
+        $perm = api_get_permissions_for_new_directories();
         $perm_file = api_get_permissions_for_new_files();
 
         $notwritable = array();
@@ -1400,11 +1400,11 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
             $notwritable[] = $checked_writable;
             @chmod($checked_writable, $perm);
         }
-        
+
         if ($course_test_was_created == false || $file_course_test_was_created == false) {
             $error = true;
         }
-        
+
 
         $checked_writable = api_get_path(SYS_PATH).'home/';
         if (!is_writable($checked_writable)) {
@@ -1428,13 +1428,13 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
 	            printf(get_lang('NoWritePermissionPleaseReadInstallGuide'), '</font>
 	            <a href="../../documentation/installation_guide.html" target="blank">', '</a> <font color="red">');
 			echo '</div>';
-				
+
             echo '<ul>';
             foreach ($notwritable as $value) {
                 echo '<li>'.$value.'</li>';
             }
             echo '</ul>';
-            
+
         }
 
         // Check wether a Chamilo configuration file already exists.
@@ -1487,7 +1487,7 @@ function display_license_agreement() {
         </td>
         </tr>
         <tr><td>
-              <label class="checkbox">  
+              <label class="checkbox">
                 <input type="checkbox" name="accept" id="accept_licence" value="1" />
                 <?php echo get_lang('IAccept'); ?>
               </label>
@@ -1512,18 +1512,18 @@ function display_license_agreement() {
 
     <!-- Contact information form -->
 	<div>
-    	
+
         	<a href="javascript://" class = "advanced_parameters" >
             	<span id="img_plus_and_minus">&nbsp;<img src="<?php echo api_get_path(WEB_IMG_PATH) ?>div_hide.gif" alt="<?php echo get_lang('Hide') ?>" title="<?php echo get_lang('Hide')?>" style ="vertical-align:middle" />&nbsp;<?php echo get_lang('ContactInformation') ?></span>
            	</a>
-		
+
 	</div>
-                    
+
     <div id="id_contact_form" style="display:block">
     	<div class="normal-message"><?php echo get_lang('ContactInformationDescription') ?></div>
         <div id="contact_registration">
         	<p><?php echo get_contact_registration_form() ?></p><br />
-    	</div>	
+    	</div>
 	</div>
     <?php
 }
@@ -1535,9 +1535,9 @@ function display_license_agreement() {
 function get_contact_registration_form() {
 
     $html ='
-   <form class="form-horizontal">    
+   <form class="form-horizontal">
    <fieldset style="width:95%;padding:15px;border:1pt solid #eee">
-    <div id="div_sent_information"></div>  
+    <div id="div_sent_information"></div>
     <div class="control-group">
             <label class="control-label"><span class="form_required">*</span>'.get_lang('Name').'</label>
             <div class="controls"><input id="person_name" type="text" name="person_name" size="30" /></div>
@@ -1593,7 +1593,7 @@ function get_contact_registration_form() {
                     </select>
             </div>
     </div>
-    
+
     <div class="control-group">
             <div class="control-label"><span class="form_required">*</span>'.get_lang('CompanyCountry').'</div>
             <div class="controls">'.get_countries_list_from_array(true).'</div>
@@ -1624,7 +1624,7 @@ function get_contact_registration_form() {
                     </select>
             </div>
     </div>
-    
+
     <div class="control-group">
             <div class="control-label">'.get_lang('HaveYouThePowerToTakeFinancialDecisions').'</div>
             <div class="controls">
@@ -1640,7 +1640,7 @@ function get_contact_registration_form() {
     <div class="control-group">
             <div class="control-label">&nbsp;</div>
             <div class="controls"><span class="form_required">*</span><small>'.get_lang('FieldRequired').'</small></div>
-    </div>    
+    </div>
 </fieldset></form>';
 
 return $html;
@@ -1661,7 +1661,7 @@ return $html;
 function display_database_parameter($install_type, $parameter_name, $form_field_name, $parameter_value, $extra_notice, $display_when_update = true, $tr_attribute = '') {
     echo "<tr ".$tr_attribute.">";
     echo "<td>$parameter_name&nbsp;&nbsp;</td>";
-    
+
     if ($install_type == INSTALL_TYPE_UPDATE && $display_when_update) {
         echo '<td><input type="hidden" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'.$parameter_value."</td>";
     } else {
@@ -1671,12 +1671,12 @@ function display_database_parameter($install_type, $parameter_name, $form_field_
         $maxlength = $form_field_name == 'dbPrefixForm' ? '15' : MAX_FORM_FIELD_LENGTH;
         if ($install_type == INSTALL_TYPE_UPDATE) {
             echo '<input type="hidden" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />';
-            echo '<td>'.api_htmlentities($parameter_value)."</td>";            
+            echo '<td>'.api_htmlentities($parameter_value)."</td>";
         } else {
             echo '<td><input type="'.$inputtype.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxlength.'" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'."</td>";
             echo "<td>$extra_notice</td>";
         }
-        
+
     }
     echo "</tr>";
 }
@@ -1693,14 +1693,14 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
 
         if (in_array($_POST['old_version'], $update_from_version_6)) {
             $dbHostForm     	= get_config_param('dbHost');
-            
+
             $dbUsernameForm 	= get_config_param('dbLogin');
             $dbPassForm     	= get_config_param('dbPass');
             $dbPrefixForm   	= get_config_param('dbNamePrefix');
             $enableTrackingForm = get_config_param('is_trackingEnabled');
             $singleDbForm   	= get_config_param('singleDbEnabled');
             $dbHostForm     	= get_config_param('mainDbName');
-                        
+
             $dbStatsForm    	= get_config_param('statsDbName');
             $dbScormForm    	= get_config_param('scormDbName');
             $dbUserForm     	= get_config_param('user_personal_database');
@@ -1727,7 +1727,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
                 $dbScormExists = false;
             }
         }
-        
+
         if (empty($dbUserForm)) {
             $dbUserForm = $singleDbForm ? $dbNameForm : $dbPrefixForm.'chamilo_user';
         }
@@ -1742,13 +1742,13 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
         echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
-        echo '</div>';                
+        echo '</div>';
     }
-    ?>    
+    ?>
     </td>
     </tr>
     <tr>
-    <td>    
+    <td>
     <table class="data_table_no_border">
     <tr>
       <td width="40%"><?php echo get_lang('DBHost'); ?> </td>
@@ -1761,7 +1761,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
       <?php endif; ?>
     </tr>
     <tr>
-    <?php	
+    <?php
     //database user username
     $example_login = get_lang('EG').' root';
     display_database_parameter($installType, get_lang('DBLogin'), 'dbUsernameForm', $dbUsernameForm, $example_login);
@@ -1771,26 +1771,26 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
     display_database_parameter($installType, get_lang('DBPassword'), 'dbPassForm', $dbPassForm, $example_password);
 
     echo '<input type="hidden" name="enableTrackingForm" value="1" />';
-        
-    $style = '';    
+
+    $style = '';
     if ($installType == INSTALL_TYPE_UPDATE) {
         $style = '';
-    } 
-       
+    }
+
     //Database Name fix replace weird chars
     if ($installType != INSTALL_TYPE_UPDATE) {
         $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
-        $dbNameForm = replace_dangerous_char($dbNameForm);        
+        $dbNameForm = replace_dangerous_char($dbNameForm);
     }
-    
+
     display_database_parameter($installType, get_lang('MainDB'), 'dbNameForm',  $dbNameForm,  '&nbsp;', null, 'id="optional_param1" '.$style);
-    
+
     //Only for updates we show this options
     if ($installType == INSTALL_TYPE_UPDATE) {
     	display_database_parameter($installType, get_lang('StatDB'), 'dbStatsForm', $dbStatsForm, '&nbsp;', null, 'id="optional_param2" '.$style);
 	    if ($installType == INSTALL_TYPE_UPDATE && in_array($_POST['old_version'], $update_from_version_6)) {
         	display_database_parameter($installType, get_lang('ScormDB'), 'dbScormForm', $dbScormForm, '&nbsp;', null, 'id="optional_param3" '.$style);
-    	}    
+    	}
     	display_database_parameter($installType, get_lang('UserDB'), 'dbUserForm', $dbUserForm, '&nbsp;', null, 'id="optional_param4" '.$style);
     }
     ?>
@@ -1800,43 +1800,43 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
             <button type="submit" class="btn" name="step3" value="<?php echo get_lang('CheckDatabaseConnection'); ?>" >
                 <?php echo get_lang('CheckDatabaseConnection'); ?></button>
         </td>
-    </tr>    
+    </tr>
     <tr>
         <td>
-        
+
         <?php
-        
-        $dbConnect = test_db_connect($dbHostForm, $dbUsernameForm, $dbPassForm, $singleDbForm, $dbPrefixForm, $dbNameForm);        
-        
+
+        $dbConnect = test_db_connect($dbHostForm, $dbUsernameForm, $dbPassForm, $singleDbForm, $dbPrefixForm, $dbNameForm);
+
         $database_exists_text = '';
-        
+
         if (database_exists($dbNameForm)) {
             $database_exists_text = '<div class="warning-message">'.get_lang('ADatabaseWithTheSameNameAlreadyExists').'</div>';
-        } else {            
+        } else {
             if ($dbConnect == -1) {
-                 $database_exists_text = '<div class="warning-message">'.sprintf(get_lang('UserXCantHaveAccessInTheDatabaseX'), $dbUsernameForm, $dbNameForm).'</div>';                 
+                 $database_exists_text = '<div class="warning-message">'.sprintf(get_lang('UserXCantHaveAccessInTheDatabaseX'), $dbUsernameForm, $dbNameForm).'</div>';
             } else {
                  //Try to create the database
-                $user_can_create_databases = false;            
+                $user_can_create_databases = false;
                 $multipleDbCheck = @Database::query("CREATE DATABASE ".mysql_real_escape_string($dbNameForm));
                 if ($multipleDbCheck !== false) {
-                    $multipleDbCheck = @Database::query("DROP DATABASE IF EXISTS ".mysql_real_escape_string($dbNameForm));                
+                    $multipleDbCheck = @Database::query("DROP DATABASE IF EXISTS ".mysql_real_escape_string($dbNameForm));
                     $user_can_create_databases = true;
-                }             
+                }
 
                 if ($user_can_create_databases) {
                     $database_exists_text = '<div class="normal-message">'.sprintf(get_lang('DatabaseXWillBeCreated'), $dbNameForm, $dbUsernameForm).'</div>';
                 } else {
                     $dbConnect = 0;
-                    $database_exists_text = '<div class="warning-message">'.sprintf(get_lang('DatabaseXCantBeCreatedUserXDoestHaveEnoughPermissions'), $dbNameForm, $dbUsernameForm).'</div>';                
+                    $database_exists_text = '<div class="warning-message">'.sprintf(get_lang('DatabaseXCantBeCreatedUserXDoestHaveEnoughPermissions'), $dbNameForm, $dbUsernameForm).'</div>';
                 }
-            }       
-        }         
-            
+            }
+        }
+
         if ($dbConnect == 1): ?>
         <td colspan="2">
             <?php echo $database_exists_text ?>
-            <div id="db_status" class="confirmation-message">                
+            <div id="db_status" class="confirmation-message">
                 Database host: <strong><?php echo Database::get_host_info(); ?></strong><br />
                 Database server version: <strong><?php echo Database::get_server_info(); ?></strong><br />
                 Database client version: <strong><?php echo Database::get_client_info(); ?></strong><br />
@@ -1844,15 +1844,15 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
                 <div style="clear:both;"></div>
             </div>
         </td>
-        <?php else: ?>        
+        <?php else: ?>
         <td colspan="2">
             <?php echo $database_exists_text ?>
-            <div id="db_status" style="float:left;" class="error-message">                
+            <div id="db_status" style="float:left;" class="error-message">
                 <div style="float:left;">
                     <strong><?php echo get_lang('FailedConectionDatabase'); ?></strong><br />
 	                <strong>Database error: <?php echo Database::errno(); ?></strong><br />
 	                <?php echo Database::error().'<br />'; ?>
-	                
+
                 </div>
             </div>
         </td>
@@ -1865,11 +1865,11 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
       <td>&nbsp;</td>
       <td align="right">
           <input type="hidden" name="is_executable" id="is_executable" value="-" />
-           <?php if ($dbConnect == 1) { ?>          
+           <?php if ($dbConnect == 1) { ?>
             <button type="submit"  class="btn next" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
           <?php } else { ?>
             <button disabled="disabled" type="submit" class="btn next disabled" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
-          <?php } ?>  
+          <?php } ?>
       </td>
     </tr>
     </table>
@@ -1904,20 +1904,20 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
     echo '<div class="RequirementContent">';
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>main/inc/conf/configuration.php</strong></p>';
     echo '</div>';
-    
+
     echo '<fieldset>';
     echo '<legend>'.get_lang('Administrator').'</legend>';
     echo '<table class="data_table_no_border">';
-    
+
     //Parameter 1: administrator's login
-    
+
     display_configuration_parameter($installType, get_lang('AdminLogin'), 'loginForm', $loginForm, $installType == 'update');
-    
+
     //Parameter 2: administrator's password
     if ($installType != 'update') {
         display_configuration_parameter($installType, get_lang('AdminPass'), 'passForm', $passForm, false);
-    }    
-    
+    }
+
     //Parameters 3 and 4: administrator's names
     if (api_is_western_name_order()) {
         display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
@@ -1926,21 +1926,21 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
         display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
         display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
     }
-    
+
     //Parameter 3: administrator's email
     display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
 
     //Parameter 6: administrator's telephone
     display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
-    
-    echo '</table>';    
+
+    echo '</table>';
     echo '</fieldset>';
-    
+
     echo '<fieldset>';
     echo '<legend>'.get_lang('Platform').'</legend>';
-    
-    echo '<table class="data_table_no_border">';    
-    
+
+    echo '<table class="data_table_no_border">';
+
     //First parameter: language
     echo "<tr>";
     echo '<td>'.get_lang('MainLang')."&nbsp;&nbsp;</td>";
@@ -1953,8 +1953,8 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
         echo "</td>\n";
     }
     echo "</tr>\n";
-    
-    
+
+
     //Second parameter: Chamilo URL
     echo "<tr>";
     echo '<td>'.get_lang('ChamiloURL').' (<font color="red">'.get_lang('ThisFieldIsRequired')."</font>)&nbsp;&nbsp;</td>";
@@ -1987,15 +1987,15 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
               <label class="checkbox inline">
                 <input class="checkbox" type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" <?php echo ($encryptPassForm == 'sha1') ? 'checked="checked" ': ''; ?>/><?php echo 'sha1'; ?>
               </label>
-       
-              <label class="checkbox inline">  
+
+              <label class="checkbox inline">
                 <input class="checkbox" type="radio" name="encryptPassForm" value="md5" id="encryptPass0" <?php echo $encryptPassForm == 1 ? 'checked="checked" ' : ''; ?>/><?php echo 'md5'; ?>
               </label>
-            
+
                 <label class="checkbox inline">
                     <input class="checkbox" type="radio" name="encryptPassForm" value="none" id="encryptPass2" <?php echo $encryptPassForm === '0' or $encryptPassForm === 0 ? 'checked="checked" ':''; ?>/><?php echo get_lang('None'); ?>
                 </label>
-           
+
           </div>
           </td>
       <?php } ?>
@@ -2117,7 +2117,7 @@ function get_countries_list_from_array($combo = false) {
 }
 
 /**
- * Lockis settings that can't be changed in other portals 
+ * Lockis settings that can't be changed in other portals
  */
 function locking_settings() {
     $access_url_locked_settings = api_get_locked_settings();
@@ -2128,34 +2128,35 @@ function locking_settings() {
     }
 }
 
-function update_dir_and_files_permissions() {    
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);    
+function update_dir_and_files_permissions() {
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
     $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."' WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
-     
+
     $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
-    
+
     unset($_SESSION['permissions_for_new_directories']);
     unset($_SESSION['permissions_for_new_files']);
 }
 
 function compare_setting_values($current_value, $wanted_value) {
     $current_value_string = $current_value;
-    $current_value = (float)$current_value;    
+    $current_value = (float)$current_value;
     $wanted_value = (float)$wanted_value;
-    
+
     if ($current_value >= $wanted_value) {
         return Display::label($current_value_string, 'success');
     } else {
         return Display::label($current_value_string, 'important');
-    }    
+    }
 }
 
-function check_course_script_interpretation($course_dir, $course_attempt_name, $file = 'test.php'){
+function check_course_script_interpretation($course_dir, $course_attempt_name, $file = 'test.php')
+{
     $output = false;
     //Write in file
     $file_name = $course_dir.'/'.$file;
@@ -2165,7 +2166,8 @@ function check_course_script_interpretation($course_dir, $course_attempt_name, $
         if ($handler = @fopen($file_name, "w")) {
             //write content
             if (fwrite($handler, $content)) {
-                $sock_errno = ''; $sock_errmsg = '';
+                $sock_errno = '';
+                $sock_errmsg = '';
                 $url = api_get_path(WEB_COURSE_PATH).$course_attempt_name.'/'.$file;
 
                 $parsed_url = parse_url($url);

+ 44 - 0
main/template/default/work/comments.tpl

@@ -0,0 +1,44 @@
+
+{# "UpdatedBy"|get_lang|format(comment.username) #}
+
+{% if work_comment_enabled %}
+    <hr>
+    <h4>
+        {{ 'Comments' | get_lang }}
+    </h4>
+    <hr>
+    <ul>
+        {% for comment in comments %}
+            <li>
+                <div class="page-header">
+                    <a href="{{ _p.web_code }}">
+                        <img height="24" src="{{ comment.picture }}"/> {{ comment.username }}
+                    </a>- {{ comment.sent_at | api_get_local_time }}
+                </div>
+                <p>
+                    {% if comment.comment is not empty %}
+                        {{ comment.comment }}
+                    {% else %}
+                        {{ 'HereIsYourFeedback' | get_lang }}
+                    {% endif %}
+                </p>
+                {% if comment.file_url is not empty %}
+                    <p>
+                        <a href="{{ comment.file_url }}">
+                            <img src="{{ "attachment.gif"|icon(32) }}">
+                            {{ comment.file_name_to_show }}
+                        </a>
+                        {% if is_allowed_to_edit %}
+                            <a href="{{ comment.delete_file_url }}">
+                                <img src="{{ "delete.png"|icon(22) }}">
+                            </a>
+                        {% endif %}
+                    </p>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+    <br />
+    <hr>
+    {{ form }}
+{% endif %}

+ 33 - 0
main/work/show_file.php

@@ -0,0 +1,33 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+/**
+ *	This file is responsible for  passing requested documents to the browser.
+ *	Html files are parsed to fix a few problems with URLs,
+ *	but this code will hopefully be replaced soon by an Apache URL
+ *	rewrite mechanism.
+ *
+ *	@package chamilo.work
+ */
+require_once '../inc/global.inc.php';
+require_once 'work.lib.php';
+
+$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$this_section = SECTION_COURSES;
+
+// Course protection
+api_protect_course_script(true);
+
+$id = intval($_GET['id']);
+
+$course_info = api_get_course_info();
+
+if (empty($course_info)) {
+    api_not_allowed(true);
+}
+
+$result = getFile($id, $course_info, false);
+
+if ($result == false) {
+    api_not_allowed();
+}

Some files were not shown because too many files changed in this diff