Skip to content

Commit

Permalink
Move session CRUD inside main/session see BT#4296
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed May 21, 2015
1 parent 0fc6dee commit 939949f
Show file tree
Hide file tree
Showing 16 changed files with 811 additions and 801 deletions.
606 changes: 303 additions & 303 deletions main/admin/add_many_session_to_category.php → .../session/add_many_session_to_category.php 100755 → 100644
View file

Large diffs are not rendered by default.

0 main/admin/add_students_to_session.php → main/session/add_students_to_session.php 100755 → 100644
View file
File renamed without changes.
0 main/admin/add_teachers_to_session.php → main/session/add_teachers_to_session.php 100755 → 100644
View file
File renamed without changes.
8 changes: 6 additions & 2 deletions main/session/add_users_to_session.php
View file
Expand Up @@ -527,8 +527,12 @@ function change_select(val) {
}
$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(get_lang('EnrollStudentsFromExistingSessions'), api_get_path(WEB_CODE_PATH).'admin/add_students_to_session.php');
$newLinks = Display::url(
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">
<?php
Expand Down
4 changes: 2 additions & 2 deletions main/session/resume_session.php
View file
Expand Up @@ -433,7 +433,7 @@

$courseUserLink = Display::url(
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(
Expand Down Expand Up @@ -463,7 +463,7 @@

$editUrl = null;
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(
Display::return_icon('agenda.png', get_lang('SessionDurationEdit')),
$editUrl
Expand Down
3 changes: 2 additions & 1 deletion main/session/session_add.php
View file
Expand Up @@ -418,7 +418,8 @@ function check_session_name($name) {
}

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>';

$form->display();
Expand Down
462 changes: 231 additions & 231 deletions main/admin/session_category_add.php → main/session/session_category_add.php 100755 → 100644
View file

Large diffs are not rendered by default.

506 changes: 253 additions & 253 deletions main/admin/session_category_edit.php → main/session/session_category_edit.php 100755 → 100644
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions main/admin/session_category_list.php → main/session/session_category_list.php 100755 → 100644
View file
Expand Up @@ -113,8 +113,8 @@ function selectAll(idCheck,numRows,action) {
<div class="actions">
<?php
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).'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_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_list.php">'.Display::return_icon('session.png', get_lang('ListSession'), '', ICON_SIZE_MEDIUM).'</a>
</div>';
?>
<form method="POST" action="session_category_list.php" class="form-inline">
Expand Down
0 main/admin/session_course_list.php → main/session/session_course_list.php 100755 → 100644
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion main/session/session_export.php
View file
Expand Up @@ -277,7 +277,7 @@
$Sessions = Database::store_result($result);

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>';

if (!empty($errorMsg)) {
Expand Down
3 changes: 2 additions & 1 deletion main/session/session_import.php
View file
Expand Up @@ -541,7 +541,8 @@
}

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>';

if (!empty($error_message)) {
Expand Down
3 changes: 2 additions & 1 deletion main/admin/session_import_drh.php → main/session/session_import_drh.php 100755 → 100644
View file
Expand Up @@ -27,7 +27,8 @@
Display::display_header($tool_name);

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>';

if (!empty($error_message)) {
Expand Down
11 changes: 7 additions & 4 deletions main/session/session_list.php
View file
Expand Up @@ -27,7 +27,7 @@
exit();
}

$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin'));
//$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin'));

$tool_name = get_lang('SessionList');
Display::display_header($tool_name);
Expand Down Expand Up @@ -211,9 +211,12 @@ function setSearchSelect(columnName) {
<div class="actions">
<?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).'admin/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).'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/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/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 '<div class="pull-right">';
Expand Down
0 main/admin/session_user_edit.php → main/session/session_user_edit.php
View file
File renamed without changes.
0 main/admin/session_user_import.php → main/session/session_user_import.php 100755 → 100644
View file
File renamed without changes.

0 comments on commit 939949f

Please sign in to comment.