Update qtip2 library using bower

pull/2487/head
jmontoyaa 9 years ago
parent 3c8e000579
commit 3313a7cdc6
  1. 3
      bower.json
  2. 20
      main/calendar/agenda_js.php
  3. 2
      main/inc/lib/api.lib.php
  4. 1
      main/inc/lib/javascript/qtip2/jquery.qtip.min.css
  5. 13
      main/inc/lib/javascript/qtip2/jquery.qtip.min.js

@ -28,7 +28,8 @@
"jquery.scrollbar": "0.2.*", "jquery.scrollbar": "0.2.*",
"jquery-file-upload": "*", "jquery-file-upload": "*",
"pwstrength-bootstrap": "*", "pwstrength-bootstrap": "*",
"readmore-js": "2.1.0" "readmore-js": "2.1.0",
"qtip2": "*"
}, },
"resolutions": { "resolutions": {
"jquery": "2.1.4" "jquery": "2.1.4"

@ -21,11 +21,12 @@ $current_course_tool = TOOL_CALENDAR_EVENT;
$this_section = SECTION_MYAGENDA; $this_section = SECTION_MYAGENDA;
$htmlHeadXtra[] = api_get_jquery_libraries_js(array('jquery-ui', 'jquery-ui-i18n')); $htmlHeadXtra[] = api_get_jquery_libraries_js(array('jquery-ui', 'jquery-ui-i18n'));
$htmlHeadXtra[] = api_get_js('qtip2/jquery.qtip.min.js');
$htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
$htmlHeadXtra[] = api_get_asset('fullcalendar/dist/fullcalendar.min.js'); $htmlHeadXtra[] = api_get_asset('fullcalendar/dist/fullcalendar.min.js');
$htmlHeadXtra[] = api_get_asset('fullcalendar/dist/gcal.js'); $htmlHeadXtra[] = api_get_asset('fullcalendar/dist/gcal.js');
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_PATH).'web/assets/fullcalendar/dist/fullcalendar.min.css'); $htmlHeadXtra[] = api_get_css_asset('fullcalendar/dist/fullcalendar.min.css');
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/qtip2/jquery.qtip.min.css'); $htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
if (api_is_platform_admin() && ($type == 'admin' || $type == 'platform')) { if (api_is_platform_admin() && ($type == 'admin' || $type == 'platform')) {
$type = 'admin'; $type = 'admin';
@ -111,7 +112,6 @@ switch ($type) {
break; break;
} }
//Setting translations //Setting translations
$day_short = api_get_week_days_short(); $day_short = api_get_week_days_short();
$days = api_get_week_days_long(); $days = api_get_week_days_long();
@ -208,7 +208,7 @@ $form = new FormValidator(
array('id' => 'add_event_form') array('id' => 'add_event_form')
); );
$form->addElement('html', '<span id="calendar_course_info"></span><div id="visible_to_input">'); $form->addHtml('<span id="calendar_course_info"></span><div id="visible_to_input">');
$sendTo = $agenda->parseAgendaFilter($userId); $sendTo = $agenda->parseAgendaFilter($userId);
$addOnlyItemsInSendTo = true; $addOnlyItemsInSendTo = true;
@ -218,11 +218,11 @@ if ($sendTo['everyone']) {
} }
$agenda->showToForm($form, $sendTo, array(), $addOnlyItemsInSendTo); $agenda->showToForm($form, $sendTo, array(), $addOnlyItemsInSendTo);
$form->addElement('html', '</div>'); $form->addHtml('</div>');
$form->addElement('html', '<div id="visible_to_read_only" style="display: none">'); $form->addHtml('<div id="visible_to_read_only" style="display: none">');
$form->addElement('label', get_lang('To'), '<div id="visible_to_read_only_users"></div>'); $form->addElement('label', get_lang('To'), '<div id="visible_to_read_only_users"></div>');
$form->addElement('html', '</div>'); $form->addHtml('</div>');
$form->addElement('label', get_lang('Agenda'), '<div id ="color_calendar"></div>'); $form->addElement('label', get_lang('Agenda'), '<div id ="color_calendar"></div>');
$form->addElement('label', get_lang('Date'), '<span id="start_date"></span><span id="end_date"></span>'); $form->addElement('label', get_lang('Date'), '<span id="start_date"></span><span id="end_date"></span>');
@ -239,9 +239,9 @@ $form->addHtmlEditor(
); );
if ($agenda->type === 'course') { if ($agenda->type === 'course') {
$form->addElement('html', '<div id="add_as_announcement_div" style="display: none">'); $form->addHtml('<div id="add_as_announcement_div" style="display: none">');
$form->addElement('checkbox', 'add_as_annonuncement', null, get_lang('AddAsAnnouncement')); $form->addElement('checkbox', 'add_as_annonuncement', null, get_lang('AddAsAnnouncement'));
$form->addElement('html', '</div>'); $form->addHtml('</div>');
$form->addElement('textarea', 'comment', get_lang('Comment'), array('id' => 'comment')); $form->addElement('textarea', 'comment', get_lang('Comment'), array('id' => 'comment'));
} }

@ -6367,6 +6367,7 @@ function api_get_js($file) {
/** /**
* Returns the <script> HTML tag * Returns the <script> HTML tag
* @return string
*/ */
function api_get_asset($file) function api_get_asset($file)
{ {
@ -6375,6 +6376,7 @@ function api_get_asset($file)
/** /**
* Returns the <script> HTML tag * Returns the <script> HTML tag
* @return string
*/ */
function api_get_css_asset($file, $media = 'screen') function api_get_css_asset($file, $media = 'screen')
{ {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save