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

Update, move opensans folder to /main/fonts - refs CT#7408

Browse Source
1.10.x
Daniel Barreto 10 years ago
parent 2ec4b9803e
commit 8f37d161fa
20 changed files with 23 additions and 16 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. 2
      main/auth/inscription.php
  2. 0
      main/fonts/opensans/LICENSE.txt
  3. 0
      main/fonts/opensans/OpenSans-Bold.ttf
  4. 0
      main/fonts/opensans/OpenSans-BoldItalic.ttf
  5. 0
      main/fonts/opensans/OpenSans-ExtraBold.ttf
  6. 0
      main/fonts/opensans/OpenSans-ExtraBoldItalic.ttf
  7. 0
      main/fonts/opensans/OpenSans-Italic.ttf
  8. 0
      main/fonts/opensans/OpenSans-Light.ttf
  9. 0
      main/fonts/opensans/OpenSans-LightItalic.ttf
  10. 0
      main/fonts/opensans/OpenSans-Regular.ttf
  11. 0
      main/fonts/opensans/OpenSans-Semibold.ttf
  12. 0
      main/fonts/opensans/OpenSans-SemiboldItalic.ttf
  13. 2
      main/gradebook/lib/fe/flatviewtable.class.php
  14. 9
      main/inc/lib/main_api.lib.php
  15. 10
      main/inc/lib/tracking.lib.php
  16. 2
      main/inc/lib/userportal.lib.php
  17. 6
      main/mySpace/myspace.lib.php
  18. 4
      plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
  19. 2
      plugin/dashboard/block_student_graph/block_student_graph.class.php
  20. 2
      plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

2
main/auth/inscription.php
Unescape View File

@ -165,7 +165,7 @@ if ($user_already_registered_show_terms == false) {
'sessionVar' => basename(__FILE__, '.php'),
'imageOptions' => array(
'font_size' => 20,
'font_path' => api_get_path(SYS_CSS_PATH) . 'opensans/',
'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
'font_file' => 'OpenSans-Regular.ttf',
//'output' => 'gif'
)

0
main/css/opensans/LICENSE.txt → main/fonts/opensans/LICENSE.txt
Unescape View File

0
main/css/opensans/OpenSans-Bold.ttf → main/fonts/opensans/OpenSans-Bold.ttf
Unescape View File

0
main/css/opensans/OpenSans-BoldItalic.ttf → main/fonts/opensans/OpenSans-BoldItalic.ttf
Unescape View File

0
main/css/opensans/OpenSans-ExtraBold.ttf → main/fonts/opensans/OpenSans-ExtraBold.ttf
Unescape View File

0
main/css/opensans/OpenSans-ExtraBoldItalic.ttf → main/fonts/opensans/OpenSans-ExtraBoldItalic.ttf
Unescape View File

0
main/css/opensans/OpenSans-Italic.ttf → main/fonts/opensans/OpenSans-Italic.ttf
Unescape View File

0
main/css/opensans/OpenSans-Light.ttf → main/fonts/opensans/OpenSans-Light.ttf
Unescape View File

0
main/css/opensans/OpenSans-LightItalic.ttf → main/fonts/opensans/OpenSans-LightItalic.ttf
Unescape View File

0
main/css/opensans/OpenSans-Regular.ttf → main/fonts/opensans/OpenSans-Regular.ttf
Unescape View File

0
main/css/opensans/OpenSans-Semibold.ttf → main/fonts/opensans/OpenSans-Semibold.ttf
Unescape View File

0
main/css/opensans/OpenSans-SemiboldItalic.ttf → main/fonts/opensans/OpenSans-SemiboldItalic.ttf
Unescape View File

2
main/gradebook/lib/fe/flatviewtable.class.php
Unescape View File

@ -210,7 +210,7 @@ class FlatViewTable extends SortableTable
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);

9
main/inc/lib/main_api.lib.php
Unescape View File

@ -284,6 +284,8 @@ define('WEB_AJAX_PATH', 'WEB_AJAX_PATH');
define('SYS_TEST_PATH', 'SYS_TEST_PATH');
define('WEB_TEMPLATE_PATH', 'WEB_TEMPLATE_PATH');
define('SYS_TEMPLATE_PATH', 'SYS_TEMPLATE_PATH');
define('WEB_FONTS_PATH', 'WEB_FONTS_PATH');
define('SYS_FONTS_PATH', 'SYS_FONTS_PATH');
// Constants for requesting path conversion.
define('TO_WEB', 'TO_WEB');
@ -475,7 +477,9 @@ function api_get_path($path_type, $path = null)
WEB_AJAX_PATH => 'inc/ajax/',
SYS_TEST_PATH => 'tests/',
WEB_TEMPLATE_PATH => 'template/',
SYS_TEMPLATE_PATH => 'template/'
SYS_TEMPLATE_PATH => 'template/',
WEB_FONTS_PATH => 'fonts/',
SYS_FONTS_PATH => 'fonts/',
);
static $resource_paths = array(
@ -580,11 +584,13 @@ function api_get_path($path_type, $path = null)
$paths[SYS_TEST_PATH] = $paths[SYS_PATH].$paths[SYS_TEST_PATH];
$paths[SYS_TEMPLATE_PATH] = $paths[SYS_CODE_PATH].$paths[SYS_TEMPLATE_PATH];
$paths[SYS_CSS_PATH] = $paths[SYS_CODE_PATH].$paths[SYS_CSS_PATH];
$paths[SYS_FONTS_PATH] = $paths[SYS_CODE_PATH].$paths[SYS_FONTS_PATH];
$paths[WEB_CSS_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_CSS_PATH];
$paths[WEB_IMG_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
$paths[WEB_LIBRARY_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];
$paths[WEB_AJAX_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_AJAX_PATH];
$paths[WEB_FONTS_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_FONTS_PATH];
$paths[WEB_PLUGIN_PATH] = $paths[WEB_PATH].$paths[WEB_PLUGIN_PATH];
$paths[WEB_ARCHIVE_PATH] = $paths[WEB_PATH].$paths[WEB_ARCHIVE_PATH];
@ -630,6 +636,7 @@ function api_get_path($path_type, $path = null)
$paths[WEB_ARCHIVE_PATH] = $paths[WEB_PATH].$web_paths[WEB_ARCHIVE_PATH];
$paths[WEB_LIBRARY_PATH] = $paths[WEB_CODE_PATH].$web_paths[WEB_LIBRARY_PATH];
$paths[WEB_AJAX_PATH] = $paths[WEB_CODE_PATH].$web_paths[WEB_AJAX_PATH];
$paths[WEB_FONTS_PATH] = $paths[WEB_CODE_PATH].$paths[WEB_FONTS_PATH];
}
}

10
main/inc/lib/tracking.lib.php
Unescape View File

@ -4635,7 +4635,7 @@ class Tracking
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10)
);
/* Write the chart title */
@ -4652,7 +4652,7 @@ class Tracking
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 6
)
);
@ -4694,7 +4694,7 @@ class Tracking
/* Draw the line chart */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);
@ -4841,7 +4841,7 @@ class Tracking
$myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
/* Set the default font */
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize));
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize));
/* Do not write the chart title */
@ -5024,7 +5024,7 @@ class Tracking
$myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
/* Set the default font */
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
/* Write the chart title */
$myPicture->drawText(

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

@ -719,7 +719,7 @@ class IndexManager
'sessionVar' => basename(__FILE__, '.php'),
'imageOptions' => array(
'font_size' => 20,
'font_path' => api_get_path(SYS_CSS_PATH) . 'opensans/',
'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
'font_file' => 'OpenSans-Regular.ttf',
//'output' => 'gif'
)

6
main/mySpace/myspace.lib.php
Unescape View File

@ -2882,7 +2882,7 @@ function grapher($sql_result, $start_date, $end_date, $type = "")
/* Set the default font */
$myPicture->setFontProperties(
array(
"FontName" => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontSize" => 10)
);
/* Write the chart title */
@ -2899,7 +2899,7 @@ function grapher($sql_result, $start_date, $end_date, $type = "")
/* Set the default font */
$myPicture->setFontProperties(
array(
"FontName" => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontSize" => 8
)
);
@ -2941,7 +2941,7 @@ function grapher($sql_result, $start_date, $end_date, $type = "")
/* Draw the line chart */
$myPicture->setFontProperties(
array(
"FontName" => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
"FontSize" => 10
)
);

4
plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
Unescape View File

@ -199,7 +199,7 @@ class BlockEvaluationGraph extends Block
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);
@ -375,7 +375,7 @@ class BlockEvaluationGraph extends Block
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);

2
plugin/dashboard/block_student_graph/block_student_graph.class.php
Unescape View File

@ -190,7 +190,7 @@ class BlockStudentGraph extends Block
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);

2
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
Unescape View File

@ -154,7 +154,7 @@ class BlockTeacherGraph extends Block
$myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
/* Set the default font */
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_CSS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
$myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
/* Do NOT Write the chart title */

Write Preview
Loading…
Cancel
Save