Version 16.146.6

This commit is contained in:
Antonio Cañas Vargas 2017-03-04 17:28:15 +01:00
parent f172ce3f0c
commit 93c3979ce3
4 changed files with 20 additions and 8 deletions

View File

@ -1589,7 +1589,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
text-align:center;
}
/********** Title of country,institution,centre,degree,course ************/
/********** Title of country, institution, centre, degree, course ************/
.TITLE_LOCATION
{
color:#808080;
@ -1597,7 +1597,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
font-weight:bold;
}
/******************************* Map of country ******************************/
/************************** Map and name of country **************************/
.COUNTRY_MAP_TITLE
{
box-sizing:border-box;
@ -1634,6 +1634,18 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
height:625px;
margin:12px;
}
.COUNTRY_TXT
{
display:inline-block;
box-sizing:border-box;
max-width:100px;
margin-left:4px;
text-align:left;
vertical-align:middle;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
/******************* Web of institution, centre, degree **********************/
.EXTERNAL_WWW_SHORT

View File

@ -197,13 +197,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.146.5 (2017-03-04)"
#define Log_PLATFORM_VERSION "SWAD 16.146.6 (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.6: Mar 03, 2017 Changes in layout of countries. (216331 lines)
Version 16.146.5: Mar 03, 2017 Code refactoring related with author of assignments, attendance events and surveys. (216319 lines)
Version 16.146.4: Mar 03, 2017 Changes in layout of surveys. (216349 lines)
Version 16.146.3: Mar 04, 2017 Changes in layout of edition of institutions, centres and degrees. (216363 lines)

View File

@ -701,8 +701,7 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
BgColor,NumCty);
/***** Country map (and link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",
BgColor);
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
"DAT_N","COUNTRY_MAP_SMALL");
fprintf (Gbl.F.Out,"</td>");
@ -814,8 +813,8 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
/***** Write country name and end link *****/
Str_Copy (CountryName,Cty->Name[Gbl.Prefs.Language],
Cty_MAX_BYTES_COUNTRY_NAME);
Str_LimitLengthHTMLStr (CountryName,30);
fprintf (Gbl.F.Out,"&nbsp;%s (%s)</a>",
fprintf (Gbl.F.Out,"<div class=\"COUNTRY_TXT\">%s (%s)</div>"
"</a>",
CountryName,
Cty->Alpha2);

View File

@ -3327,7 +3327,7 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows,
/* Write ranking of this country */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LOG RIGHT_TOP\">");
"<td class=\"LOG RIGHT_MIDDLE\">");
if (CtyCod > 0)
fprintf (Gbl.F.Out,"%lu",++Ranking);
fprintf (Gbl.F.Out,"&nbsp;"