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 remote-tracking branch 'origin/master'

Browse Source
pull/5671/head
Angel Fernando Quiroz Campos 1 year ago
parent a7d08da0f5 da295a514c
commit 29c1b725d4
No known key found for this signature in database
GPG Key ID: B284841AE3E562CD
13 changed files with 33 additions and 33 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. 8
      public/main/admin/access_url_add_users_to_url.php
  2. 4
      public/main/admin/access_url_edit_course_category_to_url.php
  3. 6
      public/main/admin/access_url_edit_courses_to_url.php
  4. 6
      public/main/admin/access_url_edit_usergroup_to_url.php
  5. 6
      public/main/admin/access_url_edit_users_to_url.php
  6. 2
      public/main/admin/access_urls.php
  7. 6
      public/main/admin/add_courses_to_usergroup.php
  8. 6
      public/main/admin/add_sessions_to_promotion.php
  9. 6
      public/main/admin/add_sessions_to_usergroup.php
  10. 4
      public/main/admin/add_users_to_usergroup.php
  11. 4
      public/main/admin/dashboard_add_courses_to_user.php
  12. 6
      public/main/admin/dashboard_add_sessions_to_user.php
  13. 2
      src/CoreBundle/Component/Utils/StateIcon.php

8
public/main/admin/access_url_add_users_to_url.php
Unescape View File

@ -45,7 +45,7 @@ echo Display::toolbarAction(
Display::page_subheader2($tool_name);
if ($_POST['form_sent']) {
if (!empty($_POST['form_sent'])) {
$form_sent = $_POST['form_sent'];
$users = is_array($_POST['user_list']) ? array_map('intval', $_POST['user_list']) : [];
$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : [];
@ -80,9 +80,9 @@ $first_letter_user_lower = Database::escape_string(api_strtolower($first_letter_
$target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
$target_name = 'lastname';
$sql = "SELECT user_id,lastname,firstname,username FROM $tbl_user
$sql = "SELECT id, lastname, firstname, username FROM $tbl_user
WHERE active <> ".USER_SOFT_DELETED." AND ".$target_name." LIKE '".$first_letter_user_lower."%' OR ".$target_name." LIKE '".$first_letter_user_lower."%'
ORDER BY ".(count($users) > 0 ? '(user_id IN('.implode(',', $users).')) DESC,' : '').' '.$target_name;
ORDER BY ".(count($users) > 0 ? '(id IN('.implode(',', $users).')) DESC,' : '').' '.$target_name;
$result = Database::query($sql);
$db_users = Database::store_result($result);
unset($result);
@ -119,7 +119,7 @@ unset($result);
<?php
foreach ($db_users as $user) {
?>
<option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) {
<option value="<?php echo $user['id']; ?>" <?php if (in_array($user['id'], $users)) {
echo 'selected="selected"';
} ?>>
<?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>

4
public/main/admin/access_url_edit_course_category_to_url.php
Unescape View File

@ -206,11 +206,11 @@ $url_list = UrlManager::get_url_data();
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} ?>

6
public/main/admin/access_url_edit_courses_to_url.php
Unescape View File

@ -218,17 +218,17 @@ $url_list = UrlManager::get_url_data();
if ($ajax_search) {
?>
<button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
}

6
public/main/admin/access_url_edit_usergroup_to_url.php
Unescape View File

@ -231,19 +231,19 @@ $url_list = UrlManager::get_url_data();
?>
<button class="btn btn--plain" type="button"
onclick="remove_item(document.getElementById('destination_users'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button"
onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br/><br/>
<button class="btn btn--plain" type="button"
onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} ?>

6
public/main/admin/access_url_edit_users_to_url.php
Unescape View File

@ -264,17 +264,17 @@ $url_list = UrlManager::get_url_data();
<?php if ($ajax_search) {
?>
<button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('destination_users'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php

2
public/main/admin/access_urls.php
Unescape View File

@ -156,7 +156,7 @@ foreach ($data as $row) {
//Status
$active = $row['active'];
$action = 'unlock';
$image = StateIcon::ACTIVE;
$image = StateIcon::INACTIVE;
if ('1' == $active) {
$action = 'lock';
$image = StateIcon::ACTIVE;

6
public/main/admin/add_courses_to_usergroup.php
Unescape View File

@ -257,17 +257,17 @@ echo Display::input('hidden', 'add_type', null);
if ($ajax_search) {
?>
<button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
}

6
public/main/admin/add_sessions_to_promotion.php
Unescape View File

@ -212,17 +212,17 @@ echo Display::input('hidden', 'add_type', null);
if ($ajax_search) {
?>
<button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('session_in_promotion'), document.getElementById('session_not_in_promotion'))" onclick="moveItem(document.getElementById('session_in_promotion'), document.getElementById('session_not_in_promotion'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
}

6
public/main/admin/add_sessions_to_usergroup.php
Unescape View File

@ -248,17 +248,17 @@ echo Display::input('hidden', 'add_type', null);
if ($ajax_search) {
?>
<button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
} else {
?>
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
<?php
}

4
public/main/admin/add_users_to_usergroup.php
Unescape View File

@ -437,11 +437,11 @@ echo Display::input('hidden', 'add_type', null);
<div class="col-md-2">
<div style="padding-top:54px;width:auto;text-align: center;">
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
<br /><br />
<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
</div>
</div>

4
public/main/admin/dashboard_add_courses_to_user.php
Unescape View File

@ -262,12 +262,12 @@ if (!empty($msg)) {
<div class="control-course">
<div class="separate-action">
<button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
</div>
<div class="separate-action">
<button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
</div>
<div class="separate-action">

6
public/main/admin/dashboard_add_sessions_to_user.php
Unescape View File

@ -258,7 +258,7 @@ $result = Database::query($sql);
?>
<div class="separate-action">
<button class="btn btn--primary" type="button" onclick="remove_item(document.getElementById('destination'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
</div>
<?php
@ -266,12 +266,12 @@ $result = Database::query($sql);
?>
<div class="separate-action">
<button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<em class="fa fa-arrow-right"></em>
<i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
</button>
</div>
<div class="separate-action">
<button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<em class="fa fa-arrow-left"></em>
<i class="mdi mdi-rewind-outline ch-tool-icon"></i>
</button>
</div>

2
src/CoreBundle/Component/Utils/StateIcon.php
Unescape View File

@ -21,7 +21,7 @@ enum StateIcon: string
// Active / Visible
case ACTIVE = 'toggle-switch';
// Inactive / Invisible
case INACTIVE = 'toggle-switch-off';
case INACTIVE = 'toggle-switch-off-outline';
// Expired
case EXPIRED = 'timer-alert-outline';
// Error

Write Preview
Loading…
Cancel
Save