Skip to content

Commit dad194f

Browse files
ywarnierywarnier
committed
Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.0-rc
2 parents d4e8604 + 44ab79d commit dad194f

File tree

105 files changed

+294
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+294
-294
lines changed

‎main/admin/access_url_edit_courses_to_url.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,17 +226,17 @@ function remove_item(origin) {
226226
if($ajax_search) {
227227
?>
228228
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
229-
<i class="fa fa-arrow-left"></i>
229+
<em class="fa fa-arrow-left"></em>
230230
</button>
231231
<?php
232232
} else {
233233
?>
234234
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
235-
<i class="fa fa-arrow-right"></i>
235+
<em class="fa fa-arrow-right"></em>
236236
</button>
237237
<br /><br />
238238
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
239-
<i class="fa fa-arrow-left"></i>
239+
<em class="fa fa-arrow-left"></em>
240240
</button>
241241
<?php
242242
}

‎main/admin/access_url_edit_usergroup_to_url.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,17 +219,17 @@ function remove_item(origin) {
219219
if ($ajax_search) {
220220
?>
221221
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
222-
<i class="fa fa-arrow-left"></i>
222+
<em class="fa fa-arrow-left"></em>
223223
</button>
224224
<?php
225225
} else {
226226
?>
227227
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
228-
<i class="fa fa-arrow-right"></i>
228+
<em class="fa fa-arrow-right"></em>
229229
</button>
230230
<br /><br />
231231
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
232-
<i class="fa fa-arrow-left"></i>
232+
<em class="fa fa-arrow-left"></em>
233233
</button>
234234
<?php
235235
}

‎main/admin/access_url_edit_users_to_url.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,15 @@ function remove_item(origin) {
273273
<td width="10%" valign="middle" align="center">
274274
<?php if ($ajax_search) { ?>
275275
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))">
276-
<i class="fa fa-arrow-left"></i>
276+
<em class="fa fa-arrow-left"></em>
277277
</button>
278278
<?php } else { ?>
279279
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
280-
<i class="fa fa-arrow-right"></i>
280+
<em class="fa fa-arrow-right"></em>
281281
</button>
282282
<br /><br />
283283
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
284-
<i class="fa fa-arrow-left"></i>
284+
<em class="fa fa-arrow-left"></em>
285285

286286
</button>
287287
<?php } ?>

‎main/admin/add_courses_to_usergroup.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,17 +249,17 @@ function search($needle,$type)
249249
if ($ajax_search) {
250250
?>
251251
<button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
252-
<i class="fa fa-arrow-left"></i>
252+
<em class="fa fa-arrow-left"></em>
253253
</button>
254254
<?php
255255
} else {
256256
?>
257257
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
258-
<i class="fa fa-arrow-right"></i>
258+
<em class="fa fa-arrow-right"></em>
259259
</button>
260260
<br /><br />
261261
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
262-
<i class="fa fa-arrow-left"></i>
262+
<em class="fa fa-arrow-left"></em>
263263
</button>
264264
<?php
265265
}

‎main/admin/add_sessions_to_promotion.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,17 @@ function search_sessions($needle, $type)
227227
if ($ajax_search) {
228228
?>
229229
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
230-
<i class="fa fa-arrow-left"></i>
230+
<em class="fa fa-arrow-left"></em>
231231
</button>
232232
<?php
233233
} else {
234234
?>
235235
<button class="btn btn-default" 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'))">
236-
<i class="fa fa-arrow-right"></i>
236+
<em class="fa fa-arrow-right"></em>
237237
</button>
238238
<br /><br />
239239
<button class="btn btn-default" 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'))">
240-
<i class="fa fa-arrow-left"></i>
240+
<em class="fa fa-arrow-left"></em>
241241
</button>
242242
<?php
243243
}

‎main/admin/add_sessions_to_usergroup.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,17 +262,17 @@ function search_sessions($needle,$type) {
262262
if ($ajax_search) {
263263
?>
264264
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
265-
<i class="fa fa-arrow-left"></i>
265+
<em class="fa fa-arrow-left"></em>
266266
</button>
267267
<?php
268268
} else {
269269
?>
270270
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
271-
<i class="fa fa-arrow-right"></i>
271+
<em class="fa fa-arrow-right"></em>
272272
</button>
273273
<br /><br />
274274
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
275-
<i class="fa fa-arrow-left"></i>
275+
<em class="fa fa-arrow-left"></em>
276276
</button>
277277
<?php
278278
}

‎main/admin/add_users_to_group.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,13 @@ function validate_filter() {
441441
<?php
442442
if ($ajax_search) {
443443
?>
444-
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ><i class="fa fa-arrow-left"></i></button>
444+
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ><em class="fa fa-arrow-left"></em></button>
445445
<?php
446446
} else {
447447
?>
448-
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))"><i class="fa fa-arrow-right"></i></button>
448+
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))"><em class="fa fa-arrow-right"></em></button>
449449
<br /><br />
450-
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))"><i class="fa fa-arrow-left"></i></button>
450+
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))"><em class="fa fa-arrow-left"></em></button>
451451
<?php
452452
}
453453
?>
@@ -473,7 +473,7 @@ function validate_filter() {
473473
<td colspan="3" align="center">
474474
<br />
475475
<?php
476-
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" ><i class="fa fa-floppy-o"></i> '.get_lang('SubscribeUsersToGroup').'</button>';
476+
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" ><em class="fa fa-floppy-o"></em> '.get_lang('SubscribeUsersToGroup').'</button>';
477477
?>
478478
</td>
479479
</tr>

‎main/admin/add_users_to_usergroup.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,11 @@ function change_select(val) {
427427
<div class="col-md-2">
428428
<div style="padding-top:54px;width:auto;text-align: center;">
429429
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
430-
<i class="fa fa-arrow-right"></i>
430+
<em class="fa fa-arrow-right"></em>
431431
</button>
432432
<br /><br />
433433
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
434-
<i class="fa fa-arrow-left"></i>
434+
<em class="fa fa-arrow-left"></em>
435435
</button>
436436
</div>
437437
</div>
@@ -453,7 +453,7 @@ function change_select(val) {
453453
</div>
454454

455455
<?php
456-
echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" ><i class="fa fa-check"></i>'.
456+
echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" ><em class="fa fa-check"></em>'.
457457
get_lang('SubscribeUsersToClass').'</button>';
458458
?>
459459
</form>

‎main/admin/configure_homepage.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ function home_tabs($file_logged_in)
472472
// If the requested action is to create a link, make some room
473473
// for the new link in the home_menu array at the requested place
474474
// and insert the new link there
475-
$icon = '<i class="fa fa-external-link"></i>';
475+
$icon = '<em class="fa fa-external-link"></em>';
476476
if ($action == 'insert_link' || $action == 'insert_tabs') {
477477
for ($i = sizeof($home_menu); $i; $i--) {
478478
if ($i > $insert_where) {
@@ -1012,11 +1012,11 @@ function home_tabs($file_logged_in)
10121012
<?php echo api_display_language_form(); ?>
10131013
<form id="formLogin" class="form-horizontal">
10141014
<div class="input-group">
1015-
<div class="input-group-addon"><i class="fa fa-user"></i></div>
1015+
<div class="input-group-addon"><em class="fa fa-user"></em></div>
10161016
<input class="form-control" type="text" id="login" value="" disabled="disabled" />
10171017
</div>
10181018
<div class="input-group">
1019-
<div class="input-group-addon"><i class="fa fa-lock"></i></div>
1019+
<div class="input-group-addon"><em class="fa fa-lock"></em></div>
10201020
<input type="password" id="password"class="form-control" value="" disabled="disabled" />
10211021
</div>
10221022
<button class="btn btn-primary btn-block" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button>

‎main/admin/course_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ function get_course_visibility_icon($v) {
368368
$form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
369369
$form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword'));
370370
$form->addButtonSearch(get_lang('SearchCourse'));
371-
$advanced = '<a class="btn btn-default" href="'. api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><i class="fa fa-search"></i> '.get_lang('AdvancedSearch').'</a>';
371+
$advanced = '<a class="btn btn-default" href="'. api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></i> '.get_lang('AdvancedSearch').'</a>';
372372

373373
// Create a filter by session
374374
$sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);

0 commit comments

Comments
 (0)