Merge branch '1.10.x' of https://github.com/aragonc/chamilo-lms into aragonc-1.10.x

1.10.x
Yannick Warnier 10 years ago
commit 273875384d
  1. 18
      app/Resources/public/css/base.css
  2. 1
      composer.json
  3. 118
      main/admin/dashboard_add_courses_to_user.php
  4. 113
      main/admin/dashboard_add_sessions_to_user.php
  5. 37
      main/admin/dashboard_add_users_to_user.php
  6. 14
      main/admin/usergroups.php
  7. 2
      main/course_info/infocours.php
  8. 4
      main/forum/viewthread.php
  9. 2
      main/group/group.php
  10. BIN
      main/img/icons/16/edit.png
  11. BIN
      main/img/icons/32/add-class.png
  12. BIN
      main/img/icons/32/add-groups.png
  13. BIN
      main/img/icons/32/add-teacher.png
  14. BIN
      main/img/icons/32/add-user.png
  15. 2820
      main/img/icons/svg/add-class.svg
  16. 1211
      main/img/icons/svg/add-groups.svg
  17. 1211
      main/img/icons/svg/add-teacher.svg
  18. 449
      main/img/icons/svg/add-user.svg
  19. 164
      main/img/icons/svg/session-add.svg
  20. BIN
      main/img/session_default.png
  21. BIN
      main/img/session_default_small.png
  22. 16
      main/inc/ajax/model.ajax.php
  23. 4
      main/inc/lib/display.lib.php
  24. 791
      main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.css
  25. 16
      main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.min.js
  26. 4
      main/inc/lib/link.lib.php
  27. 6
      main/inc/lib/template.lib.php
  28. 8
      main/user/class.php
  29. 13
      main/user/user.php

@ -2408,6 +2408,10 @@ form .formw .freeze {
.label_tag.course {
background-color: #62cffc;
}
.label{
font-weight: normal;
font-size: 90%;
}
.invisible {
color: #999;
}
@ -4274,7 +4278,11 @@ ul.holder li.bit-box{
padding-top: 2em;
padding-bottom: 2em;
}
#multiple-add-session .control-course{
.code-course{
padding-left: 10px;
padding-right: 10px;
}
.control-course{
text-align: center;
}
.data_table tr td .form-control{
@ -4416,6 +4424,7 @@ ul.exercise-draggable-answer .touch-items{
padding: 10px 20px 10px 20px;
border: solid #b0b0b0 1px;
text-decoration: none;
z-index: 100;
}
ul.exercise-draggable-answer .touch-items:hover{
background: #ffffff;
@ -5102,13 +5111,13 @@ div#chat-remote-video video {
}
.ui-accordion .ui-accordion-content-active{
}
.ui-jqgrid-view .label-success{
font-size: 14px;
}
.ui-jqgrid-view .ui-widget-content a{
color:#666666;
}
.ui-jqgrid-view .ui-widget-content a.btn{
color: #fff;
}
.ui-jqgrid-view .ui-state-default,
.ui-jqgrid-view .ui-widget-content .ui-state-default,
.ui-jqgrid-view .ui-widget-header .ui-state-default{
@ -5313,6 +5322,7 @@ div#chat-remote-video video {
.items-course .items-course-info .title{
font-size: 14px;
min-height: 32px;
line-height: 1.3;
}
.items-course .items-course-info .teachers{
font-size: 12px;

@ -79,6 +79,7 @@
"bower-asset/MathJax": "2.5.*",
"bower-asset/webcamjs": "1.0.*",
"bower-asset/cropper": "1.0.*",
"bower-asset/jquery.scrollbar": "0.2.*",
"clue/graph": "~0.9.0",
"graphp/graphviz": "~0.2.0",
"graphp/algorithms": "~0.8.0",

@ -170,13 +170,13 @@ if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
Display::display_header($tool_name);
// actions
echo '<div class="actions">
<span style="float: right;margin:0px;padding:0px;">
<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.Display::return_icon('add_user_big.gif', get_lang('AssignUsers'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignUsers').'</a>
<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignSessions').'</a></span>
</div>';
echo Display::page_header(sprintf(get_lang('AssignCoursesToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])));
$actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM).'</a>';
echo $html = Display::toolbarAction('toolbar-dashboard', array($actionsLeft));
echo Display::page_header(sprintf(get_lang('AssignCoursesToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])), null, 'h3');
$assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
$assigned_courses_code = array_keys($assigned_courses_to_hrm);
@ -224,77 +224,75 @@ if(!empty($msg)) {
Display::display_normal_message($msg); //main API
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td align="left"></td>
<td align="left"></td>
<td width="" align="center"> &nbsp; </td>
</tr>
<tr>
<td width="45%" align="center"><b><?php echo get_lang('CoursesListInPlatform') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%"><b>
<?php
if (UserManager::is_admin($user_id)) {
echo get_lang('AssignedCoursesListToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) {
echo get_lang('AssignedCoursesListToSessionsAdministrator');
} else {
echo get_lang('AssignedCoursesListToHumanResourcesManager');
}
?>
:</b></td>
</tr>
<?php if($add_type == 'multiple') { ?>
<tr><td width="45%" align="center">
<?php echo get_lang('FirstLetterCourse');?> :
<select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')">
<option value="%">--</option>
<?php
echo Display :: get_alphabet_options($firstLetter);
?>
</select>
</td>
<td>&nbsp;</td></tr>
<?php } ?>
<tr>
<td width="45%" align="center">
<div class="row">
<div class="col-md-4">
<h5><?php echo get_lang('CoursesListInPlatform') ?> :</h5>
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" style="width:340px;">
<?php
while ($enreg = Database::fetch_array($result)) {
?>
<?php while ($enreg = Database::fetch_array($result)) { ?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'],ENT_QUOTES).'"';?>><?php echo $enreg['title'].' ('.$enreg['code'].')'; ?></option>
<?php } ?>
</select></div>
</td>
</select>
</div>
<td width="10%" valign="middle" align="center">
<button class="btn-default" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
</div>
<div class="col-md-4">
<div class="code-course">
<?php if($add_type == 'multiple') { ?>
<p><?php echo get_lang('FirstLetterCourse');?> :</p>
<select name="firstLetterCourse" class="selectpicker form-control" onchange = "xajax_search_courses(this.value,'multiple')">
<option value="%">--</option>
<?php echo Display :: get_alphabet_options($firstLetter); ?>
</select>
<?php } ?>
</div>
<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>
</button>
<br /><br />
<button class="btn-default" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
</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>
</button>
<br /><br /><br /><br /><br /><br />
<?php
echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
</div>
<div class="separate-action">
<?php echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>'; ?>
</div>
</div>
</div>
<div class="col-md-4">
<h5><?php
if (UserManager::is_admin($user_id)) {
echo get_lang('AssignedCoursesListToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) {
echo get_lang('AssignedCoursesListToSessionsAdministrator');
} else {
echo get_lang('AssignedCoursesListToHumanResourcesManager');
}
?>
</td>
<td width="45%" align="center">
:
</h5>
<select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">
<?php
if (is_array($assigned_courses_to_hrm)) {
foreach ($assigned_courses_to_hrm as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="' . htmlspecialchars($enreg['title'], ENT_QUOTES) . '"'; ?>><?php echo $enreg['title'] . ' (' . $enreg['code'] . ')'; ?></option>
<?php }
}?>
</select></td>
</tr>
</table>
<?php
}
}
?>
</select>
</div>
</div>
</form>
<?php

@ -166,15 +166,16 @@ if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
Display::display_header($tool_name);
// actions
echo '<div class="actions">';
if ($user_info['status'] != SESSIONADMIN) {
echo '<span style="float: right;margin:0px;padding:0px;">
<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.Display::return_icon('add_user_big.gif', get_lang('AssignUsers'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignUsers').'</a>
<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">'.Display::return_icon('course_add.gif', get_lang('AssignCourses'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignCourses').'</a>
</span>';
$actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">' . Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM ) . '</a>';
$actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">' . Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM) . '</a>';
}
echo '</div>';
echo Display::page_header(sprintf(get_lang('AssignSessionsToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])));
echo Display::toolbarAction('toolbar-dashboard', array( 0 => $actionsLeft, 1 => ''));
echo Display::page_header(sprintf(get_lang('AssignSessionsToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])), null, 'h3');
$assigned_sessions_to_hrm = SessionManager::get_sessions_followed_by_drh($user_id);
$assigned_sessions_id = array_keys($assigned_sessions_to_hrm);
@ -206,43 +207,11 @@ $result = Database::query($sql);
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>
<input type="hidden" name="formSent" value="1" />
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td align="left"></td>
<td align="left"></td>
<td width="" align="center"> &nbsp; </td>
</tr>
<tr>
<td width="45%" align="center"><b><?php echo get_lang('SessionsListInPlatform') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%">
<b>
<?php
if (UserManager::is_admin($user_id)) {
echo get_lang('AssignedSessionsListToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) {
echo get_lang('AssignedSessionsListToSessionsAdministrator');
} else {
echo get_lang('AssignedSessionsListToHumanResourcesManager');
}
?>
: </b></td>
</tr>
<?php if ($add_type == 'multiple') { ?>
<tr><td width="45%" align="center">
<?php echo get_lang('FirstLetterSession');?> :
<select name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
<option value="%">--</option>
<?php
echo Display :: get_alphabet_options($firstLetterSession);
?>
</select>
</td>
<td>&nbsp;</td></tr>
<?php } ?>
<tr>
<td width="45%" align="center">
<div class="row">
<div class="col-md-4">
<h5><?php echo get_lang('SessionsListInPlatform') ?> :</h5>
<div id="ajax_list_sessions_multiple">
<select id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20" style="width:340px;">
<?php
@ -252,37 +221,64 @@ $result = Database::query($sql);
<?php echo $enreg['name']; ?>
</option>
<?php } ?>
</select></div>
</td>
<td width="10%" valign="middle" align="center">
</select>
</div>
</div>
<div class="col-md-4">
<div class="code-course">
<?php if ($add_type == 'multiple') { ?>
<p><?php echo get_lang('FirstLetterSession');?> :</p>
<select class="selectpicker form-control" name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
<option value="%">--</option>
<?php echo Display :: get_alphabet_options($firstLetterSession); ?>
</select>
<?php } ?>
</div>
<div class="control-course">
<?php
if ($ajax_search) {
?>
<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination'))">
<div class="separate-action">
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))">
<em class="fa fa-arrow-left"></em>
</button>
</div>
<?php
}
else
{
?>
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<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>
</button>
<br /><br />
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
</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>
</button>
</div>
<?php
}
?>
<br /><br /><br /><br /><br /><br />
<?php
echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
?>
</td>
<td width="45%" align="center">
</div>
</div>
<div class="col-md-4">
<h5><?php
if (UserManager::is_admin($user_id)) {
echo get_lang('AssignedSessionsListToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) {
echo get_lang('AssignedSessionsListToSessionsAdministrator');
} else {
echo get_lang('AssignedSessionsListToHumanResourcesManager');
}
?>
:</h5>
<select id='destination' name="SessionsList[]" multiple="multiple" size="20" style="width:320px;">
<?php
if (is_array($assigned_sessions_to_hrm)) {
@ -293,9 +289,10 @@ $result = Database::query($sql);
</option>
<?php }
}?>
</select></td>
</tr>
</table>
</select>
</div>
</div>
</form>
<?php

@ -408,23 +408,7 @@ if(!empty($msg)) {
<div class="row">
<div class="col-md-4">
<?php echo get_lang('UserListInPlatform') ?>
<?php if($add_type == 'multiple') { ?>
<div class="form-group">
<label class="col-sm-7 control-label"><?php echo get_lang('FirstLetterUser');?></label>
<div class="col-sm-5">
<select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
<option value="%">--</option>
<?php echo Display::get_alphabet_options($firstLetterUser); ?>
</select>
</div>
</div>
<!-- <div class="form-group">
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" onclick="moveItem(document.getElementById('user_to_add'), document.getElementById('destination'))" />
<div id="ajax_list_users_single"></div>
</div> -->
<?php } ?>
<div class="form-group">
<div class="col-sm-12">
<div id="ajax_list_users_multiple">
@ -443,23 +427,42 @@ if(!empty($msg)) {
</div>
<div class="col-md-4">
<div class="code-course">
<?php if($add_type == 'multiple') { ?>
<p><?php echo get_lang('FirstLetterUser');?></p>
<select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
<option value="%">--</option>
<?php echo Display::get_alphabet_options($firstLetterUser); ?>
</select>
<?php } ?>
</div>
<div class="control-course">
<?php if ($ajax_search) { ?>
<div class="separate-action">
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
</div>
<?php } else { ?>
<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-chevron-right"></em>
</button>
<br /><br />
</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-chevron-left"></em>
</button>
</div>
<?php
}
?>
<div class="separate-action">
<?php
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
?>
</div>
</div>
</div>
<div class="col-md-4">
<?php
if (UserManager::is_admin($user_id)) {

@ -60,8 +60,8 @@ $column_model = array(
array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'sortable'=>'false','formatter'=>'action_formatter'),
array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'center'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'center', 'sortable'=>'false','formatter'=>'action_formatter'),
);
//Autowidth
@ -73,11 +73,11 @@ $extra_params['sortorder'] = 'desc';
//With this function we can add actions to the jgrid
$action_links = 'function action_formatter (cellvalue, options, rowObject) {
return \''
.' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/user_to_class.png" title="'.get_lang('SubscribeUsersToClass').'"></a>'
.' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/course_to_class.png" title="'.get_lang('SubscribeClassToCourses').'"></a>'
.' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/sessions_to_class.png" title="'.get_lang('SubscribeClassToSessions').'"></a>'
.' <a href="?action=edit&id=\'+options.rowId+\'"><img width="22px" src="../img/edit.png" title="'.get_lang('Edit').'" ></a>'
.' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a>\';
.' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('user_to_class.png', get_lang('SubscribeUsersToClass'), null, ICON_SIZE_SMALL) . '</a>'
.' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('course_to_class.png', get_lang('SubscribeClassToCourses'), null, ICON_SIZE_SMALL) . '</a>'
.' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('sessions_to_class.png', get_lang('SubscribeClassToSessions'), null, ICON_SIZE_SMALL) . '</a>'
.' <a href="?action=edit&id=\'+options.rowId+\'">' . Display::return_icon('edit.png', get_lang('Edit'), null, ICON_SIZE_TINY) . '</a>'
.' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?action=delete&id=\'+options.rowId+\'">' . Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_TINY) . '</a>\';
}';
?>

@ -70,7 +70,7 @@ $(document).ready(function() {
$image.cropper("destroy");
$image.cropper({
aspectRatio: 4 / 3,
aspectRatio: 16 / 9,
responsive : true,
center : false,
guides : false,

@ -218,11 +218,11 @@ if ($my_message != 'PostDeletedSpecial') {
. '&search=' . Security::remove_XSS(urlencode($my_search));
echo $my_url . '&view=flat">'
. Display::return_icon('forum_listview.png', get_lang('FlatView'), null, ICON_SIZE_MEDIUM)
. get_lang('FlatView') . '</a>';
. '</a>';
//echo $my_url.'&view=threaded">'.Display::return_icon('forum_threadedview.gif', get_lang('ThreadedView')).get_lang('ThreadedView').'</a>';
echo $my_url . '&view=nested">'
. Display::return_icon('forum_nestedview.png', get_lang('NestedView'), null, ICON_SIZE_MEDIUM)
. get_lang('NestedView') . '</a>';
. '</a>';
}
$my_url = null;

@ -166,7 +166,7 @@ $actionsLeft = '';
if (api_is_allowed_to_edit(false, true)) {
$actionsLeft .= '<a href="group_creation.php?'.api_get_cidreq().'">'.
Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
Display::return_icon('add-groups.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_get_setting('allow_group_categories') == 'true') {
$actionsLeft .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 B

After

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 80 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 42 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 42 KiB

@ -0,0 +1,449 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="128"
height="128"
id="svg43586"
inkscape:version="0.91 r"
sodipodi:docname="add_user.svg">
<metadata
id="metadata170">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1051"
id="namedview168"
showgrid="false"
inkscape:zoom="1.9779896"
inkscape:cx="190.6062"
inkscape:cy="0.56054598"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg43586" />
<defs
id="defs43588">
<linearGradient
id="linearGradient44699">
<stop
id="stop44701"
style="stop-color:#000173;stop-opacity:0.93333334"
offset="0" />
<stop
id="stop44703"
style="stop-color:#3575f0;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44693">
<stop
id="stop44695"
style="stop-color:#3690e6;stop-opacity:1"
offset="0" />
<stop
id="stop44697"
style="stop-color:#d0e9ff;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44681">
<stop
id="stop44683"
style="stop-color:#ff5c38;stop-opacity:1"
offset="0" />
<stop
id="stop44685"
style="stop-color:#fb7e65;stop-opacity:0.99607843"
offset="0.30397323" />
<stop
id="stop44687"
style="stop-color:#cd0000;stop-opacity:0.98039216"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44627">
<stop
id="stop44629"
style="stop-color:#fffcfb;stop-opacity:1"
offset="0" />
<stop
id="stop44633"
style="stop-color:#f4ad94;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44615">
<stop
id="stop44617"
style="stop-color:#2f68fa;stop-opacity:1"
offset="0" />
<stop
id="stop44619"
style="stop-color:#c7d5fb;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44605">
<stop
id="stop44607"
style="stop-color:#d0ecff;stop-opacity:1"
offset="0" />
<stop
id="stop44609"
style="stop-color:#d7f0ff;stop-opacity:1"
offset="0.5" />
<stop
id="stop44611"
style="stop-color:#ffffff;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44090">
<stop
id="stop44092"
style="stop-color:#0926bb;stop-opacity:1"
offset="0" />
<stop
id="stop44094"
style="stop-color:#6bb5fe;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient44080">
<stop
id="stop44082"
style="stop-color:#2c8300;stop-opacity:1"
offset="0" />
<stop
id="stop44084"
style="stop-color:#57aeff;stop-opacity:1"
offset="0.25" />
<stop
id="stop44086"
style="stop-color:#ffffff;stop-opacity:1"
offset="0.5" />
<stop
id="stop44088"
style="stop-color:#5aafff;stop-opacity:1"
offset="1" />
</linearGradient>
<filter
id="filter3297">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.26694977"
id="feGaussianBlur3299" />
</filter>
<filter
id="filter3293">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.355"
id="feGaussianBlur3295" />
</filter>
<linearGradient
id="linearGradient3219">
<stop
id="stop3221"
style="stop-color:#0e7309;stop-opacity:1"
offset="0" />
<stop
id="stop3223"
style="stop-color:#70d13e;stop-opacity:1"
offset="1" />
</linearGradient>
<radialGradient
cx="53.60223"
cy="59.728882"
r="17.834057"
fx="53.60223"
fy="59.728882"
id="radialGradient44048"
xlink:href="#linearGradient44627"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)" />
<radialGradient
cx="479.68311"
cy="709.6579"
r="5.0058851"
fx="479.68311"
fy="709.6579"
id="radialGradient44061"
xlink:href="#linearGradient44605"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.856113,-0.0637264,0.1161478,1.5603521,-743.30707,-121.7687)" />
<linearGradient
x1="517.02167"
y1="705.48438"
x2="517.02167"
y2="745.30084"
id="linearGradient44067"
xlink:href="#linearGradient44090"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,253.42404,245.75912)" />
<linearGradient
x1="517.02167"
y1="705.48438"
x2="517.02167"
y2="745.30084"
id="linearGradient44070"
xlink:href="#linearGradient44090"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-730.02214,245.75912)" />
<radialGradient
cx="491.52231"
cy="670.92523"
r="36.426601"
fx="491.52231"
fy="670.92523"
id="radialGradient44073"
xlink:href="#linearGradient44080"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,2.0237831,-1.9580539,0,1075.328,-66.735647)" />
<linearGradient
x1="83.28125"
y1="123.09795"
x2="83.28125"
y2="66.310989"
id="linearGradient44076"
xlink:href="#linearGradient44699"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-282.47353,882.69271)" />
<linearGradient
x1="-246.57739"
y1="958.07971"
x2="-248.7769"
y2="964.61743"
id="linearGradient44613"
xlink:href="#linearGradient44615"
gradientUnits="userSpaceOnUse" />
<linearGradient
x1="-246.57739"
y1="958.07971"
x2="-248.7769"
y2="964.61743"
id="linearGradient44625"
xlink:href="#linearGradient44615"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,-476.93424,0)" />
<linearGradient
x1="517.02167"
y1="705.48438"
x2="517.02167"
y2="745.30084"
id="linearGradient44667"
xlink:href="#linearGradient3219"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-772.48144,227.87334)" />
<linearGradient
x1="60.126968"
y1="81.913818"
x2="60.126968"
y2="47.542713"
id="linearGradient44677"
xlink:href="#linearGradient44681"
gradientUnits="userSpaceOnUse" />
<linearGradient
x1="-35.566662"
y1="76.562927"
x2="-35.566662"
y2="84.910484"
id="linearGradient44691"
xlink:href="#linearGradient44693"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4161"
id="linearGradient4167"
x1="227.02383"
y1="130.94472"
x2="227.08005"
y2="109.8502"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.80011,0,0,1.80011,-313.07166,-137.6591)" />
<linearGradient
inkscape:collect="always"
id="linearGradient4161">
<stop
style="stop-color:#97d600;stop-opacity:1"
offset="0"
id="stop4163" />
<stop
style="stop-color:#6f8f00;stop-opacity:1"
offset="1"
id="stop4165" />
</linearGradient>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter6061"
x="-0.036"
width="1.072"
y="-0.036"
height="1.072">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.61687168"
id="feGaussianBlur6063" />
</filter>
</defs>
<rect
y="-1.8164062e-06"
x="0"
height="128"
width="128"
id="rect6075"
style="opacity:1;fill:#1a1a1a;fill-opacity:0;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5" />
<g
transform="matrix(1.1454774,0,0,1.1454774,336.47789,-1030.8399)"
id="g3498"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<path
inkscape:connector-curvature="0"
d="m -263.35265,933.74757 c 8.46364,9.0621 14.91528,24.09751 16.80551,38.65267"
id="path3217"
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44667);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -237.54657,906.14303 c -14.71669,0 -26.69498,11.97829 -26.69498,26.69498 0,14.71669 11.97829,26.69498 26.69498,26.69498 14.71668,0 26.69497,-11.97829 26.69497,-26.69498 0,-14.71669 -11.97829,-26.69498 -26.69497,-26.69498 z"
id="path44010"
style="fill:#000000;fill-opacity:0.50196078;stroke:none;stroke-width:1.33686185;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3297)" />
<path
inkscape:connector-curvature="0"
d="m -237.62978,943.41146 c -21.63445,0 -39.1875,17.34747 -39.1875,38.75 l 0,6.125 c 0,6.05287 6.27536,18.75004 28.90625,18.75004 l 20.53125,0 c 22.63038,0 28.9375,-12.07968 28.9375,-18.75004 l 0,-6.125 c 0,-21.40254 -17.55305,-38.75 -39.1875,-38.75 z"
id="path44012"
style="fill:#000000;fill-opacity:0.50196078;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3293)" />
<path
inkscape:connector-curvature="0"
d="m -238.37978,942.16146 c -21.63445,0 -39.1875,17.34747 -39.1875,38.75 l 0,6.125 c 0,6.05287 6.27536,18.75004 28.90625,18.75004 l 20.53125,0 c 22.63038,0 28.9375,-12.07968 28.9375,-18.75004 l 0,-6.125 c 0,-21.40254 -17.55305,-38.75 -39.1875,-38.75 z"
id="path44014"
style="fill:url(#linearGradient44076);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -238.37978,944.32217 c -20.11022,0 -36.4266,15.9074 -36.4266,35.53322 l 0,5.61655 c 0,5.55039 5.83324,17.19346 26.8697,17.19346 l 19.08475,0 c 21.03599,0 26.89875,-11.07683 26.89875,-17.19346 l 0,-5.61655 c 0,-19.62582 -16.31638,-35.53322 -36.4266,-35.53322 z"
id="path44016"
style="fill:url(#radialGradient44073);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -220.89335,951.63335 c 8.46364,9.0621 14.91528,24.09751 16.80551,38.65267"
id="path44018"
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44070);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -255.70476,951.63335 c -8.46364,9.0621 -14.91528,24.09751 -16.80551,38.65267"
id="path44020"
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44067);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -245.07157,955.83473 c -2.3027,1.97418 -4.96223,3.5307 -3.72122,8.28271 -5.66073,-1.14662 -9.94971,-8.89011 -6.36208,-14.40472 l 10.0833,6.12201 z"
id="path44022"
style="fill:#c5ffbd;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient44613);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -36.972118,84.910487 -5.409768,-9.369991 10.819535,-10e-7 -5.409767,9.369992 z"
transform="matrix(1.1784451,0,0,0.9316118,-194.72944,886.86434)"
id="path44024"
style="fill:url(#linearGradient44691);fill-opacity:1;stroke:none;stroke-width:0.85552669;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -254.93334,950.41537 9,5.46875 c -0.98816,0.81483 -2.01362,1.64574 -2.75,2.78125 -0.74928,1.1554 -0.98341,2.74156 -0.65625,4.71875 -2.36917,-0.72853 -4.49352,-2.64468 -5.65625,-5.0625 -1.20326,-2.5021 -1.34831,-5.40312 0.0625,-7.90625 z"
id="path44028"
style="fill:url(#radialGradient44061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m -231.86267,955.83473 c 2.3027,1.97418 4.96223,3.5307 3.72122,8.28271 5.66073,-1.14662 9.94971,-8.89011 6.36208,-14.40472 l -10.0833,6.12201 z"
id="path44621"
style="fill:#9dcfff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient44625);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
d="m 76.945221,64.499184 a 17.165627,17.165627 0 1 1 -34.331253,0 17.165627,17.165627 0 1 1 34.331253,0 z"
transform="matrix(1.4960409,0,0,1.4960409,-327.73177,835.09337)"
id="path44030"
style="fill:url(#radialGradient44048);fill-opacity:1;stroke:url(#linearGradient44677);stroke-width:1.33686185;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
<circle
style="opacity:1;fill:#1a1a1a;fill-opacity:0.66393439;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter6061)"
id="circle6047"
cx="-295.68277"
cy="983.96625"
r="20.562389"
transform="matrix(1.4081142,0,0,1.4081142,510.77481,-1296.7313)"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5" />
<circle
r="29.819862"
cy="87.29007"
cx="93.472504"
id="path4147"
style="opacity:1;fill:#256526;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5" />
<circle
r="27.881796"
cy="87.29007"
cx="93.472504"
id="circle4151"
style="opacity:1;fill:url(#linearGradient4167);fill-opacity:1;stroke:none;stroke-width:0.32836357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5" />
<g
id="text6036"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.51968384px;line-height:125%;font-family:Archive;-inkscape-font-specification:'Archive, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#5a9604;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="matrix(1.7920204,0,0,1.7920204,624.4132,-1674.3289)"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<path
inkscape:connector-curvature="0"
id="path6041"
style="fill:#5a9604;fill-opacity:1"
d="m -287.86811,980.96356 -5.69764,0 0,-5.69764 c 0,-0.76535 -0.25512,-1.23307 -1.23307,-1.23307 l -3.31654,0 c -0.97795,0 -1.23307,0.46772 -1.23307,1.23307 l 0,5.69764 -5.74016,0 c -0.76535,0 -1.23307,0.25512 -1.23307,1.23307 l 0,3.31653 c 0,0.97796 0.46772,1.23307 1.23307,1.23307 l 5.74016,0 0,5.69764 c 0,0.76536 0.25512,1.23307 1.23307,1.23307 l 3.31654,0 c 0.97795,0 1.23307,-0.46771 1.23307,-1.23307 l 0,-5.69764 5.69764,0 c 0.76535,0 1.23307,-0.25511 1.23307,-1.23307 l 0,-3.31653 c 0,-0.97795 -0.46772,-1.23307 -1.23307,-1.23307 z" />
</g>
<g
transform="matrix(1.7920204,0,0,1.7920204,625.74941,-1675.8012)"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.51968384px;line-height:125%;font-family:Archive;-inkscape-font-specification:'Archive, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="g6043"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-user.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<path
inkscape:connector-curvature="0"
d="m -287.86811,980.96356 -5.69764,0 0,-5.69764 c 0,-0.76535 -0.25512,-1.23307 -1.23307,-1.23307 l -3.31654,0 c -0.97795,0 -1.23307,0.46772 -1.23307,1.23307 l 0,5.69764 -5.74016,0 c -0.76535,0 -1.23307,0.25512 -1.23307,1.23307 l 0,3.31653 c 0,0.97796 0.46772,1.23307 1.23307,1.23307 l 5.74016,0 0,5.69764 c 0,0.76536 0.25512,1.23307 1.23307,1.23307 l 3.31654,0 c 0.97795,0 1.23307,-0.46771 1.23307,-1.23307 l 0,-5.69764 5.69764,0 c 0.76535,0 1.23307,-0.25511 1.23307,-1.23307 l 0,-3.31653 c 0,-0.97795 -0.46772,-1.23307 -1.23307,-1.23307 z"
id="path6045" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 19 KiB

@ -24,7 +24,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -42,8 +42,8 @@
id="namedview114"
showgrid="false"
inkscape:zoom="2.6074563"
inkscape:cx="171.65395"
inkscape:cy="42.817392"
inkscape:cx="75.199793"
inkscape:cy="41.28333"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
@ -154,23 +154,6 @@
offset="1"
style="stop-color:#001c36;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient3370"
y2="279.27"
gradientUnits="userSpaceOnUse"
x2="663.65"
y1="279.27"
x1="572.87"
gradientTransform="matrix(1.0473917,0,0,1.0473917,-586.70062,-211.78347)">
<stop
id="stop3366"
stop-color="#2e6b01"
offset="0" />
<stop
id="stop3368"
stop-color="#152c28"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient3376"
y2="284.79"
@ -273,64 +256,6 @@
stop-color="#811f00"
offset="1" />
</linearGradient>
<filter
id="filter3772"
y="-.031029"
width="1.7633"
x="-.38163"
height="1.0621">
<feGaussianBlur
id="feGaussianBlur3774"
stdDeviation="0.58138587" />
</filter>
<linearGradient
id="linearGradient3810"
y2="64.41"
gradientUnits="userSpaceOnUse"
x2="45.798"
gradientTransform="matrix(0.4716744,0.77958486,-0.77958486,0.4716744,83.820935,-15.213245)"
y1="113.08"
x1="45.798">
<stop
id="stop3685"
stop-color="#5a5a6b"
offset="0" />
<stop
id="stop3691"
stop-color="#837e97"
offset=".5" />
<stop
id="stop3693"
stop-color="#9192a7"
offset=".75" />
<stop
id="stop3687"
stop-color="#8780a4"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient3814"
y2="71.687"
gradientUnits="userSpaceOnUse"
x2="41.167"
gradientTransform="matrix(0.4716744,0.77958486,-0.77958486,0.4716744,83.820935,-15.213245)"
y1="113.08"
x1="41.167">
<stop
id="stop3697"
stop-color="#c8c8d8"
offset="0" />
<stop
id="stop3699"
stop-color="#fbfbfc"
offset="1" />
</linearGradient>
<filter
id="filter3834">
<feGaussianBlur
id="feGaussianBlur3836"
stdDeviation="0.38432455" />
</filter>
<linearGradient
id="linearGradient3845"
y2="297.6"
@ -465,12 +390,6 @@
gradientTransform="matrix(1.0473917,0,0,1.0473917,-586.7053,-211.78347)"
y1="290.65"
x1="598.18" />
<filter
id="filter3955">
<feGaussianBlur
id="feGaussianBlur3957"
stdDeviation="1.2991875" />
</filter>
<linearGradient
id="linearGradient3980"
y2="55.843"
@ -563,20 +482,6 @@
offset="1"
style="stop-color:#003d18;stop-opacity:1" />
</linearGradient>
<inkscape:perspective
id="perspective5139"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective5148" />
<linearGradient
gradientTransform="translate(-107.42857,-368.36218)"
gradientUnits="userSpaceOnUse"
@ -605,34 +510,7 @@
stdDeviation="0.32"
inkscape:collect="always" />
</filter>
<linearGradient
y2="391.98309"
x2="146.4288"
y1="391.98309"
x1="116.41035"
gradientTransform="translate(260.93361,-523.79076)"
gradientUnits="userSpaceOnUse"
id="linearGradient5729"
xlink:href="#linearGradient5683"
inkscape:collect="always" />
<linearGradient
y2="392.44968"
x2="152.07178"
y1="392.44968"
x1="111.10294"
gradientTransform="translate(260.93361,-523.79076)"
gradientUnits="userSpaceOnUse"
id="linearGradient5734"
xlink:href="#linearGradient5665"
inkscape:collect="always" />
</defs>
<g
id="g11646"
inkscape:export-filename="/var/www/chamilo/main/img/icons/22/session-add.png"
inkscape:export-xdpi="15.46875"
inkscape:export-ydpi="15.46875">
<g
id="g11622">
<rect
style="opacity:1;fill:#ffcc00;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect3450"
@ -763,32 +641,30 @@
style="fill:url(#linearGradient3980);fill-rule:evenodd"
d="m 14.773489,9.2905432 -1.27677,72.5643448 1.047391,0.03352 1.276771,-72.5978614 -1.047392,0 z"
id="path3972" />
</g>
<g
inkscape:export-ydpi="22.5"
inkscape:export-xdpi="22.5"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/course-add.png"
inkscape:label="Layer 1"
transform="matrix(1.2744868,0,0,1.2744868,-74.589703,-414.89768)"
id="layer1-8"
transform="matrix(1.2744868,0,0,1.2744868,-74.589703,-414.89768)">
inkscape:label="Layer 1"
inkscape:export-filename="/var/www/chamilo/main/img/icons/32/course-add.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
<path
inkscape:connector-curvature="0"
style="opacity:1;fill:#000000;fill-opacity:0.49803922;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1;filter:url(#filter5703)"
d="m 17.875,3.40625 c -2.475371,0 -4.5,2.02464 -4.5,4.5 l 0,5.5 -5.5,0 c -2.4753702,0 -4.5,2.02464 -4.5,4.5 l 0,13 c 10e-8,2.47537 2.02464,4.5 4.5,4.5 l 5.5,0 0,5.5 c 0,2.47537 2.02464,4.5 4.5,4.5 l 13,0 c 2.475369,0 4.5,-2.02464 4.5,-4.5 l 0,-5.5 5.5,0 c 2.475371,0 4.5,-2.02464 4.5,-4.5 l 0,-13 c 10e-7,-2.47537 -2.02464,-4.5 -4.5,-4.5 l -5.5,0 0,-5.5 c 10e-7,-2.4753702 -2.02464,-4.5 -4.5,-4.5 l -13,0 z"
id="path5701"
transform="translate(107.42857,368.36218)"
id="path5701" />
d="m 17.875,3.40625 c -2.475371,0 -4.5,2.02464 -4.5,4.5 l 0,5.5 -5.5,0 c -2.4753702,0 -4.5,2.02464 -4.5,4.5 l 0,13 c 10e-8,2.47537 2.02464,4.5 4.5,4.5 l 5.5,0 0,5.5 c 0,2.47537 2.02464,4.5 4.5,4.5 l 13,0 c 2.475369,0 4.5,-2.02464 4.5,-4.5 l 0,-5.5 5.5,0 c 2.475371,0 4.5,-2.02464 4.5,-4.5 l 0,-13 c 10e-7,-2.47537 -2.02464,-4.5 -4.5,-4.5 l -5.5,0 0,-5.5 c 10e-7,-2.4753702 -2.02464,-4.5 -4.5,-4.5 l -13,0 z"
style="opacity:1;fill:#000000;fill-opacity:0.49803922;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1;filter:url(#filter5703)"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5671);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1"
d="M 17.5,4 C 15.561337,4 14,5.5613368 14,7.5 L 14,14 7.5,14 C 5.5613365,14 3.9999998,15.561336 4,17.5 l 0,13 c 0,1.938663 1.5613363,3.499999 3.5,3.5 l 6.5,0 0,6.5 c 0,1.938663 1.561337,3.499999 3.5,3.5 l 13,0 c 1.938663,0 3.5,-1.561337 3.5,-3.5 l 0,-6.5 6.5,0 c 1.938663,0 3.5,-1.561337 3.5,-3.5 l 0,-13 C 44,15.561337 42.438664,14 40.5,14 L 34,14 34,7.5 C 34,5.5613365 32.438664,4.0000002 30.5,4 l -13,0 z"
id="rect5154"
transform="translate(107.42857,368.36218)"
id="rect5154" />
d="M 17.5,4 C 15.561337,4 14,5.5613368 14,7.5 L 14,14 7.5,14 C 5.5613365,14 3.9999998,15.561336 4,17.5 l 0,13 c 0,1.938663 1.5613363,3.499999 3.5,3.5 l 6.5,0 0,6.5 c 0,1.938663 1.561337,3.499999 3.5,3.5 l 13,0 c 1.938663,0 3.5,-1.561337 3.5,-3.5 l 0,-6.5 6.5,0 c 1.938663,0 3.5,-1.561337 3.5,-3.5 l 0,-13 C 44,15.561337 42.438664,14 40.5,14 L 34,14 34,7.5 C 34,5.5613365 32.438664,4.0000002 30.5,4 l -13,0 z"
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5671);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;fill:url(#linearGradient5689);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1"
d="m 19,9 0,10 -10,0 0,10 10,0 0,10 10,0 0,-10 10,0 0,-10 -10,0 0,-10 -10,0 z"
id="rect5673"
transform="translate(107.42857,368.36218)"
id="rect5673" />
</g>
d="m 19,9 0,10 -10,0 0,10 10,0 0,10 10,0 0,-10 10,0 0,-10 -10,0 0,-10 -10,0 z"
style="opacity:1;fill:url(#linearGradient5689);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.56000006;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1505,19 +1505,19 @@ switch ($action) {
$group['users'] = count($obj->get_users_by_usergroup($group['id']));
if ($obj->usergroup_was_added_in_course($group['id'], $course_id)) {
$url = 'class.php?action=remove_class_from_course&id='.$group['id'].'&'.api_get_cidreq();
//$icon = Display::return_icon('delete.png', get_lang('Remove'));
$class = 'btn btn-danger';
$text = get_lang('Remove');
$icon = Display::return_icon('delete.png', get_lang('Remove'));
//$class = 'btn btn-danger';
//$text = get_lang('Remove');
} else {
$url = 'class.php?action=add_class_to_course&id='.$group['id'].'&'.api_get_cidreq().'&type=not_registered';
$class = 'btn btn-primary';
//$icon = Display::return_icon('add.png', get_lang('Add'));
$text = get_lang('Add');
//$class = 'btn btn-primary';
$icon = Display::return_icon('add.png', get_lang('Add'));
//$text = get_lang('Add');
}
switch ($group['group_type']) {
case 0:
$group['group_type'] = Display::label(get_lang('Class'), 'info');
$group['group_type'] = Display::label(get_lang('Class'), 'primary');
break;
case 1:
$group['group_type'] = Display::label(get_lang('Social'), 'success');
@ -1528,7 +1528,7 @@ switch ($action) {
$group['status'] = $role;
$group['actions'] = Display::url($text, $url, ['class' => $class]);
$group['actions'] = Display::url($icon, $url);
$new_result[] = $group;
}
$result = $new_result;

@ -1831,8 +1831,8 @@ class Display
case 'info':
$class = 'label-info';
break;
case 'inverse':
$class = 'label-inverse';
case 'primary':
$class = 'label-primary';
break;
default:
$class = 'label-default';

@ -1,791 +0,0 @@
/*************** SCROLLBAR BASE CSS ***************/
.scroll-wrapper {
overflow: hidden !important;
padding: 0 !important;
position: relative;
}
.scroll-wrapper > .scroll-content {
border: none !important;
box-sizing: content-box !important;
height: auto;
left: 0;
margin: 0;
max-height: none;
max-width: none !important;
/* overflow: scroll !important; */
padding: 0;
position: relative !important;
top: 0;
width: auto !important;
}
.scroll-wrapper > .scroll-content::-webkit-scrollbar {
height: 0;
width: 0;
}
.scroll-element {
display: none;
}
.scroll-element, .scroll-element div {
box-sizing: content-box;
}
.scroll-element.scroll-x.scroll-scrollx_visible,
.scroll-element.scroll-y.scroll-scrolly_visible {
display: block;
}
.scroll-element .scroll-bar,
.scroll-element .scroll-arrow {
cursor: default;
}
.scroll-textarea {
border: 1px solid #cccccc;
border-top-color: #999999;
}
.scroll-textarea > .scroll-content {
overflow: hidden !important;
}
.scroll-textarea > .scroll-content > textarea {
border: none !important;
box-sizing: border-box;
height: 100% !important;
margin: 0;
max-height: none !important;
max-width: none !important;
overflow: scroll !important;
outline: none;
padding: 2px;
position: relative !important;
top: 0;
width: 100% !important;
}
.scroll-textarea > .scroll-content > textarea::-webkit-scrollbar {
height: 0;
width: 0;
}
/*************** SIMPLE INNER SCROLLBAR ***************/
.scrollbar-inner > .scroll-element,
.scrollbar-inner > .scroll-element div
{
border: none;
margin: 0;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-inner > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-inner > .scroll-element.scroll-x {
bottom: 2px;
height: 8px;
left: 0;
width: 100%;
}
.scrollbar-inner > .scroll-element.scroll-y {
height: 100%;
right: 2px;
top: 0;
width: 8px;
}
.scrollbar-inner > .scroll-element .scroll-element_outer {
overflow: hidden;
}
.scrollbar-inner > .scroll-element .scroll-element_outer,
.scrollbar-inner > .scroll-element .scroll-element_track,
.scrollbar-inner > .scroll-element .scroll-bar {
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}
.scrollbar-inner > .scroll-element .scroll-element_track,
.scrollbar-inner > .scroll-element .scroll-bar {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
filter: alpha(opacity=40);
opacity: 0.4;
}
.scrollbar-inner > .scroll-element .scroll-element_track { background-color: #e0e0e0; }
.scrollbar-inner > .scroll-element .scroll-bar { background-color: #c2c2c2; }
.scrollbar-inner > .scroll-element:hover .scroll-bar { background-color: #919191; }
.scrollbar-inner > .scroll-element.scroll-draggable .scroll-bar { background-color: #919191; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -12px; }
.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -12px; }
.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -12px; }
.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -12px; }
/*************** SIMPLE OUTER SCROLLBAR ***************/
.scrollbar-outer > .scroll-element,
.scrollbar-outer > .scroll-element div
{
border: none;
margin: 0;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-outer > .scroll-element {
background-color: #ffffff;
}
.scrollbar-outer > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-outer > .scroll-element.scroll-x {
bottom: 0;
height: 12px;
left: 0;
width: 100%;
}
.scrollbar-outer > .scroll-element.scroll-y {
height: 100%;
right: 0;
top: 0;
width: 12px;
}
.scrollbar-outer > .scroll-element.scroll-x .scroll-element_outer { height: 8px; top: 2px; }
.scrollbar-outer > .scroll-element.scroll-y .scroll-element_outer { left: 2px; width: 8px; }
.scrollbar-outer > .scroll-element .scroll-element_outer { overflow: hidden; }
.scrollbar-outer > .scroll-element .scroll-element_track { background-color: #eeeeee; }
.scrollbar-outer > .scroll-element .scroll-element_outer,
.scrollbar-outer > .scroll-element .scroll-element_track,
.scrollbar-outer > .scroll-element .scroll-bar {
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}
.scrollbar-outer > .scroll-element .scroll-bar { background-color: #d9d9d9; }
.scrollbar-outer > .scroll-element .scroll-bar:hover { background-color: #c2c2c2; }
.scrollbar-outer > .scroll-element.scroll-draggable .scroll-bar { background-color: #919191; }
/* scrollbar height/width & offset from container borders */
.scrollbar-outer > .scroll-content.scroll-scrolly_visible { left: -12px; margin-left: 12px; }
.scrollbar-outer > .scroll-content.scroll-scrollx_visible { top: -12px; margin-top: 12px; }
.scrollbar-outer > .scroll-element.scroll-x .scroll-bar { min-width: 10px; }
.scrollbar-outer > .scroll-element.scroll-y .scroll-bar { min-height: 10px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-outer > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -14px; }
.scrollbar-outer > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -14px; }
.scrollbar-outer > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -14px; }
.scrollbar-outer > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -14px; }
/*************** SCROLLBAR MAC OS X ***************/
.scrollbar-macosx > .scroll-element,
.scrollbar-macosx > .scroll-element div
{
background: none;
border: none;
margin: 0;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-macosx > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-macosx > .scroll-element .scroll-element_track { display: none; }
.scrollbar-macosx > .scroll-element .scroll-bar {
background-color: #6C6E71;
display: block;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0);
opacity: 0;
-webkit-border-radius: 7px;
-moz-border-radius: 7px;
border-radius: 7px;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear;
-ms-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.scrollbar-macosx:hover > .scroll-element .scroll-bar,
.scrollbar-macosx > .scroll-element.scroll-draggable .scroll-bar {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: 0.7;
}
.scrollbar-macosx > .scroll-element.scroll-x {
bottom: 0px;
height: 0px;
left: 0;
min-width: 100%;
overflow: visible;
width: 100%;
}
.scrollbar-macosx > .scroll-element.scroll-y {
height: 100%;
min-height: 100%;
right: 0px;
top: 0;
width: 0px;
}
/* scrollbar height/width & offset from container borders */
.scrollbar-macosx > .scroll-element.scroll-x .scroll-bar { height: 7px; min-width: 10px; top: -9px; }
.scrollbar-macosx > .scroll-element.scroll-y .scroll-bar { left: -9px; min-height: 10px; width: 7px; }
.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_outer { left: 2px; }
.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_size { left: -4px; }
.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_outer { top: 2px; }
.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_size { top: -4px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-macosx > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -11px; }
.scrollbar-macosx > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -11px; }
/*************** SCROLLBAR LIGHT ***************/
.scrollbar-light > .scroll-element,
.scrollbar-light > .scroll-element div {
border: none;
margin: 0;
overflow: hidden;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-light > .scroll-element {
background-color: #ffffff;
}
.scrollbar-light > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-light > .scroll-element .scroll-element_outer {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}
.scrollbar-light > .scroll-element .scroll-element_size {
background: #dbdbdb;
background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RiZGJkYiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlOGU4ZTgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+');
background: -moz-linear-gradient(left, #dbdbdb 0%, #e8e8e8 100%);
background: -webkit-gradient(linear, left top, right top, color-stop(0%,#dbdbdb), color-stop(100%,#e8e8e8));
background: -webkit-linear-gradient(left, #dbdbdb 0%,#e8e8e8 100%);
background: -o-linear-gradient(left, #dbdbdb 0%,#e8e8e8 100%);
background: -ms-linear-gradient(left, #dbdbdb 0%,#e8e8e8 100%);
background: linear-gradient(to right, #dbdbdb 0%,#e8e8e8 100%);
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}
.scrollbar-light > .scroll-element.scroll-x {
bottom: 0;
height: 17px;
left: 0;
min-width: 100%;
width: 100%;
}
.scrollbar-light > .scroll-element.scroll-y {
height: 100%;
min-height: 100%;
right: 0;
top: 0;
width: 17px;
}
.scrollbar-light > .scroll-element .scroll-bar {
background: #fefefe;
background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlZmVmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNWY1ZjUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+');
background: -moz-linear-gradient(left, #fefefe 0%, #f5f5f5 100%);
background: -webkit-gradient(linear, left top, right top, color-stop(0%,#fefefe), color-stop(100%,#f5f5f5));
background: -webkit-linear-gradient(left, #fefefe 0%,#f5f5f5 100%);
background: -o-linear-gradient(left, #fefefe 0%,#f5f5f5 100%);
background: -ms-linear-gradient(left, #fefefe 0%,#f5f5f5 100%);
background: linear-gradient(to right, #fefefe 0%,#f5f5f5 100%);
border: 1px solid #dbdbdb;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}
/* scrollbar height/width & offset from container borders */
.scrollbar-light > .scroll-content.scroll-scrolly_visible { left: -17px; margin-left: 17px; }
.scrollbar-light > .scroll-content.scroll-scrollx_visible { top: -17px; margin-top: 17px; }
.scrollbar-light > .scroll-element.scroll-x .scroll-bar { height: 10px; min-width: 10px; top: 0px; }
.scrollbar-light > .scroll-element.scroll-y .scroll-bar { left: 0px; min-height: 10px; width: 10px; }
.scrollbar-light > .scroll-element.scroll-x .scroll-element_outer { height: 12px; left: 2px; top: 2px; }
.scrollbar-light > .scroll-element.scroll-x .scroll-element_size { left: -4px; }
.scrollbar-light > .scroll-element.scroll-y .scroll-element_outer { left: 2px; top: 2px; width: 12px; }
.scrollbar-light > .scroll-element.scroll-y .scroll-element_size { top: -4px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-light > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -19px; }
.scrollbar-light > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -19px; }
.scrollbar-light > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -19px; }
.scrollbar-light > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -19px; }
/*************** SCROLLBAR RAIL ***************/
.scrollbar-rail > .scroll-element,
.scrollbar-rail > .scroll-element div
{
border: none;
margin: 0;
overflow: hidden;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-rail > .scroll-element {
background-color: #ffffff;
}
.scrollbar-rail > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-rail > .scroll-element .scroll-element_size {
background-color: #999;
background-color: rgba(0, 0, 0, 0.3);
}
.scrollbar-rail > .scroll-element .scroll-element_outer:hover .scroll-element_size {
background-color: #666;
background-color: rgba(0, 0, 0, 0.5);
}
.scrollbar-rail > .scroll-element.scroll-x {
bottom: 0;
height: 12px;
left: 0;
min-width: 100%;
padding: 3px 0 2px;
width: 100%;
}
.scrollbar-rail > .scroll-element.scroll-y {
height: 100%;
min-height: 100%;
padding: 0 2px 0 3px;
right: 0;
top: 0;
width: 12px;
}
.scrollbar-rail > .scroll-element .scroll-bar {
background-color: #d0b9a0;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5);
}
.scrollbar-rail > .scroll-element .scroll-element_outer:hover .scroll-bar {
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);
}
/* scrollbar height/width & offset from container borders */
.scrollbar-rail > .scroll-content.scroll-scrolly_visible { left: -17px; margin-left: 17px; }
.scrollbar-rail > .scroll-content.scroll-scrollx_visible { margin-top: 17px; top: -17px; }
.scrollbar-rail > .scroll-element.scroll-x .scroll-bar { height: 10px; min-width: 10px; top: 1px; }
.scrollbar-rail > .scroll-element.scroll-y .scroll-bar { left: 1px; min-height: 10px; width: 10px; }
.scrollbar-rail > .scroll-element.scroll-x .scroll-element_outer { height: 15px; left: 5px; }
.scrollbar-rail > .scroll-element.scroll-x .scroll-element_size { height: 2px; left: -10px; top: 5px; }
.scrollbar-rail > .scroll-element.scroll-y .scroll-element_outer { top: 5px; width: 15px; }
.scrollbar-rail > .scroll-element.scroll-y .scroll-element_size { left: 5px; top: -10px; width: 2px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-rail > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -25px; }
.scrollbar-rail > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -25px; }
.scrollbar-rail > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -25px; }
.scrollbar-rail > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -25px; }
/*************** SCROLLBAR DYNAMIC ***************/
.scrollbar-dynamic > .scroll-element,
.scrollbar-dynamic > .scroll-element div
{
background: none;
border: none;
margin: 0;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-dynamic > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-dynamic > .scroll-element.scroll-x {
bottom: 2px;
height: 7px;
left: 0;
min-width: 100%;
width: 100%;
}
.scrollbar-dynamic > .scroll-element.scroll-y {
height: 100%;
min-height: 100%;
right: 2px;
top: 0;
width: 7px;
}
.scrollbar-dynamic > .scroll-element .scroll-element_outer {
opacity: 0.3;
-webkit-border-radius: 12px;
-moz-border-radius: 12px;
border-radius: 12px;
}
.scrollbar-dynamic > .scroll-element .scroll-element_size {
background-color: #cccccc;
opacity: 0;
-webkit-border-radius: 12px;
-moz-border-radius: 12px;
border-radius: 12px;
-webkit-transition: opacity 0.2s;
-moz-transition: opacity 0.2s;
-o-transition: opacity 0.2s;
-ms-transition: opacity 0.2s;
transition: opacity 0.2s;
}
.scrollbar-dynamic > .scroll-element .scroll-bar {
background-color: #6c6e71;
-webkit-border-radius: 7px;
-moz-border-radius: 7px;
border-radius: 7px;
}
/* scrollbar height/width & offset from container borders */
.scrollbar-dynamic > .scroll-element.scroll-x .scroll-bar {
bottom: 0;
height: 7px;
min-width: 24px;
top: auto;
}
.scrollbar-dynamic > .scroll-element.scroll-y .scroll-bar {
left: auto;
min-height: 24px;
right: 0;
width: 7px;
}
.scrollbar-dynamic > .scroll-element.scroll-x .scroll-element_outer {
bottom: 0;
top: auto;
left: 2px;
-webkit-transition: height 0.2s;
-moz-transition: height 0.2s;
-o-transition: height 0.2s;
-ms-transition: height 0.2s;
transition: height 0.2s;
}
.scrollbar-dynamic > .scroll-element.scroll-y .scroll-element_outer {
left: auto;
right: 0;
top: 2px;
-webkit-transition: width 0.2s;
-moz-transition: width 0.2s;
-o-transition: width 0.2s;
-ms-transition: width 0.2s;
transition: width 0.2s;
}
.scrollbar-dynamic > .scroll-element.scroll-x .scroll-element_size { left: -4px; }
.scrollbar-dynamic > .scroll-element.scroll-y .scroll-element_size { top: -4px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-dynamic > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -11px; }
.scrollbar-dynamic > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -11px; }
/* hover & drag */
.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer,
.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer {
overflow: hidden;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: 0.7;
}
.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer .scroll-element_size,
.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer .scroll-element_size {
opacity: 1;
}
.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer .scroll-bar,
.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer .scroll-bar {
height: 100%;
width: 100%;
-webkit-border-radius: 12px;
-moz-border-radius: 12px;
border-radius: 12px;
}
.scrollbar-dynamic > .scroll-element.scroll-x:hover .scroll-element_outer,
.scrollbar-dynamic > .scroll-element.scroll-x.scroll-draggable .scroll-element_outer {
height: 20px;
min-height: 7px;
}
.scrollbar-dynamic > .scroll-element.scroll-y:hover .scroll-element_outer,
.scrollbar-dynamic > .scroll-element.scroll-y.scroll-draggable .scroll-element_outer {
min-width: 7px;
width: 20px;
}
/*************** SCROLLBAR GOOGLE CHROME ***************/
.scrollbar-chrome > .scroll-element,
.scrollbar-chrome > .scroll-element div
{
border: none;
margin: 0;
overflow: hidden;
padding: 0;
position: absolute;
z-index: 10;
}
.scrollbar-chrome > .scroll-element {
background-color: #ffffff;
}
.scrollbar-chrome > .scroll-element div {
display: block;
height: 100%;
left: 0;
top: 0;
width: 100%;
}
.scrollbar-chrome > .scroll-element .scroll-element_outer {}
.scrollbar-chrome > .scroll-element .scroll-element_track {
background: #f1f1f1;
border: 1px solid #dbdbdb;
}
.scrollbar-chrome > .scroll-element.scroll-x {
bottom: 0;
height: 16px;
left: 0;
min-width: 100%;
width: 100%;
}
.scrollbar-chrome > .scroll-element.scroll-y {
height: 100%;
min-height: 100%;
right: 0;
top: 0;
width: 16px;
}
.scrollbar-chrome > .scroll-element .scroll-bar {
background-color: #d9d9d9;
border: 1px solid #bdbdbd;
cursor: default;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.scrollbar-chrome > .scroll-element .scroll-bar:hover {
background-color: #c2c2c2;
border-color: #a9a9a9;
}
.scrollbar-chrome > .scroll-element.scroll-draggable .scroll-bar {
background-color: #919191;
border-color: #7e7e7e;
}
/* scrollbar height/width & offset from container borders */
.scrollbar-chrome > .scroll-content.scroll-scrolly_visible { left: -16px; margin-left: 16px; }
.scrollbar-chrome > .scroll-content.scroll-scrollx_visible { top: -16px; margin-top: 16px; }
.scrollbar-chrome > .scroll-element.scroll-x .scroll-bar { height: 8px; min-width: 10px; top: 3px; }
.scrollbar-chrome > .scroll-element.scroll-y .scroll-bar { left: 3px; min-height: 10px; width: 8px; }
.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_outer { border-left: 1px solid #dbdbdb; }
.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_track { height: 14px; left: -3px; }
.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_size { height: 14px; left: -4px; }
.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_outer { border-top: 1px solid #dbdbdb; }
.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_track { top: -3px; width: 14px; }
.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_size { top: -4px; width: 14px; }
/* update scrollbar offset if both scrolls are visible */
.scrollbar-chrome > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -19px; }
.scrollbar-chrome > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -19px; }
.scrollbar-chrome > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -19px; }
.scrollbar-chrome > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -19px; }

File diff suppressed because one or more lines are too long

@ -1545,10 +1545,10 @@ class Link extends Model
$count = count($categories);
if (!empty($count)) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM). get_lang('FlatView') . ' </a>';
echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . ' </a>';
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . get_lang('NestedView') . '</a>';
echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . '</a>';
}
echo '</div>';

@ -519,13 +519,13 @@ class Template
'mediaelement/build/mediaelementplayer.min.css',
'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.css',
'bootstrap/dist/css/bootstrap.min.css',
'jquery.scrollbar/jquery.scrollbar.css',
];
foreach ($bowerCSSFiles as $file) {
$css[] = api_get_path(WEB_PATH).'web/assets/'.$file;
}
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/bootstrap-select/css/bootstrap-select.min.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery-scrollbar/jquery.scrollbar.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/style.css';
@ -626,7 +626,6 @@ class Template
// JS files
$js_files = array(
'chosen/chosen.jquery.min.js',
'jquery-scrollbar/jquery.scrollbar.min.js',
'bootstrap-select/js/bootstrap-select.min.js',
$selectLink
);
@ -663,7 +662,8 @@ class Template
'jquery-timeago/jquery.timeago.js',
'mediaelement/build/mediaelement-and-player.min.js',
'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
'imagemap-resizer/js/imageMapResizer.min.js'
'imagemap-resizer/js/imageMapResizer.min.js',
'jquery.scrollbar/jquery.scrollbar.min.js'
];
if (api_get_setting('include_asciimathml_script') == 'true') {

@ -43,7 +43,7 @@ if (api_is_allowed_to_edit()) {
$actions .= '<div class="actions">';
if ($type == 'registered') {
$actions .= '<a href="class.php?'.api_get_cidreq().'&type=not_registered">'.
Display::return_icon('add.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).'</a>';
Display::return_icon('add-class.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).'</a>';
} else {
$actions .= '<a href="class.php?'.api_get_cidreq().'&type=registered">'.
Display::return_icon('back.png', get_lang("Classes"), array(), ICON_SIZE_MEDIUM).'</a>';
@ -124,13 +124,13 @@ $columnModel = array(
'name' => 'group_type',
'index' => 'group_type',
'width' => '15',
'align' => 'left',
'align' => 'center',
),
array(
'name' => 'actions',
'index' => 'actions',
'width' => '20',
'align' => 'left',
'width' => '10',
'align' => 'center',
'sortable' => 'false',
),
);

@ -957,19 +957,24 @@ if (api_is_allowed_to_edit(null, true)) {
case STUDENT:
$selectedTab = 1;
$url = api_get_path(WEB_CODE_PATH).'user/subscribe_user.php?'.api_get_cidreq().'&type='.STUDENT;
$icon = Display::url(
Display::return_icon('add-user.png', get_lang('Add'), '', ICON_SIZE_MEDIUM),
$url
);
break;
case COURSEMANAGER:
$selectedTab = 2;
$url = api_get_path(WEB_CODE_PATH).'user/subscribe_user.php?'.api_get_cidreq().'&type='.COURSEMANAGER;
$icon = Display::url(
Display::return_icon('add-teacher.png', get_lang('Add'), '', ICON_SIZE_MEDIUM),
$url
);
break;
}
echo '<div class="row">';
echo '<div class="col-md-6">';
echo Display::url(
Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM),
$url
);
echo $icon;
$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.

Loading…
Cancel
Save