Version 16.105.1

This commit is contained in:
Antonio Cañas Vargas 2016-12-20 10:03:00 +01:00
parent f7012b9921
commit 5de2e083b2
10 changed files with 29 additions and 22 deletions

View File

@ -1301,7 +1301,7 @@ void Ctr_WriteSelectorOfCentre (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeDeg); Act_FormGoToStart (ActSeeDeg);
fprintf (Gbl.F.Out,"<select name=\"ctr\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"ctr\" name=\"ctr\" style=\"width:175px;\"");
if (Gbl.CurrentIns.Ins.InsCod > 0) if (Gbl.CurrentIns.Ins.InsCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);

View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.105 (2016-12-20)" #define Log_PLATFORM_VERSION "SWAD 16.105.1 (2016-12-20)"
#define CSS_FILE "swad16.105.css" #define CSS_FILE "swad16.105.css"
#define JS_FILE "swad16.101.js" #define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.105.1: Dec 20, 2016 Changes in behaviour of labels in forms. (211244 lines)
Version 16.105: Dec 20, 2016 Changes in behaviour of labels in forms. Version 16.105: Dec 20, 2016 Changes in behaviour of labels in forms.
Changes in layout for Safari browser. (211237 lines) Changes in layout for Safari browser. (211237 lines)
Version 16.104.3: Dec 19, 2016 Changes in search input fields. (211196 lines) Version 16.104.3: Dec 19, 2016 Changes in search input fields. (211196 lines)

View File

@ -1106,7 +1106,7 @@ void Cty_WriteSelectorOfCountry (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeIns); Act_FormGoToStart (ActSeeIns);
fprintf (Gbl.F.Out,"<select name=\"cty\" style=\"width:175px;\"" fprintf (Gbl.F.Out,"<select id=\"cty\" name=\"cty\" style=\"width:175px;\""
" onchange=\"document.getElementById('%s').submit();\">" " onchange=\"document.getElementById('%s').submit();\">"
"<option value=\"\"", "<option value=\"\"",
Gbl.Form.Id); Gbl.Form.Id);

View File

@ -907,7 +907,7 @@ void Crs_WriteSelectorOfCourse (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCrsInf); Act_FormGoToStart (ActSeeCrsInf);
fprintf (Gbl.F.Out,"<select name=\"crs\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"crs\" name=\"crs\" style=\"width:175px;\"");
if (Gbl.CurrentDeg.Deg.DegCod > 0) if (Gbl.CurrentDeg.Deg.DegCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);

View File

@ -596,7 +596,7 @@ void Deg_WriteSelectorOfDegree (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCrs); Act_FormGoToStart (ActSeeCrs);
fprintf (Gbl.F.Out,"<select name=\"deg\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"deg\" name=\"deg\" style=\"width:175px;\"");
if (Gbl.CurrentCtr.Ctr.CtrCod > 0) if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);

View File

@ -3254,6 +3254,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
/***** Select the complete course, not a group *****/ /***** Select the complete course, not a group *****/
fprintf (Gbl.F.Out,"<li class=\"%s\">" fprintf (Gbl.F.Out,"<li class=\"%s\">"
"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"-1\"", "<input type=\"radio\" name=\"GrpCod\" value=\"-1\"",
IsCourseZone ? "BROWSER_TITLE" : IsCourseZone ? "BROWSER_TITLE" :
"BROWSER_TITLE_LIGHT"); "BROWSER_TITLE_LIGHT");
@ -3261,6 +3262,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />" fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
"%s" "%s"
"</label>"
"</li>", "</li>",
Gbl.Form.Id, Gbl.Form.Id,
Gbl.CurrentCrs.Crs.FullName); Gbl.CurrentCrs.Crs.FullName);
@ -3282,6 +3284,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
" alt=\"\" title=\"\"" " alt=\"\" title=\"\""
" class=\"ICO25x25\"" " class=\"ICO25x25\""
" style=\"margin-left:6px;\" />" " style=\"margin-left:6px;\" />"
"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"", "<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
(IsGroupZone && (IsGroupZone &&
GrpDat.GrpCod == Gbl.CurrentCrs.Grps.GrpCod) ? "BROWSER_TITLE" : GrpDat.GrpCod == Gbl.CurrentCrs.Grps.GrpCod) ? "BROWSER_TITLE" :
@ -3294,6 +3297,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />" fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
"%s %s" "%s %s"
"</label>"
"</li>", "</li>",
Gbl.Form.Id, Gbl.Form.Id,
GrpDat.GrpTypName,GrpDat.GrpName); GrpDat.GrpTypName,GrpDat.GrpName);

View File

@ -76,8 +76,8 @@ void Hie_WriteMenuHierarchy (void)
/***** Write a 1st selector /***** Write a 1st selector
with all the countries *****/ with all the countries *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"RIGHT_MIDDLE\">"
"%s:" "<label for=\"cty\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Country); The_ClassForm[Gbl.Prefs.Theme],Txt_Country);
@ -90,8 +90,8 @@ void Hie_WriteMenuHierarchy (void)
/***** Write a 2nd selector /***** Write a 2nd selector
with the institutions of selected country *****/ with the institutions of selected country *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"RIGHT_MIDDLE\">"
"%s:" "<label for=\"ins\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Institution); The_ClassForm[Gbl.Prefs.Theme],Txt_Institution);
@ -104,8 +104,8 @@ void Hie_WriteMenuHierarchy (void)
/***** Write a 3rd selector /***** Write a 3rd selector
with all the centres of selected institution *****/ with all the centres of selected institution *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"RIGHT_MIDDLE\">"
"%s:" "<label for=\"ctr\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Centre); The_ClassForm[Gbl.Prefs.Theme],Txt_Centre);
@ -118,8 +118,8 @@ void Hie_WriteMenuHierarchy (void)
/***** Write a 4th selector /***** Write a 4th selector
with all the degrees of selected centre *****/ with all the degrees of selected centre *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"RIGHT_MIDDLE\">"
"%s:" "<label for=\"deg\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Degree); The_ClassForm[Gbl.Prefs.Theme],Txt_Degree);
@ -132,8 +132,8 @@ void Hie_WriteMenuHierarchy (void)
/***** Write a 5th selector /***** Write a 5th selector
with all the courses of selected degree *****/ with all the courses of selected degree *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">" "<td class=\"RIGHT_MIDDLE\">"
"%s:" "<label for=\"crs\" class=\"%s\">%s:</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">", "<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Course); The_ClassForm[Gbl.Prefs.Theme],Txt_Course);

View File

@ -1221,7 +1221,7 @@ void Ins_WriteSelectorOfInstitution (void)
/***** Start form *****/ /***** Start form *****/
Act_FormGoToStart (ActSeeCtr); Act_FormGoToStart (ActSeeCtr);
fprintf (Gbl.F.Out,"<select name=\"ins\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"ins\" name=\"ins\" style=\"width:175px;\"");
if (Gbl.CurrentCty.Cty.CtyCod > 0) if (Gbl.CurrentCty.Cty.CtyCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);

View File

@ -1092,8 +1092,9 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
if (FuncParams) if (FuncParams)
FuncParams (); FuncParams ();
/***** Start container *****/ /***** Start container and label *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT %s %s\" title=\"%s\">", fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT %s %s\" title=\"%s\">"
"<label>",
Checked ? "CHECKBOX_CHECKED" : Checked ? "CHECKBOX_CHECKED" :
"CHECKBOX_UNCHECKED", "CHECKBOX_UNCHECKED",
The_ClassFormBold[Gbl.Prefs.Theme], The_ClassFormBold[Gbl.Prefs.Theme],
@ -1111,8 +1112,9 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
fprintf (Gbl.F.Out,"&nbsp;%s", fprintf (Gbl.F.Out,"&nbsp;%s",
Text); Text);
/***** End container *****/ /***** End label and container *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</label>"
"</div>");
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -371,6 +371,7 @@ void Sch_PutInputStringToSearch (const char *IdInputText)
extern const char *Txt_Search; extern const char *Txt_Search;
/***** String to find *****/ /***** String to find *****/
// Input field not required, because it can be hidden (display:none)
fprintf (Gbl.F.Out,"<input"); fprintf (Gbl.F.Out,"<input");
if (IdInputText) if (IdInputText)
fprintf (Gbl.F.Out," id=\"%s\"",IdInputText); fprintf (Gbl.F.Out," id=\"%s\"",IdInputText);
@ -381,8 +382,7 @@ void Sch_PutInputStringToSearch (const char *IdInputText)
if (!Gbl.Search.Str[0]) if (!Gbl.Search.Str[0])
fprintf (Gbl.F.Out," placeholder=\"%s&hellip;\"", fprintf (Gbl.F.Out," placeholder=\"%s&hellip;\"",
Txt_Search); Txt_Search);
fprintf (Gbl.F.Out," style=\"margin:0;\"" fprintf (Gbl.F.Out," style=\"margin:0;\" />");
" required=\"required\" />");
} }
/*****************************************************************************/ /*****************************************************************************/