Переглянути джерело

Replacing form_header to the legend tag

Julio Montoya 13 роки тому
батько
коміт
3b189e9ad2
46 змінених файлів з 285 додано та 773 видалено
  1. 1 11
      main/admin/add_courses_to_session.php
  2. 3 3
      main/admin/add_courses_to_usergroup.php
  3. 2 1
      main/admin/add_many_session_to_category.php
  4. 2 3
      main/admin/add_sessions_to_promotion.php
  5. 3 3
      main/admin/add_sessions_to_usergroup.php
  6. 1 3
      main/admin/add_users_to_group.php
  7. 1 3
      main/admin/add_users_to_session.php
  8. 3 4
      main/admin/add_users_to_usergroup.php
  9. 1 1
      main/admin/configure_homepage.php
  10. 4 4
      main/admin/course_edit.php
  11. 1 2
      main/admin/course_export.php
  12. 6 12
      main/admin/course_import.php
  13. 1 1
      main/admin/session_category_add.php
  14. 1 1
      main/admin/session_category_edit.php
  15. 1 1
      main/admin/session_course_user.php
  16. 0 3
      main/admin/session_import.php
  17. 1 1
      main/admin/settings.lib.php
  18. 3 15
      main/admin/settings.php
  19. 1 1
      main/admin/system_announcements.php
  20. 1 1
      main/announcements/announcements.php
  21. 4 2
      main/attendance/attendance_add.php
  22. 6 3
      main/attendance/attendance_edit.php
  23. 1 2
      main/calendar/agenda.inc.php
  24. 17 17
      main/course_info/infocours.php
  25. 3 7
      main/create_course/add_course.php
  26. 64 491
      main/css/base.css
  27. 3 17
      main/css/base_chamilo.css
  28. 6 3
      main/css/pre_base.css
  29. 1 1
      main/document/create_document.php
  30. 2 2
      main/document/document.inc.php
  31. 3 3
      main/document/document.php
  32. 3 3
      main/document/document_lite.php
  33. 1 3
      main/document/slideshowoptions.php
  34. 2 1
      main/dropbox/dropbox_functions.inc.php
  35. 9 9
      main/exercice/exercise.class.php
  36. 1 1
      main/exercice/hotpotatoes.php
  37. 8 8
      main/group/group_edit.php
  38. 9 9
      main/inc/lib/blog.lib.php
  39. 27 31
      main/inc/lib/fckeditor/editor/dialog/fck_template.html
  40. 11 12
      main/inc/lib/formvalidator/FormValidator.class.php
  41. 9 7
      main/link/link.php
  42. 52 61
      main/newscorm/learnpath.class.php
  43. 2 2
      main/survey/survey.lib.php
  44. 1 1
      main/wiki/wiki.inc.php
  45. 2 2
      main/work/work.lib.php
  46. 1 1
      main/work/work.php

+ 1 - 11
main/admin/add_courses_to_session.php

@@ -194,10 +194,6 @@ echo '<div class="actions">';
 echo $link_add_type_unique.$link_add_type_multiple;
 echo '</div>';
 
-echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info['name'].')</div></div><br />';
-
-
-
 /*$sql = 'SELECT COUNT(1) FROM '.$tbl_course;
 $rs = Database::query($sql);
 $count_courses = Database::result($rs, 0, 0);*/
@@ -270,16 +266,10 @@ if ($ajax_search) {
 		}
 	}
 }
-
 unset($Courses);
-
-
-
 ?>
-
-
-
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']) ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<legend><?php echo $tool_name.' ('.$session_info['name'].')'; ?></legend>
 <input type="hidden" name="formSent" value="1" />
 
 <?php

+ 3 - 3
main/admin/add_courses_to_usergroup.php

@@ -178,12 +178,12 @@ if ($add_type == 'multiple') {
 echo '<div class="actions">';
 echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';       
 echo '</div>';
-
-echo '<div class="row"><div class="form_header">'.$data['name'].': '.$tool_name.'</div></div><br/>'; ?>
+?>
 
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
 
-<?php
+<?php echo '<legend>'.$data['name'].': '.$tool_name.'</legend>'; 
+
 if ($add_type=='multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list)>0 ) {

+ 2 - 1
main/admin/add_many_session_to_category.php

@@ -125,7 +125,7 @@ if(isset($_GET['msg']) && $_GET['msg']=='ok'){
 
 // display the dokeos header
 Display::display_header($tool_name);
-echo '<div class="row"><div class="form_header">'.$tool_name.' </div></div><br />';
+
 
 $where ='';
 $rows_category_session = array();
@@ -149,6 +149,7 @@ $result=Database::query($sql);
 $rows_session = Database::store_result($result);
 ?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']); if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+    <?php echo '<legend>'.$tool_name.'</legend>'; ?>
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($errorMsg)) {

+ 2 - 3
main/admin/add_sessions_to_promotion.php

@@ -185,12 +185,11 @@ if ($add_type == 'multiple') {
 echo '<div class="actions">';
 echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';       
 echo '</div>';
-
-echo '<div class="row"><div class="form_header">'.$tool_name.' '.$promotion_data['name'].'</div></div><br/>'; ?>
+?>
 
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
 
-<?php
 if ($add_type=='multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list)>0 ) {

+ 3 - 3
main/admin/add_sessions_to_usergroup.php

@@ -181,11 +181,11 @@ echo '<div class="actions">';
 echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';       
 echo '</div>';
 
-echo '<div class="row"><div class="form_header">'.$data['name'].': '.$tool_name.'</div></div><br/>'; ?>
-
+?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-
 <?php
+echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
+
 if ($add_type=='multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list)>0 ) {

+ 1 - 3
main/admin/add_users_to_group.php

@@ -388,10 +388,8 @@ if ($add_type == 'multiple') {
 	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
 </div>
 
-<?php echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info['name'].')</div></div><br/>'; ?>
-
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $group_id; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-
+<?php echo '<legend>'.$tool_name.' ('.$session_info['name'].')</legend>'; ?>    
 <?php if ($add_type=='multiple') { ?>
 <select name="relation" id="relation" onchange="xajax_search_users(document.getElementById('firstLetterUser').value,'multiple',this.value)">
 <?php } else { ?>

+ 1 - 3
main/admin/add_users_to_session.php

@@ -453,10 +453,8 @@ if ($add_type == 'multiple') {
 <div class="actions">
 	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
 </div>
-<?php echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info['name'].')</div></div><br/>'; ?>
-
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']); ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-
+<?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
 if ($add_type=='multiple') {
 	if (is_array($extra_field_list)) {

+ 3 - 4
main/admin/add_users_to_usergroup.php

@@ -224,12 +224,11 @@ if ($add_type == 'multiple') {
 echo '<div class="actions">';
 echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';       
 echo '</div>';
-
-echo '<div class="row"><div class="form_header">'.$data['name'].': '.$tool_name.'</div></div><br/>'; ?>
-
+?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
-
 <?php
+echo '<legend>'.$data['name'].': '.$tool_name.'</legend>'; 
+
 if ($add_type=='multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list)>0 ) {

+ 1 - 1
main/admin/configure_homepage.php

@@ -625,7 +625,7 @@ switch ($action) {
 		// Display for edit_notice case
 		?>
 		<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
-		<div class="row"><div class="form_header"><?php echo $tool_name; ?></div></div>
+		<legend><?php echo $tool_name; ?></legend>
 		<input type="hidden" name="formSent" value="1"/>
 		<?php
 		if (!empty($errorMsg)) {

+ 4 - 4
main/admin/course_edit.php

@@ -112,11 +112,11 @@ $group[] = FormValidator::createElement('select', 'platform_teachers', '', $teac
 $group[] = FormValidator::createElement('select', 'course_teachers', '',   $course_teachers, ' id="course_teachers" multiple=multiple size="4" style="width:300px;"');
 
 $element_template = <<<EOT
-	<div class="row">
-		<div class="label">
+	<div class="control-group">
+		<label>
 			<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
-		</div>
-		<div class="formw">
+		</label>
+		<div class="controls">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->	<td>{element}</td>

+ 1 - 2
main/admin/course_export.php

@@ -80,8 +80,7 @@ if (!empty($msg)) {
 
 <form method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
     <input type="hidden" name="formSent" value="1">
-    <div class="row"><div class="form_header"><?php echo $tool_name; ?></div></div>
-    <br />
+    <legend><?php echo $tool_name; ?></legend>    
 <?php if (!empty($course_list)) { ?>
 <div>
 <input id="all-courses" class="checkbox" type="radio" value="1" name="select_type" <?php if(!$formSent || ($formSent && $select_type == 1)) echo 'checked="checked"'; ?> onclick="javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"/>

+ 6 - 12
main/admin/course_import.php

@@ -208,27 +208,21 @@ if (count($errors) != 0) {
 }
 ?>
 <form method="post" action="<?php echo api_get_self(); ?>" enctype="multipart/form-data" style="margin: 0px;">
-<div class="row"><div class="form_header"><?php echo $tool_name; ?></div></div>
-<div class="row">
-    <div class="label"><?php echo get_lang('ImportCSVFileLocation'); ?></div>
-    <div class="formw">
+<legend><?php echo $tool_name; ?></legend>
+<div class="control-group">
+    <label><?php echo get_lang('ImportCSVFileLocation'); ?></label>
+    <div class="control">
         <input type="file" name="import_file"/>
     </div>
 </div>
-<div class="row">
-    <div class="label"></div>
-    <div class="formw">
+<div class="control-group ">    
+    <div class="control">
         <button type="submit" class="save" value="<?php echo get_lang('Import'); ?>"><?php echo get_lang('Import'); ?></button>
     </div>
 </div>
-
-
 <input type="hidden" name="formSent" value="1"/>
-
 </form>
-
 <div style="clear: both;"></div>
-
 <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
 
 <blockquote>

+ 1 - 1
main/admin/session_category_add.php

@@ -60,7 +60,7 @@ if (!empty($return)) {
 ?>
 <form method="post" name="form" action="<?php echo api_get_self(); ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
-<div class="row"><div class="form_header"><?php echo $tool_name; ?></div></div>
+<legend><?php echo $tool_name; ?></legend>
 <table border="0" cellpadding="5" cellspacing="0" width="550">
 <tr>
   <td width="30%"><?php echo get_lang('SessionCategoryName') ?>&nbsp;&nbsp;</td>

+ 1 - 1
main/admin/session_category_edit.php

@@ -58,7 +58,7 @@ if (!empty($return)) {
 ?>
 <form method="post" name="form" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']) ?>&id=<?php echo $id; ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
-<div class="row"><div class="form_header"><?php echo $tool_name; ?></div></div>
+<legend><?php echo $tool_name;?> </legend>
 <table border="0" cellpadding="5" cellspacing="0" width="550">
 <tr>
   <td width="30%"><?php echo get_lang('SessionName') ?>&nbsp;&nbsp;</td>

+ 1 - 1
main/admin/session_course_user.php

@@ -121,7 +121,7 @@ if (!empty($_GET['msg'])) {
 // the form header
 $session_info = SessionManager::fetch($id_session);
 $user_info = api_get_user_info($id_user);
-echo '<div class="row"><div class="form_header">'.$tool_name.': '.$session_info['name'].' - '.$user_info['complete_name'].'</div></div><br />';
+echo '<legend>'.$tool_name.': '.$session_info['name'].' - '.$user_info['complete_name'].'</legend>';
 
 $nosessionCourses = $sessionCourses = array();
 // actual user

+ 0 - 3
main/admin/session_import.php

@@ -807,9 +807,6 @@ if (count($inserted_in_course) > 1) {
 echo '<div class="actions">';
 echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
-//echo '<div class=row><div class="form_header">';
-//echo $tool_name;
-//echo '</div></div>';
 ?>
 <table border="0" cellpadding="5" cellspacing="0">
 

+ 1 - 1
main/admin/settings.lib.php

@@ -542,7 +542,7 @@ function handle_search() {
             $element = & $form->createElement('radio', 'search_show_unlinked_results', '', get_lang($value['display_text']), $value['value']);
             $group[] = $element;
         }
-        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), '<div></div>', false);
+        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), '', false);
         $default_values['search_show_unlinked_results'] = api_get_setting('search_show_unlinked_results');
     
         // Search_prefilter_prefix.

+ 3 - 15
main/admin/settings.php

@@ -107,19 +107,7 @@ if (isset($_GET['action']) &&  $_GET['action'] == 'delete_grading') {
 // Build the form.
 if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', 'stylesheets', 'Search'))) {
     $form = new FormValidator('settings', 'post', 'settings.php?category='.$_GET['category']);
-    
-    $renderer = & $form->defaultRenderer();
-    $renderer->setElementTemplate('<div class="row">
-        <div class="label">{label}</div>
-        <div class="formw">{element}
-           <!-- BEGIN label_3 -->
-                {label_3}            
-            <!-- END label_3 -->            
-            <!-- BEGIN label_2 -->
-                <span class="help-block">{label_2}</span>
-            <!-- END label_2 -->
-            </div>
-        </div>');
+   
     
     /*$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>');
     $renderer->setElementTemplate('<div class="sectionvalue">{element}</div><div class="sectioncomment">{label}</div>'."\n");*/
@@ -287,7 +275,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
                         $group[] = $element;
                     }
                 }
-                $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), '<div></div>', false); //julio
+                $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), '', false); //julio
                 $default_values[$row['variable']] = $row['selected_value'];
                 break;
             case 'checkbox';
@@ -328,7 +316,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
                     }
                     $group[] = $element;
                 }
-                $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])),'<div></div>');
+                $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])),'');
                 break;
             case 'link':
                 $form->addElement('static', null, array(get_lang($row['title']), get_lang($row['comment'])), get_lang('CurrentValue').' : '.$row['selected_value'], $hideme);

+ 1 - 1
main/admin/system_announcements.php

@@ -157,7 +157,7 @@ if ($action_todo) {
     $group[]= $form->createElement('checkbox', 'visible_student', null, get_lang('Student'));
     $group[]= $form->createElement('checkbox', 'visible_guest', null, get_lang('Guest'));
     
-    $form->addGroup($group, null, get_lang('Visible'), '<div></div>');
+    $form->addGroup($group, null, get_lang('Visible'), '');
     
     $form->addElement('hidden', 'id');
 

+ 1 - 1
main/announcements/announcements.php

@@ -721,7 +721,7 @@ if ($display_form) {
 	} else {
 		$form_name = get_lang('ModifyAnnouncement');
 	}
-	echo '<div class="row"><div class="form_header">'.$form_name.'</div></div>';
+	echo '<legend>'.$form_name.'</legend>';
 
 	//this variable defines if the course administrator can send a message to a specific user / group or not
 	if (empty($_SESSION['toolgroup'])) {

+ 4 - 2
main/attendance/attendance_add.php

@@ -33,8 +33,10 @@ $form->applyFilter('title','html_filter');
 $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '150'));
 
 // Adavanced Parameters
-$form->addElement('html', '<div class="row"><div class="label"></div>');
-$form->addElement('html', '<div class="formw"><br /><a href="javascript://" class = "advanced_parameters" ><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a></div></div>');
+
+$advanced = '<a href="javascript://" class = "advanced_parameters" ><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a>';
+$form -> addElement('advanced_settings',$advanced);
+
 $form->addElement('html','<div id="id_qualify" style="display:none">');
 
 // Qualify Attendance for gradebook option

+ 6 - 3
main/attendance/attendance_edit.php

@@ -37,14 +37,17 @@ $form->applyFilter('title','html_filter');
 $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
 
 // Adavanced Parameters
-$form->addElement('html', '<div class="row"><div class="label"></div>');
+
 if (!empty($attendance_qualify_title) || !empty($attendance_weight)) {
-	$form->addElement('html', '<div class="formw"><br /><a href="javascript://" class="advanced_parameters"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a></div></div>');
+    $advanced = '<a href="javascript://" class="advanced_parameters"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a>';
+    $form -> addElement('advanced_settings',$advanced);    
+    
 	$form->addElement('html','<div id="id_qualify" style="display:block">');
 	$form->addElement('checkbox', 'attendance_qualify_gradebook', '', get_lang('QualifyAttendanceGradebook'),array('checked'=>'true','onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}'));
 	$form -> addElement('html','<div id="options_field" style="display:block">');
 } else {
-	$form->addElement('html', '<div class="formw"><br /><a href="javascript://" class="advanced_parameters"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a></div></div>');
+	$advanced = '<a href="javascript://" class="advanced_parameters"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a>';
+    $form -> addElement('advanced_settings',$advanced);
 	$form->addElement('html','<div id="id_qualify" style="display:none">');
 	$form->addElement('checkbox', 'attendance_qualify_gradebook', '', get_lang('QualifyAttendanceGradebook'),'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
 	$form -> addElement('html','<div id="options_field" style="display:none">');

+ 1 - 2
main/calendar/agenda.inc.php

@@ -2330,8 +2330,7 @@ function show_add_form($id = '') {
 	} else {
 		$form_title = get_lang('AddCalendarItem');
 	}
-	echo '<div class="row"><div class="form_header">'.$form_title.'</div></div>';
-	
+	echo '<legend>'.$form_title.'</legend>';
 	
 	// the title of the agenda item
 	echo 	'<div class="row">

+ 17 - 17
main/course_info/infocours.php

@@ -188,17 +188,17 @@ $group[]= $form->createElement('radio', 'visibility', get_lang("CourseAccess"),
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
-$form->addGroup($group, '', array(get_lang("CourseAccess"), get_lang("CourseAccessConfigTip")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("CourseAccess"), get_lang("CourseAccessConfigTip")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'subscribe', get_lang('Subscription'), get_lang('Allowed'), 1);
 $group[]=$form->createElement('radio', 'subscribe', null, get_lang('Denied'), 0);
-$form->addGroup($group, '', array(get_lang("Subscription")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("Subscription")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'unsubscribe', get_lang('Unsubscription'), get_lang('AllowedToUnsubscribe'), 1);
 $group[]=$form->createElement('radio', 'unsubscribe', null, get_lang('NotAllowedToUnsubscribe'), 0);
-$form->addGroup($group, '', array(get_lang("Unsubscription")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("Unsubscription")), '');
 
 $form->add_textfield('course_registration_password', get_lang('CourseRegistrationPassword'), false, array('size' => '60'));
 
@@ -217,28 +217,28 @@ $group = array();
 $group[]=$form->createElement('radio', 'email_alert_to_teacher_on_new_user_in_course', get_lang('NewUserEmailAlert'), get_lang('NewUserEmailAlertEnable'), 1);
 $group[]=$form->createElement('radio', 'email_alert_to_teacher_on_new_user_in_course', null, get_lang('NewUserEmailAlertToTeacharAndTutor'), 2);
 $group[]=$form->createElement('radio', 'email_alert_to_teacher_on_new_user_in_course', null, get_lang('NewUserEmailAlertDisable'), 0);
-$form->addGroup($group, '', array(get_lang("NewUserEmailAlert")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("NewUserEmailAlert")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'email_alert_students_on_new_homework', get_lang('NewHomeworkEmailAlert'), get_lang('NewHomeworkEmailAlertEnable'), 1);
 $group[]=$form->createElement('radio', 'email_alert_students_on_new_homework', null, get_lang('NewHomeworkEmailAlertDisable'), 0);
-$form->addGroup($group, '', array(get_lang("NewHomeworkEmailAlert")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("NewHomeworkEmailAlert")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_doc', get_lang('WorkEmailAlert'), get_lang('WorkEmailAlertActivate'), 1);
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_doc', null, get_lang('WorkEmailAlertDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("WorkEmailAlert")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("WorkEmailAlert")), '');
 
 
 $group = array();
 $group[]=$form->createElement('radio', 'email_alert_on_new_doc_dropbox', get_lang('DropboxEmailAlert'), get_lang('DropboxEmailAlertActivate'), 1);
 $group[]=$form->createElement('radio', 'email_alert_on_new_doc_dropbox', null, get_lang('DropboxEmailAlertDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("DropboxEmailAlert")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("DropboxEmailAlert")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', get_lang('QuizEmailAlert'), get_lang('QuizEmailAlertActivate'), 1);
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', null, get_lang('QuizEmailAlertDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("QuizEmailAlert")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("QuizEmailAlert")), '');
 
 
 $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
@@ -273,22 +273,22 @@ $form->addElement('html', '<div> <h3>'.Display::return_icon('user.png', Security
 $group = array();
 $group[]=$form->createElement('radio', 'allow_user_edit_agenda', get_lang('AllowUserEditAgenda'), get_lang('AllowUserEditAgendaActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_user_edit_agenda', null, get_lang('AllowUserEditAgendaDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("AllowUserEditAgenda")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("AllowUserEditAgenda")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'allow_user_edit_announcement', get_lang('AllowUserEditAnnouncement'), get_lang('AllowUserEditAnnouncementActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_user_edit_announcement', null, get_lang('AllowUserEditAnnouncementDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("AllowUserEditAnnouncement")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("AllowUserEditAnnouncement")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'allow_user_image_forum', get_lang('AllowUserImageForum'), get_lang('AllowUserImageForumActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_user_image_forum', null, get_lang('AllowUserImageForumDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("AllowUserImageForum")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("AllowUserImageForum")), '');
 
 $group = array();
 $group[]=$form->createElement('radio', 'allow_user_view_user_list', get_lang('AllowUserViewUserList'), get_lang('AllowUserViewUserListActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_user_view_user_list', null, get_lang('AllowUserViewUserListDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("AllowUserViewUserList")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("AllowUserViewUserList")), '');
 
 $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
 
@@ -301,7 +301,7 @@ $form->addElement('html', '<div><h3>'.Display::return_icon('chat.png', Security:
 $group = array();
 $group[]=$form->createElement('radio', 'allow_open_chat_window', get_lang('AllowOpenchatWindow'), get_lang('AllowOpenChatWindowActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_open_chat_window', null, get_lang('AllowOpenChatWindowDeactivate'), 0);
-$form->addGroup($group, '', array(get_lang("AllowOpenchatWindow")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("AllowOpenchatWindow")), '');
 
 $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
 $form->addElement('html', '</div></div>');
@@ -315,18 +315,18 @@ $group = array();
 $group[]=$form->createElement('radio', 'enable_lp_auto_launch', get_lang('LPAutoLaunch'), get_lang('RedirectToALearningPath'), 1);
 $group[]=$form->createElement('radio', 'enable_lp_auto_launch', get_lang('LPAutoLaunch'), get_lang('RedirectToTheLearningPathList'), 2);
 $group[]=$form->createElement('radio', 'enable_lp_auto_launch', null, get_lang('Deactivate'), 0);
-$form->addGroup($group, '', array(get_lang("LPAutoLaunch")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("LPAutoLaunch")), '');
 
 if (api_get_setting('allow_course_theme') == 'true') {
 	// Allow theme into Learning path
 	$group = array();
 	$group[]=$form->createElement('radio', 'allow_learning_path_theme', get_lang('AllowLearningPathTheme'), get_lang('AllowLearningPathThemeAllow'), 1);
 	$group[]=$form->createElement('radio', 'allow_learning_path_theme', null, get_lang('AllowLearningPathThemeDisallow'), 0);
-    $form->addGroup($group, '', array(get_lang("AllowLearningPathTheme")), '<div></div>');
+    $form->addGroup($group, '', array(get_lang("AllowLearningPathTheme")), '');
     
 	$group = array();
 	$group[]=$form->createElement('select_theme', 'course_theme', null, array('class'=>' ', 'id'=>'course_theme_id'));    
-    $form->addGroup($group, '', array(get_lang("Stylesheets")), '<div></div>');
+    $form->addGroup($group, '', array(get_lang("Stylesheets")), '');
 }
 
 if (is_settings_editable()) {
@@ -349,7 +349,7 @@ $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse',
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DisplayAboutNextAdvanceNotDone'), 2);
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DisplayAboutNextAdvanceNotDoneAndLastDoneAdvance'), 3);
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DoNotDisplayAnyAdvance'), 0);
-$form->addGroup($group, '', array(get_lang("InfoAboutAdvanceInsideHomeCourse")), '<div></div>');
+$form->addGroup($group, '', array(get_lang("InfoAboutAdvanceInsideHomeCourse")), '');
 
 $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
 

+ 3 - 7
main/create_course/add_course.php

@@ -94,16 +94,12 @@ $form->addElement('text', 'title', array(get_lang('CourseName'), get_lang('Ex'))
 $form->applyFilter('title', 'html_filter');
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
 
-$form -> addElement('html','<div class="row">
-    <div class="label">&nbsp;</div>
-    <div class="formw">
-        <a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" ><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</div></span></a>
-    </div>
-    </div>');
-
+$advanced = '<a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" ><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</div></span></a>';
+$form -> addElement('advanced_settings',$advanced);
 $form -> addElement('html','<div id="options" style="display:none">');
 
 
+
 // Course category.
 $categories_select = $form->addElement('select', 'category_code', array(get_lang('Fac'), get_lang('TargetFac')), array(), array('id'=> 'category_code','class'=>'chzn-select', 'style'=>'width:350px'));
 $form->applyFilter('category_code', 'html_filter');

+ 64 - 491
main/css/base.css

@@ -2,358 +2,76 @@
  * Common CSS for all themes
  */
 
-/* Reset.less */
+@import url('pre_base.css');
 
-* {
-    outline :none;
-}
+/* some changes to the pre_base */
 
-html, body {
-  margin: 0;
-  padding: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dd,
-dl,
-dt,
-li,
-ol,
-ul,
-fieldset,
-form,
-label,
-legend,
-button,
-caption,
-tfoot,
-thead,
-tr,
-th,
-td {
-  margin: 0;
-  padding: 0;
-  border: 0; 
-  font-weight: normal;
-  font-style: normal;
-  font-size: 100%;
-  line-height: 1;
-  font-family: inherit;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul {  
-  list-style: none outside none;
+select {
+    width : auto;
 }
 
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-html {
-/*  overflow-y: scroll; breaks fckeditor */
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-audio, canvas, video {
-  display: inline-block;
-  display: inline;
-  zoom: 1;
-}
-audio:not([controls]) {
-  display: none;
-}
-sub, sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-img {
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-button,
-input,
-select,
-textarea {
-  font-size: 100%;
-  margin: 0;
-  vertical-align: baseline;
-  *vertical-align: middle;
-}
-button, input {
-  line-height: normal;
-  *overflow: visible;
-}
-button::-moz-focus-inner, input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-input[type="search"] {
-  -webkit-appearance: textfield;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-a del {
-  color: #bbb;
-}
-del, del p {
-  color: #aaa;
-  text-decoration: line-through;
+.invisible {
+    visibility: visible;
 }
 
-/* Typography.less
- * Headings, body text, lists, code, and more for a versatile and durable typography system
- * ---------------------------------------------------------------------------------------- */
-p {
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 18px;
-  margin-bottom: 9px;
-}
-p small {
-  font-size: 11px;
-  color: #bfbfbf;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-weight: bold;
-  color: #404040;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  color: #bfbfbf;
-}
-h1 {
-  margin-bottom: 18px;
-  font-size: 30px;
-  line-height: 36px;
-}
-h1 small {
-  font-size: 18px;
-}
-h2 {
-  font-size: 24px;
-  line-height: 36px;
-}
-h2 small {
-  font-size: 14px;
-}
-h3,
-h4,
-h5,
-h6 {
-  line-height: 36px;
-}
-h3 {
-  font-size: 18px;
-}
-h3 small {
-  font-size: 14px;
-}
-h4 {
-  font-size: 16px;
-}
-h4 small {
-  font-size: 12px;
-}
-h5 {
-  font-size: 14px;
-}
-h6 {
-  font-size: 13px;
-  color: #bfbfbf;
-  text-transform: uppercase;
-}
-ul, ol {
-  margin: 0 0 18px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-ul {
-  list-style: disc;
-}
-ol {
-  list-style: decimal;
-}
-li {
-  line-height: 18px;
-  color: #808080;
-}
-ul.unstyled {
-  list-style: none;
-  margin-left: 0;
-}
-dl {
-  margin-bottom: 18px;
-}
-dl dt, dl dd {
-  line-height: 18px;
-}
-dl dt {
-  font-weight: bold;
-}
-dl dd {
-  margin-left: 9px;
-}
-hr {
-  margin: 0 0 19px;
-  border: 0;
-  border-bottom: 1px solid #eee;
-}
-strong {
-  font-style: inherit;
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
   font-weight: bold;
-  line-height: inherit;
-}
-em {
-  font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
-}
-.muted {
-  color: #bfbfbf;
-}
-blockquote {
-  margin-bottom: 18px;
-  border-left: 5px solid #eee;
-  padding-left: 15px;
-}
-blockquote p {
-  font-size: 14px;
-  font-weight: 300;
-  line-height: 18px;
-  margin-bottom: 0;
-}
-blockquote small {
-  display: block;
-  font-size: 12px;
-  font-weight: 300;
-  line-height: 18px;
-  color: #bfbfbf;
-}
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-address {
-  display: block;
-  line-height: 18px;
-  margin-bottom: 18px;
-}
-code, pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Andale Mono, Courier New, monospace;
-  font-size: 12px;
+  color: #ffffff;
+  text-transform: none;
+  background-color: none;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-code {
-  background-color: #fee9cc;
-  color: rgba(0, 0, 0, 0.75);
-  padding: 1px 3px;
+
+legend {
+    margin-bottom: 10px;
 }
-pre {  
-  background-color: #f5f5f5;
-  display: block;
-  padding: 17px;
-  margin: 25px 0 18px;
-  line-height: 18px;
-  font-size: 12px;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  white-space: pre;
-  white-space: pre-wrap;
-  word-wrap: break-word;
+
+
+
+/* Fixing old chamilo forms */
+
+form .label {
+    color: #404040;
+    float: left;
+    font-size: 13px;
+    line-height: 18px;
+    padding-top: 6px;
+    text-align: right;
+    width: 150px;    
+}
+form .formw {
+    margin-left: 170px;
 }
 
+form .formw input {
+    float:left;
+}
 
+.formw input[type="checkbox"], .formw input[type="radio"] {
+    margin-right: 5px;
+    margin-top: 2px;
+}
+
+/* end chamilo forms fixes */
 
-/* top nav bar features */
 
 
 
+* {
+    /* outline :none; */
+}
+
+html, body {
+  margin: 0;
+  padding: 0;
+}
+
+/* top nav bar features */
+
 .nav {
   margin-left: 0;
   margin-bottom: 18px;
@@ -1314,8 +1032,6 @@ footer {
 #topbar_push {
     height:40px;
 }
-
-
 .actions {	
 	background:#efefef;
     border:1px solid #ccc; 
@@ -1324,10 +1040,19 @@ footer {
     padding:2px;     
     vertical-align:middle;
 }
+
+.actions form {
+    margin-bottom: 0px;
+}
+
 .actions a img {
     padding-right:0px;
 }
 
+.muted {
+    color: #999999 !important;
+}
+
 .actions img {	
 	padding-right:10px;
     border: none;
@@ -2167,9 +1892,6 @@ button.next.disabled, .a_button.disabled {
 }
 
 
-
-
-
 /* Note */
 .note {
     margin: 6px;
@@ -2189,7 +1911,7 @@ button.next.disabled, .a_button.disabled {
 /* Breadcrumb */
 
 .bread {
-    height: 25px;
+    height: 24px;
     margin: 0px 0px 5px 0px;    
     padding:0px;
     border-bottom:1px solid #ccc;
@@ -2204,7 +1926,6 @@ button.next.disabled, .a_button.disabled {
 
 .bread span {
     display: block;
-
     font-size:11px;
     padding: 0px 15px 0 9px;
 }
@@ -2223,16 +1944,17 @@ button.next.disabled, .a_button.disabled {
 }
 
 .bread li a {    
-    height:17px;
+    height:26px;
     background: url("crumbs.gif") no-repeat scroll right center transparent;
     display: block;    
     background-repeat:no-repeat; 
     background-position:right;
-    padding:7px 0px 0px 0px;
+    padding:0px 0px 0px 0px;
 }
 
 .bread .home {
     padding:5px 15px 4px 8px;
+    height: 17px;
 /* padding:0px 15px 4px 8px; might show better in IE7 & 8 */
 }    
 
@@ -3389,18 +3111,6 @@ border-top: 1px solid #E2E2E2;
     margin-right:4px;
 }
 
-input {
-    -moz-border-radius:5px;    
-    -webkit-border-radius:5px;  
-    border-radius:5px;
-    -x-system-font:none;
-    border:1px solid #CCCCCC;
-    color:#666666;
-    font-family:Arial,Helvetica,sans-serif;
-    font-size:120%;   
-    line-height:normal;
-    padding:4px;
-}
 
 textarea {
     border:1px solid #CCCCCC;
@@ -3423,37 +3133,6 @@ select {
     border-radius:5px;      
 }
 
-input[type=checkbox], input[type=radio], input[type=button], input[type=submit] {
-    border: 1px solid #E1E1E0;
-    border-radius: 5px 5px 5px 5px;
-    cursor: pointer;
-    font-size: 12px;
-}
-
-input[type=checkbox], input[type=radio] {
-    margin-right: 5px;
-    margin-top: 6px;
-}
-
-input[type="text"]:focus, input[type="password"]:focus, textarea:focus {    
-  outline: none;
-  border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input, select, textarea {
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-  transition: border linear 0.2s, box-shadow linear 0.2s;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-
-
 /* Fixes the FB input*/
 input.maininput:focus {
     box-shadow:0 0 0px #fff;
@@ -4141,114 +3820,8 @@ form .formw .freeze {
     padding-top: 8px;    
 
 }
-form .label {
-    color: #404040;
-    float: left;
-    font-size: 13px;
-    line-height: 18px;
-    padding-top: 6px;
-    text-align: right;
-    width: 150px;    
-}
-form .formw {
-    margin-left: 170px;
-}
-
-/* disabled inputs */
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  background-color: #f5f5f5;
-  border-color: #ddd;
-  cursor: not-allowed;
-}
-
-.formw iframe {
-   text-align: left;
-}
-
-.formw table {
-/*    float: left;
-    margin-left: 24px;*/
-}
-
-form div.form_error {
-    background: none repeat scroll 0 0 #FAE5E3;
-    border-radius: 4px 4px 4px 4px;
-    margin: -10px 0 10px;
-    padding: 10px 0;
-}
-
-fieldset {
-    margin-top: 12px;
- 
-}
-
-
 
 
-fieldset legend {
-    color: #404040;
-    display: block;
-    font-size: 20px;
-    line-height: 1;
-/*    margin-left: 150px;*/
-    margin-bottom:15px;
-}
-
-
-.help-inline {
-    padding-left: 5px;
-    color: red;
-}
-
-.help-block{
-    display:block;
-    max-width:640px;
-    margin:5px 0 0!important;
-    line-height:18px;
-}
-.help-inline, .help-block {
-    color: #777777;
-    font-size: 12px;
-}
-
-
-form div.error > .label, 
-form div.error > label, 
-form div.error span.help-inline, 
-form div.error span.help-block {
-    color: #9D261D;  
-}
-
-form div.error input:focus, 
-form div.error textarea:focus {
-    border-color: #C87872;
-    box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);  
-}
-
-form div.error {
-	color: #b94a48;
-	border-color: #ee5f5b;
-    
-}
-
-
-.formw label {
-    line-height: 18px;
-    text-align: left;
-    white-space: normal;
-}
-
-
-form div.error input, form div.error textarea {
-    border-color: #C87872;
-    box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
-}
-
 .course_activity_home {
     width:100%;
 }

+ 3 - 17
main/css/base_chamilo.css

@@ -9,14 +9,12 @@ html {
 
 body {
     /* hack ignored by non-IE to enable ie to support :hover on button */
-    behavior:url("/main/css/csshover3.htc");    
-    font-size: 12px;
+    behavior:url("/main/css/csshover3.htc");        
     color: #000;
     margin: 0;
     padding: 0;
     background-color: #fff;
-    height: 100%; /* stick */
-	font-family: Arial, Helvetica, sans-serif;    
+    height: 100%; /* stick */	
 }
 
 /* Sticky footer*/
@@ -936,14 +934,7 @@ form br {
     height: 1%;
     margin-left: 0;
 }
-/* End hide from IE5/mac */
 
-.radio, .checkbox {
-    margin: 0;
-    padding: 0;
-    border: none;
-    background-color: transparent;
-}
 .required {
 /*    color: #f00;
     font-weight: bold;*/
@@ -1856,12 +1847,7 @@ Document title
     padding-right:0px;
 }
 
-.actions img {	
-	padding-right:10px;
-    border: none;
-    text-decoration: none;    
-    vertical-align:middle;
-}
+
 .actions a {
     display:inline-block;
     margin-right: 10px;

+ 6 - 3
main/css/pre_base.css

@@ -547,6 +547,9 @@ select,
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+select {
+    width : auto;
+}
 .uneditable-textarea {
   width: auto;
   height: auto;
@@ -593,7 +596,7 @@ select, input[type="file"] {
   line-height: 28px;
 }
 select {
-  width: 220px;
+ /* width: 220px;*/
   background-color: #ffffff;
 }
 select[multiple], select[size] {
@@ -3044,7 +3047,7 @@ a.thumbnail:hover {
 .thumbnail .caption {
   padding: 9px;
 }
-.label {
+.label_tag {
   padding: 1px 3px 2px;
   font-size: 9.75px;
   font-weight: bold;
@@ -3361,5 +3364,5 @@ a.thumbnail:hover {
   display: block;
 }
 .invisible {
-  visibility: hidden;
+  /* visibility: hidden; */
 }

+ 1 - 1
main/document/create_document.php

@@ -21,7 +21,7 @@ $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = '
 <style>
 .formw {
-    margin-left:200px !important;
+    margin-left:180px !important;
 }
 form .label {
      width: 160px !important;

+ 2 - 2
main/document/document.inc.php

@@ -127,7 +127,7 @@ function create_document_link($document_data, $show_as_icon = false, $counter =
     $url_path = urlencode($document_data['path']);
     
     // Add class="invisible" on invisible files
-    $visibility_class = ($visibility == false) ? ' class="invisible"' : '';
+    $visibility_class = ($visibility == false) ? ' class="muted"' : '';
 
     if (!$show_as_icon) {
         // Build download link (icon)
@@ -762,7 +762,7 @@ function create_dir_form($current_dir_id) {
     $new_folder_text .= '<input type="hidden" name="id" value="'.intval($current_dir_id).'" />';
 
     // Form title
-    $new_folder_text .= '<div class="row"><div class="form_header">'.get_lang('CreateDir').'</div></div>';
+    $new_folder_text .= '<legend>'.get_lang('CreateDir').'</legend>';
 
     // Folder field
     $new_folder_text .= '<div class="row">';

+ 3 - 3
main/document/document.php

@@ -597,11 +597,11 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
                         $user_shared_folders[]=$fold;
                     }
                 }
-                echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';                    
+                echo '<legend>'.get_lang('Move').'</legend>';                    
                 echo build_move_to_selector($user_shared_folders, $move_path, $my_get_move, $group_properties['directory']);
             } else {
                                     
-                echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';
+                echo '<legend>'.get_lang('Move').'</legend>';
                 echo build_move_to_selector($folders, $move_path, $my_get_move, $group_properties['directory']);
             }
         }
@@ -949,7 +949,7 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
         
         $is_visible = DocumentManager::is_visible_by_id($document_data['id'], $course_info, api_get_session_id(), api_get_user_id(), false);
         
-        $invisibility_span_open  = ($is_visible == 0) ? '<span class="invisible">' : '';
+        $invisibility_span_open  = ($is_visible == 0) ? '<span class="muted">' : '';
         $invisibility_span_close = ($is_visible == 0) ? '</span>' : '';
                 
         

+ 3 - 3
main/document/document_lite.php

@@ -408,11 +408,11 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
                         $user_shared_folders[]=$fold;
                     }
                 }
-                echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';                    
+                echo '<legend>'.get_lang('Move').'</legend>';                    
                 echo build_move_to_selector($user_shared_folders, $move_path, $my_get_move, $group_properties['directory']);
             } else {
                                     
-                echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';
+                echo '<legend>'.get_lang('Move').'</legend>';
                 echo build_move_to_selector($folders, $move_path, $my_get_move, $group_properties['directory']);
             }
         }
@@ -736,7 +736,7 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
         
         $is_visible = DocumentManager::is_visible_by_id($document_data['id'], $course_info, api_get_session_id(), api_get_user_id(), false);
         
-        $invisibility_span_open  = ($is_visible == 0) ? '<span class="invisible">' : '';
+        $invisibility_span_open  = ($is_visible == 0) ? '<span class="muted">' : '';
         $invisibility_span_close = ($is_visible == 0) ? '</span>' : '';
                 
         

+ 1 - 3
main/document/slideshowoptions.php

@@ -93,9 +93,7 @@ echo '</div>';
 ?>
 
 <form action="slideshow.php?curdirpath=<?php echo $pathurl; ?>" method="post" name="options" id="options">
-
-	<div class="row"><div class="form_header"><?php echo get_lang('_slideshow_options') ?></div></div>
-
+	<legend><?php echo get_lang('_slideshow_options') ?></legend>
 	<div class="row">
 		<div class="label">
 			<input class="checkbox" name="radio_resizing" type="radio" onClick="disableresizing()" value="noresizing" <?php

+ 2 - 1
main/dropbox/dropbox_functions.inc.php

@@ -152,8 +152,9 @@ function delete_category($action, $id) {
 * @version march 2006
 */
 function display_move_form($part, $id, $target = array(), $extra_params) {
-	echo '<div class="row"><div class="form_header">'.get_lang('MoveFileTo').'</div></div>';
+	
 	echo '<form name="form1" method="post" action="'.api_get_self().'?view_received_category='.Security::remove_XSS($_GET['view_received_category']).'&view_sent_category='.Security::remove_XSS($_GET['view_sent_category']).'&view='.Security::remove_XSS($_GET['view']).'&'.$extra_params.'">';
+    echo '<legend>'.get_lang('MoveFileTo').'</legend>';
 	echo '<input type="hidden" name="id" value="'.Security::remove_XSS($id).'">';
 	echo '<input type="hidden" name="part" value="'.Security::remove_XSS($part).'">';
 	echo '

+ 9 - 9
main/exercice/exercise.class.php

@@ -901,7 +901,7 @@ class Exercise {
 				}
 
 				$radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2'));
-				$form->addGroup($radios_feedback, null, get_lang('FeedbackType'), '<div></div>');
+				$form->addGroup($radios_feedback, null, get_lang('FeedbackType'), '');
 
 				//$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
 				// test type
@@ -910,13 +910,13 @@ class Exercise {
 				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
 				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
-				$form->addGroup($radios, null, get_lang('QuestionsPerPage'), '<div></div>');
+				$form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
 
 				$radios_results_disabled = array();
 				$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
 				$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
 				$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-				$form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '<div></div>');
+				$form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
 
 			} else {
 				// if is Directfeedback but has not questions we can allow to modify the question type
@@ -944,19 +944,19 @@ class Exercise {
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-					$form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'<div></div>');
+					$form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
 				} else {
 					//Show options freeze
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
 					$radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-					$result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'<div></div>');
+					$result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
 					$result_disable_group->freeze();
 
 					$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
 					$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
-					$type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '<div></div>');
+					$type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
 					$type_group->freeze();
 
 					//we force the options to the DirectFeedback exercisetype
@@ -977,7 +977,7 @@ class Exercise {
 			$radios_random_answers = array();
 			$radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('Yes'),'1');
 			$radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('No'),'0');
-			$form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), '<div></div>');
+			$form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), '');
 
 			//randow by category
 			$form->addElement('html','<div class="clear">&nbsp;</div>');
@@ -985,14 +985,14 @@ class Exercise {
 			$radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1');
 			$radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2');
 			$radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('No'),'0');
-			$form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), '<div></div>');
+			$form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), '');
 			$form->addElement('html','<div class="clear">&nbsp;</div>');
 			
 			// add the radio display the category name for student 
 			$radio_display_cat_name = array();
 			$radio_display_cat_name[] = FormValidator::createElement('radio', 'display_category_name', null, get_lang('Yes'),'1');
 			$radio_display_cat_name[] = FormValidator::createElement('radio', 'display_category_name', null, get_lang('No'),'0');
-            $form->addGroup($radio_display_cat_name, null, get_lang('QuestionDisplayCategoryName'), '<div></div>');
+            $form->addGroup($radio_display_cat_name, null, get_lang('QuestionDisplayCategoryName'), '');
 			
 			//Attempts
 			$attempt_option=range(0,10);

+ 1 - 1
main/exercice/hotpotatoes.php

@@ -211,7 +211,7 @@ if ((api_is_allowed_to_edit(null, true)) && (($finish == 0) || ($finish == 2)))
             "<input type=\"submit\" name=\"submit\" value=\"".get_lang('Send')."\"><br/>\n";*/
     //Display::display_icon('hotpotatoes.jpg','',array('align'=> 'right', 'style' => 'position: absolute; padding-top: 30px; margin-left: 500px;'));
 
-    echo '<div class="row"><div class="form_header">'.$nameTools.'</div></div>';
+    echo '<legend>'.$nameTools.'</legend>';
     echo '<div class="row">';
     echo '<div class="label" style="padding:10px">';
     echo '<span class="form_required">*</span>';

+ 8 - 8
main/group/group_edit.php

@@ -249,21 +249,21 @@ $form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callb
 $group = array();
 $group[] = $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1);
 $group[] = $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1);
-$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false);
 
 // Documents settings
 $group = array();
 $group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false);
 
 // Work settings
 $group = array();
 $group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false);
 
 
 // Calendar settings
@@ -271,35 +271,35 @@ $group = array();
 $group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false);
 
 // Announcements settings
 $group = array();
 $group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false);
 
 //Forum settings
 $group = array();
 $group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false);
 
 // Wiki settings
 $group = array();
 $group[] = $form->createElement('radio', 'wiki_state', get_lang('GroupWiki'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false);
 
 // Chat settings
 $group = array();
 $group[] = $form->createElement('radio', 'chat_state', get_lang('Chat'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'chat_state', null, get_lang('Public'), TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'chat_state', null, get_lang('Private'), TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat') , array(), ICON_SIZE_SMALL).' '.get_lang('Chat'), '<div></div>', false);
+$form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat') , array(), ICON_SIZE_SMALL).' '.get_lang('Chat'), '', false);
 
 // submit button
 $form->addElement('style_submit_button', 'submit', get_lang('PropModify'), 'class="save"');

+ 9 - 9
main/inc/lib/blog.lib.php

@@ -1198,7 +1198,7 @@ class Blog {
 			echo '<input type="hidden" name="post_title_edited" id="post_title_edited" value="false" />';
 
 			// form title
-			echo '<div class="row"><div class="form_header">' . get_lang('NewPost') . '</div></div>';
+			echo '<legend>' . get_lang('NewPost') . '</legend>';
 
 			// article title
 			echo '<div><span class="form_required">*</span>'.get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" onblur="check_if_still_empty()" /></div><br />';
@@ -1288,7 +1288,7 @@ class Blog {
 		echo '<form name="edit_post" method="post" action="blog.php?action=edit_post&post_id=' . Security::remove_XSS($_GET['post_id']) . '&blog_id=' . Security::remove_XSS($blog_id) . '&article_id='.Security::remove_XSS($_GET['article_id']).'&task_id='.Security::remove_XSS($_GET['task_id']).'">';
 
 		// form title
-		echo '<div class="row"><div class="form_header">' . get_lang('EditPost') . '</div></div>';
+		echo '<legend>' . get_lang('EditPost') . '</legend>';
 
 		// article title
 		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" value="'.stripslashes($blog_post['title']) . '" /><br /></div>';
@@ -1479,7 +1479,7 @@ class Blog {
 		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">';
 
 		// form title
-		echo '<div class="row"><div class="form_header">'.get_lang('AddTask').'</div></div>';
+		echo '<legend>'.get_lang('AddTask').'</legend>';
 
 		// task title
 		echo '	<div class="row">
@@ -1707,7 +1707,7 @@ class Blog {
 		echo '<form name="assign_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">';
 
 		// form title
-		echo '<div class="row"><div class="form_header">'.get_lang('AssignTask').'</div></div>';
+		echo '<legend>'.get_lang('AssignTask').'</legend>';
 
 		// user
 		echo '	<div class="row">
@@ -2118,7 +2118,7 @@ class Blog {
 		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
 		$table_course_user 	= Database::get_main_table(TABLE_MAIN_COURSE_USER);
 
-		echo '<div class="row"><div class="form_header">'.get_lang('SubscribeMembers').'</div></div>';
+		echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
 		$course_id = api_get_course_int_id();
 		$properties["width"] = "100%";
 
@@ -2227,7 +2227,7 @@ class Blog {
 		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
 
-		echo '<div class="row"><div class="form_header">'.get_lang('UnsubscribeMembers').'</div></div>';
+		echo '<legend>'.get_lang('UnsubscribeMembers').'</legend>';
 
 		$properties["width"] = "100%";
 		//table column titles
@@ -2330,7 +2330,7 @@ class Blog {
 		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
 
-		echo '<div class="row"><div class="form_header">'.get_lang('RightsManager').'</div></div>';
+		echo '<legend>'.get_lang('RightsManager').'</legend>';
 		echo '<br />';
 
 		// Integration of patricks permissions system.
@@ -2347,9 +2347,9 @@ class Blog {
 		echo '<form name="add_post" enctype="multipart/form-data" method="post" action="blog.php?action=view_post&amp;blog_id=' . intval($blog_id) . '&amp;post_id=' . intval($post_id) . '">';
 
 		// form title
-		echo '<div class="row"><div class="form_header">';
+		echo '<legend>';
 		echo (isset($_GET['task_id']) ? get_lang('ExecuteThisTask') : get_lang('AddNewComment'));
-		echo '</div></div>';
+		echo '</legend>';
 
 		// comment title
 		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="comment_title" id="comment_title" type="text" size="60" value="Re: '.stripslashes($title) . '" /></div><br />';

+ 27 - 31
main/inc/lib/fckeditor/editor/dialog/fck_template.html

@@ -27,37 +27,33 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex, nofollow" />
 	<style type="text/css">
-			.TplList
-			{
-				border: #fff 2px solid;
-				background-color: #ffffff;
-				overflow: auto;
-				width: 165px;
-			}
-
-			.TplItem
-			{
-				margin: 5px;
-				padding: 7px;
-				border: #eeeeee 1px solid;
-				text-decoration: none;
-			}
-
-			.TplItem TABLE
-			{
-				display: inline;
-			}
-
-			.TplTitle
-			{
-				font-weight: bold;
-			}
-
-			.TplTitle a
-			{
-				color:000;
-				text-decoration: none;
-			}
+  
+    .TplList {
+        border: #fff 2px solid;
+        background-color: #ffffff;
+        overflow: auto;
+        width: 148px;
+    }
+
+    .TplItem {
+        margin: 5px;
+        padding: 7px;
+        border: #eeeeee 1px solid;
+        text-decoration: none;
+    }
+
+    .TplItem table {
+        display: inline;
+    }
+
+    .TplTitle    {
+        font-weight: bold;
+    }
+
+    .TplTitle a    {
+        color:000;
+        text-decoration: none;
+    }
 		</style>
 	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 	<script type="text/javascript">

+ 11 - 12
main/inc/lib/formvalidator/FormValidator.class.php

@@ -58,7 +58,7 @@ class FormValidator extends HTML_QuickForm {
 		// Modify the default templates
 		$renderer = & $this->defaultRenderer();
 		$form_template = <<<EOT
-<form {attributes}>
+<form class="form-horizontal" {attributes}>
 <fieldset>
 	{content}
 	<div class="clear"></div>
@@ -69,24 +69,24 @@ EOT;
 		$renderer->setFormTemplate($form_template);
 		$element_template = <<<EOT
 	
-		<div class="row {error_class}">	
-			<div class="label">
+		<div class="control-group {error_class}">				
+            <label class="control-label">
 				<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
 				{label}
-			</div>
-			<div class="formw">
+			</label>
+			<div class="controls">
 				{element}
 				
 				<!-- BEGIN label_3 -->
-                    <span>{label_3}</span>
+                    <p class="help-block">{label_3}</p>
                 <!-- END label_3 -->
                 
-				<!-- BEGIN label_2 -->
-					<span class="help-block">{label_2}</span>
+				<!-- BEGIN label_2 -->                    
+					<p class="help-block">{label_2}</p>
 				<!-- END label_2 -->
 				
 				<!-- BEGIN error -->
-					<span class="help-inline">{error}</span>
+					3<span class="help-inline">{error}</span>
 				<!-- END error -->	
 			</div>
 		</div>
@@ -98,9 +98,8 @@ EOT;
 		$renderer->setHeaderTemplate($header_template);
 		HTML_QuickForm::setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
 		$required_note_template = <<<EOT
-	<div class="row">
-		<div class="label"></div>
-		<div class="formw">{requiredNote}</div>
+	<div class="control-group">		
+		<div class="controls">{requiredNote}</div>
 	</div>
 EOT;
 		$renderer->setRequiredNoteTemplate($required_note_template);

+ 9 - 7
main/link/link.php

@@ -187,17 +187,19 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
 	// Displaying the correct title and the form for adding a category or link. This is only shown when nothing
 	// has been submitted yet, hence !isset($submit_link)
 	if (($_GET['action'] == 'addlink' || $_GET['action'] == 'editlink') && empty($_POST['submitLink'])) {
-		echo '<div class="row">';
-		if ($_GET['action'] == 'addlink') {
-			echo '<div class="form_header">'.get_lang('LinkAdd').'</div>';
-		} else {
-			echo '<div class="form_header">'.get_lang('LinkMod').'</div>';
-		}
-		echo '</div>';
+		
+		
+		
 		if ($category == '') {
 			$category = 0;
 		}        
 		echo '<form method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&amp;urlview='.Security::remove_XSS($urlview).'">';
+        if ($_GET['action'] == 'addlink') {
+			echo '<legend>'.get_lang('LinkAdd').'</legend>';
+		} else {
+			echo '<legend>'.get_lang('LinkMod').'</legend>';
+		}
+        
 		echo '<input type="hidden" name="sec_token" value="'.$token.'" />';
 		if ($_GET['action'] == 'editlink') {
 		    $clean_link_id = intval($_GET['id']);

+ 52 - 61
main/newscorm/learnpath.class.php

@@ -5612,8 +5612,7 @@ class learnpath {
         $item_title			= Security::remove_XSS($item_title);        
         $item_description 	= Security::remove_XSS($item_description);
 
-        $return = '	<div class="row">
-                                <div class="form_header">';
+        $legend = '<legend>';
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
         else
@@ -5647,19 +5646,18 @@ class learnpath {
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $return .= get_lang('CreateTheExercise') . '&nbsp;:';
-        elseif ($action == 'move') $return .= get_lang('MoveTheCurrentExercise') . '&nbsp;:';
+            $legend .= get_lang('CreateTheExercise') . '&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise') . '&nbsp;:';
         else
-            $return .= get_lang('EditCurrentExecice') . '&nbsp;:';
-
+            $legend .= get_lang('EditCurrentExecice') . '&nbsp;:';
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $return .= Display :: return_warning_message('<p class="lp_title">' . get_lang('Warning') . ' !</p>' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
-        $return .= '	</div>
-                                </div>';
+        $legend .= '</legend>';
         $return .= '<div class="sectioncomment">';
 
         $return .= '<form method="POST">';
+        $return .= $legend;
         $return .= '<table class="lp_form">';
 
         if ($action != 'move') {
@@ -5871,28 +5869,26 @@ class learnpath {
                 'max_time_allowed' => $row['max_time_allowed']
             );
         }        
-/*
-        $this->tree_array($arrLP);
-        $arrLP = $this->arrMenu;
-        unset ($this->arrMenu);*/
 
+        $legend = '<legend>';        
         if ($action == 'add')
-            $return .= '<div class="row"><div class="form_header">' . get_lang('CreateTheExercise') . '&nbsp;:</div></div>';
-        elseif ($action == 'move') $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentExercise') . '&nbsp;:</p>';
-        else
-            //$return .= '<p class="form_header">' . get_lang('EditCurrentExecice') . '&nbsp;:</p>';
-            $return .= '<div class="row"><div class="form_header">' . get_lang('EditCurrentExecice') . '&nbsp;:</div></div>';
+            $legend .= get_lang('CreateTheExercise');
+        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise');
+        else            
+            $legend .= get_lang('EditCurrentExecice');
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $return .= Display :: return_warning_message('<p class="lp_title">' . get_lang('Warning') . ' !</p>' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
+        $legend .= '</legend>';  
 
         $return .= '<form method="POST">';
+        $return .= $legend;
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
         $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . ' :</label></td>';
         $return .= '<td class="input">';
-        $return .= "\t\t\t\t" . '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
-        $return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
+        $return .= '<option class="top" value="0">' . $this->name . '</option>';
         $arrHide = array (
             $id
         );
@@ -6043,8 +6039,7 @@ class learnpath {
             $item_description = '';
         }
 
-        $return = '	<div class="row">
-                                <div class="form_header">';
+        $legend = '<legend>';
 
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
@@ -6082,15 +6077,16 @@ class learnpath {
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $return .= get_lang('CreateTheForum') . '&nbsp;:';
-        elseif ($action == 'move') $return .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('CreateTheForum') . '&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
         else
-            $return .= get_lang('EditCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
 
-        $return .= '	</div>
-                                </div>';
+        $legend .= '</legend>';
+        
         $return .= '<div class="sectioncomment">';
         $return .= '<form method="POST">';
+        $return .= $legend;
         $return .= '<table class="lp_form">';
 
         if ($action != 'move') {
@@ -6103,8 +6099,8 @@ class learnpath {
         $return .= '<tr>';
         $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
         $return .= '<td class="input">';
-        $return .= "\t\t\t\t" . '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
-        $return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
+        $return .= '<option class="top" value="0">' . $this->name . '</option>';
         $arrHide = array (
             $id
         );
@@ -6435,8 +6431,7 @@ class learnpath {
             $item_path_fck = '';
         }
 
-        $return = '<div class="row">
-                        <div class="form_header">';
+        $legend = '<legend>';
 
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
@@ -6475,22 +6470,19 @@ class learnpath {
         $arrLP = $this->arrMenu;
         unset ($this->arrMenu);
 
-        $return .= $title;
-        
-        $return .= '</div>
-                            </div>';
+        $legend .= $title;
         
+        $legend .= '</legend>';        
         
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
         $url = api_get_self() . '?' .api_get_cidreq().'&gradeboook='.$gradebook.'&action='.$action.'&type='.$item_type.'&lp_id='.$this->lp_id;        
-        //var_dump(api_get_self() . '?' . $_SERVER['QUERY_STRING']);
-        
+                
         $form = new FormValidator('form', 'POST',  $url);
 
         $defaults['title'] = api_html_entity_decode($item_title, ENT_QUOTES, $charset);
         $defaults['description'] = $item_description;
 
-        $form->addElement('html', $return);
+        $form->addElement('html', $legend);
 
         //$arrHide = array($id);
         $arrHide[0]['value'] = Security :: remove_XSS($this->name);
@@ -6684,8 +6676,7 @@ class learnpath {
             $item_title = '';
             $item_description = '';
         }
-        $return = '<div class="row">
-                    	<div class="form_header">';
+        $return = '<legend>';
 
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
@@ -6726,8 +6717,7 @@ class learnpath {
             $return .= get_lang('EditTheCurrentDocument');
         }
 
-        $return .= '</div>
-                        </div>';
+        $return .= '</legend>';
 
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
             $return .= Display :: return_warning_message('<strong>' . get_lang('Warning') . ' !</strong><br />' . get_lang('WarningEditingDocument'), false);
@@ -6975,8 +6965,7 @@ class learnpath {
             $item_url = '';
         }
 
-        $return = '	<div class="row">
-                                <div class="form_header">';
+        $legend = '<legend>';
 
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
@@ -7010,15 +6999,16 @@ class learnpath {
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $return .= get_lang('CreateTheLink') . '&nbsp;:';
-        elseif ($action == 'move') $return .= get_lang('MoveCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('CreateTheLink') . '&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
         else
-            $return .= get_lang('EditCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
 
-        $return .= '	</div>
-                                </div>';
+        $legend .= '</legend>';
+        
         $return .= '<div class="sectioncomment">';
         $return .= '<form method="POST">';
+        $return .= $legend;
         $return .= '<table>';
 
         if ($action != 'move') {
@@ -7186,8 +7176,7 @@ class learnpath {
             $item_title = get_lang('Student_publication');
         }
 
-        $return = '	<div class="row">
-                                <div class="form_header">';
+        $legend = '<legend>';
 
         if ($id != 0 && is_array($extra_info))
             $parent = $extra_info['parent_item_id'];
@@ -7224,14 +7213,15 @@ class learnpath {
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $return .= get_lang('Student_publication') . '&nbsp;:' . "\n";
-        elseif ($action == 'move') $return .= get_lang('MoveCurrentStudentPublication') . '&nbsp;:' . "\n";
+            $legend .= get_lang('Student_publication') . '&nbsp;:' . "\n";
+        elseif ($action == 'move') $legend .= get_lang('MoveCurrentStudentPublication') . '&nbsp;:' . "\n";
         else
-            $return .= get_lang('EditCurrentStudentPublication') . '&nbsp;:' . "\n";
-        $return .= '	</div>
-                                </div>';
+            $legend .= get_lang('EditCurrentStudentPublication') . '&nbsp;:' . "\n";
+        $legend .= '</legend>';
+        
         $return .= '<div class="sectioncomment">';
         $return .= '<form method="POST">';
+        $return .= $legend;
         $return .= '<table class="lp_form">';
         if ($action != 'move') {
             $return .= '<tr>';
@@ -7617,12 +7607,13 @@ class learnpath {
         //$preq_max = $row['max_score'];
 
         $return = $this->display_manipulate($item_id, TOOL_DOCUMENT);
-        $return = '	<div class="row">
-                                <div class="form_header">';
-        $return .= get_lang('AddEditPrerequisites');
-        $return .= '</div></div>';
         $return .= '<div class="sectioncomment">';
         $return .= '<form method="POST">';
+        
+        $return = '<legend>';
+        $return .= get_lang('AddEditPrerequisites');
+        $return .= '</legend>';
+        
         $return .= '<table class="data_table" style="width:650px">';
         $return .= '<tr>';
         $return .= '<th height="24">' . get_lang('Prerequisites') . '</th>';

+ 2 - 2
main/survey/survey.lib.php

@@ -1288,9 +1288,9 @@ class survey_question {
 		} else {
 			$tool_name .= ': '.get_lang(api_ucfirst(Security::remove_XSS($_GET['type'])));
 		}
-
-		$this->html .= '<div class="row"><div class="form_header">'.$tool_name.'</div></div>';
+		
 		$this->html .= '<form id="question_form" name="question_form" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS($_GET['type']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question_id='.Security::remove_XSS($_GET['question_id']).'">';
+        $this->html .= '<legend>'.$tool_name.'</legend>';
 		$this->html .= '		<input type="hidden" name="survey_id" id="survey_id" value="'.Security::remove_XSS($_GET['survey_id']).'"/>';
 		$this->html .= '		<input type="hidden" name="question_id" id="question_id" value="'.Security::remove_XSS($_GET['question_id']).'"/>';
 		$this->html .= '		<input type="hidden" name="shared_question_id" id="shared_question_id" value="'.Security::remove_XSS($form_content['shared_question_id']).'"/>';

+ 1 - 1
main/wiki/wiki.inc.php

@@ -1982,7 +1982,7 @@ function display_wiki_search_results($search_term, $search_content=0, $all_vers=
 {
     global $tbl_wiki, $groupfilter, $MonthsLong, $condition_session;
 
-    echo '<div class="row"><div class="form_header">'.get_lang('WikiSearchResults').'</div></div>';
+    echo '<legend>'.get_lang('WikiSearchResults').'</legend>';
 
     $_clean['group_id']=(int)$_SESSION['_gid'];
     $session_id=api_get_session_id();

+ 2 - 2
main/work/work.lib.php

@@ -116,7 +116,7 @@ function display_tool_options($uploadvisibledisabled, $origin) {
 		return;
 	}
 	echo '<form method="post" action="'.api_get_self().'?origin='.$origin.'&gradebook='.$gradebook.'&action=settings">';
-	echo '<div class="row"><div class="form_header">'.get_lang('EditToolOptions').'</div></div>';
+	echo '<legend>'.get_lang('EditToolOptions').'</legend>';
 	display_default_visibility_form($uploadvisibledisabled);
 	display_studentsdelete_form();
 	echo '<div class="row">
@@ -145,7 +145,7 @@ function display_default_visibility_form($uploadvisibledisabled) {
 		<input id="uploadvisibledisabled_1" class="checkbox" type="radio" name="uploadvisibledisabled" value="0"   <?php if ($uploadvisibledisabled == 0) echo 'checked'; ?> />
 <label for="uploadvisibledisabled_1">
 				<?php echo get_lang('_new_visible'); ?></label>
-<div></div>
+
 		<input id="uploadvisibledisabled_2" class="checkbox" type="radio" name="uploadvisibledisabled" value="1" <?php if ($uploadvisibledisabled == 1) echo 'checked'; ?> />
 <label for="uploadvisibledisabled_2">
 				<?php echo get_lang('_new_unvisible'); ?>

+ 1 - 1
main/work/work.php

@@ -516,7 +516,7 @@ switch ($action) {
 		    $token = Security::get_token();
 			//create the form that asks for the directory name
 			$new_folder_text = '<form name="form1" method="POST">';
-			$new_folder_text .= '<div class="row"><div class="form_header">'.get_lang('CreateAssignment').'</div></div>';
+			$new_folder_text .= '<legend>'.get_lang('CreateAssignment').'</legend>';
 			$new_folder_text .= '<input type="hidden" name="action" value="add"/>';
 			$new_folder_text .= '<input type="hidden" name="curdirpath" value="' . Security :: remove_XSS($curdirpath) . '"/>';
 			$new_folder_text .= '<input type="hidden" name="sec_token" value="'.$token.'" />';