[svn r20924] Reverted unauthorized database change (and corresponding changes). As discussed, the changes will be applied to the Dokeos 1.8.6 package but not to the Subversion repository before 1.8.6 stable, to keep the database free of changes.

16 years ago · 15a9859b4a
parent b60fa6d273
commit 15a9859b4a
5 changed files with 10 additions and 26 deletions
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@ -60,7 +60,7 @@ $error_message_not_installed = <<<EOM
 			<title>Dokeos not installed!</title>
 			<style type="text/css" media="screen, projection">
 				/*<![CDATA[*/
-				@import "main/css/dokeos_blue/default.css";
+				@import "main/css/public_admin/default.css";
 				/*]]>*/
 			</style>
 		</head>
@ -69,17 +69,7 @@ $error_message_not_installed = <<<EOM
 				<div id="header1"><a href="http://www.dokeos.com">Dokeos Homepage</a></div>
 				<div class="clear"></div>
 				<div id="header2">&nbsp;</div>
-				<div id="header3">
-				 <ul id="logout">
-						<li><a href="" target="_top"><span>&nbsp;</span></a></li>
-				 </ul>
-				
-					<ul>
-						<li id="current"><a href="#"><span>Installation</span></a></li>
-					</ul>
-					<div style="clear: both;" class="clear"></div>
-				</div>
-				<div id="header4">&nbsp;</div>
+				<div id="header3">&nbsp;</div>
 			</div>

 			<div style="text-align: center;"><br /><br />
--- a/main/install/dokeos_main.sql
+++ b/main/install/dokeos_main.sql
@ -636,7 +636,7 @@ VALUES
 ('service_ppt2lp', 'path_to_lzx', 'textfield', NULL, NULL, '', NULL, NULL, NULL, 0),
 ('service_ppt2lp', 'size', 'radio', NULL, '720x540', '', NULL, NULL, NULL, 0),
 ('wcag_anysurfer_public_pages', NULL, 'radio','Platform','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL, 0),
-('stylesheets', NULL, 'textfield','stylesheets','dokeos_blue','',NULL, NULL, NULL, 1), 
+('stylesheets', NULL, 'textfield','stylesheets','public_admin','',NULL, NULL, NULL, 1), 
 ('upload_extensions_list_type', NULL, 'radio', 'Security', 'blacklist', 'UploadExtensionsListType', 'UploadExtensionsListTypeComment', NULL, NULL, 0),
 ('upload_extensions_blacklist', NULL, 'textfield', 'Security', '', 'UploadExtensionsBlacklist', 'UploadExtensionsBlacklistComment', NULL, NULL, 0),
 ('upload_extensions_whitelist', NULL, 'textfield', 'Security', 'htm;html;jpg;jpeg;gif;png;swf;avi;mpg;mpeg', 'UploadExtensionsWhitelist', 'UploadExtensionsWhitelistComment', NULL, NULL, 0),
--- a/main/install/index.php
+++ b/main/install/index.php
@ -356,7 +356,7 @@ if ($encryptPassForm=='1' ) {
 	<title>&mdash; <?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
 	<style type="text/css" media="screen, projection">
 		/*<![CDATA[*/
-		@import "../css/dokeos_blue/default.css";
+		@import "../css/public_admin/default.css";
 		/*]]>*/
 	</style>
 	<script type="text/javascript" src="../inc/lib/javascript/jquery.js"></script>
@ -432,16 +432,10 @@ if ($encryptPassForm=='1' ) {
 	<div id="header1"><?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?><?php if($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); else if($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').(is_array($update_from_version)?implode('|',$update_from_version):''); ?></div>
 	<div id="header2">&nbsp;</div>
 	<div id="header3">
-	 <ul id="logout">
-			<li><a href="" target="_top"><span>&nbsp;</span></a></li>
-	 </ul>
-	
 		<ul>
 			<li id="current"><a href="#"><span>Installation</span></a></li>
-		</ul>
-		<div style="clear: both;" class="clear"></div>
+		</ul>	
 	</div>
-	<div id="header4">&nbsp;</div>
 </div>


--- a/main/install/update_courses.php
+++ b/main/install/update_courses.php
@ -122,7 +122,7 @@ elseif($_POST['step1'])
 <html>
 <head>
 <title>-- Dokeos course update -- version <?php echo $dokeos_version; ?></title>
-<link rel="stylesheet" href="../css/dokeos_blue/default.css" type="text/css">
+<link rel="stylesheet" href="../css/public_admin/default.css" type="text/css">
 </head>
 <body bgcolor="white" dir="<?php echo $text_dir ?>">

@ -217,7 +217,7 @@ else
 		</table>

 		<p align="center">
-		<input type="submit" name="step2" value="Update courses" onClick="javascript:if(this.value == 'Please Wait...') return false; else this.value='Please Wait...';" />
+		<input type="submit" name="step2" value="Update courses" onclick="javascript:if(this.value == 'Please Wait...') return false; else this.value='Please Wait...';" />
 		</p>
 	<?php
 }
--- a/main/install/upgrade.php
+++ b/main/install/upgrade.php
@ -485,7 +485,7 @@ class ActionDisplay extends HTML_QuickForm_Action_Display
 		<head>
 		<title>-- Dokeos - upgrade to version <?php echo $dokeos_version; ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-		<link rel="stylesheet" href="../css/dokeos_blue/default.css" type="text/css"/>
+		<link rel="stylesheet" href="../css/public_admin/default.css" type="text/css"/>
 		</head>
 		<body dir="<?php echo get_lang('text_dir'); ?>">
 		<div id="header1">
@ -552,7 +552,7 @@ class ActionProcess extends HTML_QuickForm_Action
 		<head>
 		<title>-- Dokeos installation -- version <?php echo $dokeos_version; ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-		<link rel="stylesheet" href="../css/dokeos_blue/default.css" type="text/css"/>
+		<link rel="stylesheet" href="../css/public_admin/default.css" type="text/css"/>
 		</head>
 		<body dir="<?php echo get_lang('text_dir'); ?>">
 		<div style="background-color:#4171B5;color:white;font-size:x-large;">
@ -614,7 +614,7 @@ function display_upgrade_header($text_dir, $dokeos_version, $install_type, $upda
 		<title>&mdash; <?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$dokeos_version; ?></title>
 		<style type="text/css" media="screen, projection">
 			/*<![CDATA[*/
-			@import "../css/dokeos_blue/default.css";
+			@import "../css/public_admin/default.css";
 			/*]]>*/
 		</style>
 	<?php if(!empty($charset)){ ?>