From 4158ab6a71c3443be97c22a0046a0646900f7d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 4 Mar 2017 01:27:54 +0100 Subject: [PATCH] Version 16.146.3 --- css/swad16.146.css | 10 +++++++++- swad_centre.c | 11 +++++------ swad_changelog.h | 3 ++- swad_degree.c | 11 +++++------ swad_institution.c | 11 +++++------ 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/css/swad16.146.css b/css/swad16.146.css index b0d0dfc27..8dcd46dba 100644 --- a/css/swad16.146.css +++ b/css/swad16.146.css @@ -1636,7 +1636,15 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} } /******************* Web of institution, centre, degree **********************/ -.EXTERNAL_WWW +.EXTERNAL_WWW_SHORT + { + box-sizing:border-box; + max-width:100px; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } +.EXTERNAL_WWW_LONG { box-sizing:border-box; max-width:250px; diff --git a/swad_centre.c b/swad_centre.c index 87d57c7b6..deb238c9a 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -500,7 +500,7 @@ static void Ctr_Configuration (bool PrintView) Act_FormEnd (); } else // I can not change centre WWW - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "%s" "" @@ -1366,8 +1366,6 @@ void Ctr_WriteSelectorOfCentre (void) /*************************** List all the centres ****************************/ /*****************************************************************************/ -#define Ctr_MAX_LENGTH_WWW_ON_SCREEN 15 - static void Ctr_ListCentresForEdition (void) { extern const char *Hlp_INSTITUTION_Centres; @@ -1515,11 +1513,12 @@ static void Ctr_ListCentresForEdition (void) { Str_Copy (WWW,Ctr->WWW, Cns_MAX_LENGTH_WWW); - Str_LimitLengthHTMLStr (WWW,Ctr_MAX_LENGTH_WWW_ON_SCREEN); - fprintf (Gbl.F.Out,"" + "" "%s" - "", + "" + "
", Ctr->WWW,Ctr->WWW,WWW); } fprintf (Gbl.F.Out,""); diff --git a/swad_changelog.h b/swad_changelog.h index d03e51c48..c48f49ceb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -197,13 +197,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.146.2 (2017-03-04)" +#define Log_PLATFORM_VERSION "SWAD 16.146.3 (2017-03-04)" #define CSS_FILE "swad16.146.css" #define JS_FILE "swad16.144.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.146.3: Mar 04, 2017 Changes in layout of edition of institutions, centres and degrees. (216363 lines) Version 16.146.2: Mar 04, 2017 Changes in layout of authors. (216354 lines) Version 16.146.1: Mar 03, 2017 Changes in layout of assigments. (216350 lines) Version 16.146: Mar 03, 2017 Changes in layout of class photos. (216351 lines) diff --git a/swad_degree.c b/swad_degree.c index f597433cf..c4c87d41e 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -457,7 +457,7 @@ static void Deg_Configuration (bool PrintView) Act_FormEnd (); } else // I can not change degree WWW - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "%s" "" @@ -676,8 +676,6 @@ void Deg_ShowDegsOfCurrentCtr (void) /********************* List current degrees for edition **********************/ /*****************************************************************************/ -#define Deg_MAX_LENGTH_WWW_ON_SCREEN 15 - static void Deg_ListDegreesForEdition (void) { extern const char *Hlp_CENTRE_Degrees; @@ -823,11 +821,12 @@ static void Deg_ListDegreesForEdition (void) { Str_Copy (WWW,Deg->WWW, Cns_MAX_LENGTH_WWW); - Str_LimitLengthHTMLStr (WWW,Deg_MAX_LENGTH_WWW_ON_SCREEN); - fprintf (Gbl.F.Out,"" + "" "%s" - "", + "" + "
", Deg->WWW,Deg->WWW,WWW); } fprintf (Gbl.F.Out,""); diff --git a/swad_institution.c b/swad_institution.c index b83295117..553f0011d 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -449,7 +449,7 @@ static void Ins_Configuration (bool PrintView) Act_FormEnd (); } else // I can not change institution WWW - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "%s" "" @@ -1383,8 +1383,6 @@ void Ins_WriteSelectorOfInstitution (void) /************************* List all the institutions *************************/ /*****************************************************************************/ -#define Ins_MAX_LENGTH_WWW_ON_SCREEN 15 - static void Ins_ListInstitutionsForEdition (void) { extern const char *Hlp_COUNTRY_Institutions; @@ -1502,11 +1500,12 @@ static void Ins_ListInstitutionsForEdition (void) { Str_Copy (WWW,Ins->WWW, Cns_MAX_LENGTH_WWW); - Str_LimitLengthHTMLStr (WWW,Ins_MAX_LENGTH_WWW_ON_SCREEN); - fprintf (Gbl.F.Out,"" + "" "%s" - "", + "" + "
", Ins->WWW,Ins->WWW,WWW); } fprintf (Gbl.F.Out,"");