diff --git a/css/swad16.185.3.css b/css/swad16.185.3.css
index aaeca9de..799aad00 100644
--- a/css/swad16.185.3.css
+++ b/css/swad16.185.3.css
@@ -2381,14 +2381,15 @@ a:hover img.CENTRE_PHOTO_SHOW
font-size:10pt;
letter-spacing:0;
}
-.TT_HOUR {height:40px;}
-.TT_FREE0 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;}
-.TT_FREE1 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;}
-.TT_FREE2 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;}
-.TT_FREE3 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;}
-.TT_THEO {height:20px; background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;}
-.TT_PRAC {height:20px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;}
-.TT_TUTO {height:20px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;}
+.TT_HOUR {height:20px;}
+.TT_ALIGN {height:10px;}
+.TT_FREE0 {height:10px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;}
+.TT_FREE1 {height:10px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;}
+.TT_FREE2 {height:10px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;}
+.TT_FREE3 {height:10px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;}
+.TT_THEO {height:10px; background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;}
+.TT_PRAC {height:10px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;}
+.TT_TUTO {height:10px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;}
/********************************* Preference ********************************/
.PREF_CONTAINER
diff --git a/swad_changelog.h b/swad_changelog.h
index eff70304..340eed6b 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -213,17 +213,20 @@
// TODO: Changes in timetable (hours end in 24h).
+// TODO: Fix bug: An URL like https://openswad.org/es?a gives Internal Server Error
+
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.185.4 (2017-04-21)"
+#define Log_PLATFORM_VERSION "SWAD 16.186 (2017-04-24)"
#define CSS_FILE "swad16.185.3.css"
#define JS_FILE "swad16.181.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
+ Version 16.186: Apr 24, 2017 Changes in timetable. Not finished. (217867 lines)
Version 16.185.4: Apr 21, 2017 Warning about Java no longer working. (217849 lines)
Version 16.185.3: Apr 20, 2017 Timetables end at 24h, suggested by Sandra Daniela Tazzioli Barroso. (217797 lines)
Version 16.185.2: Apr 19, 2017 Changes in forums. (217793 lines)
diff --git a/swad_config.h b/swad_config.h
index e0663d6f..a7c3a267 100644
--- a/swad_config.h
+++ b/swad_config.h
@@ -51,8 +51,8 @@
#define Cfg_PLATFORM_SHORT_NAME "SWAD local"
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_SERVER "localhost" // Server name (main part of the URL)
-#define Cfg_URL_SWAD_SERVER "https://localhost/swad/" // With ending slash
-#define Cfg_URL_SWAD_CGI "https://localhost/swad" // Without ending slash
+#define Cfg_URL_SWAD_SERVER "https://localhost/" // With ending slash
+#define Cfg_URL_SWAD_CGI "https://localhost" // Without ending slash
#define Cfg_URL_SWAD_PUBLIC "https://localhost/swad" // Without ending slash
#define Cfg_PATH_CGI_BIN "/usr/lib/cgi-bin/swad" // Directory for this CGI and other commands called by it
#define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc.
diff --git a/swad_text.c b/swad_text.c
index b4fabf15..d2f05b6b 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -41163,57 +41163,13 @@ const char *Txt_Tag_X_not_allowed_Click_to_allow_it = // Warning: it is very imp
#if defined LOCALHOST_UBUNTU // localhost (Ubuntu) *****************
-const char *Txt_TAGLINE =
-# if L==1
- "plataforma de suport a la docència";
-# elif L==2
- "Plattform zur Unterstützung der Lehre";
-# elif L==3
- "platform to support teaching";
-# elif L==4
- "plataforma de apoyo a la docencia";
-# elif L==5
- "plate-forme pour appuyer l'enseignement";
-# elif L==6
- "plataforma de apoyo a la docencia"; // Okoteve traducción
-# elif L==7
- "piattaforma per sostenere l'insegnamento";
-# elif L==8
- "platforma do wspierania nauczania";
-# elif L==9
- "plataforma de apoio ao ensino";
-# endif
-
-const char *Txt_TAGLINE_BR =
-# if L==1
- "plataforma de suport
a la docència";
-# elif L==2
- "Plattform zur
Unterstützung der Lehre";
-# elif L==3
- "platform to
support teaching";
-# elif L==4
- "plataforma de apoyo
a la docencia";
-# elif L==5
- "plate-forme pour
appuyer l'enseignement";
-# elif L==6
- "plataforma de apoyo
a la docencia"; // Okoteve traducción
-# elif L==7
- "piattaforma per
sostenere l'insegnamento";
-# elif L==8
- "platforma do
wspierania nauczania";
-# elif L==9
- "plataforma de
apoio ao ensino";
-# endif
-
-#elif defined OPENSWAD_ORG // openswad.org ***********************
-
const char *Txt_TAGLINE =
# if L==1
"plataforma educativa";
# elif L==2
"Bildungsplattform";
# elif L==3
- "educational platform";
+ "social learning platform";
# elif L==4
"plataforma educativa";
# elif L==5
@@ -41234,7 +41190,51 @@ const char *Txt_TAGLINE_BR =
# elif L==2
"Bildungs-
plattform";
# elif L==3
- "educational
platform";
+ "social learning
platform";
+# elif L==4
+ "plataforma
educativa";
+# elif L==5
+ "plate-forme
éducative";
+# elif L==6
+ "plataforma
educativa"; // Okoteve traducción
+# elif L==7
+ "piattaforma
educativa";
+# elif L==8
+ "platforma
edukacyjna";
+# elif L==9
+ "plataforma
educacional";
+# endif
+
+#elif defined OPENSWAD_ORG // openswad.org ***********************
+
+const char *Txt_TAGLINE =
+# if L==1
+ "plataforma educativa";
+# elif L==2
+ "Bildungsplattform";
+# elif L==3
+ "social learning platform";
+# elif L==4
+ "plataforma educativa";
+# elif L==5
+ "plate-forme éducative";
+# elif L==6
+ "plataforma educativa"; // Okoteve traducción
+# elif L==7
+ "piattaforma educativa";
+# elif L==8
+ "platforma edukacyjna";
+# elif L==9
+ "plataforma educacional";
+# endif
+
+const char *Txt_TAGLINE_BR =
+# if L==1
+ "plataforma
educativa";
+# elif L==2
+ "Bildungs-
plattform";
+# elif L==3
+ "social learning
platform";
# elif L==4
"plataforma
educativa";
# elif L==5
diff --git a/swad_timetable.c b/swad_timetable.c
index e786799f..ed03f1b5 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -52,6 +52,8 @@ extern struct Globals Gbl;
#define TT_START_HOUR 6 // Day starts at 6:00
#define TT_HOURS_PER_DAY 18 // From 6:00 to 24:00
+// #define TT_HOURS_PER_DAY 2 // From 6:00 to 24:00
+
#define TT_DAYS 7 // Seven days per week
#define TT_MAX_COLUMNS_PER_CELL 3 // Maximum number of items (i.e. classes) in a timetable cell (1, 2, 3 or 4)
#define TT_NUM_MINICOLUMNS_PER_DAY 6 // Least common multiple of 1,2,3,...,TT_MAX_COLUMNS_PER_CELL
@@ -105,8 +107,8 @@ struct
{
unsigned NumColumns;
struct TimeTableColumn Columns[TT_MAX_COLUMNS_PER_CELL];
- } TimeTable[TT_DAYS][TT_HOURS_PER_DAY * 2];
-bool TimeTableHoursChecked[TT_HOURS_PER_DAY * 2];
+ } TimeTable[TT_DAYS][TT_HOURS_PER_DAY * 12];
+bool TimeTableHoursChecked[TT_HOURS_PER_DAY * 12];
/*****************************************************************************/
/***************************** Internal prototypes **************************/
@@ -834,6 +836,7 @@ static void TT_DrawTimeTable (void)
unsigned DayColumn; // Column from left (0) to right (6)
unsigned Day; // Day of week
unsigned Hour;
+ unsigned Min;
unsigned H;
unsigned Column;
unsigned ColumnsToDraw;
@@ -863,7 +866,7 @@ static void TT_DrawTimeTable (void)
/***** Row with day names *****/
fprintf (Gbl.F.Out,"