Version 14.123.1

This commit is contained in:
Antonio Cañas Vargas 2015-07-28 10:15:44 +02:00
parent 432ae9624b
commit a20f5ffd31
10 changed files with 266 additions and 159 deletions

View File

@ -139,19 +139,86 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
border-width:1px 0 0 0;
border-color:#DDECF1;
}
.MONTH {color:#4D88A1; font-size:8pt; white-space:nowrap;}
.DAY_WRK_HEAD {color:#4D88A1; font-size:8pt;}
.DAY_NO_WRK_HEAD {color:#FF0000; font-size:8pt;}
.DAY_WRK {color:#202020; font-size:8pt;}
.DAY_NO_WORK {color:#C04080; font-size:8pt;}
.DAY_HLD {color:#FF0000; font-size:8pt;}
.DAY_WRK_LIGHT {color:#E0E0E0; font-size:8pt;}
.DAY_NO_WORK_LIGHT {color:#FFE0FF; font-size:8pt;}
.DAY_HLD_LIGHT {color:#FFE0E0; font-size:8pt;}
.DAY {border:solid 1px; border-color:white;}
.TODAY {border:solid 1px; border-color:#50B800;}
.DAY_EVENT {border:solid 1px; border-color:white; background-color:#FFF080;}
.TODAY_EVENT {border:solid 1px; border-color:#50B800; background-color:#FFF080;}
.MONTH
{
color:#4D88A1;
font-size:8pt;
white-space:nowrap;
}
.DAY_WRK_HEAD
{
color:#4D88A1;
font-size:8pt;
text-align:center;
}
.DAY_NO_WRK_HEAD
{
color:#FF0000;
font-size:8pt;
text-align:center;
}
.DAY_WRK
{
color:#202020;
font-size:8pt;
text-align:center;
}
.DAY_NO_WORK
{
color:#C04080;
font-size:8pt;
text-align:center;
}
.DAY_HLD
{
color:#FF0000;
font-size:8pt;
text-align:center;
}
.DAY_WRK_LIGHT
{
color:#E0E0E0;
font-size:8pt;
text-align:center;
}
.DAY_NO_WORK_LIGHT
{
color:#FFE0FF;
font-size:8pt;
text-align:center;
}
.DAY_HLD_LIGHT
{
color:#FFE0E0;
font-size:8pt;
text-align:center;
}
.DAY
{
border:solid 1px;
border-color:white;
text-align:center;
}
.TODAY
{
border:solid 1px;
border-color:#50B800;
text-align:center;
}
.DAY_EVENT
{
border:solid 1px;
border-color:white;
background-color:#FFF080;
text-align:center;
}
.TODAY_EVENT
{
border:solid 1px;
border-color:#50B800;
background-color:#FFF080;
text-align:center;
}
/********************************* Buttons ***********************************/
.BT_CREATE
@ -391,6 +458,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
font-size:20pt;
font-weight:bold;
color:#808080;
text-align:center;
}
/******************************* Map of country ******************************/
@ -442,6 +510,7 @@ a:hover img.CENTRE_PHOTO_SHOW
color:#A0A0A0;
font-size:7pt;
max-width:400px;
text-align:center;
}
/******************************* User's photo ********************************/

View File

@ -89,19 +89,86 @@ form {margin:0; display:inline;}
border-width:1px 0 0 0;
border-color:#DDECF1;
}
.MONTH {color:#4D88A1; font-size:8pt; white-space:nowrap;}
.DAY_WRK_HEAD {color:#4D88A1; font-size:8pt;}
.DAY_NO_WRK_HEAD {color:#FF0000; font-size:8pt;}
.DAY_WRK {color:#202020; font-size:8pt;}
.DAY_NO_WORK {color:#C04080; font-size:8pt;}
.DAY_HLD {color:#FF0000; font-size:8pt;}
.DAY_WRK_LIGHT {color:#E0E0E0; font-size:8pt;}
.DAY_NO_WORK_LIGHT {color:#FFE0FF; font-size:8pt;}
.DAY_HLD_LIGHT {color:#FFE0E0; font-size:8pt;}
.DAY {border:solid 1px; border-color:white;}
.TODAY {border:solid 1px; border-color:#50B800;}
.DAY_EVENT {border:solid 1px; border-color:white; background-color:#FFF080;}
.TODAY_EVENT {border:solid 1px; border-color:#50B800; background-color:#FFF080;}
.MONTH
{
color:#4D88A1;
font-size:8pt;
white-space:nowrap;
}
.DAY_WRK_HEAD
{
color:#4D88A1;
font-size:8pt;
text-align:center;
}
.DAY_NO_WRK_HEAD
{
color:#FF0000;
font-size:8pt;
text-align:center;
}
.DAY_WRK
{
color:#202020;
font-size:8pt;
text-align:center;
}
.DAY_NO_WORK
{
color:#C04080;
font-size:8pt;
text-align:center;
}
.DAY_HLD
{
color:#FF0000;
font-size:8pt;
text-align:center;
}
.DAY_WRK_LIGHT
{
color:#E0E0E0;
font-size:8pt;
text-align:center;
}
.DAY_NO_WORK_LIGHT
{
color:#FFE0FF;
font-size:8pt;
text-align:center;
}
.DAY_HLD_LIGHT
{
color:#FFE0E0;
font-size:8pt;
text-align:center;
}
.DAY
{
border:solid 1px;
border-color:white;
text-align:center;
}
.TODAY
{
border:solid 1px;
border-color:#50B800;
text-align:center;
}
.DAY_EVENT
{
border:solid 1px;
border-color:white;
background-color:#FFF080;
text-align:center;
}
.TODAY_EVENT
{
border:solid 1px;
border-color:#50B800;
background-color:#FFF080;
text-align:center;
}
/********************************* Buttons ***********************************/
.BT_CREATE
@ -354,6 +421,7 @@ form {margin:0; display:inline;}
font-size:20pt;
font-weight:bold;
color:#808080;
text-align:center;
}
/******************************* Map of country ******************************/
@ -405,6 +473,7 @@ a:hover img.CENTRE_PHOTO_SHOW
color:#A0A0A0;
font-size:7pt;
max-width:400px;
text-align:center;
}
/******************************* User's photo ********************************/

View File

@ -98,7 +98,7 @@ void Ban_SeeBanners (void)
NumBan++)
/* Write data of this banner */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:left;\">"
"<td class=\"LEFT_MIDDLE\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s\""
" alt=\"%s\" title=\"%s\""
@ -343,7 +343,7 @@ static void Ban_ListBannersForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Banner code */
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%ld&nbsp;"
"</td>",
Ban->IsHidden ? "DAT_LIGHT" :
@ -351,8 +351,7 @@ static void Ban_ListBannersForEdition (void)
Ban->BanCod);
/* Banner short name */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRenBanSho);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\" size=\"12\" maxlength=\"%u\" value=\"%s\""
@ -362,8 +361,7 @@ static void Ban_ListBannersForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Banner full name */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRenBanFul);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\" size=\"24\" maxlength=\"%u\" value=\"%s\""
@ -373,8 +371,7 @@ static void Ban_ListBannersForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Banner image */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgBanImg);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Img\""
@ -385,8 +382,7 @@ static void Ban_ListBannersForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Banner WWW */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgBanWWW);
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"WWW\" size=\"24\" maxlength=\"%u\" value=\"%s\""
@ -748,26 +744,26 @@ static void Ban_PutFormToCreateBanner (void)
"<td></td>");
/***** Banner short name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"ShortName\" size=\"12\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName);
/***** Banner full name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"FullName\" size=\"24\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_FULL_NAME,Ban->FullName);
/***** Banner image *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"Img\""
" size=\"12\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ban_MAX_LENGTH_IMAGE,Ban->Img);
/***** Banner WWW *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"WWW\" size=\"24\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
@ -795,11 +791,11 @@ static void Ban_PutHeadBanners (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\"></td>"
"<td class=\"BM\"></td>"
"<td class=\"TIT_TBL\" style=\"text-align:right;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"<td class=\"TIT_TBL RIGHT_MIDDLE\">%s</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\">%s</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\">%s</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\">%s</td>"
"<td class=\"TIT_TBL LEFT_MIDDLE\">%s</td>"
"</tr>",
Txt_Code,
Txt_Short_name,
@ -910,7 +906,7 @@ void Ban_WriteMenuWithBanners (void)
{
/* Write data of this banner */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:120px; vertical-align:middle;\">");
"<td class=\"LEFT_MIDDLE\" style=\"width:120px;\">");
Act_FormStart (ActClkBan);
Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod);
Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW);

View File

@ -141,7 +141,7 @@ void Cal_DrawCalendar (void)
/***** Draw several months *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<td class=\"CENTER_TOP\">"
"<table style=\"margin:0 auto; border-spacing:5px;\">");
for (Row = 0;
Row < 4;
@ -152,8 +152,7 @@ void Cal_DrawCalendar (void)
Col < 4;
Col++)
{
fprintf (Gbl.F.Out,"<td style=\"width:120px;"
" text-align:center; vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:120px;\">");
Cal_DrawMonth (Year,Month,true,!PrintView,(Gbl.CurrentAct == ActPrnCal));
fprintf (Gbl.F.Out,"</td>");
if (++Month == 13)
@ -256,7 +255,7 @@ static void Cal_DrawMonth (unsigned RealYear,unsigned RealMonth,
for (DayOfWeek = 0;
DayOfWeek < 7;
DayOfWeek++)
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<td class=\"%s\">"
"%c"
"</td>",
(DayOfWeek == 6) ? "DAY_NO_WRK_HEAD" :
@ -351,7 +350,7 @@ static void Cal_DrawMonth (unsigned RealYear,unsigned RealMonth,
}
/***** Write the box with the day *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;\">",
fprintf (Gbl.F.Out,"<td class=\"%s\">",
IsToday ? (ThisDayHasEvent ? "TODAY_EVENT" :
"TODAY") :
(ThisDayHasEvent ? "DAY_EVENT" :
@ -363,7 +362,7 @@ static void Cal_DrawMonth (unsigned RealYear,unsigned RealMonth,
Act_FormStart (ActSeeExaAnn);
fprintf (Gbl.F.Out,"<table style=\"width:100%%;\">"
"<tr>"
"<td class=\"%s\" style=\"text-align:center;\">",
"<td class=\"%s\">",
ClassForDay);
Act_LinkFormSubmit (Gbl.Title,ClassForDay);
}

View File

@ -141,10 +141,10 @@ void Ctr_SeeCtrWithPendingDegs (void)
Lay_StartRoundFrameTable (NULL,2,Txt_Centres_with_pending_degrees);
fprintf (Gbl.F.Out,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</th>"
"</tr>",
@ -169,8 +169,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
/* Centre logo */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
"<td class=\"DAT CENTER_MIDDLE\""
" style=\"background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ctr.WWW,Ctr.FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,
@ -179,8 +179,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
"</td>");
/* Centre full name */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\""
" style=\"background-color:%s;\">",
BgColor);
Act_FormGoToStart (ActSeeDeg);
Ctr_PutParamCtrCod (Ctr.CtrCod);
@ -193,8 +193,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
fprintf (Gbl.F.Out,"</td>");
/* Number of pending degrees (row[1]) */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\""
" style=\"background-color:%s;\">"
"%s"
"</td>"
"</tr>",
@ -289,8 +289,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -312,8 +311,7 @@ static void Ctr_Configuration (bool PrintView)
/* Photo image */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"DAT_SMALL\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"DAT_SMALL CENTER_MIDDLE\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">",
Gbl.CurrentCtr.Ctr.WWW);
@ -337,8 +335,7 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM && !PrintView)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgCtrPhoAtt);
fprintf (Gbl.F.Out,"<textarea name=\"Attribution\" cols=\"50\" rows=\"2\""
" onchange=\"javascript:document.getElementById('%s').submit();\">",
@ -352,8 +349,7 @@ static void Ctr_Configuration (bool PrintView)
}
else if (PhotoAttribution)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"ATTRIBUTION\""
" style=\"text-align:center;\">"
"<td colspan=\"2\" class=\"ATTRIBUTION\">"
"%s"
"</td>"
"</tr>",
@ -368,8 +364,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Centre);
if (PutLink)
@ -386,8 +381,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"%s"
"</td>"
"</tr>",
@ -402,8 +396,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Web,
@ -421,8 +414,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"<a href=\"%s/%s?ctr=%ld\" class=\"DAT\" target=\"_blank\">"
"%s/%s?ctr=%ld"
"</a>"
@ -440,8 +432,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"ctr",Gbl.CurrentCtr.Ctr.CtrCod);
@ -455,8 +446,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"%u"
"</td>"
"</tr>",
@ -469,8 +459,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"%u"
"</td>"
"</tr>",
@ -483,8 +472,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"%u"
"</td>"
"</tr>",
@ -497,8 +485,7 @@ static void Ctr_Configuration (bool PrintView)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">"
"<td class=\"DAT LEFT_MIDDLE\">"
"%u"
"</td>"
"</tr>",
@ -605,16 +592,16 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
/***** Number of centre in this list *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
NumCtr);
/***** Centre logo *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\""
" style=\"background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
TxtClass,BgColor,
Ctr->WWW,Ctr->FullName);
@ -624,8 +611,8 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
"</td>");
/***** Place *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\""
" style=\"background-color:%s;\">"
"%s"
"</td>",
TxtClass,BgColor,
@ -633,8 +620,8 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
Txt_Another_place);
/***** Centre name *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">",
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\""
" style=\"background-color:%s;\">",
TxtClass,BgColor);
Act_FormGoToStart (ActSeeCtrInf);
Ctr_PutParamCtrCod (Ctr->CtrCod);
@ -646,16 +633,16 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
fprintf (Gbl.F.Out,"</td>");
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\""
" style=\"background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
Ctr->NumTchs);
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\""
" style=\"background-color:%s;\">"
"%u"
"</td>",
TxtClass,BgColor,
@ -663,8 +650,8 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
/***** Centre status *****/
StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle; background-color:%s;\">"
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\""
" style=\"background-color:%s;\">"
"%s"
"</td>"
"</tr>",
@ -1180,21 +1167,20 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre code */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%ld&nbsp;"
"</td>",
Ctr->CtrCod);
/* Centre logo */
fprintf (Gbl.F.Out,"<td title=\"%s\""
" style=\"width:20px; text-align:left;\">",
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\""
" style=\"width:20px;\">",
Ctr->FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,16,NULL,true);
fprintf (Gbl.F.Out,"</td>");
/* Institution */
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) // I can select institution
{
Act_FormStart (ActChgCtrIns);
@ -1218,8 +1204,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Place */
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (ICanEdit)
{
Act_FormStart (ActChgCtrPlc);
@ -1251,8 +1236,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre short name */
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (ICanEdit)
{
Act_FormStart (ActRenCtrSho);
@ -1268,8 +1252,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre full name */
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (ICanEdit)
{
Act_FormStart (ActRenCtrFul);
@ -1285,8 +1268,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Centre WWW */
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (ICanEdit)
{
Act_FormStart (ActChgCtrWWW);
@ -1309,20 +1291,20 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Number of teachers */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ctr->NumTchs);
/* Number of degrees */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%u"
"</td>",
Ctr->NumDegs);
/* Centre status */
StatusTxt = Ctr_GetStatusTxtFromStatusBits (Ctr->Status);
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left; vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM &&
StatusTxt == Ctr_STATUS_PENDING)
{
@ -1347,8 +1329,7 @@ static void Ctr_ListCentresForEdition (void)
/* Centre requester */
UsrDat.UsrCod = Ctr->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
fprintf (Gbl.F.Out,"<td style=\"width:100px;"
" text-align:left; vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:100px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100px;\">"
"<tr>");
Msg_WriteMsgAuthor (&UsrDat,80,10,"DAT",true,NULL);
@ -1839,7 +1820,7 @@ void Ctr_RequestPhoto (void)
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Photo);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
"<td class=\"CENTER_MIDDLE\">");
/***** Write help message *****/
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y,
@ -1989,12 +1970,12 @@ static void Ctr_PutFormToCreateCentre (void)
fprintf (Gbl.F.Out,"<td></td>");
/***** Centre logo *****/
fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">");
Log_DrawLogo (Sco_SCOPE_CTR,-1L,"",16,NULL,true);
fprintf (Gbl.F.Out,"</td>");
/***** Institution *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"OthInsCod\" style=\"width:50px;\" disabled=\"disabled\">"
"<option value=\"%ld\" selected=\"selected\">"
"%s"
@ -2005,7 +1986,7 @@ static void Ctr_PutFormToCreateCentre (void)
Gbl.CurrentIns.Ins.ShortName);
/***** Place *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<select name=\"PlcCod\" style=\"width:50px;\">"
"<option value=\"0\"");
if (Ctr->PlcCod == 0)
@ -2023,43 +2004,41 @@ static void Ctr_PutFormToCreateCentre (void)
"</td>");
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"ShortName\" size=\"10\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ctr_MAX_LENGTH_CENTRE_SHORT_NAME,Ctr->ShortName);
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"FullName\" size=\"30\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Ctr_MAX_LENGTH_CENTRE_FULL_NAME,Ctr->FullName);
/***** Centre WWW *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"WWW\" size=\"10\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Cns_MAX_LENGTH_WWW,Ctr->WWW);
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"0"
"</td>");
/***** Centre status *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"%s"
"</td>",
Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]);
/***** Centre requester *****/
fprintf (Gbl.F.Out,"<td style=\"width:100px;"
" text-align:left; vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:100px;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100px;\">"
"<tr>");
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,80,10,"DAT",true,NULL);
@ -2070,7 +2049,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"12\" style=\"text-align:center;\">");
"<td colspan=\"12\" class=\"CENTER_MIDDLE\">");
Lay_PutCreateButton (Txt_Create_centre);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2098,7 +2077,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
fprintf (Gbl.F.Out,"<tr>"
"<th></th>"
"<th class=\"BM\"></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>",
Txt_Place);
@ -2106,7 +2085,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
Order <= Ctr_ORDER_BY_NUM_TCHS;
Order++)
{
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:left;\">");
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL LEFT_MIDDLE\">");
if (OrderSelectable)
{
Act_FormStart (ActSeeCtr);
@ -2125,10 +2104,10 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
}
fprintf (Gbl.F.Out,"</th>");
}
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"</tr>",
@ -2155,35 +2134,35 @@ static void Ctr_PutHeadCentresForEdition (void)
fprintf (Gbl.F.Out,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th style=\"width:20px;\"></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
"<th class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
"<th class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</th>"
"</tr>",
@ -2447,8 +2426,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
/* Number of centres found */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" class=\"TIT_TBL\""
" style=\"text-align:center;\">");
"<td colspan=\"7\" class=\"TIT_TBL CENTER_MIDDLE\">");
if (NumCtrs == 1)
fprintf (Gbl.F.Out,"1 %s",Txt_centre);
else

View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.123 (2015/07/27)"
#define Log_PLATFORM_VERSION "SWAD 14.123.1 (2015/07/27)"
// 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 14.123.1: Jul 28, 2015 Changes in CSS of forms. (184984 lines)
Version 14.123: Jul 28, 2015 Changes in CSS of forms. (184877 lines)
Version 14.122: Jul 27, 2015 Changes in CSS of forms. (184892 lines)
Version 14.121: Jul 27, 2015 Changes in CSS of forms. (184890 lines)

View File

@ -249,8 +249,7 @@ static void Cty_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",
@ -301,8 +300,7 @@ static void Cty_Configuration (bool PrintView)
}
else if (MapAttribution)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"ATTRIBUTION\""
" style=\"text-align:center;\">"
"<td colspan=\"2\" class=\"ATTRIBUTION\">"
"%s"
"</td>"
"</tr>",

View File

@ -208,8 +208,7 @@ static void Crs_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",

View File

@ -325,8 +325,7 @@ static void Deg_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",

View File

@ -265,8 +265,7 @@ static void Ins_Configuration (bool PrintView)
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"TITLE_LOCATION\""
" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"TITLE_LOCATION\">");
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">",