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

Move session CRUD inside main/session see BT#4296

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 0fc6dee2c8
commit 939949f9cc
16 changed files with 811 additions and 801 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. 0
      main/session/add_many_session_to_category.php
  2. 0
      main/session/add_students_to_session.php
  3. 0
      main/session/add_teachers_to_session.php
  4. 8
      main/session/add_users_to_session.php
  5. 4
      main/session/resume_session.php
  6. 3
      main/session/session_add.php
  7. 0
      main/session/session_category_add.php
  8. 0
      main/session/session_category_edit.php
  9. 4
      main/session/session_category_list.php
  10. 0
      main/session/session_course_list.php
  11. 2
      main/session/session_export.php
  12. 3
      main/session/session_import.php
  13. 3
      main/session/session_import_drh.php
  14. 11
      main/session/session_list.php
  15. 0
      main/session/session_user_edit.php
  16. 0
      main/session/session_user_import.php

0
main/admin/add_many_session_to_category.php → main/session/add_many_session_to_category.php
Unescape View File

0
main/admin/add_students_to_session.php → main/session/add_students_to_session.php
Unescape View File

0
main/admin/add_teachers_to_session.php → main/session/add_teachers_to_session.php
Unescape View File

8
main/session/add_users_to_session.php
Unescape View File

@ -527,8 +527,12 @@ if ($add_type == 'multiple') {
} }
$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>'; $link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
$newLinks = Display::url(get_lang('EnrollTrainersFromExistingSessions'), api_get_path(WEB_CODE_PATH).'admin/add_teachers_to_session.php'); $newLinks = Display::url(
$newLinks .= Display::url(get_lang('EnrollStudentsFromExistingSessions'), api_get_path(WEB_CODE_PATH).'admin/add_students_to_session.php'); get_lang('EnrollTrainersFromExistingSessions'), api_get_path(WEB_CODE_PATH).'session/add_teachers_to_session.php'
);
$newLinks .= Display::url(
get_lang('EnrollStudentsFromExistingSessions'), api_get_path(WEB_CODE_PATH).'session/add_students_to_session.php'
);
?> ?>
<div class="actions"> <div class="actions">
<?php <?php

4
main/session/resume_session.php
Unescape View File

@ -433,7 +433,7 @@ if (!empty($userList)) {
$courseUserLink = Display::url( $courseUserLink = Display::url(
Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')), Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')),
api_get_path(WEB_CODE_PATH).'admin/session_course_user.php?id_user='.$user['user_id'].'&id_session='.$sessionId api_get_path(WEB_CODE_PATH).'session/session_course_user.php?id_user='.$user['user_id'].'&id_session='.$sessionId
); );
$removeLink = Display::url( $removeLink = Display::url(
@ -463,7 +463,7 @@ if (!empty($userList)) {
$editUrl = null; $editUrl = null;
if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) { if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) {
$editUrl = api_get_path(WEB_CODE_PATH) . 'admin/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId; $editUrl = api_get_path(WEB_CODE_PATH) . 'session/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId;
$editUrl = Display::url( $editUrl = Display::url(
Display::return_icon('agenda.png', get_lang('SessionDurationEdit')), Display::return_icon('agenda.png', get_lang('SessionDurationEdit')),
$editUrl $editUrl

3
main/session/session_add.php
Unescape View File

@ -418,7 +418,8 @@ if (!empty($return)) {
} }
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="../session/session_list.php">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
$form->display(); $form->display();

0
main/admin/session_category_add.php → main/session/session_category_add.php
Unescape View File

0
main/admin/session_category_edit.php → main/session/session_category_edit.php
Unescape View File

4
main/admin/session_category_list.php → main/session/session_category_list.php
Unescape View File

@ -113,8 +113,8 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<div class="actions"> <div class="actions">
<?php <?php
echo '<div style="float:right;"> echo '<div style="float:right;">
<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_add.php">'.Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), '', ICON_SIZE_MEDIUM).'</a> <a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_add.php">'.Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), '', 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> <a href="'.api_get_path(WEB_CODE_PATH).'session/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" class="form-inline"> <form method="POST" action="session_category_list.php" class="form-inline">

0
main/admin/session_course_list.php → main/session/session_course_list.php
Unescape View File

2
main/session/session_export.php
Unescape View File

@ -277,7 +277,7 @@ $result = Database::query($sql);
$Sessions = Database::store_result($result); $Sessions = Database::store_result($result);
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="../session/session_list.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
if (!empty($errorMsg)) { if (!empty($errorMsg)) {

3
main/session/session_import.php
Unescape View File

@ -541,7 +541,8 @@ if (count($inserted_in_course) > 1) {
} }
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="../session/session_list.php">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
if (!empty($error_message)) { if (!empty($error_message)) {

3
main/admin/session_import_drh.php → main/session/session_import_drh.php
Unescape View File

@ -27,7 +27,8 @@ $inserted_in_course = array();
Display::display_header($tool_name); Display::display_header($tool_name);
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="../session/session_list.php">'.
Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
if (!empty($error_message)) { if (!empty($error_message)) {

11
main/session/session_list.php
Unescape View File

@ -27,7 +27,7 @@ if ($action == 'delete') {
exit(); exit();
} }
$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin')); //$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin'));
$tool_name = get_lang('SessionList'); $tool_name = get_lang('SessionList');
Display::display_header($tool_name); Display::display_header($tool_name);
@ -211,9 +211,12 @@ $(function() {
<div class="actions"> <div class="actions">
<?php <?php
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.
Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.
Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>';
echo $actions; echo $actions;
echo '<div class="pull-right">'; echo '<div class="pull-right">';

0
main/admin/session_user_edit.php → main/session/session_user_edit.php
Unescape View File

0
main/admin/session_user_import.php → main/session/session_user_import.php
Unescape View File

Write Preview
Loading…
Cancel
Save