Browse Source

Minor corrections in popups

Julio Montoya 14 years ago
parent
commit
95c4d4b3ae
2 changed files with 27 additions and 28 deletions
  1. 3 4
      main/inc/lib/social.lib.php
  2. 24 24
      main/messages/send_message_to_userfriend.inc.php

+ 3 - 4
main/inc/lib/social.lib.php

@@ -588,8 +588,7 @@ class SocialManager extends UserManager {
 			//--- Group image
 			$group_info = GroupPortalManager::get_group_data($group_id);
 			$big		= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_BIG);
-			$original	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_ORIGINAL);
-            
+			$original	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_ORIGINAL);            
 	
 			echo '<div class="social-content-image">';                
 				echo '<div class="social-background-content" onmouseout="hide_icon_edit()" onmouseover="show_icon_edit()"><center>';				
@@ -703,7 +702,7 @@ class SocialManager extends UserManager {
     	  	$html_actions = '';
 
 	  		if ($user_id != api_get_user_id()) {
-	  			echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=550&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
+	  			echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=470&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
 	  			echo  Display::return_icon('compose_message.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';
 	  		}
 
@@ -714,7 +713,7 @@ class SocialManager extends UserManager {
 	  			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
 	  		} else {
 	  			if (!$show_full_profile) {
-	  				echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=550&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
+	  				echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=230&width=500&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
 	  			}
 	  		}
 	  		echo '</ul></div>';

+ 24 - 24
main/messages/send_message_to_userfriend.inc.php

@@ -29,31 +29,31 @@ if (isset($_REQUEST['user_friend']) ) {
 <div id="id_content_panel_init">
     <dl>
 <?php
-		if (api_get_setting('allow_message_tool')=='true') {
-			if ($panel == 1) {
-                //normal message
-		   		 $user_info=api_get_user_info($userfriend_id); ?>
-		   		 <div id="display_response_id" style="height:200px;">
-			  		 <?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>			  		 
-			  		 <br />
-			 		 <br /><span style="color:red">*</span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
-			 		 <input id="txt_subject_id" type="text" style="width:400px;"><br/>
-			   		 <br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />
-			   		 <textarea id="txt_area_invite" rows="3" cols="60"></textarea>		   		 			   		 
-			   		 <br />
-			   		 <br />
-			   		 <button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>" onclick="action_database_panel('5','<?php echo $userfriend_id;?>')"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>			   		 
-		   		 </div>
+if (api_get_setting('allow_message_tool')=='true') {
+	if ($panel == 1) {
+        //normal message
+   		 $user_info=api_get_user_info($userfriend_id); ?>
+   		 <div id="display_response_id" style="height:200px;width=400px">
+	  		 <?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>			  		 
+	  		 <br />
+	 		 <br /><span style="color:red">*</span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
+	 		 <input id="txt_subject_id" type="text" style="width:400px;"><br/>
+	   		 <br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />
+	   		 <textarea id="txt_area_invite" rows="5" cols="55"></textarea>		   		 			   		 
+	   		 <br />
+	   		 <br />
+	   		 <button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>" onclick="action_database_panel('5','<?php echo $userfriend_id;?>')"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>			   		 
+   		 </div>
 <?php
-			} else {
-                // friend invitation message
-                ?>
-                <div id="display_response_id" style="height:200px;">
-					<?php echo api_xml_http_response_encode(get_lang('AddPersonalMessage'));  ?> :<br /><br />				
-					<textarea id="txt_area_invite" rows="5" cols="60"></textarea><br /><br />
- 					<button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SocialAddToFriends')); ?>" onclick="action_database_panel('4','<?php echo $userfriend_id;?>')" >
- 					<?php echo api_xml_http_response_encode(get_lang('SendInvitation')) ?></button>
- 				</div>
+	} else {
+        // friend invitation message
+        ?>
+        <div id="display_response_id" style="height:200px;">
+			<?php echo api_xml_http_response_encode(get_lang('AddPersonalMessage'));  ?> :<br /><br />				
+			<textarea id="txt_area_invite" rows="5" cols="55"></textarea><br /><br />
+			<button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SocialAddToFriends')); ?>" onclick="action_database_panel('4','<?php echo $userfriend_id;?>')" >
+			<?php echo api_xml_http_response_encode(get_lang('SendInvitation')) ?></button>
+		</div>
 <?php			}
 			} ?>
     </dl>