Yannick Warnier 15 years ago
parent
commit
6f4cf015f4

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

@@ -377,7 +377,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 			//if($answerType == 2)
 			//	$s.=' / '.$total_item;		
 			echo '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'">';
-			echo '<table class="exercise_questions">
+			echo '<table class="exercise_questions" >
 				  <tr>
 			  		<td valign="top" colspan="2">';
 					echo $questionDescription=api_parse_tex($questionDescription);
@@ -527,7 +527,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 		</td></tr>";
 		echo $s;
 	}
-	echo "</table>";
+	echo "</table><br />";
 
 	return $nbrAnswers;
 }

+ 6 - 6
main/install/install_functions.inc.php

@@ -530,27 +530,27 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
 	echo '<div class="RequirementContent">';
 	echo '<table class="requirements">
 			<tr>
-				<td class="requirements-item">dokeos/main/inc/conf/</td>
+				<td class="requirements-item">chamilo/main/inc/conf/</td>
 				<td class="requirements-value">'.check_writable('inc/conf/').'</td>
 			</tr>
 			<tr>
-				<td class="requirements-item">dokeos/main/upload/users/</td>
+				<td class="requirements-item">chamilo/main/upload/users/</td>
 				<td class="requirements-value">'.check_writable('upload/users/').'</td>
 			</tr>
 			<tr>
-				<td class="requirements-item">dokeos/main/default_course_document/images/</td>
+				<td class="requirements-item">chamilo/main/default_course_document/images/</td>
 				<td class="requirements-value">'.check_writable('default_course_document/images/').'</td>
 			</tr>
 			<tr>
-				<td class="requirements-item">dokeos/archive/</td>
+				<td class="requirements-item">chamilo/archive/</td>
 				<td class="requirements-value">'.check_writable('../archive/').'</td>
 			</tr>
 			<tr>
-				<td class="requirements-item">dokeos/courses/</td>
+				<td class="requirements-item">chamilo/courses/</td>
 				<td class="requirements-value">'.check_writable('../courses/').'</td>
 			</tr>
 			<tr>
-				<td class="requirements-item">dokeos/home/</td>
+				<td class="requirements-item">chamilo/home/</td>
 				<td class="requirements-value">'.check_writable('../home/').'</td>
 			</tr>'.
             //'<tr>

+ 2 - 6
main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql

@@ -20,7 +20,6 @@ ALTER TABLE session_rel_course_rel_user ADD COLUMN visibility int NOT NULL defau
 ALTER TABLE session_rel_course_rel_user ADD COLUMN status int NOT NULL default 0;
 CREATE TABLE session_category (id int(11) NOT NULL auto_increment, name varchar(100) default NULL, date_start date default NULL, date_end date default NULL, PRIMARY KEY  (id));
 
-
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_coach_to_edit_course_session', NULL, 'radio', 'Course', 'false', 'AllowCoachsToEditInsideTrainingSessions', 'AllowCoachsToEditInsideTrainingSessionsComment', NULL, NULL, 0);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('show_courses_descriptions_in_catalog', NULL, 'radio', 'Course', 'true', 'ShowCoursesDescriptionsInCatalogTitle', 'ShowCoursesDescriptionsInCatalogComment', NULL, NULL, 1, 1);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('show_glossary_in_extra_tools', NULL, 'radio', 'Course', 'false', 'ShowGlossaryInExtraToolsTitle', 'ShowGlossaryInExtraToolsComment', NULL, NULL,1,0);
@@ -37,8 +36,6 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('show_gloss
 CREATE TABLE tag (id int NOT NULL auto_increment, tag varchar(255) NOT NULL, field_id int NOT NULL, count int NOT NULL, PRIMARY KEY  (id));
 CREATE TABLE user_rel_tag (id int NOT NULL auto_increment,user_id int NOT NULL,tag_id int NOT NULL, PRIMARY KEY  (id));
 
-CREATE TABLE announcement_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, announcement_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
-
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('send_email_to_admin_when_create_course',NULL,'radio','Platform','false','SendEmailToAdminTitle','SendEmailToAdminComment',NULL,NULL, 1);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('send_email_to_admin_when_create_course','true','Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('send_email_to_admin_when_create_course','false','No');
@@ -47,13 +44,12 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_options (variable, value, display_text) VALUES ('go_to_course_after_login', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('go_to_course_after_login', 'false', 'No');
 
-CREATE TABLE IF NOT EXISTS message_attachment (id int NOT NULL AUTO_INCREMENT, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, message_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY(id));
+CREATE TABLE message_attachment (id int NOT NULL AUTO_INCREMENT, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, message_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY(id));
 
 CREATE TABLE groups (id int NOT NULL AUTO_INCREMENT, name varchar(255) NOT NULL, description varchar(255) NOT NULL, picture_uri varchar(255) NOT NULL, url varchar(255) NOT NULL, visibility int NOT NULL, updated_on varchar(255) NOT NULL, created_on varchar(255) NOT NULL, PRIMARY KEY (id));
 CREATE TABLE group_rel_tag (id int NOT NULL AUTO_INCREMENT, tag_id int NOT NULL, group_id int NOT NULL, PRIMARY KEY (id));
 CREATE TABLE group_rel_user (id int NOT NULL AUTO_INCREMENT, group_id int NOT NULL, user_id int NOT NULL, relation_type int NOT NULL, PRIMARY KEY (id));
 
-
 ALTER TABLE message ADD COLUMN group_id INT NOT NULL DEFAULT 0;
 ALTER TABLE message ADD COLUMN parent_id INT NOT NULL DEFAULT 0;
 ALTER TABLE message ADD INDEX idx_message_group(group_id);
@@ -75,7 +71,6 @@ ALTER TABLE group_rel_user ADD INDEX ( relation_type );
 ALTER TABLE group_rel_tag  ADD INDEX ( group_id );
 ALTER TABLE group_rel_tag  ADD INDEX ( tag_id );
 
-
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_students_to_create_groups_in_social', NULL, 'radio', 'Tools', 'false', 'AllowStudentsToCreateGroupsInSocialTitle', 'AllowStudentsToCreateGroupsInSocialComment', NULL, NULL, 0);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_students_to_create_groups_in_social', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_students_to_create_groups_in_social', 'false', 'No');
@@ -96,6 +91,7 @@ ALTER TABLE track_e_online ADD INDEX (course);
 
 -- xxCOURSExx
 
+CREATE TABLE announcement_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, announcement_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
 ALTER TABLE quiz ADD COLUMN session_id smallint DEFAULT 0, ADD INDEX (session_id);
 ALTER TABLE blog ADD COLUMN session_id smallint DEFAULT 0, ADD INDEX (session_id);
 ALTER TABLE course_description ADD COLUMN session_id smallint DEFAULT 0, ADD INDEX (session_id);