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

Merge pull request #598 from aragonc/bootstrap

Browse Source 
Bootstrap update scorm add effects CT#7339
1.10.x
Julio 11 years ago
parent 7c5f9e8840 81057bcd86
commit 90c5a87d37
45 changed files with 422 additions and 7005 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. 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

156
main/admin/add_courses_to_session.php
Unescape View File

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

2
main/admin/add_teachers_to_session.php
Unescape View File

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

60
main/admin/add_users_to_session.php
Unescape View File

@ -563,32 +563,22 @@ if (!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API Display::display_normal_message($errorMsg); //main API
} }
?> ?>
<div class="row"> <div id="multiple-add-session" class="row">
<div class="span5"> <div class="col-md-5">
<div class="multiple_select_header"> <div class="multiple_select_header">
<b><?php echo get_lang('UserListInPlatform') ?> :</b> <label><?php echo get_lang('UserListInPlatform') ?> :</label>
<?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 } ?>
</div> </div>
<div id="content_source"> <div id="content_source">
<?php <?php
if (!($add_type=='multiple')) { 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> <div id="ajax_list_users_single"></div>
<?php <?php
} else { } else {
?> ?>
<div id="ajax_list_users_multiple"> <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 <?php
foreach ($nosessionUsersList as $uid => $enreg) { foreach ($nosessionUsersList as $uid => $enreg) {
?> ?>
@ -616,22 +606,35 @@ if (!empty($errorMsg)) {
</div> </div>
</div> </div>
<div class="span2"> <div class="col-md-3">
<div style="padding-top:54px;width:auto;text-align: center;"> <?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 <?php
if ($ajax_search) { if ($ajax_search) {
?> ?>
<button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" > <button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
<i class="fa fa-chevron-right"></i> <i class="fa fa-chevron-left"></i>
</button> </button>
<?php <?php
} else { } 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> <i class="fa fa-chevron-right"></i>
</button> </button>
<br /><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 />
<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> <i class="fa fa-chevron-left"></i>
</button> </button>
<?php <?php
@ -642,18 +645,17 @@ if (!empty($errorMsg)) {
<br /> <br />
<?php <?php
if (!empty($addProcess)) { 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 { } 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>
<div class="span5"> <div class="col-md-4">
<div class="multiple_select_header"> <label><?php echo get_lang('UserListInSession') ?> :</label>
<b><?php echo get_lang('UserListInSession') ?> :</b>
</div> <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="form-control">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
<?php <?php
foreach ($sessionUsersList as $enreg) { foreach ($sessionUsersList as $enreg) {
?> ?>

4
main/admin/archive_cleanup.php
Unescape View File

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

2
main/admin/configure_homepage.php
Unescape View File

@ -1117,7 +1117,7 @@ switch ($action) {
<div><input type="text" id="login" size="15" value="" disabled="disabled" /></div> <div><input type="text" id="login" size="15" value="" disabled="disabled" /></div>
<div><label><?php echo get_lang('UserPassword'); ?></label></div> <div><label><?php echo get_lang('UserPassword'); ?></label></div>
<div><input type="password" id="password" size="15" value="" disabled="disabled" /></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> </form>
</div> </div>

2
main/admin/course_export.php
Unescape View File

@ -79,7 +79,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
fputs($fp, $add); fputs($fp, $add);
} }
fclose($fp); 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 { } else {
$msg = get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty'); $msg = get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty');
} }

8
main/admin/dashboard_add_users_to_user.php
Unescape View File

@ -465,13 +465,13 @@ if(!empty($msg)) {
<td width="10%" valign="middle" align="center"> <td width="10%" valign="middle" align="center">
<?php if ($ajax_search) { ?> <?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 { ?> <?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> <i class="fa fa-chevron-right"></i>
</button> </button>
<br /><br /> <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> <i class="fa fa-chevron-left"></i>
</button> </button>
<?php <?php
@ -479,7 +479,7 @@ if(!empty($msg)) {
?> ?>
<br /><br /><br /><br /> <br /><br /><br /><br />
<?php <?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>
<td width="45%" align="center"> <td width="45%" align="center">

2
main/admin/languages.php
Unescape View File

@ -111,7 +111,7 @@ $htmlHeadXtra[] = '<script>
var action = datos.split(":")[0]; var action = datos.split(":")[0];
if (action && action == "confirm") { if (action && action == "confirm") {
var id = datos.split(":")[1]; 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); $("#id_content_message").html(sure);
} }
} }); } });

10
main/admin/session_category_list.php
Unescape View File

@ -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> <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>'; </div>';
?> ?>
<form method="POST" action="session_category_list.php"> <form method="POST" action="session_category_list.php" class="form-inline">
<input type="text" name="keyword" value="<?php echo $keyword; ?>"/> <div class="form-group">
<button class="search" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><?php echo get_lang('Search') ?></button> <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> --> <!-- <a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a> -->
</div>
</form> </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;"> <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 /> </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_off_session" selected="selected"><?php echo get_lang('DeleteSelectedSessionCategory'); ?></option>
<option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option> <option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option>
</select> </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 } ?> <?php } ?>
</table> </table>

88
main/admin/session_course_edit.php
Unescape View File

@ -115,53 +115,53 @@ Display::display_header($tool_name);
$tool_name = get_lang('ModifySessionCourse'); $tool_name = get_lang('ModifySessionCourse');
api_display_tool_title($tool_name); 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;"> <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"> <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> <div class="row">
<td width="25%" valign = "top"><?php echo get_lang("CoachName") ?>&nbsp;&nbsp;</td> <div class="col-md-12">
<td width="70%"> <div class="title"></div>
<select name="id_coach[]" style="width:450px;" multiple="multiple" size="7"> <?php
<option value="0">----- <?php echo get_lang("Choose") ?> -----</option> if(!empty($errorMsg)) {
<option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>> Display::display_normal_message($errorMsg);
<?php echo get_lang('None') ?> }
</option> ?>
<?php </div>
foreach($coaches as $enreg) { </div>
?> <div class="row">
<option value="<?php echo $enreg['user_id']; ?>" <?php if(((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>> <div class="col-md-2">
<?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?> <?php echo get_lang("CoachName") ?>
</option> </div>
<?php <div class="col-md-8">
}
unset($coaches); <select name="id_coach[]" class="form-control">
?> <option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
</select> <option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>>
</td> <?php echo get_lang('None') ?>
</tr> </option>
<tr> <?php
<td>&nbsp;</td> foreach($coaches as $enreg) {
<td> ?>
<button class="save" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>"> <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 get_lang('AssignCoach') ?> <?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
</button> </option>
</td> <?php
</tr> }
</table> 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> </form>
</div>
<?php <?php
Display::display_footer(); Display::display_footer();

4
main/admin/session_export.php
Unescape View File

@ -241,7 +241,7 @@ if ($_POST['formSent']) {
fputs($fp,"</Sessions>\n"); fputs($fp,"</Sessions>\n");
fclose($fp); 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('select', 'session_id', get_lang('WhichSessionToExport'), $options);
$form->addElement('button', 'submit', get_lang('ExportSession')); $form->addButtonExport(get_lang('ExportSession'));
$defaults = array(); $defaults = array();
$defaults['file_type'] = 'csv'; $defaults['file_type'] = 'csv';

2
main/admin/session_import.php
Unescape View File

@ -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', 'update_course_coaches', null, get_lang('CleanAndUpdateCourseCoaches'));
$form->addElement('checkbox', 'add_me_as_coach', null, get_lang('AddMeAsCoach')); $form->addElement('checkbox', 'add_me_as_coach', null, get_lang('AddMeAsCoach'));
$form->addElement('checkbox', 'sendMail', null, get_lang('SendMailToUsers')); $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'); $defaults = array('sendMail' => 'true','file_type' => 'csv');
$form->setDefaults($defaults); $form->setDefaults($defaults);

2
main/admin/session_import_drh.php
Unescape View File

@ -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('file', 'import_file', get_lang('ImportFileLocation'));
$form->addElement('checkbox', 'remove_old_relationships', null, get_lang('RemoveOldRelationships')); $form->addElement('checkbox', 'remove_old_relationships', null, get_lang('RemoveOldRelationships'));
//$form->addElement('checkbox', 'send_email', null, get_lang('SendMailToUsers')); //$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 ($form->validate()) {
if (isset($_FILES['import_file']['tmp_name']) && !empty($_FILES['import_file']['tmp_name'])) { if (isset($_FILES['import_file']['tmp_name']) && !empty($_FILES['import_file']['tmp_name'])) {

4
main/admin/special_exports.php
Unescape View File

@ -127,7 +127,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
if ($export && $name) { if ($export && $name) {
Display::display_confirmation_message(get_lang('BackupCreated')); 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 { } else {
// Display forms especial export // Display forms especial export
if (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') { 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('SpecialCreateFullBackup'), 'full_backup');
$form->addElement('radio', 'backup_option', '', get_lang('SpecialLetMeSelectItems'), 'select_items'); $form->addElement('radio', 'backup_option', '', get_lang('SpecialLetMeSelectItems'), 'select_items');
$form->addElement('html','<br />'); $form->addElement('html','<br />');
$form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"'); $form->addButtonExport(get_lang('CreateBackup'));
$form->add_progress_bar(); $form->add_progress_bar();
$values['backup_option'] = 'full_backup'; $values['backup_option'] = 'full_backup';
$form->setDefaults($values); $form->setDefaults($values);

4
main/admin/user_move_stats.php
Unescape View File

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

2
main/announcements/announcements.php
Unescape View File

@ -330,7 +330,7 @@ switch ($action) {
$form->addCheckBox('send_to_users_in_session', null, get_lang('SendToUsersInSessions')); $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); $form->setDefaults($defaults);
$content = $form->return_form(); $content = $form->return_form();

4
main/coursecopy/classes/CourseSelectForm.class.php
Unescape View File

@ -217,8 +217,8 @@ class CourseSelectForm
echo '<blockquote>'; echo '<blockquote>';
echo '<div class="btn-group">'; 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 btn-default\" 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',false);\" >".get_lang('None')."</a>";
echo '</div><br />'; echo '</div><br />';
foreach ($resources as $id => $resource) { foreach ($resources as $id => $resource) {

4
main/coursecopy/copy_course_session.php
Unescape View File

@ -117,7 +117,7 @@ function display_form()
$html .= '<select id="destination" name="SessionCoursesListDestination[]" style="width:380px;" ></select></div></td>'; $html .= '<select id="destination" name="SessionCoursesListDestination[]" style="width:380px;" ></select></div></td>';
$html .= '</tr></table>'; $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 .= '<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 .= get_lang('FullCopy').'</label><br/>';
$html .= '<label class="radio"><input type="radio" id="copy_option_2" name="copy_option" value="select_items" disabled="disabled"/>'; $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 .= '<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 // Add Security token
$html .= '<input type="hidden" value="' . Security::get_token() . '" name="sec_token">'; $html .= '<input type="hidden" value="' . Security::get_token() . '" name="sec_token">';

10
main/coursecopy/import_backup.php
Unescape View File

@ -96,21 +96,21 @@ if (Security::check_token('post') && (
$cr->set_file_option($_POST['same_file_name_option']); $cr->set_file_option($_POST['same_file_name_option']);
$cr->restore(); $cr->restore();
Display::display_normal_message(get_lang('ImportFinished')); 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 { } else {
if (!$error) { if (!$error) {
Display::display_warning_message(get_lang('NoResourcesInBackupFile')); 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) { } elseif ($filename === false) {
Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin')); 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 { } else {
if ($filename == '') { if ($filename == '') {
Display::display_error_message(get_lang('SelectBackupFile')); 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 { } else {
Display::display_error_message(get_lang('UploadError')); 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>';
} }
} }
} }

2
main/create_course/add_course.php
Unescape View File

@ -245,7 +245,7 @@ if ($form->validate()) {
$message = (is_array($course_request_info) ? '<strong>'.$course_request_info['code'].'</strong> : ' : '').get_lang('CourseRequestCreated'); $message = (is_array($course_request_info) ? '<strong>'.$course_request_info['code'].'</strong> : ' : '').get_lang('CourseRequestCreated');
$message = Display :: return_message($message, 'confirmation', false); $message = Display :: return_message($message, 'confirmation', false);
$message .= '<div style="float: left; margin:0px; padding: 0px;">' . $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>'; '</div>';
} else { } else {
$message = Display :: return_message(get_lang('CourseRequestCreationFailed'), 'error', false); $message = Display :: return_message(get_lang('CourseRequestCreationFailed'), 'error', false);

137
main/css/base.css
Unescape View File

@ -3333,7 +3333,7 @@ form .formw .freeze {
} }
/* for section */ /* for section */
.scorm_item_section.scorm_completed{ .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; padding-right: 1.5em;
} }
.scorm_item_section{ .scorm_item_section{
@ -3370,10 +3370,10 @@ form .formw .freeze {
} }
/* items scorm*/ /* items scorm*/
.scorm_item_normal.scorm_completed { .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{ .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{ .scorm_item_normal .scorm_item_level_0{
padding-left: .5em; padding-left: .5em;
@ -5555,24 +5555,95 @@ ul.holder li.bit-box a.closebutton{
visibility: hidden; visibility: hidden;
display: none; display: none;
} }
/* Bar toggle scorm */ .sidebar-scorm,
.scorm-toggle{ .content-scorm{
background-color: #ddd4b0 !important; position: relative;
margin-left: 10px; min-height: 1px;
border-radius: 4px; padding-left: 15px;
-webkit-border-radius: 4px; padding-right: 15px;
-moz-border-radius: 4px;
display: block;
cursor: pointer;
} }
.scorm-toggle.arrow-right{ .sidebar-scorm,
background: url("../img/arrow-right.png") no-repeat center center; .content-scorm{
float: left;
} }
.scorm-toggle.arrow-left{ .total{
background: url("../img/arrow-left.png") no-repeat center center; 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 */ /* 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 { #learning_path_breadcrumb_zone {
display: none; display: none;
visibility: hidden; visibility: hidden;
@ -5580,4 +5651,36 @@ ul.holder li.bit-box a.closebutton{
#learning_path_main{ #learning_path_main{
margin-top: 5px; 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;
}
} }

6687
main/css/chamilo/default.css
View File

File diff suppressed because it is too large Load Diff

2
main/dropbox/recover_dropbox_files.php
Unescape View File

@ -42,7 +42,7 @@ if (Database::num_rows($result)) {
$rows[] = array( $rows[] = array(
$file['filename'], $file['filename'],
api_convert_and_format_date($file['upload_date']), 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'))
); );
} }
} }

4
main/exercice/answer_admin.inc.php
Unescape View File

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

BIN
main/img/icons/48/hidden-touch-left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 746 B

BIN
main/img/icons/48/show-touch-right.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 708 B

2
main/inc/ajax/user_manager.ajax.php
Unescape View File

@ -25,7 +25,7 @@ switch ($action) {
$user_info['mail'] = ' '.$user_info['mail'].' '; $user_info['mail'] = ' '.$user_info['mail'].' ';
} }
echo '<h3>'.$user_info['complete_name'].'</h3>'.$user_info['mail'].$user_info['official_code']; 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>'; echo '</div>';
echo '</div>'; echo '</div>';

10
main/inc/introductionSection.inc.php
Unescape View File

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

4
main/inc/lib/AnnouncementManager.php
Unescape View File

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

12
main/inc/lib/api.lib.php
Unescape View File

@ -2862,7 +2862,7 @@ function api_display_tool_title($title_element) {
unset ($title_element); unset ($title_element);
$title_element['mainTitle'] = $tit; $title_element['mainTitle'] = $tit;
} }
echo '<h2>'; echo '<h3>';
if (!empty($title_element['supraTitle'])) { if (!empty($title_element['supraTitle'])) {
echo '<small>'.$title_element['supraTitle'].'</small><br />'; echo '<small>'.$title_element['supraTitle'].'</small><br />';
} }
@ -2872,7 +2872,7 @@ function api_display_tool_title($title_element) {
if (!empty($title_element['subTitle'])) { if (!empty($title_element['subTitle'])) {
echo '<br /><small>'.$title_element['subTitle'].'</small>'; 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 = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
$action = str_replace('&amp;', '&', $action); $action = str_replace('&amp;', '&', $action);
$form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked')); $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('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' => 'span3')); //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 span3')); $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) // 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); $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 .= "<p style='text-align:center'><a href='#' onclick='$(this).parent().next().toggle()'>".get_lang('LoginWithExternalAccount')."</a></p>";
$msg .= "<div style='display:none;'>"; $msg .= "<div style='display:none;'>";
} }
$msg .= '<div class="well_login">'; $msg .= '<div class="well">';
$msg .= $form->return_form(); $msg .= $form->return_form();
$msg .='</div>'; $msg .='</div>';
if (api_is_cas_activated()) { if (api_is_cas_activated()) {

4
main/inc/lib/blog.lib.php
Unescape View File

@ -2038,7 +2038,7 @@ class Blog
//Link to register users //Link to register users
if($a_infosUser["user_id"] != $_SESSION['_user']['user_id']) 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 else
{ {
@ -2151,7 +2151,7 @@ class Blog
//Link to register users //Link to register users
if($myrow["user_id"] != $_user['user_id']) { 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 { } else {
$row[] = ''; $row[] = '';
} }

4
main/inc/lib/career.lib.php
Unescape View File

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

4
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -2237,9 +2237,9 @@ class GroupManager
// Self-registration / unregistration // Self-registration / unregistration
if (!api_is_allowed_to_edit(false, true)) { if (!api_is_allowed_to_edit(false, true)) {
if (self :: is_self_registration_allowed($user_id, $this_group['id'])) { 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'])) { } 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 { } else {
$row[] = '-'; $row[] = '-';
} }

107
main/inc/lib/javascript/jquery.lp_minipanel.js
Unescape View File

@ -5,89 +5,44 @@
Requirements: JQuery 1.4.4, JQuery UI 1.8.7 Requirements: JQuery 1.4.4, JQuery UI 1.8.7
@author Alberto Torreblanca @albert1t0 @author Alberto Torreblanca @albert1t0
@author Julio Montoya Cleaning/fixing some code @author Julio Montoya Cleaning/fixing some code
@author Alex Aragon Cleaning/fixing code update
**/ **/
// Copy little progress bar in <tr></tr> $(document).ready(function(){
function toggle_minipanel() {
// Construct mini panel $('#touch-button').click(function(){
var panel = $('#lp_navigation_elem div:first').clone();
$(panel).attr('id', 'control'); $('#learning_path_left_zone').toggle("slow",function(){
$('#learning_path_main').append(panel); $('#learning_path_right_zone').toggleClass('total');
$(function(){
$('#learning_path_main #control tr').after('<tr></tr>'); $('#learning_path_right_zone').slideToggle(300);
$('#learning_path_main #control tr:eq(1)').append($('#progress_bar').html()); $('#control-bottom').toggle("slow");
$('#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'); $(this).toggleClass('show-touch');
$('#learning_path_main #control tr:eq(1) #progress_bar_img_limit_right').attr('height','5'); $('#learning_path_right_zone').slideToggle(300);
$('#learning_path_main #control tr:eq(1) #progress_text').remove(); });
$('#learning_path_main #control tr:eq(1) div').css('width',''); //effects items scorm content
$('.scorm_item_normal').click(function(){
$('#learning_path_main #control .buttons').attr('text-align','center'); $('#learning_path_right_zone').fadeOut(300);
$('#content_id').css({ height: $('#content_id').height() - ($('#control').height() + 10) }); 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 $('.scorm-previous').click(function(){
$('#learning_path_left_zone').hide(50); $('#learning_path_right_zone').fadeOut(300);
$('#learning_path_right_zone').css('margin-left','10px'); setTimeout(function(){
$('#hide_bar table').css('backgroundImage','url(../img/hide2.png)').css('backgroundColor','#EEEEEE'); $('#learning_path_right_zone').fadeIn(300);
} },300);
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"});
$("#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});
}); */
}); });

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

@ -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'])); $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) { 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 = ''; $date = '';

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

@ -338,7 +338,7 @@ class Nanogong
if (!empty($file_path)) { if (!empty($file_path)) {
$url = $this->get_public_url(true); $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')); $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) { if ($show_delete_button) {
$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();')); $actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));

6
main/inc/lib/promotion.lib.php
Unescape View File

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

2
main/inc/lib/sortable_table.class.php
Unescape View File

@ -665,7 +665,7 @@ class SortableTable extends HTML_Table
//} //}
$result[] = '</select>'; $result[] = '</select>';
$result[] = '<noscript>'; $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[] = '</noscript>';
$result[] = '</form>'; $result[] = '</form>';
$result = implode("\n", $result); $result = implode("\n", $result);

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

@ -3937,7 +3937,7 @@ class UserManager
<option value="2"' . (($searchType=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option> <option value="2"' . (($searchType=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option>
</select> </select>
'.$extraFields.' '.$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> </form>
'; ';

1
main/link/link.php
Unescape View File

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

28
main/newscorm/learnpath.class.php
Unescape View File

@ -1898,29 +1898,35 @@ class learnpath
* Gets the navigation bar for the learnpath display screen * Gets the navigation bar for the learnpath display screen
* @return string The HTML string to use as a navigation bar * @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) { if ($this->debug > 0) {
error_log('New LP - In learnpath::get_navigation_bar()', 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; $navbar = null;
$lp_id = $this->lp_id; $lp_id = $this->lp_id;
$mycurrentitemid = $this->get_current_item_id(); $mycurrentitemid = $this->get_current_item_id();
if ($this->mode == 'fullscreen') { if ($this->mode == 'fullscreen') {
$navbar = ' $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="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 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 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-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> <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>'; </div>';
} else { } else {
$navbar = ' $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="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 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 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-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>'; </div>';
} }
return $navbar; return $navbar;
@ -3140,9 +3146,9 @@ class learnpath
if ($this->get_lp_session_id() == api_get_session_id()) { if ($this->get_lp_session_id() == api_get_session_id()) {
$html .= '<div id="actions_lp" class="actions_lp">'; $html .= '<div id="actions_lp" class="actions_lp">';
$html .= '<div class="btn-group">'; $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 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' 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;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=edit&amp;lp_id=" . $this->lp_id.'">'.get_lang('Settings').'</a>';
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
} }
@ -5395,7 +5401,7 @@ class learnpath
$return .= '<div class="col-md-12">'; $return .= '<div class="col-md-12">';
$return .= self::return_new_tree($update_audio); $return .= self::return_new_tree($update_audio);
$return .='</div>'; $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 { } else {
$return_audio .= self::return_new_tree($update_audio); $return_audio .= self::return_new_tree($update_audio);
$return .= $return_audio.'</table>'; $return .= $return_audio.'</table>';

4
main/newscorm/lp_list.php
Unescape View File

@ -475,10 +475,10 @@ if (!empty($flat_list)) {
} else { } else {
if ($is_allowed_to_edit) { if ($is_allowed_to_edit) {
echo '<div id="no-data-view">'; 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 Display::return_icon('scorms.png', '', array(), 64);
echo '<div class="controls">'; 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>';
echo '</div>'; echo '</div>';
} }

20
main/newscorm/lp_view.php
Unescape View File

@ -340,6 +340,7 @@ if (!api_is_invitee()) {
$progress_bar = $_SESSION['oLP']->getProgressBar(); $progress_bar = $_SESSION['oLP']->getProgressBar();
} }
$navigation_bar = $_SESSION['oLP']->get_navigation_bar(); $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); $mediaplayer = $_SESSION['oLP']->get_mediaplayer($autostart);
$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM); $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>'; 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-group" id="accordion" role="tablist" aria-multiselectable="true">';
echo '<div class="panel panel-default">'; echo '<div class="panel panel-default">';
echo '<div class="panel-heading" role="tab" id="headingOne"> echo '<div class="panel-heading" role="tab" id="headingOne">
@ -448,11 +453,8 @@ if ($is_allowed_to_edit) {
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- end media player layout -->
<!-- TOC layout --> <!-- TOC layout -->
<div id="toc_id" name="toc_name"> <div id="toc_id" name="toc_name">
@ -462,10 +464,11 @@ if ($is_allowed_to_edit) {
</div> </div>
<!-- end TOC layout --> <!-- end TOC layout -->
</div> </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 --> <!-- 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 <?php
// hub 26-05-2010 Fullscreen or not fullscreen // hub 26-05-2010 Fullscreen or not fullscreen
$height = '100%'; $height = '100%';
@ -476,8 +479,11 @@ if ($is_allowed_to_edit) {
} }
?> ?>
</div> </div>
<!-- end right Zone --> <!-- end right Zone -->
</div> </div>
<?php echo $navigation_bar_bottom; ?>
</div></div>
<script> <script>
// Resize right and left pane to full height (HUB 20-05-2010). // Resize right and left pane to full height (HUB 20-05-2010).
@ -543,7 +549,7 @@ if ($is_allowed_to_edit) {
} }
$(document).ready(function() { $(document).ready(function() {
updateContentHeight(); updateContentHeight();
$('#hide_bar').children().click(function(){ $('#touch-button').children().click(function(){
updateContentHeight(); updateContentHeight();
}); });
$(window).resize(function() { $(window).resize(function() {

6
plugin/advanced_subscription/views/admin_view.tpl
Unescape View File

@ -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"> <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="row">
<div class="span6"> <div class="col-md-6">
<p class="text-title-select">{{ 'SelectASession' | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p> <p class="text-title-select">{{ 'SelectASession' | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
<select id="session-select" name="s"> <select id="session-select" name="s">
<option value="0"> <option value="0">
@ -19,7 +19,7 @@
<p>{{ session.target }}</p> <p>{{ session.target }}</p>
</div> </div>
<div class="span6"> <div class="col-md-6">
<p class="separate-badge"> <p class="separate-badge">
<span class="badge badge-dis">{{ session.vacancies }}</span> <span class="badge badge-dis">{{ session.vacancies }}</span>
{{ "Vacancies" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p> {{ "Vacancies" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="span12"> <div class="col-md-12">
<div class="student-list-table"> <div class="student-list-table">
<table id="student_table" class="table table-striped"> <table id="student_table" class="table table-striped">
<tbody> <tbody>

5
plugin/advanced_subscription/views/terms_and_conditions.tpl
Unescape View File

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

Write Preview
Loading…
Cancel
Save