chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
skala
jmontoya 17 years ago
parent 92752b528e fd4c6b0cf0
commit 776fb39aae
24 changed files with 204 additions and 151 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      documentation/credits.html
  2. 4
      documentation/index.html
  3. 6
      documentation/installation_guide.html
  4. 10
      documentation/installation_guide_es_ES.html
  5. 20
      main/css/academica/default.css
  6. 19
      main/css/baby_orange/default.css
  7. 11
      main/css/blue_lagoon/default.css
  8. 11
      main/css/cool_blue/default.css
  9. 19
      main/css/corporate/default.css
  10. 19
      main/css/cosmic_campus/default.css
  11. 11
      main/css/delicious_bordeaux/default.css
  12. 11
      main/css/dokeos_blue/default.css
  13. 16
      main/css/dokeos_classic/default.css
  14. 19
      main/css/dokeos_classic_2D/default.css
  15. 11
      main/css/empire_green/default.css
  16. 11
      main/css/fruity_orange/default.css
  17. 19
      main/css/medical/default.css
  18. 6
      main/css/public_admin/default.css
  19. 11
      main/css/royal_purple/default.css
  20. 19
      main/css/silver_line/default.css
  21. 19
      main/css/sober_brown/default.css
  22. 11
      main/css/steel_grey/default.css
  23. 11
      main/css/tasty_olive/default.css
  24. 10
      main/install/index.php

13
documentation/credits.html
Unescape View File

@ -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>

4
documentation/index.html
Unescape View File

@ -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">

6
documentation/installation_guide.html
Unescape View File

@ -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>

10
documentation/installation_guide_es_ES.html
Unescape View File

@ -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>

20
main/css/academica/default.css
Unescape View File

@ -1778,6 +1778,8 @@ 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;
@ -1785,23 +1787,25 @@ div.image-social-content center.friend {
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;

19
main/css/baby_orange/default.css
Unescape View File

@ -1773,6 +1773,7 @@ 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;
@ -1780,23 +1781,25 @@ div.image-social-content center.friend {
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;

11
main/css/blue_lagoon/default.css
Unescape View File

@ -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;
}
/*****************************************************

11
main/css/cool_blue/default.css
Unescape View File

@ -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;
}
/*****************************************************

19
main/css/corporate/default.css
Unescape View File

@ -1789,6 +1789,7 @@ 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;
@ -1796,23 +1797,25 @@ div.image-social-content center.friend {
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;

19
main/css/cosmic_campus/default.css
Unescape View File

@ -1807,6 +1807,7 @@ 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;
@ -1814,23 +1815,25 @@ div.image-social-content center.friend {
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;

11
main/css/delicious_bordeaux/default.css
Unescape View File

@ -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;
}
/*****************************************************

11
main/css/dokeos_blue/default.css
Unescape View File

@ -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;
}
/*****************************************************

16
main/css/dokeos_classic/default.css
Unescape View File

@ -2513,6 +2513,7 @@ 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;
@ -2520,24 +2521,23 @@ div.image-social-content center.friend {
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;

19
main/css/dokeos_classic_2D/default.css
Unescape View File

@ -2547,6 +2547,7 @@ 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;
@ -2554,23 +2555,25 @@ div.image-social-content center.friend {
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;

11
main/css/empire_green/default.css
Unescape View File

@ -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;
}
/*****************************************************

11
main/css/fruity_orange/default.css
Unescape View File

@ -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;
}
/*****************************************************

19
main/css/medical/default.css
Unescape View File

@ -2469,6 +2469,7 @@ 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;
@ -2476,23 +2477,25 @@ div.image-social-content center.friend {
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;

6
main/css/public_admin/default.css
Unescape View File

@ -2503,7 +2503,7 @@ div.image-social-content center.friend {
}
#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;

11
main/css/royal_purple/default.css
Unescape View File

@ -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;
}
/*****************************************************

19
main/css/silver_line/default.css
Unescape View File

@ -2179,6 +2179,7 @@ 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;
@ -2186,23 +2187,25 @@ div.image-social-content center.friend {
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;

19
main/css/sober_brown/default.css
Unescape View File

@ -2506,6 +2506,7 @@ 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;
@ -2513,23 +2514,25 @@ div.image-social-content center.friend {
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;

11
main/css/steel_grey/default.css
Unescape View File

@ -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;
}
/*****************************************************

11
main/css/tasty_olive/default.css
Unescape View File

@ -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;
}
/*****************************************************

10
main/install/index.php
Unescape View File

@ -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); ?>" />

Write Preview
Loading…
Cancel
Save