Replacing wrong lang variables, minor UI improvements (description hide if does not exist)

skala
Julio Montoya 15 years ago
parent 28e0eb6394
commit a457f8f36a
  1. 2
      main/group/group_edit.php
  2. 6
      main/social/groups.php
  3. 6
      main/social/profile_friends_and_groups.inc.php
  4. 4
      main/social/search.php

@ -144,7 +144,7 @@ $form->addElement('hidden', 'referer');
$form->add_textfield('name', get_lang('GroupName'));
// Description
$form->addElement('textarea', 'description', get_lang('GroupDescription'), array ('cols' => 50, 'rows' => 6));
$form->addElement('textarea', 'description', get_lang('Description'), array ('cols' => 50, 'rows' => 6));
// Tutors: this has been replaced with the new tutors code
//$tutors = GroupManager :: get_all_tutors();

@ -348,7 +348,7 @@ if ($group_id != 0 ) {
$item_2 = '';
$item_3 = '';
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('GroupDescription').'</span></div>';
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
@ -382,7 +382,7 @@ if ($group_id != 0 ) {
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg','').'</div>';
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('GroupDescription').'</span></div>';
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
@ -418,7 +418,7 @@ if ($group_id != 0 ) {
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('GroupDescription').'</span></div>';
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';

@ -75,7 +75,11 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
}
$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);
$item_name = '<div class="box_shared_profile_group_title">'.$url_open.'<span class="social-groups-text1">'.api_xml_http_response_encode(api_strtoupper($name)).'</span>'. $icon.$url_close.'</div>';
$item_description = '<div class="box_shared_profile_group_description"><span class="social-groups-text2">'.api_xml_http_response_encode(get_lang('GroupDescription')).'</span><p class="social-groups-text4">'.cut(api_xml_http_response_encode($result['description']),120,true).'</p></div>';
$item_description = '';
if (!empty($result['description'])) {
$item_description = '<div class="box_shared_profile_group_description"><span class="social-groups-text2">'.api_xml_http_response_encode(get_lang('Description')).'</span><p class="social-groups-text4">'.cut(api_xml_http_response_encode($result['description']),120,true).'</p></div>';
}
$result['picture_uri'] = '<div class="box_shared_profile_group_image"><img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" /></div>';
$item_actions = '';
if (api_get_user_id() == $user_id) {

@ -110,7 +110,7 @@ echo '<div id="social-content">';
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('DescriptionGroup').'</span></div>';
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
@ -144,7 +144,7 @@ echo '<div id="social-content">';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$group['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($group['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('DescriptionGroup').'</span></div>';
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($group['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';

Loading…
Cancel
Save