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

Social: Reorded. MY PERSONAL OPEN AREA > MY COMPETENCES > MY DIPLOMAS >

Browse Source 
WHAT I AM ABLE TO TEACH > MY PRODUCTIONS #3626 - refs GH#3626
pull/3634/head
Carlos Alvarado 5 years ago
parent b83da152b0
commit bae394cc11
No known key found for this signature in database
GPG Key ID: B612DB1EE6658FBB
4 changed files with 68 additions and 48 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. 29
      main/admin/configure_inscription.php
  2. 43
      main/auth/inscription.php
  3. 22
      main/extra/userInfo.php
  4. 22
      main/inc/lib/social.lib.php

29
main/admin/configure_inscription.php
Unescape View File

@ -241,43 +241,46 @@ if ($display_all_form) {
}
// EXTENDED FIELDS
// MY PERSONAL OPEN AREA
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
) {
$form->addHtmlEditor('openarea', get_lang('MyPersonalOpenArea'), false, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']);
} // MY COMPETENCES
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mycomptetences') == 'true'
) {
$form->addHtmlEditor('competences', get_lang('MyCompetences'), false, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']);
}
// MY DIPLOMAS
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mydiplomas') == 'true'
) {
$form->addHtmlEditor('diplomas', get_lang('MyDiplomas'), false, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']);
}
// WHAT I AM ABLE TO TEACH
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'myteach') == 'true'
) {
$form->addHtmlEditor('teach', get_lang('MyTeach'), false, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']);
}
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
) {
$form->addHtmlEditor('openarea', get_lang('MyPersonalOpenArea'), false, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']);
}
if (api_get_setting('extended_profile') == 'true') {
// MY PERSONAL OPEN AREA
if (api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') == 'true') {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
} // MY COMPETENCES
if (api_get_setting('extendedprofile_registrationrequired', 'mycomptetences') == 'true') {
$form->addRule('competences', get_lang('ThisFieldIsRequired'), 'required');
}
// MY DIPLOMAS
if (api_get_setting('extendedprofile_registrationrequired', 'mydiplomas') == 'true') {
$form->addRule('diplomas', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registrationrequired', 'myteach') == 'true') {
// WHAT I AM ABLE TO TEACH
if (api_get_setting('extendedprofile_registrationrequired', 'myteach') == 'true') {
$form->addRule('teach', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') == 'true') {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
}
}
$extraField = new ExtraField('user');

43
main/auth/inscription.php
Unescape View File

@ -258,6 +258,20 @@ if ($user_already_registered_show_terms === false &&
}
// EXTENDED FIELDS
// MY PERSONAL OPEN AREA
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
) {
$form->addHtmlEditor(
'openarea',
get_lang('MyPersonalOpenArea'),
false,
false,
['ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130']
);
}
// MY COMPETENCES
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mycomptetences') == 'true'
) {
@ -269,7 +283,7 @@ if ($user_already_registered_show_terms === false &&
['ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130']
);
}
// MY DIPLOMAS
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mydiplomas') == 'true'
) {
@ -281,7 +295,7 @@ if ($user_already_registered_show_terms === false &&
['ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130']
);
}
// WHAT I AM ABLE TO TEACH
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'myteach') == 'true'
) {
@ -294,39 +308,32 @@ if ($user_already_registered_show_terms === false &&
);
}
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
) {
$form->addHtmlEditor(
'openarea',
get_lang('MyPersonalOpenArea'),
false,
false,
['ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130']
);
}
if (api_get_setting('extended_profile') === 'true') {
// MY PERSONAL OPEN AREA
if (api_get_setting('extendedprofile_registration', 'mypersonalopenarea') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') === 'true'
) {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
}
// MY COMPETENCES
if (api_get_setting('extendedprofile_registration', 'mycomptetences') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mycomptetences') === 'true'
) {
$form->addRule('competences', get_lang('ThisFieldIsRequired'), 'required');
}
// MY DIPLOMAS
if (api_get_setting('extendedprofile_registration', 'mydiplomas') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mydiplomas') === 'true'
) {
$form->addRule('diplomas', get_lang('ThisFieldIsRequired'), 'required');
}
// WHAT I AM ABLE TO TEACH
if (api_get_setting('extendedprofile_registration', 'myteach') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'myteach') === 'true'
) {
$form->addRule('teach', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registration', 'mypersonalopenarea') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') === 'true'
) {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
}
}
// EXTRA FIELDS

22
main/extra/userInfo.php
Unescape View File

@ -314,18 +314,23 @@ if ($displayMode == "viewDefEdit") {
}
if (api_get_setting('extended_profile') == 'true') {
// MY PERSONAL OPEN AREA
if (!empty($mainUserInfo['openarea'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div><div>'.$mainUserInfo['openarea'].'</div>';
}
// MY COMPETENCES
if (!empty($mainUserInfo['competences'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyCompetences').'</strong></div><div>'.$mainUserInfo['competences'].'</div>';
}
// MY DIPLOMAS
if (!empty($mainUserInfo['diplomas'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div><div>'.$mainUserInfo['diplomas'].'</div>';
}
// WHAT I AM ABLE TO TEACH
if (!empty($mainUserInfo['teach'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyTeach').'</strong></div><div>'.$mainUserInfo['teach'].'</div>';
}
if (!empty($mainUserInfo['openarea'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div><div>'.$mainUserInfo['openarea'].'</div>';
}
// MY PRODUCTIONS
if (!empty($mainUserInfo['competences'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyProductions').'</strong></div><div>'.UserManager::build_production_list($mainUserInfo['user_id']).'</div>';
}
@ -397,18 +402,23 @@ if ($displayMode == "viewDefEdit") {
}
if (api_get_setting('extended_profile') == 'true') {
// MY PERSONAL OPEN AREA
if (!empty($mainUserInfo['openarea'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div><div>'.$mainUserInfo['openarea'].'</div>';
}
// MY COMPETENCES
if (!empty($mainUserInfo['competences'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyCompetences').'</strong></div><div>'.$mainUserInfo['competences'].'</div>';
}
// MY DIPLOMAS
if (!empty($mainUserInfo['diplomas'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div><div>'.$mainUserInfo['diplomas'].'</div>';
}
// WHAT I AM ABLE TO TEACH
if (!empty($mainUserInfo['teach'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyTeach').'</strong></div><div>'.$mainUserInfo['teach'].'</div>';
}
if (!empty($mainUserInfo['openarea'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div><div>'.$mainUserInfo['openarea'].'</div>';
}
// MY PRODUCTIONS
if (!empty($mainUserInfo['competences'])) {
echo '<div style="margin-top:10px;" class="actions-message"><strong>'.get_lang('MyProductions').'</strong></div><div>'.UserManager::build_production_list($mainUserInfo['user_id']).'</div>';
}

22
main/inc/lib/social.lib.php
Unescape View File

@ -1450,24 +1450,29 @@ class SocialManager extends UserManager
if (api_get_setting('show_email_addresses') == 'true') {
$html .= Display::encrypted_mailto_link($user_object->email, $user_object->email).'<br />';
}
// MY PERSONAL OPEN AREA
if ($user_object->openarea) {
$html .= Display::page_subheader(get_lang('MyPersonalOpenArea'));
$html .= '<p>'.$user_object->openarea.'</p>';
}
// MY COMPETENCES
if ($user_object->competences) {
$html .= Display::page_subheader(get_lang('MyCompetences'));
$html .= '<p>'.$user_object->competences.'</p>';
}
// MY DIPLOMAS
if ($user_object->diplomas) {
$html .= Display::page_subheader(get_lang('MyDiplomas'));
$html .= '<p>'.$user_object->diplomas.'</p>';
}
// WHAT I AM ABLE TO TEACH
if ($user_object->teach) {
$html .= Display::page_subheader(get_lang('MyTeach'));
$html .= '<p>'.$user_object->teach.'</p>';
}
// MY PRODUCTIONS
self::display_productions($user_object->user_id);
if ($user_object->openarea) {
$html .= Display::page_subheader(get_lang('MyPersonalOpenArea'));
$html .= '<p>'.$user_object->openarea.'</p>';
}
} else {
$html .= '<div class="actions-title">';
$html .= get_lang('UsersOnLineList');
@ -2512,23 +2517,18 @@ class SocialManager extends UserManager
$more_info .= '<div class="social-profile-extended">'.$user_info['competences'].'</div>';
$more_info .= '<br />';
}
// MY DIPLOMAS
if (!empty($user_info['diplomas'])) {
$more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div>';
$more_info .= '<div class="social-profile-extended">'.$user_info['diplomas'].'</div>';
$more_info .= '<br />';
}
// MY PRODUCTIONS
$product_content = '';
if (!empty($production_list)) {
$more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyProductions').'</strong></div>';
$more_info .= '<div class="social-profile-extended">'.$production_list.'</div>';
$more_info .= '<br />';
}else{
$more_info = "Nada aqui";
}
// WHAT I AM ABLE TO TEACH
if (!empty($user_info['teach'])) {
$more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyTeach').'</strong></div>';

Write Preview
Loading…
Cancel
Save