jmontoya 15 years ago
parent
commit
776fb39aae

+ 13 - 0
documentation/credits.html

@@ -265,6 +265,8 @@ see also http://www.dokeos.com/extensions/
   <li>Vargas Palma Rubén (thiefdp@hotmail.com)</li>
   <li>Dokeos 1.8 integration and refactoring:</li>
   <li> Evie Embrechts </li>
+  <li>Julio Montoya Armas (gugli100@gmail.com)</li>
+  <li>Isaac Flores</li>
 </ul>
 
 
@@ -338,6 +340,15 @@ see also http://www.dokeos.com/extensions/
   <li>First integration into Dokeos and many improvements (including Google Maps integration): Juan Carlos Raña</li>
 </ul>
 
+
+<h2>Social Network</h2>
+<ul>
+  <li>Julio Montoya Armas (gugli100@gmail.com)</li>
+  <li>Isaac Flores</li>
+</ul>
+
+
+
 <h2>User Image</h2>
 <ul>
   <li> Miguel (miguel@cesga.es)</li>
@@ -461,6 +472,8 @@ the development of the notebook and glossary tools</li>
   <li> Ronny Velasquez, for a series of bugfixes and improvements in 1.8.6</li>
   <li> Ricardo Rodriguez, for implementing the first set of unit tests in 1.8.6, and manual testing and reporting</li>
   <li> Franco Cedillo, for minor bugfixes in 1.8.6</li>
+  <li> Ruben Pereira, Ana Elena Olivera and all the kids from the Joaquin Sant'Anna school for being an inspiration to all of us.</li>
+  
 </ul>
 
 <h1>Removed developments</h1>

+ 2 - 2
documentation/index.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   
-  <title>Dokeos 1.8.6</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
+  <title>Dokeos 1.8.6.1</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
   <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
   <style type="text/css">
 	<!--
@@ -14,7 +14,7 @@
 
 <body>
 <div id="header1">
-<h1>Dokeos FREE 1.8.6 <span style="font-style: italic;">Svalbard</span> - Documentation</h1>
+<h1>Dokeos FREE 1.8.6.1 <span style="font-style: italic;">Babel</span> - Documentation</h1>
 </div>
 
 <div id="outerframe">

+ 3 - 3
documentation/installation_guide.html

@@ -7,7 +7,7 @@
   
   
   
-  <title>Dokeos 1.8.6 Installation Guide</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
+  <title>Dokeos 1.8.6.1 Installation Guide</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
 
   
   <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
@@ -25,7 +25,7 @@
 
 
 <div id="header1">
-<h1>Dokeos 1.8.6 FREE : Installation Guide</h1>
+<h1>Dokeos 1.8.6.1 FREE : Installation Guide</h1>
 
 </div>
 
@@ -35,7 +35,7 @@
 <p></p>
 
 
-<p>Thank you for downloading Dokeos Svalbard FREE.</p>
+<p>Thank you for downloading Dokeos Babel FREE.</p>
 
 
 <ul>

+ 5 - 5
documentation/installation_guide_es_ES.html

@@ -7,7 +7,7 @@
 
   
   
-  <title>Guia de Instalación de Dokeos 1.8.6 Svalbard</title>
+  <title>Guia de Instalación de Dokeos 1.8.6.1 Babel</title>
   <link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
 
   
@@ -27,11 +27,11 @@
 
 
 <div id="header1">
-<h1>Guía de Instalación de Dokeos 1.8.6 Svalbard</h1>
+<h1>Guía de Instalación de Dokeos 1.8.6.1 Babel</h1>
 
 </div>
 
-<a href="index.html">Documentación</a> &gt; Guia de Instalación
+<a href="index.html">Documentación</a> &gt; Guía de Instalación
 <div id="outerframe">
 <div id="main">
 <p></p>
@@ -474,10 +474,10 @@ asistencia para su propio SO en <a href="http://www.dokeos.com/en/node/66">nuest
 En Windows, quizas usted necesite revisar las propiedades de las carpetas.
 <p>
 </p>
-<h3>3.4 Guia de Actualizacion Rapida desde 1.6.x para Linux</h3>
+<h3>3.4 Guía de Actualizacion Rapida desde 1.6.x para Linux</h3>
 
 
-La siguiente guia de actualizacion rapida asume lo siguiente:
+La siguiente guía de actualizacion rapida asume lo siguiente:
 <ul>
   <li>el nombre de usuario de la base de datos de Dokeos (para MySQL) es "dokeos_db_user" y su acceso es "dokeos_user"</li>
   <li>actualmente la instalacion de Dokeos esta en /var/www/dokeos/ y tiene permisos 777</li>

+ 13 - 9
main/css/academica/default.css

@@ -1778,30 +1778,34 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 12 - 9
main/css/baby_orange/default.css

@@ -1773,30 +1773,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 7 - 6
main/css/blue_lagoon/default.css

@@ -2298,25 +2298,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 7 - 6
main/css/cool_blue/default.css

@@ -2291,25 +2291,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 12 - 9
main/css/corporate/default.css

@@ -1789,30 +1789,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 12 - 9
main/css/cosmic_campus/default.css

@@ -1807,30 +1807,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 7 - 6
main/css/delicious_bordeaux/default.css

@@ -2299,25 +2299,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 7 - 6
main/css/dokeos_blue/default.css

@@ -2285,25 +2285,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 9 - 9
main/css/dokeos_classic/default.css

@@ -2513,31 +2513,31 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:20%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:47%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
 }
+
 .social-profile-post {
 	width: 450px;
 	background : #EFEFEF;

+ 12 - 9
main/css/dokeos_classic_2D/default.css

@@ -2547,30 +2547,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 7 - 6
main/css/empire_green/default.css

@@ -2298,25 +2298,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 7 - 6
main/css/fruity_orange/default.css

@@ -2298,25 +2298,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 12 - 9
main/css/medical/default.css

@@ -2469,30 +2469,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 4 - 4
main/css/public_admin/default.css

@@ -2499,11 +2499,11 @@ div.image-social-content center.friend {
 	float: left;
 }
 #social-profile-container {
-/*width: 100%;*/
+	/*width: 100%;*/
 }
 #social-profile-left {
 	float:left;
-	width:22%;
+	width:21%;
 }
 .left-side {
 	min-width: 198px;
@@ -2511,11 +2511,11 @@ div.image-social-content center.friend {
 }
 #social-profile-content {
 	float:right;
-	width:47%;
+	width:46%;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
 }
 .social-profile-post {
 	background : #EFEFEF;

+ 7 - 6
main/css/royal_purple/default.css

@@ -2293,25 +2293,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 12 - 9
main/css/silver_line/default.css

@@ -2179,30 +2179,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:20%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	width: 450px;

+ 12 - 9
main/css/sober_brown/default.css

@@ -2506,30 +2506,33 @@ div.image-social-content center.friend {
 	padding-left:10px;
 	width:200px;
 }
+/* general layout of the profile page */
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
 	margin:0 auto;
 	float: left;
-}
+}	
 #social-profile-container {
-/*width: 100%;*/
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:22%;
-}
-.left-side {
-	min-width: 198px;
-	margin: 0px;
+	width:21%;	
 }
 #social-profile-content {
 	float:right;
-	width:48%;
+	width:46%;
+	margin-left: 2px;
 }
 #social-profile-right {
 	float:right;
-	width:30%;
+	width:32%;
+	margin-left: 2px;
+}
+.left-side {
+	min-width: 198px;
+	margin: 0px;
 }
 .social-profile-post {
 	background : #EFEFEF;

+ 7 - 6
main/css/steel_grey/default.css

@@ -2301,25 +2301,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 7 - 6
main/css/tasty_olive/default.css

@@ -2298,25 +2298,26 @@ div.image-social-content center.friend {
 }
 /* general layout of the profile page */
 #social-profile-wrapper {
-	width: 1000px;
+	width: 100%;
 	text-align:left;
 	margin:0 auto;
-}
+	float: left;
+}	
 #social-profile-container {
-	width: 705px;
+	/* width: 705px; */
 }
 #social-profile-left {
 	float:left;
-	width:220px;
+	width:22%;	
 }
 #social-profile-content {
 	float:right;
-	width:480px;
+	width:47%;
 	margin-left: 4px;
 }
 #social-profile-right {
 	float:right;
-	width:290px;
+	width:30%;
 	margin-left: 4px;
 }
 /*****************************************************

+ 8 - 2
main/install/index.php

@@ -311,8 +311,7 @@ if($installType=='update' && in_array($my_old_version,$update_from_version_8))
 	include_once '../inc/conf/configuration.php';
 }
 
-if(!isset($_GET['running']))
-{
+if(!isset($_GET['running'])) {
 	$dbHostForm='localhost';
 	$dbUsernameForm='root';
 	$dbPassForm='';
@@ -541,6 +540,13 @@ if ($encryptPassForm=='1' ) {
 </div>
 
 <table cellpadding="6" cellspacing="0" border="0" width="72%" align="center">
+<tr>
+<td>
+	<div id="note" style="float:right;">
+		<a href="../../documentation/installation_guide.html" target="_blank">Read the installation guide.</a>
+	</div>
+</td>
+</tr>
 <tr>
   <td>
 	<input type="hidden" name="updatePath"           value="<?php if(!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES, $charset); ?>" />