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

Browse Source
pull/2744/head
Yannick Warnier 7 years ago
parent 27cdd8072c
commit a9cf571540
24 changed files with 26 additions and 26 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. 4
      main/admin/usergroup_users.php
  2. 2
      main/extra/userInfo.php
  3. 4
      main/gradebook/lib/GradebookUtils.php
  4. 6
      main/gradebook/lib/fe/displaygradebook.php
  5. 2
      main/inc/ajax/model.ajax.php
  6. 2
      main/inc/lib/myspace.lib.php
  7. 2
      main/mySpace/company_reports.php
  8. 2
      main/mySpace/company_reports_resumed.php
  9. 2
      main/mySpace/course.php
  10. 2
      main/mySpace/index.php
  11. 2
      main/mySpace/session.php
  12. 4
      main/mySpace/student.php
  13. 2
      main/mySpace/teachers.php
  14. 4
      main/mySpace/users.php
  15. 2
      main/survey/survey.php
  16. 2
      main/tracking/exams.php
  17. 2
      main/user/user.php
  18. 2
      main/wiki/wiki.inc.php
  19. BIN
      public/img/icons/16/stats.png
  20. BIN
      public/img/icons/22/stats.png
  21. BIN
      public/img/icons/32/stats.png
  22. BIN
      public/img/icons/48/stats.png
  23. 2
      public/img/icons/svg/statistics.svg
  24. 2
      public/img/icons/svg/statistics_na.svg

4
main/admin/usergroup_users.php
Unescape View File

@ -202,7 +202,7 @@ $urlStats = api_get_path(WEB_CODE_PATH);
//$addCalendar = '<a href="'.$urlStats.'mySpace/myStudents.php?student=\'+options.rowId+\'">'.Display::return_icon('agenda.png', get_lang('Agenda'), '', ICON_SIZE_SMALL).'</a>';
$reportingIcon = Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_SMALL);
$reportingIcon = Display::return_icon('statistics.png', get_lang('Reporting'), '', ICON_SIZE_SMALL);
$controlPoint = Display::return_icon('add.png', get_lang('ControlPoint'), '', ICON_SIZE_SMALL);
//return \'<a href="session_edit.php?page=resume_session.php&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
@ -231,7 +231,7 @@ function extra_formatter(cellvalue, options, rowObject) {
return calendarName;
return \''.
'&nbsp;<a href="'.$urlStats.'mySpace/myStudents.php?student=\'+options.rowId+\'">'.Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_SMALL).'</a>'.
'&nbsp;<a href="'.$urlStats.'mySpace/myStudents.php?student=\'+options.rowId+\'">'.Display::return_icon('statistics.png', get_lang('Reporting'), '', ICON_SIZE_SMALL).'</a>'.
' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;" href="?id='.$id.'&action=delete&user_id=\'+options.rowId+\'">'.$deleteIcon.'</a>\';
}';

2
main/extra/userInfo.php
Unescape View File

@ -165,7 +165,7 @@ if (api_is_allowed_to_edit(null, true)) {
).get_lang('ViewUser').'</a>';
}
}
echo '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&origin=user_course&student='.$userIdViewed.'&details=true&course='.$_course['id'].'">'.Display::return_icon('stats.png', get_lang('UserStatistics'), '', ICON_SIZE_MEDIUM).get_lang('UserStatistics').'</a>';
echo '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&origin=user_course&student='.$userIdViewed.'&details=true&course='.$_course['id'].'">'.Display::return_icon('statistics.png', get_lang('UserStatistics'), '', ICON_SIZE_MEDIUM).get_lang('UserStatistics').'</a>';
echo '</div>';
} else {
if ($tool_info['visibility'] == 1) {

4
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -229,7 +229,7 @@ class GradebookUtils
if (!api_is_allowed_to_edit(null, true)) {
$modify_icons .= Display::url(
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('FlatView'),
'',
ICON_SIZE_SMALL
@ -298,7 +298,7 @@ class GradebookUtils
$modify_icons .= '<a href="gradebook_flatview.php?selectcat='.$cat->get_id().'&'.$courseParams.'">'.
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('FlatView'),
'',
ICON_SIZE_SMALL

6
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -430,7 +430,7 @@ class DisplayGradebook
if (!$message_resource) {
$actionsLeft .= '<a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
Display::return_icon('statistics.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
if ($my_category['generate_certificates'] == 1) {
$actionsLeft .= Display::url(
@ -503,7 +503,7 @@ class DisplayGradebook
if ($isDrhOfCourse) {
$actionsLeft .= '<a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('FlatView'),
'',
ICON_SIZE_MEDIUM
@ -576,7 +576,7 @@ class DisplayGradebook
$header = '<div class="actions">';
if ($is_course_admin) {
$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.Display::return_icon('statistics.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.Display::return_icon('settings.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).'</a>';
} elseif (!(isset($_GET['studentoverview']))) {
$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat='.$catobj->get_id().'">'.Display::return_icon('view_list.gif', get_lang('FlatView')).' '.get_lang('FlatView').'</a>';

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

@ -2161,7 +2161,7 @@ switch ($action) {
if ($obj->allowTeachers()) {
$group['actions'] .= Display::url(
Display::return_icon('stats.png'),
Display::return_icon('statistics.png'),
$urlUserGroup.'&id='.$group['id']
).'&nbsp;';
}

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

@ -66,7 +66,7 @@ class MySpace
$menuItems = [];
$menuItems[] = Display::url(
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('MyStats'),
'',
ICON_SIZE_MEDIUM

2
main/mySpace/company_reports.php
Unescape View File

@ -99,7 +99,7 @@ $actions = null;
if (api_is_student_boss()) {
$actions .= Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$actions .= Display::url(

2
main/mySpace/company_reports_resumed.php
Unescape View File

@ -87,7 +87,7 @@ $actions = null;
if (api_is_student_boss()) {
$actions .= Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$actions .= Display::url(

2
main/mySpace/course.php
Unescape View File

@ -87,7 +87,7 @@ if (api_is_platform_admin(true, true)) {
if (!api_is_session_admin()) {
$menu_items[] = Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$menu_items[] = Display::url(

2
main/mySpace/index.php
Unescape View File

@ -209,7 +209,7 @@ if (!empty($session_id) &&
} else {
$actionsLeft .= Display::url(
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('MyStats'),
null,
ICON_SIZE_MEDIUM

2
main/mySpace/session.php
Unescape View File

@ -43,7 +43,7 @@ if (api_is_platform_admin(true, true)) {
if (!api_is_session_admin()) {
$menu_items[] = Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$menu_items[] = Display::url(

4
main/mySpace/student.php
Unescape View File

@ -223,7 +223,7 @@ $actionsLeft = '';
if (api_is_drh()) {
$menu_items = [
Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
),
Display::url(
@ -256,7 +256,7 @@ if (api_is_drh()) {
}
} elseif (api_is_student_boss()) {
$actionsLeft .= Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$actionsLeft .= Display::url(

2
main/mySpace/teachers.php
Unescape View File

@ -193,7 +193,7 @@ $actionsLeft = '';
if (api_is_drh()) {
$menu_items = [
Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
),
Display::url(Display::return_icon('user.png', get_lang('Students'), [], ICON_SIZE_MEDIUM), 'student.php'),

4
main/mySpace/users.php
Unescape View File

@ -199,7 +199,7 @@ $actionsLeft = '';
if (api_is_drh()) {
$menu_items = [
Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
),
Display::url(
@ -232,7 +232,7 @@ if (api_is_drh()) {
}
} elseif (api_is_student_boss()) {
$actionsLeft .= Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
);
$actionsLeft .= Display::url(

2
main/survey/survey.php
Unescape View File

@ -153,7 +153,7 @@ $survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite
if ($survey_data['survey_type'] != 3) {
if (!api_get_configuration_value('hide_survey_reporting_button')) {
$survey_actions .= Display::url(
Display::return_icon('stats.png', get_lang('Reporting'), [], ICON_SIZE_MEDIUM),
Display::return_icon('statistics.png', get_lang('Reporting'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&survey_id='.$survey_id
);
}

2
main/tracking/exams.php
Unescape View File

@ -83,7 +83,7 @@ if (!$exportToXLS) {
$actionsLeft = $actionsRight = '';
if ($global) {
$actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'.
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM);
Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM);
$actionsLeft .= '</a>';
$courseInfo = api_get_course_info();

2
main/user/user.php
Unescape View File

@ -999,7 +999,7 @@ function modify_filter($user_id, $row, $data)
$result = '';
if ($is_allowed_to_track) {
$result .= '<a href="../mySpace/myStudents.php?'.api_get_cidreq().'&student='.$user_id.'&details=true&course='.$_course['id'].'&origin=user_course&id_session='.api_get_session_id().'" title="'.get_lang('Tracking').'">
'.Display::return_icon('stats.png', get_lang('Tracking')).'
'.Display::return_icon('statistics.png', get_lang('Tracking')).'
</a>';
}

2
main/wiki/wiki.inc.php
Unescape View File

@ -6051,7 +6051,7 @@ class Wiki
urlencode($page)
).'"'.self::is_active_navigation_tab('more').'>'.
Display::return_icon(
'stats.png',
'statistics.png',
get_lang('Statistics'),
'',
ICON_SIZE_MEDIUM

BIN
public/img/icons/16/stats.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 907 B

BIN
public/img/icons/22/stats.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/img/icons/32/stats.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
public/img/icons/48/stats.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

2
public/img/icons/svg/statistics.svg
Unescape View File

@ -17,7 +17,7 @@
version="1.1"
inkscape:version="0.91 r"
sodipodi:docname="statistics.svg"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/stats.png"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/statistics.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<defs

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

2
public/img/icons/svg/statistics_na.svg
Unescape View File

@ -17,7 +17,7 @@
version="1.1"
inkscape:version="0.91 r"
sodipodi:docname="statistics_na.svg"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/stats.png"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/statistics.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<sodipodi:namedview

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Write Preview
Loading…
Cancel
Save