Juan Carlos Raña 15 years ago
parent
commit
4b250c078c

+ 89 - 3
main/css/blue_lagoon/default.css

@@ -2839,9 +2839,65 @@ a.unread {
 	width:300px;
 }
 .groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
-.groups_grid_element_1 { width:100px; float:left; text-align:left;margin-bottom:5px;}
+.groups_grid_element_1 { width:100px; float:left; text-align:left;	margin-bottom:5px;}
 .groups_grid_element_2 { width:150px; float:left;}
 
+/*POPULAR GROUP*/
+.popular_grid_container { width:100%;}
+.popular_grid_item {
+	border:1px dotted #CCCCCC;
+	float:left;
+	height:90px;
+	margin:5px;
+	padding:5px;
+	width:500px;
+}
+.popular_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.popular_grid_element_1 { width:350px; float:left; text-align:left;	margin-bottom:1px; padding:1px;}
+.popular_grid_element_2 { width:200px; float:left;}
+.popular_grid_element_3 { width:200px; float:left; text-align:justify;}
+
+/*NEWEST GROUP*/
+.newest_grid_container { width:100%;}
+.newest_grid_item {
+	border:1px dotted #CCCCCC;
+	float:left;
+	height:90px;
+	margin:5px;
+	padding:5px;
+	width:500px;
+}
+.newest_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.newest_grid_element_1 { width:350px; float:left; text-align:left;	margin-bottom:1px; padding:1px;}
+.newest_grid_element_2 { width:400px; float:left; text-align:justify;}
+
+/*MY GROUPS*/
+.mygroups_grid_container { width:100%;}
+.mygroups_grid_item {
+	border:1px dotted #CCCCCC;
+	float:left;
+	height:90px;
+	margin:5px;
+	padding:5px;
+	width:500px;
+}
+.mygroups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.mygroups_grid_element_1 { width:350px; float:left; text-align:left;	margin-bottom:1px; padding:1px;}
+.mygroups_grid_element_2 { width:400px; float:left; text-align:justify;}
+
+/*PROFILE*/
+.profile_grid_container { width:100%;}
+.profile_grid_item {
+	border:1px dotted #CCCCCC;
+	float:left;
+	height:90px;
+	margin:5px;
+	padding:5px;
+	width:270px;
+}
+.profile_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.profile_grid_element_1 { width:170px; float:left; text-align:left;	margin-bottom:1px; }
+
 
 /* Groups boxes */
 .group_invitation_grid_container { width:100%;}
@@ -2858,8 +2914,19 @@ a.unread {
 .group_invitation_grid_element_2 { width:150px; float:left;}
 
 
-
-
+/*INVITATION IN PROFILE*/
+.invitation_profile_grid_container { width:100%;}
+.invitation_profile_grid_item {
+	border:1px dotted #CCCCCC;
+	float:left;
+	height:90px;
+	margin:5px;
+	padding:5px;
+	width:100px;
+}
+.invitation_profile_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.invitation_profile_grid_element_2 { width:100px; float:left; text-align:center;}
+.invitation_profile_grid_element_3 { width:100px; float:left; text-align:center;}
 
 /* User boxes */
 .search_users_grid_container { width:100%;}
@@ -2872,6 +2939,25 @@ a.unread {
 .search_users_grid_title 	{ width:30%; float:left;}
 .search_users_grid_nav 		{ float:right;}
 
+
+/*WAITING USER*/
+.waiting_user_grid_container { width:100%;}
+.waiting_user_grid_item { width:500px;  height: 120px;  border:1px dotted #ccc; float:left; padding:5px; margin:5px;}
+.waiting_user_grid_element_0 { width:100px; height: 90px; float:left; text-align:center; margin-bottom:5px; padding-top:15px;}
+.waiting_user_grid_element_1 { width:400px; float:left; text-align:left; margin-bottom:5px}
+.waiting_user_grid_element_2 { width:400px; float:left; text-align:justify;margin-bottom:5px}
+.waiting_user_grid_element_5 { width:100%;  text-align:left;}
+.waiting_user_grid_element_6 { width:100%;  text-align:left;}
+
+/*LIST MEMBERS*/
+.list_members_grid_container { width:100%;}
+.list_members_grid_item { width:100px;  height: 125px;  border:1px dotted #ccc; float:left; padding:5px; margin:8px;}
+.list_members_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.list_members_grid_element_2 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.list_members_grid_element_3 { width:100px; float:left; text-align:center; margin-bottom:5px;}
+.list_members_grid_element_5 { width:100%;  text-align:center;}
+
+
 #menu {
 	-moz-border-radius: 10px; border: 1px solid #e1e1e0;
 	-webkit-border-radius: 10px; border: 1px solid #e1e1e0;

+ 2 - 1
main/exercice/exercise.lib.php

@@ -350,7 +350,8 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 		$answer_list = '<div style="padding: 10px; margin-left: 0px; border: 1px solid #A4A4A4; height: 408px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><dl>';
 		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
 		{
-			$answer_list .= '<dt>'.$answerId.'.- '.$objAnswerTmp->selectAnswer($answerId).'</dt><br>';
+			$answers = $objAnswerTmp->selectAnswerByAutoId($objAnswerTmp->selectAutoId($answerId));			
+			$answer_list .= '<dt>'.$answers['id'].'.- '.$objAnswerTmp->selectAnswer($answerId).'</dt><br>';
 		}
 		$answer_list .= '</dl></div>';
 

+ 1 - 1
main/messages/inbox.php

@@ -162,7 +162,7 @@ if ($_GET['f']=='social') {
 
 echo '<div id="inbox-wrapper">';
 		//LEFT CONTENT
-	echo '<div id="inbox-menu">';	
+	echo '<div id="inbox-menu" class="actions">';	
 		echo '<ul>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$social_parameter.'">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$social_parameter.'">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';

+ 1 - 1
main/messages/new_message.php

@@ -190,7 +190,7 @@ function manage_form ($default, $select_from_user_list = null) {
 				<input type="file" name="attach_1"  size="28" />
 				<input type="text" name="legend[]" size="28" />
 				</div></span></div></div>');
-		$form->addElement('html','<div class="row"><div class="formw"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a>&nbsp;('.get_lang('MaximunFileSizeXMB').')</div></div>');
+		$form->addElement('html','<div class="row"><div class="formw"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a>&nbsp;('.sprintf(get_lang('MaximunFileSizeXMB'),25).')</div></div>');
 	}
 		
 	$form->addElement('style_submit_button','compose',api_xml_http_response_encode(get_lang('SendMessage')),'class="save"');

+ 1 - 1
main/messages/outbox.php

@@ -116,7 +116,7 @@ $user_sender_id=api_get_user_id();
 
 echo '<div id="inbox-wrapper">';
 	//LEFT COLUMN
-	echo '<div id="inbox-menu">';	
+	echo '<div id="inbox-menu" class="actions">';	
 		echo '<ul>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$social_parameter.'">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$social_parameter.'">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';

+ 1 - 1
main/social/group_invitation.php

@@ -572,7 +572,7 @@ function makepost(select){
 $members = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION));
 if (is_array($members) && count($members)>0) {
 	echo get_lang('UsersAlreadyInvited');
-	Display::display_sortable_grid('group_invitation', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true));
+	Display::display_sortable_grid('invitation_profile', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true));
 }
 
 

+ 2 - 2
main/social/group_members.php

@@ -109,7 +109,7 @@ foreach($users as $user) {
 			break;
 			case  GROUP_USER_PERMISSION_READER:
 				if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
-				$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('del_user_big.gif', get_lang('DeleteFromGroup')).'</a><br />'.
+				$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('del_user_big.gif', get_lang('DeleteFromGroup')).'</a>'.
 								'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('admins.gif', get_lang('AddModerator')).'</a>';
 				}
 			break;		
@@ -128,7 +128,7 @@ foreach($users as $user) {
 }
 
 if (count($new_member_list) > 0) {			
-	Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));		
+	Display::display_sortable_grid('list_members', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));		
 }
 
 echo '</div>'; // end layout right

+ 6 - 6
main/social/groups.php

@@ -157,7 +157,7 @@ if ($group_id != 0 ) {
 			if ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
 				$result['name'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
 			}			
-			$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],70));
+			$groups[]= array($url_open.$result['picture_uri'].$url_close, cut($url_open.$result['name'],200,true).$url_close,cut($result['description'],180,true));
 		}
 	}
 	echo '<br/>';
@@ -174,7 +174,7 @@ if ($group_id != 0 ) {
 	echo '<h1>'.get_lang('MyGroups').'</h1>';
 	
 	if (count($groups) > 0) {		
-		Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+		Display::display_sortable_grid('mygroups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 	}
 	
 	
@@ -186,11 +186,11 @@ if ($group_id != 0 ) {
 		$id = $result['id'];
 		$url_open  = '<a href="groups.php?id='.$id.'">';
 		$url_close = '</a>';		
-		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],70));
+		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],220,true));
 	}
 	if (count($groups) > 0) {
 		echo '<h1>'.get_lang('Newest').'</h1>';	
-		Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
+		Display::display_sortable_grid('newest', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
 	}	
 	
 	// Pop groups -----
@@ -208,11 +208,11 @@ if ($group_id != 0 ) {
 			$result['count'] = $result['count'].' '.get_lang('Members');
 		}
 		
-		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],cut($result['description'],70));
+		$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],cut($result['description'],100,true));
 	}
 	if (count($groups) > 0) {
 		echo '<h1>'.get_lang('Popular').'</h1>';
-		Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+		Display::display_sortable_grid('popular', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 	}
 	
 	

+ 4 - 3
main/social/invitations.php

@@ -212,14 +212,15 @@ if (count($pending_invitations) > 0) {
 	
 	foreach ($pending_invitations as $invitation) {
 		$invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$invitation['picture_uri'].'</a>';		
-		$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.$invitation['name'].'</a>'; 
+		$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
 		$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.get_lang('AcceptInvitation').'</a>';
 		$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.get_lang('DenyInvitation').'</a>';
+		$invitation['description'] = cut($invitation['description'],220,true);
 		//$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
 		//$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';
 		$new_invitation[]=$invitation;
-	}	
-	Display::display_sortable_grid('search_users', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));
+	}
+	Display::display_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));
 }
 	
 Display::display_footer();

+ 2 - 2
main/social/profile.php

@@ -567,11 +567,11 @@ echo '<div id="social-profile-container">';
 						if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {			
 							$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
 						}
-						$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
+						$groups[]= array($url_open.$result['picture_uri'].$url_close, 												$url_open.$result['name'].$url_close);
 					}
 					if (count($groups)> 0) {
 						echo '<h2>'.get_lang('MyGroups').'</h2>';
-						Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+						Display::display_sortable_grid('profile', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 					}