chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replacing thickbox with the ajax jquery-ui dialog box see #4489

Browse Source
skala
Julio Montoya 14 years ago
parent dc33a544ca
commit 61c311a0a8
7 changed files with 9 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      main/admin/user_move_stats.php
  2. 2
      main/exercice/exercise.lib.php
  3. 2
      main/exercice/overview.php
  4. 2
      main/inc/lib/group_portal_manager.lib.php
  5. 4
      main/social/groups.php
  6. 6
      main/template/default/layout/head.tpl
  7. 1
      whoisonline.php

5
main/admin/user_move_stats.php
Unescape View File

@ -710,10 +710,7 @@ if (!empty($user_list)) {
echo '<select id="'.$unique_id.'" name="'.$unique_id.'">'; echo '<select id="'.$unique_id.'" name="'.$unique_id.'">';
echo $options; echo $options;
echo '</select>'; echo '</select>';
echo '<br />'; echo '<br />';
//KK(\''.$unique_id.'\', \''.$user_id.'\')
//echo '<input type="submit" class="thickbox" value="'.get_lang('ViewStats').'" alt="user_move_stats.php?height=520&width=500&load_ajax=1&view_stat=1&unique_id='.$unique_id.'&user_id='.$user_id.'" >';
//echo '<input type="submit" class="thickbox" value="'.get_lang('ViewStats').'" alt="user_move_stats.php?height=520&width=500&load_ajax=1&view_stat=1&unique_id='.$unique_id.'&user_id='.$user_id.'" >';
echo '<button type="submit" class="save" onclick="view_stat(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('CompareStats').'</button>'; echo '<button type="submit" class="save" onclick="view_stat(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('CompareStats').'</button>';
echo '<button type="submit" class="save" onclick="moveto(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('Move').'</button>'; echo '<button type="submit" class="save" onclick="moveto(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('Move').'</button>';
echo '<div id ="reponse_'.$unique_id.'"></div>'; echo '<div id ="reponse_'.$unique_id.'"></div>';

2
main/exercice/exercise.lib.php
Unescape View File

@ -1125,7 +1125,7 @@ function get_exam_results_data($from, $number_of_items, $column, $direction, $ex
} }
} else { } else {
$attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750'; $attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750';
$attempt_link = Display::url(get_lang('Show'), $attempt_url, array('class'=>'thickbox a_button white small')); $attempt_link = Display::url(get_lang('Show'), $attempt_url, array('class'=>'ajax btn'));
$actions .= $attempt_link; $actions .= $attempt_link;
} }

2
main/exercice/overview.php
Unescape View File

@ -132,7 +132,7 @@ if (!empty($attempts)) {
$score = show_score($attempt_result['exe_result'], $attempt_result['exe_weighting']); $score = show_score($attempt_result['exe_result'], $attempt_result['exe_weighting']);
$attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$attempt_result['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750'; $attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$attempt_result['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750';
$attempt_link = Display::url(get_lang('Show'), $attempt_url, array('class'=>'thickbox a_button white small')); $attempt_link = Display::url(get_lang('Show'), $attempt_url, array('class'=>'ajax btn'));
$teacher_revised = Display::span(get_lang('Validated'), array('class'=>'label_tag success')); $teacher_revised = Display::span(get_lang('Validated'), array('class'=>'label_tag success'));
//$attempt_link = get_lang('NoResult'); //$attempt_link = get_lang('NoResult');

2
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -1089,7 +1089,7 @@ class GroupPortalManager {
break; break;
case GROUP_USER_PERMISSION_HRM: case GROUP_USER_PERMISSION_HRM:
$relation_group_title = get_lang('IAmAHRM'); $relation_group_title = get_lang('IAmAHRM');
$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>'; $links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
$links .= '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>'; $links .= '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
$links .= '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>'; $links .= '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
$links .= '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>'; $links .= '<li><a href="group_members.php?id='.$group_id.'">'. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';

4
main/social/groups.php
Unescape View File

@ -267,9 +267,9 @@ if ($group_id != 0 ) {
$content = MessageManager::display_messages_for_group($group_id); $content = MessageManager::display_messages_for_group($group_id);
if ($is_group_member) { if ($is_group_member) {
if (empty($content)) { if (empty($content)) {
$create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="a_button white medium thickbox" title="'.get_lang('ComposeMessage').'">'.get_lang('YouShouldCreateATopic').'</a></li>'; $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('YouShouldCreateATopic').'</a></li>';
} else { } else {
$create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="a_button white medium thickbox" title="'.get_lang('ComposeMessage').'">'.get_lang('NewTopic').'</a>'; $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('NewTopic').'</a>';
} }
} }
$members = GroupPortalManager::get_users_by_group($group_id); $members = GroupPortalManager::get_users_by_group($group_id);

6
main/template/default/layout/head.tpl
Unescape View File

@ -88,7 +88,7 @@ $(document).ready(function() {
var url = this.href; var url = this.href;
var dialog = $("#dialog"); var dialog = $("#dialog");
if ($("#dialog").length == 0) { if ($("#dialog").length == 0) {
dialog = $('<div id="dialog" style="display:hidden"></div>').appendTo('body'); dialog = $('<div id="dialog" style="display:none"></div>').appendTo('body');
} }
// load remote content // load remote content
@ -98,8 +98,8 @@ $(document).ready(function() {
function(responseText, textStatus, XMLHttpRequest) { function(responseText, textStatus, XMLHttpRequest) {
dialog.dialog({ dialog.dialog({
modal : true, modal : true,
width : 540, width : 580,
height : 400 height : 450
}); });
}); });
//prevent the browser to follow the link //prevent the browser to follow the link

1
whoisonline.php
Unescape View File

@ -32,7 +32,6 @@ $htmlHeadXtra[] = '<script type="text/javascript">
} }
</script>'; </script>';
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = '<script type="text/javascript"> $htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready(function (){ $(document).ready(function (){
$("input#id_btn_send_invitation").bind("click", function(){ $("input#id_btn_send_invitation").bind("click", function(){

Write Preview
Loading…
Cancel
Save