diff --git a/css/swad15.152.css b/css/swad15.157.css similarity index 99% rename from css/swad15.152.css rename to css/swad15.157.css index 7bae511db..4a811eb41 100644 --- a/css/swad15.152.css +++ b/css/swad15.157.css @@ -194,7 +194,7 @@ a:hover /* Default ==> underlined */ #head_row_1_search { display:inline-block; - padding:0 20px; + padding-right:20px; } @media only screen and (max-width: 1279px) { /* For mobile phones and tablets */ diff --git a/swad_changelog.h b/swad_changelog.h index 78bdb1fd6..713c1d161 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.156.1 (2016-03-20)" -#define CSS_FILE "swad15.152.css" +#define Log_PLATFORM_VERSION "SWAD 15.157 (2016-03-20)" +#define CSS_FILE "swad15.157.css" #define JS_FILE "swad15.131.3.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 15.157: Mar 20, 2016 Changes in tagline and title. (196227 lines) Version 15.156.1: Mar 20, 2016 Change in layout of banners. Changes in layout of types of degree. (196139 lines) Version 15.156: Mar 20, 2016 New module swad_degree_type for degree types. (196137 lines) diff --git a/swad_config.h b/swad_config.h index 90acadefc..32cf69d2e 100644 --- a/swad_config.h +++ b/swad_config.h @@ -102,7 +102,7 @@ #define Cfg_PLATFORM_SHORT_NAME "OpenSWAD" #define Cfg_PLATFORM_FULL_NAME "OpenSWAD (Open Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD (free platform for learning & educational management)" // This title will appear on browser top +#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "openswad.org" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://openswad.org" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://openswad.org/swad" // Without ending slash @@ -171,7 +171,7 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "SWAD UGR" // This title will appear on browser top +#define Cfg_PLATFORM_PAGE_TITLE "SWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "swad.ugr.es" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://swad.ugr.es" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://swad.ugr.es/swad" // Without ending slash @@ -226,11 +226,11 @@ " ga('send', 'pageview');" \ "" -#elif defined WWW_CEVUNA_UNA_PY // www.cevuna.una.py/swad ****************** +#elif defined WWW_CEVUNA_UNA_PY // www.cevuna.una.py/swad ************** #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "SWAD UNA" // This title will appear on browser top +#define Cfg_PLATFORM_PAGE_TITLE "SWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "www.cevuna.una.py" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://www.cevuna.una.py/swad" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://www.cevuna.una.py/swad" // Without ending slash diff --git a/swad_layout.c b/swad_layout.c index fea3165ae..8d0154472 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -365,6 +365,8 @@ static void Lay_WriteEndOfPage (void) static void Lay_WritePageTitle (void) { + extern const char *Txt_TAGLINE; + fprintf (Gbl.F.Out,""); if (Gbl.GetMethod && Gbl.CurrentDeg.Deg.DegCod > 0) @@ -377,8 +379,8 @@ static void Lay_WritePageTitle (void) Gbl.CurrentCrs.Crs.ShortName); } else - fprintf (Gbl.F.Out,"%s", - Cfg_PLATFORM_PAGE_TITLE); + fprintf (Gbl.F.Out,"%s: %s", + Cfg_PLATFORM_PAGE_TITLE,Txt_TAGLINE); fprintf (Gbl.F.Out,"\n"); } @@ -731,6 +733,7 @@ static void Lay_WriteScriptCustomDropzone (void) static void Lay_WritePageTopHeading (void) { extern const char *The_ClassHead[The_NUM_THEMES]; + extern const char *Txt_TAGLINE; const char *ClassHeadRow1[The_NUM_THEMES] = { "HEAD_ROW_1_WHITE", // The_THEME_WHITE @@ -787,7 +790,7 @@ static void Lay_WritePageTopHeading (void) fprintf (Gbl.F.Out,"
" "%s" "
", // head_row_1_logo_small - "free platform for learning & educational management"); // TODO: Need translation!!!!! + Txt_TAGLINE); fprintf (Gbl.F.Out,"
"); Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : diff --git a/swad_text.c b/swad_text.c index b7d341924..bf11047ed 100644 --- a/swad_text.c +++ b/swad_text.c @@ -68,6 +68,7 @@ #include "swad_assignment.h" #include "swad_attendance.h" +#include "swad_config.h" #include "swad_country.h" #include "swad_course.h" #include "swad_degree.h" @@ -39705,6 +39706,100 @@ const char *Txt_Tag_X_not_allowed_Click_to_allow_it = // Warning: it is very imp "Tag %s not allowed. Click to allow it."; // Necessita de tradução #endif +#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 + +#elif defined OPENSWAD_ORG // openswad.org ************************ + +const char *Txt_TAGLINE = +# if L==1 + "plataforma gratuïta de suport a la docència"; +# elif L==2 + "kostenlose Plattform zur Unterstützung der Lehre"; +# elif L==3 + "free platform to support teaching"; +# elif L==4 + "plataforma gratuita de apoyo a la docencia"; +# elif L==5 + "plate-forme gratuite pour appuyer l'enseignement"; +# elif L==6 + "plataforma gratuita de apoyo a la docencia"; // Okoteve traducción +# elif L==7 + "piattaforma gratuita per sostenere l'insegnamento"; +# elif L==8 + "wolna platforma do wspierania nauczania"; +# elif L==9 + "plataforma gratuita de apoio ao ensino"; +# endif + +#elif defined SWAD_UGR_ES // swad.ugr.es ************************* + +const char *Txt_TAGLINE = +# if L==1 + "plataforma de suport a la docència (UGR)"; +# elif L==2 + "Plattform zur Unterstützung der Lehre (UGR)"; +# elif L==3 + "platform to support teaching (UGR)"; +# elif L==4 + "plataforma de apoyo a la docencia (UGR)"; +# elif L==5 + "plate-forme pour appuyer l'enseignement (UGR)"; +# elif L==6 + "plataforma de apoyo a la docencia (UGR)"; // Okoteve traducción +# elif L==7 + "piattaforma per sostenere l'insegnamento (UGR)"; +# elif L==8 + "platforma do wspierania nauczania (UGR)"; +# elif L==9 + "plataforma de apoio ao ensino (UGR)"; +# endif + +#elif defined WWW_CEVUNA_UNA_PY // www.cevuna.una.py/swad ************** + +const char *Txt_TAGLINE = +# if L==1 + "plataforma de suport a la docència (UNA)"; +# elif L==2 + "Plattform zur Unterstützung der Lehre (UNA)"; +# elif L==3 + "platform to support teaching (UNA)"; +# elif L==4 + "plataforma de apoyo a la docencia (UNA)"; +# elif L==5 + "plate-forme pour appuyer l'enseignement (UNA)"; +# elif L==6 + "plataforma de apoyo a la docencia (UNA)"; // Okoteve traducción +# elif L==7 + "piattaforma per sostenere l'insegnamento (UNA)"; +# elif L==8 + "platforma do wspierania nauczania (UNA)"; +# elif L==9 + "plataforma de apoio ao ensino (UNA)"; +# endif + +#endif + const char *Txt_Tags = // Tags used in test #if L==1 "Descriptors";