Merge pull request #598 from aragonc/bootstrap

Bootstrap update scorm add effects CT#7339
1.10.x
Julio 11 years ago
commit 90c5a87d37
  1. 156
      main/admin/add_courses_to_session.php
  2. 2
      main/admin/add_teachers_to_session.php
  3. 60
      main/admin/add_users_to_session.php
  4. 4
      main/admin/archive_cleanup.php
  5. 2
      main/admin/configure_homepage.php
  6. 2
      main/admin/course_export.php
  7. 8
      main/admin/dashboard_add_users_to_user.php
  8. 2
      main/admin/languages.php
  9. 10
      main/admin/session_category_list.php
  10. 88
      main/admin/session_course_edit.php
  11. 4
      main/admin/session_export.php
  12. 2
      main/admin/session_import.php
  13. 2
      main/admin/session_import_drh.php
  14. 4
      main/admin/special_exports.php
  15. 4
      main/admin/user_move_stats.php
  16. 2
      main/announcements/announcements.php
  17. 4
      main/coursecopy/classes/CourseSelectForm.class.php
  18. 4
      main/coursecopy/copy_course_session.php
  19. 10
      main/coursecopy/import_backup.php
  20. 2
      main/create_course/add_course.php
  21. 137
      main/css/base.css
  22. 6687
      main/css/chamilo/default.css
  23. 2
      main/dropbox/recover_dropbox_files.php
  24. 4
      main/exercice/answer_admin.inc.php
  25. BIN
      main/img/icons/48/hidden-touch-left.png
  26. BIN
      main/img/icons/48/show-touch-right.png
  27. 2
      main/inc/ajax/user_manager.ajax.php
  28. 10
      main/inc/introductionSection.inc.php
  29. 4
      main/inc/lib/AnnouncementManager.php
  30. 12
      main/inc/lib/api.lib.php
  31. 4
      main/inc/lib/blog.lib.php
  32. 4
      main/inc/lib/career.lib.php
  33. 4
      main/inc/lib/groupmanager.lib.php
  34. 107
      main/inc/lib/javascript/jquery.lp_minipanel.js
  35. 2
      main/inc/lib/message.lib.php
  36. 2
      main/inc/lib/nanogong.lib.php
  37. 6
      main/inc/lib/promotion.lib.php
  38. 2
      main/inc/lib/sortable_table.class.php
  39. 2
      main/inc/lib/usermanager.lib.php
  40. 1
      main/link/link.php
  41. 28
      main/newscorm/learnpath.class.php
  42. 4
      main/newscorm/lp_list.php
  43. 20
      main/newscorm/lp_view.php
  44. 6
      plugin/advanced_subscription/views/admin_view.tpl
  45. 5
      plugin/advanced_subscription/views/terms_and_conditions.tpl

@ -190,98 +190,96 @@ unset($Courses);
Display::display_normal_message($errorMsg); //main API
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td width="45%" align="center"><b><?php echo get_lang('CourseListInPlatform') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%"><b><?php echo get_lang('CourseListInSession') ?> :</b></td>
</tr>
<?php if($add_type == 'multiple') { ?>
<tr><td width="45%" align="center">
<div id="multiple-add-session" class="row">
<div class="col-md-5">
<label><?php echo get_lang('CourseListInPlatform') ?> :</label>
<?php
if (!($add_type == 'multiple')) {
?>
<input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,'single')" class="form-control"/>
<div id="ajax_list_courses_single"></div>
<?php
} else {
?>
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" class="form-control"> <?php
foreach($nosessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>>
<?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
</option>
<?php
}
?></select>
</div>
<?php
}
unset($nosessionCourses);
?>
</div>
<div class="col-md-2">
<?php if($add_type == 'multiple') { ?>
<div class="code-course">
<?php echo get_lang('FirstLetterCourse'); ?> :
<select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')">
<br /><br />
<select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')" class="form-control">
<option value="%">--</option>
<?php
echo Display :: get_alphabet_options();
echo Display :: get_numeric_options(0,9,'');
?>
</select>
</td>
<td>&nbsp;</td></tr>
<?php } ?>
<tr>
<td width="45%" align="center">
<?php
if (!($add_type == 'multiple')) {
?>
<input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,'single')" />
<div id="ajax_list_courses_single"></div>
<?php
} else {
?>
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:360px;"> <?php
foreach($nosessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>>
<?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
</option>
<?php
}
?></select>
</div>
<?php
}
unset($nosessionCourses);
</div>
<?php } ?>
<div class="control-course">
<br /><br />
<?php
if ($ajax_search) {
?>
</td>
<td width="10%" valign="middle" align="center">
<?php
if ($ajax_search) {
?>
<button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))">
<i class="fa fa-chevron-left"></i>
</button>
<br /><br />
<?php
} else {
?>
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<i class="fa fa-chevron-right"></i>
</button>
<br /><br />
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<i class="fa fa-chevron-left"></i>
</button>
<br /><br />
<?php
}
?>
<?php
if (isset($_GET['add'])) {
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('NextStep').'</button>';
} else {
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeCoursesToSession').'</button>';
}
?>
</div>
</div>
<div class="col-md-5">
<label><?php echo get_lang('CourseListInSession') ?> :</label>
<select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" class="form-control">
<?php
} else {
foreach($sessionCourses as $enreg) {
?>
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<i class="fa fa-chevron-right"></i>
</button>
<br /><br />
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<i class="fa fa-chevron-left"></i>
</button>
<?php
}
?>
<br /><br /><br /><br /><br /><br />
<option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>">
<?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
</option>
<?php
if (isset($_GET['add'])) {
echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('NextStep').'</button>';
} else {
echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeCoursesToSession').'</button>';
}
unset($sessionCourses);
?>
</td>
<td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:360px;">
<?php
foreach($sessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>">
<?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
</option>
<?php
}
unset($sessionCourses);
?>
</select></td>
</tr>
</table>
</select>
</div>
</div>
</form>
<script>
function moveItem(origin , destination) {

@ -105,7 +105,7 @@ echo Display::input('hidden', 'form_sent', '1');
<td colspan="3" align="center">
<br />
<?php
echo '<button class="save" type="submit"" >'.
echo '<button class="btn btn-success" type="submit"" >'.
get_lang('SubscribeTeachersToSession').'</button>';
?>
</td>

@ -563,32 +563,22 @@ if (!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
?>
<div class="row">
<div class="span5">
<div id="multiple-add-session" class="row">
<div class="col-md-5">
<div class="multiple_select_header">
<b><?php echo get_lang('UserListInPlatform') ?> :</b>
<?php if ($add_type=='multiple') { ?>
<?php echo get_lang('FirstLetterUser'); ?> :
<select id="first_letter_user" name="firstLetterUser" onchange = "change_select(this.value);" >
<option value = "%">--</option>
<?php
echo Display :: get_alphabet_options();
?>
</select>
<?php } ?>
<label><?php echo get_lang('UserListInPlatform') ?> :</label>
</div>
<div id="content_source">
<?php
if (!($add_type=='multiple')) {
?>
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" />
<div id="ajax_list_users_single"></div>
<?php
} else {
?>
<div id="ajax_list_users_multiple">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="form-control">
<?php
foreach ($nosessionUsersList as $uid => $enreg) {
?>
@ -616,22 +606,35 @@ if (!empty($errorMsg)) {
</div>
</div>
<div class="span2">
<div style="padding-top:54px;width:auto;text-align: center;">
<div class="col-md-3">
<?php if ($add_type=='multiple') { ?>
<?php echo get_lang('FirstLetterUser'); ?> :
<select id="first_letter_user" name="firstLetterUser" onchange = "change_select(this.value);" >
<option value = "%">--</option>
<?php
echo Display :: get_alphabet_options();
?>
</select>
<br />
<br />
<?php } ?>
<div class="control-course">
<?php
if ($ajax_search) {
?>
<button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
<i class="fa fa-chevron-right"></i>
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
<i class="fa fa-chevron-left"></i>
</button>
<?php
} else {
?>
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
<i class="fa fa-chevron-right"></i>
</button>
<br /><br />
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
<br />
<br />
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
<i class="fa fa-chevron-left"></i>
</button>
<?php
@ -642,18 +645,17 @@ if (!empty($errorMsg)) {
<br />
<?php
if (!empty($addProcess)) {
echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
} else {
echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
}
?>
</div>
<div class="span5">
<div class="multiple_select_header">
<b><?php echo get_lang('UserListInSession') ?> :</b>
</div>
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
<div class="col-md-4">
<label><?php echo get_lang('UserListInSession') ?> :</label>
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="form-control">
<?php
foreach ($sessionUsersList as $enreg) {
?>

@ -22,7 +22,7 @@ api_protect_admin_script(true);
$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$form = new FormValidator('archive_cleanup_form');
$form->addButton('proceed', get_lang('ArchiveDirCleanupProceedButton'));
$form->addButtonSend( get_lang('ArchiveDirCleanupProceedButton'));
$message = null;
@ -46,7 +46,7 @@ if ($form->validate()) {
}
Display::display_header(get_lang('ArchiveDirCleanup'));
Display::display_normal_message(get_lang('ArchiveDirCleanupDescr'));
Display::display_warning_message(get_lang('ArchiveDirCleanupDescr'));
if (isset($_GET['msg']) && isset($_GET['type'])) {
if (in_array($_GET['msg'], array('ArchiveDirCleanupSucceeded', 'ArchiveDirCleanupFailed')))

@ -1117,7 +1117,7 @@ switch ($action) {
<div><input type="text" id="login" size="15" value="" disabled="disabled" /></div>
<div><label><?php echo get_lang('UserPassword'); ?></label></div>
<div><input type="password" id="password" size="15" value="" disabled="disabled" /></div>
<div><button class="btn" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
<div><button class="btn btn-default" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
</form>
</div>

@ -79,7 +79,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
fputs($fp, $add);
}
fclose($fp);
$msg = get_lang('CoursesListHasBeenExported').'<br/><a class="btn" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
$msg = get_lang('CoursesListHasBeenExported').'<br/><a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
} else {
$msg = get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty');
}

@ -465,13 +465,13 @@ if(!empty($msg)) {
<td width="10%" valign="middle" align="center">
<?php if ($ajax_search) { ?>
<button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
<?php } else { ?>
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<i class="fa fa-chevron-right"></i>
</button>
<br /><br />
<button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<i class="fa fa-chevron-left"></i>
</button>
<?php
@ -479,7 +479,7 @@ if(!empty($msg)) {
?>
<br /><br /><br /><br />
<?php
echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
?>
</td>
<td width="45%" align="center">

@ -111,7 +111,7 @@ $htmlHeadXtra[] = '<script>
var action = datos.split(":")[0];
if (action && action == "confirm") {
var id = datos.split(":")[1];
var sure = "<div class=\"warning-message\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'</div><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn\">' . get_lang('MakeUnavailable') . '</a>";
var sure = "<div class=\"warning-message\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'</div><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn btn-default\">' . get_lang('MakeUnavailable') . '</a>";
$("#id_content_message").html(sure);
}
} });

@ -118,10 +118,12 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_list.php">'.Display::return_icon('session.png', get_lang('ListSession'), '', ICON_SIZE_MEDIUM).'</a>
</div>';
?>
<form method="POST" action="session_category_list.php">
<input type="text" name="keyword" value="<?php echo $keyword; ?>"/>
<button class="search" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><?php echo get_lang('Search') ?></button>
<form method="POST" action="session_category_list.php" class="form-inline">
<div class="form-group">
<input class="form-control" type="text" name="keyword" value="<?php echo $keyword; ?>"/>
<button class="btn btn-default" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><i class="fa fa-search"></i> <?php echo get_lang('Search') ?></button>
<!-- <a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a> -->
</div>
</form>
<form method="post" action="<?php echo api_get_self(); ?>?action=delete&sort=<?php echo $sort; ?>" onsubmit="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
</div><br />
@ -234,7 +236,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<option value="delete_off_session" selected="selected"><?php echo get_lang('DeleteSelectedSessionCategory'); ?></option>
<option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option>
</select>
<button class="save" type="submit" name="name" value="<?php echo get_lang('Ok') ?>"><?php echo get_lang('Ok') ?></button>
<button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('Ok') ?>"><?php echo get_lang('Ok') ?></button>
<?php } ?>
</table>

@ -115,53 +115,53 @@ Display::display_header($tool_name);
$tool_name = get_lang('ModifySessionCourse');
api_display_tool_title($tool_name);
?>
<div class="session-course-edit">
<form method="post" action="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo Security::remove_XSS($_GET['page']) ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1">
<table border="0" cellpadding="5" cellspacing="0" width="600px">
<?php
if(!empty($errorMsg)) {
?>
<tr>
<td colspan="2">
<?php
Display::display_normal_message($errorMsg);
?>
</td>
</tr>
<?php
}
?>
<tr>
<td width="25%" valign = "top"><?php echo get_lang("CoachName") ?>&nbsp;&nbsp;</td>
<td width="70%">
<select name="id_coach[]" style="width:450px;" multiple="multiple" size="7">
<option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
<option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>>
<?php echo get_lang('None') ?>
</option>
<?php
foreach($coaches as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>" <?php if(((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>>
<?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
</option>
<?php
}
unset($coaches);
?>
</select>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<button class="save" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>">
<?php echo get_lang('AssignCoach') ?>
</button>
</td>
</tr>
</table>
<div class="row">
<div class="col-md-12">
<div class="title"></div>
<?php
if(!empty($errorMsg)) {
Display::display_normal_message($errorMsg);
}
?>
</div>
</div>
<div class="row">
<div class="col-md-2">
<?php echo get_lang("CoachName") ?>
</div>
<div class="col-md-8">
<select name="id_coach[]" class="form-control">
<option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
<option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>>
<?php echo get_lang('None') ?>
</option>
<?php
foreach($coaches as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>" <?php if(((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>>
<?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
</option>
<?php
}
unset($coaches);
?>
</select>
<div class="control">
<button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>">
<i class="fa fa-plus"></i>
<?php echo get_lang('AssignCoach') ?>
</button>
</div>
</div>
<div class="col-md-2"></div>
</div>
</form>
</div>
<?php
Display::display_footer();

@ -241,7 +241,7 @@ if ($_POST['formSent']) {
fputs($fp,"</Sessions>\n");
fclose($fp);
$errorMsg=get_lang('UserListHasBeenExported').'<br/><a class="btn" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
$errorMsg=get_lang('UserListHasBeenExported').'<br/><a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
}
}
@ -284,7 +284,7 @@ foreach ($Sessions as $enreg) {
}
$form->addElement('select', 'session_id', get_lang('WhichSessionToExport'), $options);
$form->addElement('button', 'submit', get_lang('ExportSession'));
$form->addButtonExport(get_lang('ExportSession'));
$defaults = array();
$defaults['file_type'] = 'csv';

@ -540,7 +540,7 @@ $form->addElement('checkbox', 'delete_users_not_in_list', null, get_lang('Delete
$form->addElement('checkbox', 'update_course_coaches', null, get_lang('CleanAndUpdateCourseCoaches'));
$form->addElement('checkbox', 'add_me_as_coach', null, get_lang('AddMeAsCoach'));
$form->addElement('checkbox', 'sendMail', null, get_lang('SendMailToUsers'));
$form->addElement('button', 'submit', get_lang('ImportSession'));
$form->addButtonImport(get_lang('ImportSession'));
$defaults = array('sendMail' => 'true','file_type' => 'csv');
$form->setDefaults($defaults);

@ -39,7 +39,7 @@ $form = new FormValidator('import_sessions', 'post', api_get_self(), null, array
$form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
$form->addElement('checkbox', 'remove_old_relationships', null, get_lang('RemoveOldRelationships'));
//$form->addElement('checkbox', 'send_email', null, get_lang('SendMailToUsers'));
$form->addElement('button', 'submit', get_lang('ImportSession'));
$form->addButtonImport(get_lang('ImportSession'));
if ($form->validate()) {
if (isset($_FILES['import_file']['tmp_name']) && !empty($_FILES['import_file']['tmp_name'])) {

@ -127,7 +127,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
if ($export && $name) {
Display::display_confirmation_message(get_lang('BackupCreated'));
echo '<br /><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
echo '<br /><a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
} else {
// Display forms especial export
if (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
@ -155,7 +155,7 @@ function form_special_export() {
$form->addElement('radio', 'backup_option', '', get_lang('SpecialCreateFullBackup'), 'full_backup');
$form->addElement('radio', 'backup_option', '', get_lang('SpecialLetMeSelectItems'), 'select_items');
$form->addElement('html','<br />');
$form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"');
$form->addButtonExport(get_lang('CreateBackup'));
$form->add_progress_bar();
$values['backup_option'] = 'full_backup';
$form->setDefaults($values);

@ -726,8 +726,8 @@ if (!empty($user_list)) {
echo $options;
echo '</select>';
echo '<br />';
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="btn save" onclick="view_stat(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('CompareStats').'</button>';
echo '<button type="submit" class="btn save" onclick="moveto(\''.$unique_id.'\', \''.$user_id.'\');"> '.get_lang('Move').'</button>';
echo '<div id ="reponse_'.$unique_id.'"></div>';
echo '</td>';
}

@ -330,7 +330,7 @@ switch ($action) {
$form->addCheckBox('send_to_users_in_session', null, get_lang('SendToUsersInSessions'));
}
$form->addButton('save', get_lang('ButtonPublishAnnouncement'));
$form->addButtonSave(get_lang('ButtonPublishAnnouncement'));
$form->setDefaults($defaults);
$content = $form->return_form();

@ -217,8 +217,8 @@ class CourseSelectForm
echo '<blockquote>';
echo '<div class="btn-group">';
echo "<a class=\"btn\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
echo "<a class=\"btn\" href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
echo '</div><br />';
foreach ($resources as $id => $resource) {

@ -117,7 +117,7 @@ function display_form()
$html .= '<select id="destination" name="SessionCoursesListDestination[]" style="width:380px;" ></select></div></td>';
$html .= '</tr></table>';
$html .= '<h3>'.get_lang('TypeOfCopy').'</h3>';
$html .= '<h4>'.get_lang('TypeOfCopy').'</h4>';
$html .= '<label class="radio"><input type="radio" id="copy_option_1" name="copy_option" value="full_copy" checked="checked"/>';
$html .= get_lang('FullCopy').'</label><br/>';
$html .= '<label class="radio"><input type="radio" id="copy_option_2" name="copy_option" value="select_items" disabled="disabled"/>';
@ -125,7 +125,7 @@ function display_form()
$html .= '<label class="checkbox"><input type="checkbox" id="copy_base_content_id" name="copy_only_session_items" />'.get_lang('CopyOnlySessionItems').'</label><br /><br/>';
$html .= '<button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;">'.get_lang('CopyCourse').'</button>';
$html .= '<button class="btn btn-success" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;"><i class="fa fa-files-o"></i> '.get_lang('CopyCourse').'</button>';
// Add Security token
$html .= '<input type="hidden" value="' . Security::get_token() . '" name="sec_token">';

@ -96,21 +96,21 @@ if (Security::check_token('post') && (
$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore();
Display::display_normal_message(get_lang('ImportFinished'));
echo '<a class="btn" href="' . api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/index.php">' . get_lang('CourseHomepage') . '</a>';
echo '<a class="btn btn-default" href="' . api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/index.php">' . get_lang('CourseHomepage') . '</a>';
} else {
if (!$error) {
Display::display_warning_message(get_lang('NoResourcesInBackupFile'));
echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
} elseif ($filename === false) {
Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
} else {
if ($filename == '') {
Display::display_error_message(get_lang('SelectBackupFile'));
echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
} else {
Display::display_error_message(get_lang('UploadError'));
echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
}
}
}

@ -245,7 +245,7 @@ if ($form->validate()) {
$message = (is_array($course_request_info) ? '<strong>'.$course_request_info['code'].'</strong> : ' : '').get_lang('CourseRequestCreated');
$message = Display :: return_message($message, 'confirmation', false);
$message .= '<div style="float: left; margin:0px; padding: 0px;">' .
'<a class="btn" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>' .
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>' .
'</div>';
} else {
$message = Display :: return_message(get_lang('CourseRequestCreationFailed'), 'error', false);

@ -3333,7 +3333,7 @@ form .formw .freeze {
}
/* for section */
.scorm_item_section.scorm_completed{
background:url("../img/icon_completed_section.png")no-repeat 280px center #606c88;
background:url("../img/icon_completed_section.png")no-repeat 98% center #606c88;
padding-right: 1.5em;
}
.scorm_item_section{
@ -3370,10 +3370,10 @@ form .formw .freeze {
}
/* items scorm*/
.scorm_item_normal.scorm_completed {
background:url("../img/icon_completed.png") no-repeat 280px center;
background:url("../img/icon_completed.png") no-repeat 98% center;
}
.scorm_item_normal.scorm_failed{
background:url("../img/icon_failed.png") no-repeat 280px center;
background:url("../img/icon_failed.png") no-repeat 98% center;
}
.scorm_item_normal .scorm_item_level_0{
padding-left: .5em;
@ -5555,24 +5555,95 @@ ul.holder li.bit-box a.closebutton{
visibility: hidden;
display: none;
}
/* Bar toggle scorm */
.scorm-toggle{
background-color: #ddd4b0 !important;
margin-left: 10px;
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
display: block;
cursor: pointer;
.sidebar-scorm,
.content-scorm{
position: relative;
min-height: 1px;
padding-left: 15px;
padding-right: 15px;
}
.scorm-toggle.arrow-right{
background: url("../img/arrow-right.png") no-repeat center center;
.sidebar-scorm,
.content-scorm{
float: left;
}
.scorm-toggle.arrow-left{
background: url("../img/arrow-left.png") no-repeat center center;
.total{
width: 100%;
}
#touch-button{
text-decoration: none;
position: fixed;
top: 40px;
left: -5px;
overflow: hidden;
width: 51px;
height: 51px;
border: none;
text-indent: 100%;
opacity: 50;
z-index: 2;
}
.hidden-touch{
background: url("../img/icons/48/hidden-touch-left.png")center center no-repeat;
}
.show-touch{
background: url("../img/icons/48/show-touch-right.png")center center no-repeat;
}
.inner_lp_toc{
overflow-y:scroll;
}
.scorm-heading{
font-size: 16px;
font-weight: bold;
padding: 10px;
}
#control-bottom{
position: fixed;
bottom: 0;
width: 100%;
text-align: center;
left: 0;
}
#control-bottom.well{
margin-bottom: 0;
}
.session-course-edit .control{
padding-top: 2em;
padding-bottom: 2em;
}
#multiple-add-session .control-course{
text-align: center;
}
/* CSS Responsive */
@media (max-width: 480px) {
@media (min-width: 1025px) and (max-width: 1200px) {
.sidebar-scorm{
width: 16.66666667%;
}
.content-scorm{
width: 83.33333333%;
}
}
@media (min-width: 1024px) {
.sidebar-scorm{
width: 25.66666667%;
}
.content-scorm{
width: 74.33333333%;
}
.total{
width: 100%;
}
}
/* Portrait tablet to landscape and desktop - Escritorio pequeño o Tablet */
@media (min-width: 768px) and (max-width: 979px) {
}
/* Landscape phone to portrait tablet - Tablet o Smartphone Horizontal */
@media (max-width: 767px) {
}
/* Landscape phones and down - Solo Smartphone*/
@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
#learning_path_breadcrumb_zone {
display: none;
visibility: hidden;
@ -5580,4 +5651,36 @@ ul.holder li.bit-box a.closebutton{
#learning_path_main{
margin-top: 5px;
}
#touch-button{
top: 5px;
}
.sidebar-scorm{
width: 100%;
}
.content-scorm{
visibility: hidden;
}
.total{
width: 100%;
visibility: visible;
}
}
@media (min-width : 480px) and (max-width: 767px) {
#learning_path_breadcrumb_zone {
display: none;
visibility: hidden;
}
#touch-button{
top: 5px;
}
.sidebar-scorm{
width: 100%;
}
.content-scorm{
visibility: hidden;
}
.total{
width: 100%;
visibility: visible;
}
}

File diff suppressed because it is too large Load Diff

@ -42,7 +42,7 @@ if (Database::num_rows($result)) {
$rows[] = array(
$file['filename'],
api_convert_and_format_date($file['upload_date']),
Display::url(get_lang('Recover'), api_get_self().'?recover_id='.$file['id'], array('class' => 'btn'))
Display::url(get_lang('Recover'), api_get_self().'?recover_id='.$file['id'], array('class' => 'btn btn-default'))
);
}
}

@ -1150,8 +1150,8 @@ if ($modifyAnswers) {
<tr>
<td colspan="4">
<button type="submit" class="btn minus" name="lessMatches" value="<?php echo get_lang('LessElements'); ?>"><?php echo get_lang('LessElements'); ?></button>
&nbsp;&nbsp;<button class="btn plus" type="submit" name="moreMatches" value="<?php echo get_lang('MoreElements'); ?>"><?php echo get_lang('MoreElements'); ?></button>
<button type="submit" class="btn btn-danger" name="lessMatches" value="<?php echo get_lang('LessElements'); ?>"><?php echo get_lang('LessElements'); ?></button>
&nbsp;&nbsp;<button class="btn btn-success" type="submit" name="moreMatches" value="<?php echo get_lang('MoreElements'); ?>"><?php echo get_lang('MoreElements'); ?></button>
</td>
</tr>
<tr>

Binary file not shown.

After

Width:  |  Height:  |  Size: 746 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 708 B

@ -25,7 +25,7 @@ switch ($action) {
$user_info['mail'] = ' '.$user_info['mail'].' ';
}
echo '<h3>'.$user_info['complete_name'].'</h3>'.$user_info['mail'].$user_info['official_code'];
echo '<br/><br/><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_info['user_id'].'">'.get_lang('ViewSharedProfile').'</a>';
echo '<br/><br/><a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_info['user_id'].'">'.get_lang('ViewSharedProfile').'</a>';
echo '</div>';
echo '</div>';
echo '</div>';

@ -277,10 +277,10 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>
</div>';
$thematic_description_html .=
'<div class="span8">
<div class="row-fluid">';
'<div class="col-md-8">
<div class="row">';
$thematic_description_html .=
'<div class="span6 items-progress'.$class1.'">
'<div class="col-md-6 items-progress'.$class1.'">
<div class="topics">' . $subTitle1 . '</div>
<p class="title_topics">' . $thematic_info['title'] . '</p>
<p class="date">' . $thematic_advance_info['start_date'] . '</p>
@ -294,7 +294,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
$thematic_description_html .=
'<div class="span6 items-progress">
'<div class="col-md-6 items-progress">
<div class="topics">'.$subTitle2.'</div>
<p class="title_topics">'.$thematic_info2['title'].'</p>
<p class="date">'.$thematic_advance_info2['start_date'].'</p>
@ -320,7 +320,7 @@ $introduction_section .= '<div class="row"><div class="col-md-12">';
$introduction_section .= $thematic_description_html;
$introduction_section .= '</div>';
$introduction_section .= '<div class="home-course-intro span12"><div class="page-course">';
$introduction_section .= '<div class="home-course-intro col-md-12"><div class="page-course">';
if ($intro_dispDefault) {
if (!empty($intro_content)) {

@ -1495,13 +1495,13 @@ class AnnouncementManager
(empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')
) {
$html .= '<div id="no-data-view">';
$html .= '<h2>' . get_lang('Announcements') . '</h2>';
$html .= '<h3>' . get_lang('Announcements') . '</h3>';
$html .= Display::return_icon('valves.png', '', array(), 64);
$html .= '<div class="controls">';
$html .= Display::url(
get_lang('AddAnnouncement'),
api_get_self() . "?" . api_get_cidreq() . "&action=add",
array('class' => 'btn')
array('class' => 'btn btn-primary')
);
$html .= '</div>';
$html .= '</div>';

@ -2862,7 +2862,7 @@ function api_display_tool_title($title_element) {
unset ($title_element);
$title_element['mainTitle'] = $tit;
}
echo '<h2>';
echo '<h3>';
if (!empty($title_element['supraTitle'])) {
echo '<small>'.$title_element['supraTitle'].'</small><br />';
}
@ -2872,7 +2872,7 @@ function api_display_tool_title($title_element) {
if (!empty($title_element['subTitle'])) {
echo '<br /><small>'.$title_element['subTitle'].'</small>';
}
echo '</h2>';
echo '</h3>';
}
/**
@ -3369,9 +3369,9 @@ function api_not_allowed($print_headers = false, $message = null)
$action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
$action = str_replace('&amp;', '&', $action);
$form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));
$form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'span3 autocapitalize_off')); //new
$form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'span3')); //new
$form->addElement('style_submit_button', 'submitAuth', get_lang('LoginEnter'), array('class' => 'btn span3'));
$form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'col-md-3 autocapitalize_off')); //new
$form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'col-md-3')); //new
$form->addElement('style_submit_button', 'submitAuth', get_lang('LoginEnter'), array('class' => 'btn col-md-3'));
// see same text in auth/gotocourse.php and main_api.lib.php function api_not_allowed (bellow)
$msg = Display::return_message(get_lang('NotAllowed'), 'error', false);
@ -3383,7 +3383,7 @@ function api_not_allowed($print_headers = false, $message = null)
$msg .= "<p style='text-align:center'><a href='#' onclick='$(this).parent().next().toggle()'>".get_lang('LoginWithExternalAccount')."</a></p>";
$msg .= "<div style='display:none;'>";
}
$msg .= '<div class="well_login">';
$msg .= '<div class="well">';
$msg .= $form->return_form();
$msg .='</div>';
if (api_is_cas_activated()) {

@ -2038,7 +2038,7 @@ class Blog
//Link to register users
if($a_infosUser["user_id"] != $_SESSION['_user']['user_id'])
{
$row[] = "<a class=\"btn \" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;register=yes&amp;user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;register=yes&amp;user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
}
else
{
@ -2151,7 +2151,7 @@ class Blog
//Link to register users
if($myrow["user_id"] != $_user['user_id']) {
$row[] = "<a class=\"btn\" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;unregister=yes&amp;user_id=" . $myrow[user_id]."\">" . get_lang('UnRegister')."</a>";
$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;unregister=yes&amp;user_id=" . $myrow[user_id]."\">" . get_lang('UnRegister')."</a>";
} else {
$row[] = '';
}

@ -121,9 +121,9 @@ class Career extends Model
$form->freeze('created_at');
}
if ($action == 'edit') {
$form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
$form->addButtonSave(get_lang('Modify'),'submit');
} else {
$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
$form->addButtonCreate(get_lang('Add'),'submit');
}
// Setting the defaults

@ -2237,9 +2237,9 @@ class GroupManager
// Self-registration / unregistration
if (!api_is_allowed_to_edit(false, true)) {
if (self :: is_self_registration_allowed($user_id, $this_group['id'])) {
$row[] = '<a class = "btn" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_reg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfRegInf').'</a>';
$row[] = '<a class = "btn btn-default" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_reg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfRegInf').'</a>';
} elseif (self :: is_self_unregistration_allowed($user_id, $this_group['id'])) {
$row[] = '<a class = "btn" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_unreg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfUnRegInf').'</a>';
$row[] = '<a class = "btn btn-default" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_unreg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfUnRegInf').'</a>';
} else {
$row[] = '-';
}

@ -5,89 +5,44 @@
Requirements: JQuery 1.4.4, JQuery UI 1.8.7
@author Alberto Torreblanca @albert1t0
@author Julio Montoya Cleaning/fixing some code
@author Alex Aragon Cleaning/fixing code update
**/
// Copy little progress bar in <tr></tr>
function toggle_minipanel() {
$(document).ready(function(){
// Construct mini panel
var panel = $('#lp_navigation_elem div:first').clone();
$('#touch-button').click(function(){
$(panel).attr('id', 'control');
$('#learning_path_main').append(panel);
$('#learning_path_main #control tr').after('<tr></tr>');
$('#learning_path_main #control tr:eq(1)').append($('#progress_bar').html());
$('#learning_path_main #control tr:eq(1) #progress_img_limit_left').attr('height','5');
$('#learning_path_main #control tr:eq(1) #progress_img_full').attr('height','5');
$('#learning_path_main #control tr:eq(1) #progress_img_limit_middle').attr('height','5');
$('#learning_path_main #control tr:eq(1) #progress_img_empty').attr('height','5');
$('#learning_path_main #control tr:eq(1) #progress_bar_img_limit_right').attr('height','5');
$('#learning_path_main #control tr:eq(1) #progress_text').remove();
$('#learning_path_main #control tr:eq(1) div').css('width','');
$('#learning_path_main #control .buttons').attr('text-align','center');
$('#content_id').css({ height: $('#content_id').height() - ($('#control').height() + 10) });
$('#learning_path_left_zone').toggle("slow",function(){
$('#learning_path_right_zone').toggleClass('total');
$(function(){
$('#learning_path_right_zone').slideToggle(300);
$('#control-bottom').toggle("slow");
});
}
);
$(this).toggleClass('show-touch');
$('#learning_path_right_zone').slideToggle(300);
});
//effects items scorm content
$('.scorm_item_normal').click(function(){
$('#learning_path_right_zone').fadeOut(300);
setTimeout(function(){
$('#learning_path_right_zone').fadeIn(300);
},300);
$('#learning_path_main #control .buttons img').click(function(){
$('#learning_path_main #control tr:eq(1)').remove();
toggle_minipanel();
});
// Hiding navigation left zone
$('#learning_path_left_zone').hide(50);
$('#learning_path_right_zone').css('margin-left','10px');
$('#hide_bar table').css('backgroundImage','url(../img/hide2.png)').css('backgroundColor','#EEEEEE');
}
function hiddenPanel(){
$("#learning_path_left_zone").addClass('demo');
}
var left_width_mini = 20; // (relative) hide_bar position
$(document).ready(function() {
var left_width = $('#learning_path_left_zone').width();
//Adding div to hide panel
$('#learning_path_right_zone').before('<div id="hide_bar" class="scorm-toggle" style="float: left; width: 25px; height: 1000px;"></div>');
//$('#hide_bar table').css({backgroundImage: "url(../img/hide0.png)", backgroundRepeat: "no-repeat", backgroundPosition: "center center"});
$('.scorm-previous').click(function(){
$('#learning_path_right_zone').fadeOut(300);
setTimeout(function(){
$('#learning_path_right_zone').fadeIn(300);
},300);
$("#hider_bar").click(function(){
$("#learning_path_left_zone").css('display:none;');
});
$('.scorm-next').click(function(){
$('#learning_path_right_zone').fadeOut(300);
setTimeout(function(){
$('#learning_path_right_zone').fadeIn(300);
},300);
//Adding effects to hide bar
/* $('#hide_bar table').hover(function () {
if ($('#hide_bar').position().left >= left_width)
$(this).css('backgroundImage','url(../img/hide1.png)').css('backgroundColor','#888888');
else if($('#hide_bar').position().left <= left_width_mini)
$(this).css('backgroundImage','url(../img/hide3.png)').css('backgroundColor','#888888');
},function (){
if($('#hide_bar').position().left >= left_width)
$(this).css('backgroundImage','url(../img/hide0.png)').css('backgroundColor','#EEEEEE');
else if($('#hide_bar').position().left <= left_width_mini)
$(this).css('backgroundImage','url(../img/hide2.png)').css('backgroundColor','#EEEEEE');
}
);
*/
var original = $('#content_id').height();
// Adding functionality
/*$('#hide_bar table').toggle(function(){
if ($('#hide_bar').position().left >= left_width) {
toggle_minipanel();
}
},
function() {
// Show navigation left zone
$('#learning_path_left_zone').show(50);
$('#learning_path_right_zone').css('marginLeft', left_width + 25 + 'px');
/* $('#hide_bar table').css('backgroundImage','url(../img/hide0.png)').css('backgroundColor','#EEEEEE');
$('#learning_path_main #control').remove();
$('#content_id').css({ height: original});
}); */
});
});

@ -1083,7 +1083,7 @@ class MessageManager
$html .= Display::tag('h4', Display::url(Security::remove_XSS($topic['title'], STUDENT, true), 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']));
if ($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) {
$actions = '<br />'.Display::url(get_lang('Delete'), api_get_path(WEB_CODE_PATH).'social/group_topics.php?action=delete&id='.$group_id.'&topic_id='.$topic['id'], array('class' => 'btn'));
$actions = '<br />'.Display::url(get_lang('Delete'), api_get_path(WEB_CODE_PATH).'social/group_topics.php?action=delete&id='.$group_id.'&topic_id='.$topic['id'], array('class' => 'btn btn-default'));
}
$date = '';

@ -338,7 +338,7 @@ class Nanogong
if (!empty($file_path)) {
$url = $this->get_public_url(true);
$actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn'));
$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
if ($show_delete_button) {
$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));

@ -191,10 +191,10 @@ class Promotion extends Model
$form->addElement('text', 'created_at', get_lang('CreatedAt'));
$form->freeze('created_at');
}
if ($action == 'edit') {
$form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
if ($action == 'edit') {
$form->addButtonSave(get_lang('Modify'),'submit');
} else {
$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
$form->addButtonCreate(get_lang('Add'),'submit');
}
// Setting the defaults

@ -665,7 +665,7 @@ class SortableTable extends HTML_Table
//}
$result[] = '</select>';
$result[] = '<noscript>';
$result[] = '<button class="btn save" type="submit">'.get_lang('Save').'</button>';
$result[] = '<button class="btn btn-success" type="submit">'.get_lang('Save').'</button>';
$result[] = '</noscript>';
$result[] = '</form>';
$result = implode("\n", $result);

@ -3937,7 +3937,7 @@ class UserManager
<option value="2"' . (($searchType=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option>
</select>
'.$extraFields.'
<button class="btn" type="submit" value="search">'.get_lang('Search').'</button>
<button class="btn btn-primary" type="submit" value="search">'.get_lang('Search').'</button>
</form>
';

@ -19,6 +19,7 @@
*/
// Language files that need to be included
$language_file = array('admin');

@ -1898,29 +1898,35 @@ class learnpath
* Gets the navigation bar for the learnpath display screen
* @return string The HTML string to use as a navigation bar
*/
public function get_navigation_bar() {
public function get_navigation_bar($idBar = null, $display=null) {
if ($this->debug > 0) {
error_log('New LP - In learnpath::get_navigation_bar()', 0);
}
if(empty($idBar)){
$idBar='control-top';
}
if(empty($display)){
$display='display:block';
}
$navbar = null;
$lp_id = $this->lp_id;
$mycurrentitemid = $this->get_current_item_id();
if ($this->mode == 'fullscreen') {
$navbar = '
<div class="buttons well">
<div id="'.$idBar.'" class="buttons well" style="'.$display.'">
<a href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onClick="window.parent.API.save_asset();return true;" target="content_name_blank" title="stats" id="stats_link"><img border="0" src="../img/btn_stats.png" title="' . get_lang('Reporting') . '"></a>
<a href="" onClick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous"><img border="0" src="../img/btn_previous.png" title="' . get_lang('ScormPrevious') . '"></a>
<a href="" onClick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next" ><img border="0" src="../img/btn_next.png" title="' . get_lang('ScormNext') . '"></a>.
<a id="scorm-previous" href="" onClick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous"><img border="0" src="../img/btn_previous.png" title="' . get_lang('ScormPrevious') . '"></a>
<a id="scorm-next" href="" onClick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next" ><img border="0" src="../img/btn_next.png" title="' . get_lang('ScormNext') . '"></a>.
<a href="lp_controller.php?action=mode&mode=embedded" target="_top" title="embedded mode"><img border="0" src="../img/view_choose.gif" title="'.get_lang('ScormExitFullScreen').'"></a>
</div>';
} else {
$navbar = '
<div class="buttons well">
<div id="'.$idBar.'" class="buttons well" style="'.$display.'">
<a href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onClick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link"><img border="0" src="../img/btn_stats.png" title="' . get_lang('Reporting') . '"></a>
<a href="" onClick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous"><img border="0" src="../img/btn_previous.png" title="' . get_lang('ScormPrevious') . '"></a>
<a href="" onClick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next" ><img border="0" src="../img/btn_next.png" title="' . get_lang('ScormNext') . '"></a>
<a id="scorm-previous" href="" onClick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous"><img border="0" src="../img/btn_previous.png" title="' . get_lang('ScormPrevious') . '"></a>
<a id="scorm-next" href="" onClick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next" ><img border="0" src="../img/btn_next.png" title="' . get_lang('ScormNext') . '"></a>
</div>';
}
return $navbar;
@ -3140,9 +3146,9 @@ class learnpath
if ($this->get_lp_session_id() == api_get_session_id()) {
$html .= '<div id="actions_lp" class="actions_lp">';
$html .= '<div class="btn-group">';
$html .= "<a class='btn' href='lp_controller.php?" . api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=build&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Overview') . "</a>";
$html .= "<a class='btn' href='lp_controller.php?" . api_get_cidreq()."&amp;action=add_item&amp;type=step&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Edit') . "</a>";
$html .= '<a class="btn" href="lp_controller.php?'.api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=edit&amp;lp_id=" . $this->lp_id.'">'.get_lang('Settings').'</a>';
$html .= "<a class='btn btn-default' href='lp_controller.php?" . api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=build&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Overview') . "</a>";
$html .= "<a class='btn btn-default' href='lp_controller.php?" . api_get_cidreq()."&amp;action=add_item&amp;type=step&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Edit') . "</a>";
$html .= '<a class="btn btn-default" href="lp_controller.php?'.api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=edit&amp;lp_id=" . $this->lp_id.'">'.get_lang('Settings').'</a>';
$html .= '</div>';
$html .= '</div>';
}
@ -5395,7 +5401,7 @@ class learnpath
$return .= '<div class="col-md-12">';
$return .= self::return_new_tree($update_audio);
$return .='</div>';
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%'));
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn btn-primary')), array('style'=>'float:left; margin-top:15px;width:100%'));
} else {
$return_audio .= self::return_new_tree($update_audio);
$return .= $return_audio.'</table>';

@ -475,10 +475,10 @@ if (!empty($flat_list)) {
} else {
if ($is_allowed_to_edit) {
echo '<div id="no-data-view">';
echo '<h2>'.get_lang('LearningPaths').'</h2>';
echo '<h3>'.get_lang('LearningPaths').'</h3>';
echo Display::return_icon('scorms.png', '', array(), 64);
echo '<div class="controls">';
echo Display::url(get_lang('LearnpathAddLearnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp', array('class' => 'btn'));
echo Display::url(get_lang('LearnpathAddLearnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp', array('class' => 'btn btn-primary'));
echo '</div>';
echo '</div>';
}

@ -340,6 +340,7 @@ if (!api_is_invitee()) {
$progress_bar = $_SESSION['oLP']->getProgressBar();
}
$navigation_bar = $_SESSION['oLP']->get_navigation_bar();
$navigation_bar_bottom = $_SESSION['oLP']->get_navigation_bar("control-bottom","display:none");
$mediaplayer = $_SESSION['oLP']->get_mediaplayer($autostart);
$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
@ -372,7 +373,11 @@ if ($is_allowed_to_edit) {
echo '</div>';
echo '</div>';
}
echo '<div id="learning_path_left_zone" style="'.$display_none.'"> ';
/* button hiden left zone */
echo '<a id="touch-button" class="hidden-touch" href="#"></a>';
/* Fin left zone */
echo '<div class="container-fluid"><div class="row">';
echo '<div id="learning_path_left_zone" class="sidebar-scorm"> ';
echo '<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">';
echo '<div class="panel panel-default">';
echo '<div class="panel-heading" role="tab" id="headingOne">
@ -448,11 +453,8 @@ if ($is_allowed_to_edit) {
</div>
</div>
</div>
</div>
<!-- end media player layout -->
<!-- TOC layout -->
<div id="toc_id" name="toc_name">
@ -462,10 +464,11 @@ if ($is_allowed_to_edit) {
</div>
<!-- end TOC layout -->
</div>
<!-- end left zone -->
<!-- end left zone
<div id="hide_bar" class="scorm-toggle" style="display:inline-block; width: 25px; height: 1000px;"></div>-->
<!-- right zone -->
<div id="learning_path_right_zone" style="margin-left:<?php echo $margin_left;?>;height:100%">
<div id="learning_path_right_zone" style="height:100%" class="content-scorm">
<?php
// hub 26-05-2010 Fullscreen or not fullscreen
$height = '100%';
@ -476,8 +479,11 @@ if ($is_allowed_to_edit) {
}
?>
</div>
<!-- end right Zone -->
</div>
<?php echo $navigation_bar_bottom; ?>
</div></div>
<script>
// Resize right and left pane to full height (HUB 20-05-2010).
@ -543,7 +549,7 @@ if ($is_allowed_to_edit) {
}
$(document).ready(function() {
updateContentHeight();
$('#hide_bar').children().click(function(){
$('#touch-button').children().click(function(){
updateContentHeight();
});
$(window).resize(function() {

@ -1,6 +1,6 @@
<form id="form_advanced_subscription_admin" class="form-search" method="post" action="/plugin/advanced_subscription/src/admin_view.php" name="form_advanced_subscription_admin">
<div class="row">
<div class="span6">
<div class="col-md-6">
<p class="text-title-select">{{ 'SelectASession' | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
<select id="session-select" name="s">
<option value="0">
@ -19,7 +19,7 @@
<p>{{ session.target }}</p>
</div>
<div class="span6">
<div class="col-md-6">
<p class="separate-badge">
<span class="badge badge-dis">{{ session.vacancies }}</span>
{{ "Vacancies" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
@ -31,7 +31,7 @@
</div>
</div>
<div class="row">
<div class="span12">
<div class="col-md-12">
<div class="student-list-table">
<table id="student_table" class="table table-striped">
<tbody>

@ -13,9 +13,10 @@
{# Improve usability in portal devices #}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ title_string }}</title>
{{ css_file_to_string }}
{{ css_style_print }}
{{ css_static_file_to_string }}
{{ js_file_to_string }}
{{ css_custom_file_to_string }}
{{ css_style_print }}
{# end copy from head.tpl #}
<h2 class="legal-terms-title legal-terms-popup">
{{ "TermsAndConditions" | get_lang }}

Loading…
Cancel
Save