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

Fix php warnings, fix icons

Browse Source
pull/3768/head
Julio Montoya 5 years ago
parent 84dd35b460
commit 1d6196c60a
18 changed files with 28 additions and 30 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
      public/main/inc/lib/display.lib.php
  2. 2
      public/main/inc/lib/exercise.lib.php
  3. 9
      public/main/inc/lib/social.lib.php
  4. 1
      public/main/messages/record_audio.php
  5. 2
      public/main/social/friends.php
  6. 2
      public/main/social/search.php
  7. 2
      public/main/template/default/exercise/partials/result_exercise.html.twig
  8. 2
      public/main/template/default/layout/login_form.html.twig
  9. 2
      public/main/template/default/my_space/partials/tracking_course_overview.html.twig
  10. 2
      public/main/template/default/my_space/user_details.html.twig
  11. 2
      public/main/template/default/skill/badge_create.html.twig
  12. 4
      public/main/template/default/social/friends.html.twig
  13. 2
      public/main/template/default/social/user_block.html.twig
  14. 4
      public/main/template/default/user_portal/classic_courses_with_category.html.twig
  15. 4
      public/main/template/default/user_portal/classic_courses_without_category.html.twig
  16. 4
      public/main/template/default/user_portal/grid_courses_with_category.html.twig
  17. 4
      public/main/template/default/user_portal/grid_courses_without_category.html.twig
  18. 4
      public/main/template/default/user_portal/grid_session.html.twig

2
public/main/inc/lib/display.lib.php
Unescape View File

@ -2725,7 +2725,7 @@ HTML;
} }
return '<div id="user_card_'.$userInfo['id'].'" class="card d-flex flex-row"> return '<div id="user_card_'.$userInfo['id'].'" class="card d-flex flex-row">
<img src="'.$userInfo['avatar'].'" class="rounded"> <img src="'.$userInfo['avatar'].'" class="rounded" />
<h3 class="card-title">'.$userInfo['complete_name'].'</h3> <h3 class="card-title">'.$userInfo['complete_name'].'</h3>
<div class="card-body"> <div class="card-body">
<div class="card-title"> <div class="card-title">

2
public/main/inc/lib/exercise.lib.php
Unescape View File

@ -1612,7 +1612,7 @@ HOTSPOT;
<input <input
type="radio" value="0" type="radio" value="0"
name="'.$questionId.'-options" autocomplete="off" checked> name="'.$questionId.'-options" autocomplete="off" checked>
<span class="fa fa-pencil" aria-hidden="true"></span> <span class="fas fa-pencil-alt" aria-hidden="true"></span>
</label> </label>
<label class="btn btn-default" <label class="btn btn-default"
aria-label="'.get_lang('Add annotation text').'"> aria-label="'.get_lang('Add annotation text').'">

9
public/main/inc/lib/social.lib.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
@ -881,7 +882,7 @@ class SocialManager extends UserManager
$show, $show,
['shared_profile', 'groups', 'group_edit', 'member_list', 'waiting_list', 'invite_friends'] ['shared_profile', 'groups', 'group_edit', 'member_list', 'waiting_list', 'invite_friends']
)) { )) {
$links = '<ul class="nav nav-pills nav-stacked">'; $links = '<ul class="nav-bar">';
$active = 'home' === $show ? 'active' : null; $active = 'home' === $show ? 'active' : null;
$links .= ' $links .= '
<li class="home-icon '.$active.'"> <li class="home-icon '.$active.'">
@ -1003,7 +1004,7 @@ class SocialManager extends UserManager
} }
if ('shared_profile' === $show) { if ('shared_profile' === $show) {
$links = '<ul class="nav nav-pills nav-stacked">'; $links = '<ul class="nav-bar">';
// My own profile // My own profile
if ($show_full_profile && $user_id == api_get_user_id()) { if ($show_full_profile && $user_id == api_get_user_id()) {
$links .= ' $links .= '
@ -1187,7 +1188,7 @@ class SocialManager extends UserManager
if ($show_delete_account_button) { if ($show_delete_account_button) {
$html .= '<div class="panel panel-default"><div class="panel-body">'; $html .= '<div class="panel panel-default"><div class="panel-body">';
$html .= '<ul class="nav nav-pills nav-stacked"><li>'; $html .= '<ul class="nav-bar"><li>';
$url = api_get_path(WEB_CODE_PATH).'auth/unsubscribe_account.php'; $url = api_get_path(WEB_CODE_PATH).'auth/unsubscribe_account.php';
$html .= Display::url( $html .= Display::url(
Display::return_icon( Display::return_icon(
@ -1768,7 +1769,7 @@ class SocialManager extends UserManager
</div> </div>
<div class="col-sm-3 pull-right"> <div class="col-sm-3 pull-right">
<a onclick="submitComment('.$messageId.');" href="javascript:void(0);" name="social_wall_new_msg_submit" class="btn btn-default btn-post"> <a onclick="submitComment('.$messageId.');" href="javascript:void(0);" name="social_wall_new_msg_submit" class="btn btn-default btn-post">
<em class="fa fa-pencil"></em> '.get_lang('Post').' <em class="fas fa-pencil-alt"></em> '.get_lang('Post').'
</a> </a>
</div> </div>
</form>'; </form>';

1
public/main/messages/record_audio.php
Unescape View File

@ -16,6 +16,7 @@ $htmlHeadXtra[] = api_get_js('record_audio/record_audio.js');
$tpl = new Template(get_lang('Compose message'), false, false, false, true); $tpl = new Template(get_lang('Compose message'), false, false, false, true);
$record = $tpl->get_template('message/record_audio.tpl'); $record = $tpl->get_template('message/record_audio.tpl');
$tpl->assign('directory', '');
$tpl->assign('user_id', api_get_user_id()); $tpl->assign('user_id', api_get_user_id());
$tpl->assign('audio_title', api_get_unique_id()); $tpl->assign('audio_title', api_get_unique_id());
$tpl->assign('reload_page', 0); $tpl->assign('reload_page', 0);

2
public/main/social/friends.php
Unescape View File

@ -109,7 +109,6 @@ if (0 == count($friends)) {
$social_right_content .= $filterForm->returnForm(); $social_right_content .= $filterForm->returnForm();
$friend_html = '<div id="whoisonline">'; $friend_html = '<div id="whoisonline">';
$friend_html .= '<div class="row">';
$number_friends = count($friends); $number_friends = count($friends);
$j = 0; $j = 0;
@ -128,7 +127,6 @@ if (0 == count($friends)) {
} }
} }
$friend_html .= '</div>'; $friend_html .= '</div>';
$friend_html .= '</div>';
$social_right_content .= $friend_html; $social_right_content .= $friend_html;
} }
$social_right_content .= '</div>'; $social_right_content .= '</div>';

2
public/main/social/search.php
Unescape View File

@ -82,7 +82,6 @@ if ('' != $query || ('1' == $query_vars['search_type'] && count($query_vars) > 2
$results = '<div id="whoisonline">'; $results = '<div id="whoisonline">';
if (is_array($users) && count($users) > 0) { if (is_array($users) && count($users) > 0) {
$results .= '<div class="row">';
$buttonClass = 'btn btn-default btn-sm'; $buttonClass = 'btn btn-default btn-sm';
foreach ($users as $user) { foreach ($users as $user) {
$user_info = api_get_user_info($user['id'], true); $user_info = api_get_user_info($user['id'], true);
@ -134,7 +133,6 @@ if ('' != $query || ('1' == $query_vars['search_type'] && count($query_vars) > 2
$invitations $invitations
); );
} }
$results .= '</div>';
} }
$results .= '</div>'; $results .= '</div>';

2
public/main/template/default/exercise/partials/result_exercise.html.twig
Unescape View File

@ -55,7 +55,7 @@
<div class="list-data"> <div class="list-data">
<span class="item"></span> <span class="item"></span>
<a id="sign" class="btn btn-primary" href="javascript:void(0)"> <a id="sign" class="btn btn-primary" href="javascript:void(0)">
<em class="fa fa-pencil"></em> {{ 'Sign'| get_plugin_lang('ExerciseSignaturePlugin') }} <em class="fas fa-pencil-alt"></em> {{ 'Sign'| get_plugin_lang('ExerciseSignaturePlugin') }}
</a> </a>
</div> </div>
{% endif %} {% endif %}

2
public/main/template/default/layout/login_form.html.twig
Unescape View File

@ -14,7 +14,7 @@
{{ login_form }} {{ login_form }}
{% if "allow_lostpassword" | api_get_setting == 'true' or "allow_registration" | api_get_setting == 'true' %} {% if "allow_lostpassword" | api_get_setting == 'true' or "allow_registration" | api_get_setting == 'true' %}
<ul class="nav nav-pills nav-stacked"> <ul class="nav-bar">
{% if "allow_registration" | api_get_setting != 'false' %} {% if "allow_registration" | api_get_setting != 'false' %}
<li><a href="{{ _p.web_main }}auth/inscription.php"> {{ 'SignUp' | get_lang }} </a></li> <li><a href="{{ _p.web_main }}auth/inscription.php"> {{ 'SignUp' | get_lang }} </a></li>
{% endif %} {% endif %}

2
public/main/template/default/my_space/partials/tracking_course_overview.html.twig
Unescape View File

@ -71,7 +71,7 @@
<span title="{{ 'TotalNumberOfAssignments'|get_lang }}">{{ 'TotalNumberOfAssignments'|get_lang }}</span> <span title="{{ 'TotalNumberOfAssignments'|get_lang }}">{{ 'TotalNumberOfAssignments'|get_lang }}</span>
</dt> </dt>
<dd> <dd>
<span class="text-color"><i class="fa fa-pencil" aria-hidden="true"></i></span> <span class="text-color"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span>
<span class="text-color">{{ data.number_assignments }}</span> <span class="text-color">{{ data.number_assignments }}</span>
</dd> </dd>
<dt> <dt>

2
public/main/template/default/my_space/user_details.html.twig
Unescape View File

@ -102,7 +102,7 @@
<div class="card box-widget"> <div class="card box-widget">
<div class="card-body"> <div class="card-body">
<div class="stat-widget-five"> <div class="stat-widget-five">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
{{ user_extra.tools.tasks }} {{ user_extra.tools.tasks }}
<div class="box-name"> <div class="box-name">
{{ 'Assignments'|trans }} {{ 'Assignments'|trans }}

2
public/main/template/default/skill/badge_create.html.twig
Unescape View File

@ -685,7 +685,7 @@
<div class="create-openbadges"> <div class="create-openbadges">
<button id="btn-open-designer" class="help-badges btn btn-primary btn-large btn-block" data-toggle="tooltip" data-placement="bottom" title="{{ 'DesignANewBadgeComment' | get_lang }}" type="button"> <button id="btn-open-designer" class="help-badges btn btn-primary btn-large btn-block" data-toggle="tooltip" data-placement="bottom" title="{{ 'DesignANewBadgeComment' | get_lang }}" type="button">
<em class="fa fa-pencil"></em> {{ 'DesignNewBadge' | get_lang }} <em class="fas fa-pencil-alt"></em> {{ 'DesignNewBadge' | get_lang }}
</button> </button>
</div> </div>
<div class="create-openbadges"> <div class="create-openbadges">

4
public/main/template/default/social/friends.html.twig
Unescape View File

@ -19,11 +19,11 @@
{{ social_right_content}} {{ social_right_content}}
</div> </div>
<div id="display_response_id" class="span5"></div> <div id="display_response_id" class="span5"></div>
{{ social_auto_extend_link }} {# {{ social_auto_extend_link }}#}
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="row"> <div class="row">
{{ social_right_information }} {# {{ social_right_information }}#}
</div> </div>
</div> </div>
</div> </div>

2
public/main/template/default/social/user_block.html.twig
Unescape View File

@ -13,7 +13,7 @@
title="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}"
href="{{ url('home') }}main/admin/user_edit.php?user_id={{ user.id }}" href="{{ url('home') }}main/admin/user_edit.php?user_id={{ user.id }}"
> >
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
</div> </div>
{% endif %} {% endif %}

4
public/main/template/default/user_portal/classic_courses_with_category.html.twig
Unescape View File

@ -33,12 +33,12 @@
<div class="pull-right"> <div class="pull-right">
{% if item.document == '' %} {% if item.document == '' %}
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{{ item.document }} {{ item.document }}
</div> </div>

4
public/main/template/default/user_portal/classic_courses_without_category.html.twig
Unescape View File

@ -31,12 +31,12 @@
<div class="pull-right"> <div class="pull-right">
{% if item.document == '' %} {% if item.document == '' %}
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{{ item.document }} {{ item.document }}
</div> </div>

4
public/main/template/default/user_portal/grid_courses_with_category.html.twig
Unescape View File

@ -42,12 +42,12 @@
<div class="admin-actions"> <div class="admin-actions">
{% if item.document == '' %} {% if item.document == '' %}
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{{ item.document }} {{ item.document }}
</div> </div>

4
public/main/template/default/user_portal/grid_courses_without_category.html.twig
Unescape View File

@ -24,12 +24,12 @@
<div class="admin-actions"> <div class="admin-actions">
{% if item.document == '' %} {% if item.document == '' %}
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{{ item.document }} {{ item.document }}
</div> </div>

4
public/main/template/default/user_portal/grid_session.html.twig
Unescape View File

@ -15,12 +15,12 @@
<div class="admin-actions"> <div class="admin-actions">
{% if course.document == '' %} {% if course.document == '' %}
<a class="btn btn-default btn-sm" href="{{ course.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ course.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ course.edit_actions }}"> <a class="btn btn-default btn-sm" href="{{ course.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fas fa-pencil-alt" aria-hidden="true"></i>
</a> </a>
{{ course.document }} {{ course.document }}
</div> </div>

Write Preview
Loading…
Cancel
Save