Minor style fixes

main/css/base.css

@@ -3670,3 +3670,14 @@ form div.error input, form div.error textarea {
     height:15px;
 }
 
+
+.tag {
+    background-color: #D3E6EF;
+    border-radius: 3px 3px 3px 3px;
+    display: inline-block;
+    float: left;
+    font-size: 12px;
+    font-weight: 700;
+    margin: 0 10px 5px 0;
+    padding: 0.4em 0.6em;
+}

main/messages/send_message_to_userfriend.inc.php

@@ -27,23 +27,47 @@ 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;width:400px">
-	  		 <?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>			  		 
+            <div class="row">
-	  		 <br />
+                <div class="label">
-	 		 <br /><span style="color:red"> * </span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
+                    <?php echo api_xml_http_response_encode(get_lang('To')); ?>: 
-	 		 <input id="txt_subject_id" type="text" style="width:400px;"><br/>
+                </div>
-	   		 <br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />
+                <div class="formw">
+                    <div class="tag">
+                        <?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>			  		 
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="label">
+                   <span style="color:red"> * </span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :
+                </div>
+                <div class="formw">
+        	 		 <input id="txt_subject_id" type="text" style="width:400px;">
+                </div>                
+            </div>
+            <div class="row">
+                <div class="label">
+        	   		 <?php echo api_xml_http_response_encode(get_lang('Message')); ?> :
+                </div>
+                <div class="formw">
         	   		 <textarea id="txt_area_invite" rows="5" cols="55"></textarea>		   		 			   		 
-	   		 <br />
+                </div>                
-	   		 <br />
+            </div>
+           <div class="row">
+                <div class="label">        	   		
+                </div>
+                <div class="formw">
                 <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>                
+            </div>
+</div>
 <?php
 	} else {
         // friend invitation message
@@ -56,5 +80,4 @@ if (api_get_setting('allow_message_tool')=='true') {
 		</div>
 <?php			}
 			} ?>
-    </dl>
 </div>

main/session/index.php

@@ -25,8 +25,6 @@ api_block_anonymous_users(); // Only users who are logged in can proceed.
 $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = api_get_jquery_ui_js(true);
 
-Display::display_header(get_lang('Session'));
-
 if (empty($_GET['session_id'])) {
 	api_not_allowed();
 }
@@ -40,34 +38,6 @@ $session_info   = SessionManager::fetch($session_id);
 $session_list   = SessionManager::get_sessions_by_coach(api_get_user_id());
 $course_list    = SessionManager::get_course_list_by_session_id($session_id);
 
-$session_select = array();
-foreach ($session_list as $item) {
-    $session_select[$item['id']] =  $item['name'];
-}
-
-// Session list form
-
-if (count($session_select) > 1) {
-    $form = new FormValidator('exercise_admin', 'get', api_get_self().'?session_id='.$session_id);
-    $form->addElement('select', 'session_id', get_lang('SessionList'), $session_select, 'onchange="javascript:change_session()"');
-    $defaults['session_id'] = $session_id;
-    $form->setDefaults($defaults);
-    $form->display();
-}
-
-//Listing LPs from all courses
-/*
-$lps = array();
-if (!empty($course_list)) {
-    foreach ($course_list as $item) {    
-        $list       = new LearnpathList(api_get_user_id(),$item['code']);
-        $flat_list  = $list->get_flat_list();        
-        $lps[$item['code']] = $flat_list;
-        foreach ($flat_list as $item) {        
-            //var_dump(get_week_from_day($item['publicated_on']));	
-        }    
-    }
-}*/
 
 //Getting all sessions where I'm subscribed
 $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
@@ -116,6 +86,7 @@ if (!empty($new_session_list)) {
 		$my_session_list[] =  $my_session_id;
 	}
 }
+
 //echo '<pre>';print_r($final_array);
 //If the requested session does not exist in my list we stop the script
 if (!api_is_platform_admin()) {
@@ -123,11 +94,46 @@ if (!api_is_platform_admin()) {
 		api_not_allowed();
 	}
 }
+
 //If session is not active we stop de script
 if (!api_is_allowed_to_session_edit()) {
 	api_not_allowed();
 }
 		
+Display::display_header(get_lang('Session'));
+
+
+$session_select = array();
+foreach ($session_list as $item) {
+    $session_select[$item['id']] =  $item['name'];
+}
+
+// Session list form
+
+if (count($session_select) > 1) {
+    $form = new FormValidator('exercise_admin', 'get', api_get_self().'?session_id='.$session_id);
+    $form->addElement('select', 'session_id', get_lang('SessionList'), $session_select, 'onchange="javascript:change_session()"');
+    $defaults['session_id'] = $session_id;
+    $form->setDefaults($defaults);
+    $form->display();
+}
+
+//Listing LPs from all courses
+/*
+$lps = array();
+if (!empty($course_list)) {
+    foreach ($course_list as $item) {    
+        $list       = new LearnpathList(api_get_user_id(),$item['code']);
+        $flat_list  = $list->get_flat_list();        
+        $lps[$item['code']] = $flat_list;
+        foreach ($flat_list as $item) {        
+            //var_dump(get_week_from_day($item['publicated_on']));	
+        }    
+    }
+}*/
+
+
+
 //Final data to be show
 $my_real_array = $new_exercises = array();
 $now = time();
@@ -219,7 +225,7 @@ if (!empty($new_exercises)) {
 }
 $back_url = '';
 if (!empty($course_id)) {
-    $back_url = Display::url(Display::return_icon('back.png',get_lang('back.png')), api_get_path(WEB_CODE_PATH).'session/?session_id='.$session_id);
+    //$back_url = Display::url(Display::return_icon('back.png',get_lang('back.png')), api_get_path(WEB_CODE_PATH).'session/?session_id='.$session_id);
 }
 
 $start = $end = $start_only = $end_only ='';

main/social/group_invitation.php

@@ -319,7 +319,7 @@ if ($add_type == 'multiple') {
 		echo '</div>';
 
 	echo '<div id="social-content-right">';	
-    echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h1>';
+    echo '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>';
     
 	if (count($nosessionUsersList) == 0) {
 			$friends = SocialManager::get_friends(api_get_user_id());