Browse Source

[svn r19975] css cleanup

Patrick Cool 16 years ago
parent
commit
dc47ff80f7

+ 2 - 2
main/messages/inbox.php

@@ -155,8 +155,8 @@ if ($request===false) {
 	$link_ref="../messages/new_message.php?rs=1";
 }
 $table_message = Database::get_main_table(TABLE_MESSAGE);
-echo '<div id="div_content_messages">';
-api_display_tool_title(mb_convert_encoding(get_lang('Inbox'),'UTF-8',$charset));
+echo '<div id="div_content_messages">&nbsp;&nbsp;';
+//api_display_tool_title(mb_convert_encoding(get_lang('Inbox'),'UTF-8',$charset));
 echo '<div class=actions>';
 echo '<a onclick="compose_and_show_message(\'show\',\'1\')" href="javascript:void(0)">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>';
 echo '</div>';

+ 3 - 2
main/messages/new_message.php

@@ -1,4 +1,4 @@
-<?php // $Id: new_message.php 19860 2009-04-19 16:39:28Z iflorespaz $
+<?php // $Id: new_message.php 19975 2009-04-22 14:23:01Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -217,7 +217,8 @@ if (isset($_GET['rs'])) {
 if ($request===false) {
 	Display::display_header('');	
 }
-api_display_tool_title($nameTools);
+
+//api_display_tool_title($nameTools);
 echo '<div class=actions>';
 echo '<a onclick="close_div_show(\'div_content_messages\')" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',get_lang('BackToInbox')).get_lang('BackToInbox').'</a>';
 echo '</div>';

+ 2 - 6
main/messages/outbox.php

@@ -112,12 +112,8 @@ if( trim($info_delete_outbox[0])=='delete' ) {
 }
 /**************************************************************/
 $table_message = Database::get_main_table(TABLE_MESSAGE);
-echo '<div id="div_content_messages_sent">';
-api_display_tool_title(mb_convert_encoding(get_lang('Outbox'),'UTF-8',$charset));
-echo '<div class=actions>';
-$language_variable=($request===true) ? mb_convert_encoding(get_lang('MessageOutboxComment'),'UTF-8',$charset) : get_lang('MessageOutboxComment');
-echo $language_variable;	
-echo '</div>';
+echo '<div id="div_content_messages_sent">&nbsp;&nbsp;';
+//api_display_tool_title(mb_convert_encoding(get_lang('Outbox'),'UTF-8',$charset));
 echo '</div>';
 $user_sender_id=api_get_user_id();
 if ($_REQUEST['action']=='delete') {

+ 2 - 2
main/messages/view_message.php

@@ -1,4 +1,4 @@
-<?php // $Id: view_message.php 18784 2009-03-03 21:02:25Z iflorespaz $
+<?php // $Id: view_message.php 19975 2009-04-22 14:23:01Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -80,7 +80,7 @@ $request=api_is_xml_http_request();
 if ($request===false) {
 	Display::display_header('');
 }
-api_display_tool_title(mb_convert_encoding(get_lang('ReadMessage'),'UTF-8',$charset));
+//api_display_tool_title(mb_convert_encoding(get_lang('ReadMessage'),'UTF-8',$charset));
 if (isset($_GET['id_send'])) {
 	MessageManager::show_message_box_sent();
 } else {

+ 4 - 8
main/social/contacts.inc.php

@@ -12,12 +12,8 @@ $_SESSION['this_section']=$this_section;
 //$list_path_friends=array();
 $request=api_is_xml_http_request();
 $language_variable=($request===true) ? mb_convert_encoding(get_lang('Contacts'),'UTF-8',$charset) : get_lang('Contacts');
-api_display_tool_title($language_variable);
-?>
-<div id="id" class="actions">
-<?php echo utf8_encode(get_lang('SocialInformationComment')); ?>
-</div>
-<?php
+//api_display_tool_title($language_variable);
+
 $user_id=api_get_user_id();
 $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,true);
 ?>
@@ -25,7 +21,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-content-table">
   <tr>
     <td width="100%" height="20" valign="top">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-title">
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
       <tr>
         <td width="100%" height="20" valign="top"><?php
         echo '&nbsp;&nbsp;Dokeos&nbsp;&nbsp;-&nbsp;&nbsp;';
@@ -52,7 +48,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
         <td width="100%" height="22" valign="top">
         <table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-align-box">
           <tr>
-            <td width="100%" height="22" valign="top" class="social-title">&nbsp;&nbsp;<?php echo utf8_encode(get_lang('ContactsList')); ?></td>
+            <td width="100%" height="22" valign="top">&nbsp;&nbsp;<?php echo utf8_encode(get_lang('ContactsList')); ?></td>
               </tr>
         </table></td>
         </tr>

+ 2 - 2
main/social/data_personal.inc.php

@@ -109,9 +109,9 @@ if (isset($_POST['load_ajax'])) {
 	// normal behavior
 $request=api_is_xml_http_request();
 $language_variable=($request===true) ? mb_convert_encoding(get_lang('PersonalData'),'UTF-8',$charset) : get_lang('PersonalData');
-api_display_tool_title($language_variable);
+//api_display_tool_title($language_variable);
 
-	echo '<div id="actions" class="actions">';
+	echo '<div class="actions">';
 	echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif',mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset)).'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>&nbsp;&nbsp;';
 	if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true' && api_get_user_id()<>2 && api_get_user_id()<>0) {
 		echo '<a href="../social/profile.php?shared=true">'.Display::return_icon('shared_profile.png',mb_convert_encoding(get_lang('ViewSharedProfile'),'UTF-8',$charset)).'&nbsp;'.mb_convert_encoding(get_lang('ViewSharedProfile'),'UTF-8',$charset).'</a>';		

+ 28 - 43
main/social/group_contact.inc.php

@@ -13,40 +13,35 @@ $list_path_friends=array();
 $list_groups=array();
 $request=api_is_xml_http_request();
 $language_variable=($request===true) ? mb_convert_encoding(get_lang('ContactsGroups'),'UTF-8',$charset) : get_lang('ContactsGroups');
-api_display_tool_title($language_variable);
-?>
-<div id="id" class="actions">
-<?php echo '&nbsp;&nbsp;'.utf8_encode(get_lang('ContactsGroupsComment')); ?>
-</div>
-<?php
+//api_display_tool_title($language_variable);
 $user_id=api_get_user_id();
 $list_groups=UserFriend::show_list_type_friends();
 
 for ($p=0;$p<count($list_groups);$p++) {
 	$list_path_friends=UserFriend::get_list_path_web_by_user_id ($user_id,$list_groups[$p]['id']);
 ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-align-box">
-  <tr>
-    <td id="<?php echo 'td_'.$list_groups[$p]['id']; ?>" width="100%" height="20" valign="top" onclick="toogle_function(this)">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="data_table">
 
-        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-title">
           <tr>
-            <td width="100%" height="22" valign="top" style="cursor:pointer">&nbsp;&nbsp;<?php echo get_lang($list_groups[$p]['title']); ?>
-            <img id="<?php echo 'btn_'.$list_groups[$p]['id']; ?>" style="float:right;margin-top:-15px" src="../img/visible.gif" /><input type="hidden" class="hidden" id="id_hd_dame" name="hd_dame" value="0" /></td>
-              </tr>
-        </table></td>
+		<th align="left" id="<?php echo 'td_'.$list_groups[$p]['id']; ?>" style="cursor:pointer" valign="top" onclick="toogle_function(this)">
+			<?php echo get_lang($list_groups[$p]['title']); ?>
+		</th>
+	    <th width="30" align="center">
+    		<?php Display::display_icon('visible.gif',get_lang('ChangeVisibility'), array('id'=>'btn_'.$list_groups[$p]['id'])); ?>
+    		<input type="hidden" class="hidden" id="id_hd_dame" name="hd_dame" value="0" />
+	    </th>
         </tr>
       <tr>
-	<td valign="top">
-<div align="center" id="<?php echo 'div_group_'.$list_groups[$p]['id']; ?>" >
-<?php
-$friend_html='';
-$number_of_images=10;
-$number_friends=0;
-$list_friends_id=array();
-$list_friends_dir=array();
-$list_friends_file=array();
-if (count($list_path_friends)!=0) { 
+	<td colspan="2">
+		<div align="center" id="<?php echo 'div_group_'.$list_groups[$p]['id']; ?>" >
+		<?php
+		$friend_html='';
+		$number_of_images=10;
+		$number_friends=0;
+		$list_friends_id=array();
+		$list_friends_dir=array();
+		$list_friends_file=array();
+		if (count($list_path_friends)!=0) { 
 	for ($z=0;$z<count($list_path_friends['id_friend']);$z++) {
 		$list_friends_id[]  = $list_path_friends['id_friend'][$z]['friend_user_id'];
 		$list_friends_dir[] = $list_path_friends['path_friend'][$z]['dir'];
@@ -56,9 +51,7 @@ if (count($list_path_friends)!=0) {
 	$number_loop   = ($number_friends/$number_of_images);
 	$loop_friends  = ceil($number_loop);
 	$j=0;//<div id="div_groupid_"'.$list_groups[$p]['id'].'">
-	$friend_html.= '<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#FFFFFC" style="border-left:1px #B8C8DC solid;border-bottom:1px #B8C8DC solid;border-right:1px #B8C8DC solid;">';		
 	for ($k=0;$k<$loop_friends;$k++) {
-		$friend_html.='<tr><td valign="top">';
 		if ($j==$number_of_images) {
 			$number_of_images=$number_of_images*2;
 		}
@@ -76,25 +69,17 @@ if (count($list_path_friends)!=0) {
 			}
 			$j++;
 		}
-		$friend_html.='</td></tr>';
 	}
-	$friend_html.='<br/></table>&nbsp;';
 	echo $friend_html; 
-}  else {
-	$friend_html.= '<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#FFFFFC" style="border-left:1px #B8C8DC solid;border-bottom:1px #B8C8DC solid;border-right:1px #B8C8DC solid;text-align:left">';		
-	$friend_html.='<tr><td valign="top">&nbsp;&nbsp;&nbsp;'.utf8_encode(get_lang('YouDontHaveContactsInThisGroup'));
-	$friend_html.='<br/><br/></td></tr>';
-	$friend_html.='</table>&nbsp;';//</div>
-	echo $friend_html;
-	echo '</br>';
-}
-?>
-        </td><br/>
-        </tr>
-    </table></td>
+		}  
+		else {
+			echo utf8_encode(get_lang('YouDontHaveContactsInThisGroup'));
+		}
+		?>
+		</div>
+	</td>
   </tr>
-</table><br/>
+</table>
 <?php
 }
-?>
-</div>
+?>

+ 13 - 13
main/social/profile.php

@@ -413,7 +413,7 @@ echo $s="<script>$(document).ready( function(){
 		});</script>";
 			
 //echo '<div id="actions">';
-	//echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>';
+//echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>';
 //echo '</div>';
 
 //Setting some course info 
@@ -463,7 +463,7 @@ echo '<div id="social-profile-wrapper">';
 				$number_loop   = ($number_friends/$number_of_images);
 				$loop_friends  = ceil($number_loop);
 				$j=0;
-				$friend_html .= '<div class="actions-profile">'.get_lang('SocialFriend').'</div>';	
+				$friend_html .= '<div class="sectiontitle">'.get_lang('SocialFriend').'</div>';	
 				$friend_html.= '<div id="friend-container">';							
 					$friend_html.= '<div id="friend-header">';
 							//$friend_html.=  $friends_count.' '.get_lang('Friends');
@@ -501,7 +501,7 @@ echo '<div id="social-profile-wrapper">';
 				}
 				//$friend_html.='</div>'; // close the div friend-container
 			} else {
-					$friend_html .= '<div class="actions-profile">'.get_lang('Friends').'</div>';
+					$friend_html .= '<div class="sectiontitle">'.get_lang('Friends').'</div>';
 					$friend_html.= '<div id="friend-container">';					
 					$friend_html.= '<div id="friend-header">';
 					$friend_html.= '<div style="float:left;">'.get_lang('Friends').'</div>';
@@ -521,7 +521,7 @@ echo '<div id="social-profile-wrapper">';
 			echo '<div class="clear"></div><br />';
 			echo '<div id="social-profile-invitations" >';
 			if ($count_pending_invitations > 0) {
-				echo '<div class="actions-profile">';
+				echo '<div class="sectiontitle">';
 				echo get_lang('PendingInvitations');
 				echo '</div>';
 				for ($i=0;$i<$count_pending_invitations;$i++) {
@@ -547,7 +547,7 @@ echo '<div id="social-profile-wrapper">';
 			$production_list =  UserManager::build_production_list($user_id);
 			if (!empty($production_list )) {
 				echo '<div class="clear"></div><br />';
-				echo '<div class="actions-profile">';
+				echo '<div class="sectiontitle">';
 				echo get_lang('MyProductions');
 				echo '</div>';
 				echo '<div class="rounded1">';
@@ -563,7 +563,7 @@ echo '<div id="social-profile-wrapper">';
 			
 			if (!empty($file_list)) {
 				echo '<div class="clear"></div><br />';
-				echo '<div class="actions-profile">';
+				echo '<div class="sectiontitle">';
 				echo get_lang('ImagesUploaded');
 				echo '</div>';
 				echo '</br><div class="rounded2">';
@@ -577,7 +577,7 @@ echo '<div id="social-profile-wrapper">';
 			//-- Competences
 			if (!empty($user_info['competences']) || !empty($user_info['diplomas']) || !empty($user_info['openarea']) || !empty($user_info['teach']) ) {
 				echo '<div class="clear"></div>';
-				echo '<div class="actions-profile">';				
+				echo '<div class="sectiontitle">';				
 				echo get_lang('MoreInformation');
 				echo '</div>';
 			}
@@ -645,7 +645,7 @@ echo '<div id="social-profile-container">';
 				//-- Extra Data							
 				$extra_user_data = UserManager::get_extra_user_data($user_id);
 				if (is_array($extra_user_data) && count($extra_user_data)>0 ) {
-					echo '<div class="actions-profile">';
+					echo '<div class="sectiontitle">';
 					echo get_lang('ExtraInformation');
 					echo '</div>';
 					echo '<div class="rounded left-side">';
@@ -659,7 +659,7 @@ echo '<div id="social-profile-container">';
 				// ---- My Agenda Items
 				$my_agenda_items = show_simple_personal_agenda($user_id);
 				if (!empty($my_agenda_items)) {
-					echo '<div class="actions-profile">';					
+					echo '<div class="sectiontitle">';					
 					echo get_lang('MyAgenda');
 					echo '</div>';
 					$tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
@@ -675,7 +675,7 @@ echo '<div id="social-profile-container">';
 		    	foreach ($course_list_code as $course) {
 	    			$content = get_all_annoucement_by_user_course($course['dbName'],$my_announcement_by_user_id);	 			
 	    	  		if (!empty($content)) {	 		    	  			  
-		    	  		$announcement_content.= '<h3>'.$course['title'].'</h3>';
+		    	  		$announcement_content.= $course['title'];
 						$announcement_content.= '<div class="rounded left-side">';							
 						$announcement_content.= $content;	
 						$announcement_content.= '</div>';
@@ -684,7 +684,7 @@ echo '<div id="social-profile-container">';
 	    	  	}
 	    	  	
 	    	  	if(!empty($announcement_content)) {
-	    	  		echo '<div class="actions-profile">';
+	    	  		echo '<div class="sectiontitle">';
 	    	  		echo get_lang('Announcements');
 	    	  		echo '</div>';
 	    	  		echo $announcement_content;
@@ -695,7 +695,7 @@ echo '<div id="social-profile-container">';
   	// CENTER COLUMN
 	echo '<div id="social-profile-content">';
 		    //--- Basic Information	
-		    echo '<div class="actions-profile">';		
+		    echo '<div class="sectiontitle">';		
 			echo get_lang('Information');  //class="social-profile-info"
 			echo '</div>';
 			if ($show_full_profile) {		 
@@ -731,7 +731,7 @@ echo '<div id="social-profile-container">';
 				//print_r($personal_course_list);		
 				//echo '<pre>';
 				if ( is_array($list) ) {
-					echo '<div class="actions-profile">';
+					echo '<div class="sectiontitle">';
 					echo ucfirst(get_lang('MyCourses'));
 					echo '</div>';
 					//Courses whithout sessions

+ 0 - 3
main/social/qualify_contact.inc.php

@@ -42,9 +42,6 @@ $user_friend_relation=UserFriend::get_relation_between_contacts(api_get_user_id(
 <input type="hidden"  name="user_cod_qualify" id="user_cod_qualify" value="<?php echo $user_friend; ?>"/>
 <table width="600" border="0" cellspacing="0" cellpadding="0">
 <tr>
-<td class="actions"><?php echo mb_convert_encoding(get_lang('ChangeContactGroup'),'UTF-8',$charset);?></td>
-</tr>
-<tr>
 <td>
 <table width="600" border="0" cellspacing="0" cellpadding="0">
 	<tr>

+ 1 - 6
main/social/select_friend_response.php

@@ -10,13 +10,8 @@ api_block_anonymous_users();
 $request=api_is_xml_http_request();
 $language_variable=($request===true) ? mb_convert_encoding(get_lang('PendingInvitations'),'UTF-8',$charset) : get_lang('PendingInvitations');
 $language_comment=($request===true) ? mb_convert_encoding(get_lang('SocialInvitesComment'),'UTF-8',$charset) : get_lang('SocialInvitesComment');
-api_display_tool_title($language_variable);
+//api_display_tool_title($language_variable);
 ?>
-<div class="actions">
-<?php
-echo $language_comment;	
- ?>
-</div>
 <div id="id_response" align="center"></div>
 <?php
 $list_get_invitation=array();