Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-06 16:55:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.105.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-20 21:46:59 +01:00
parent 0816562f7a
commit 15b2efddf2
4 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
swad_action.c
View File

@ -4716,7 +4716,8 @@ static void Act_FormStartInternal (Act_Action_t NextAction,bool PutParameterLoca
}
// Params should have space for 256+256+Ses_LENGTH_SESSION_ID+256 bytes
void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,bool PutParameterLocationIfNoSesion)
void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,
bool PutParameterLocationIfNoSesion)
{
char ParamAction[256];
char ParamSession[256+Ses_LENGTH_SESSION_ID];
@ -4727,30 +4728,44 @@ void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,bool PutParamete
ParamLocation[0] = '\0';
if (NextAction != ActUnk)
sprintf (ParamAction,"<input type=\"hidden\" name=\"act\" value=\"%ld\" />",
sprintf (ParamAction,"<input type=\"hidden\" name=\"act\""
" value=\"%ld\" />",
Act_Actions[NextAction].ActCod);
if (Gbl.Session.Id[0])
sprintf (ParamSession,"<input type=\"hidden\" name=\"ses\" value=\"%s\" />",
sprintf (ParamSession,"<input type=\"hidden\" name=\"ses\""
" value=\"%s\" />",
Gbl.Session.Id);
else if (PutParameterLocationIfNoSesion) // Extra parameters necessary when there's no open session
else if (PutParameterLocationIfNoSesion)
// Extra parameters necessary when there's no open session
{
/* If session is open, course code will be get from session data,
but if there is not an open session, and next action is known, it is necessary to send a parameter with course code */
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // If course selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"crs\" value=\"%ld\" />",
but if there is not an open session, and next action is known,
it is necessary to send a parameter with course code */
if (Gbl.CurrentCrs.Crs.CrsCod > 0)
// If course selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"crs\""
" value=\"%ld\" />",
Gbl.CurrentCrs.Crs.CrsCod);
else if (Gbl.CurrentDeg.Deg.DegCod > 0) // If no course selected, but degree selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"deg\" value=\"%ld\" />",
else if (Gbl.CurrentDeg.Deg.DegCod > 0)
// If no course selected, but degree selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"deg\""
" value=\"%ld\" />",
Gbl.CurrentDeg.Deg.DegCod);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // If no degree selected, but centre selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"ctr\" value=\"%ld\" />",
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
// If no degree selected, but centre selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"ctr\""
" value=\"%ld\" />",
Gbl.CurrentCtr.Ctr.CtrCod);
else if (Gbl.CurrentIns.Ins.InsCod > 0) // If no centre selected, but institution selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"ins\" value=\"%ld\" />",
else if (Gbl.CurrentIns.Ins.InsCod > 0)
// If no centre selected, but institution selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"ins\""
" value=\"%ld\" />",
Gbl.CurrentIns.Ins.InsCod);
else if (Gbl.CurrentCty.Cty.CtyCod > 0) // If no institution selected, but country selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"cty\" value=\"%ld\" />",
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
// If no institution selected, but country selected...
sprintf (ParamLocation,"<input type=\"hidden\" name=\"cty\""
" value=\"%ld\" />",
Gbl.CurrentCty.Cty.CtyCod);
}

3
swad_action.h
View File

@ -1521,7 +1521,8 @@ void Act_FormStartUnique (Act_Action_t NextAction);
void Act_FormStartAnchor (Act_Action_t NextAction,const char *Anchor);
void Act_FormStartUniqueAnchor (Act_Action_t NextAction,const char *Anchor);
void Act_FormStartId (Act_Action_t NextAction,const char *Id);
void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,bool PutParameterLocationIfNoSesion);
void Act_SetParamsForm (char *ParamsStr,Act_Action_t NextAction,
bool PutParameterLocationIfNoSesion);
void Act_FormEnd (void);
void Act_LinkFormSubmit (const char *Title,const char *LinkStyle,
const char *OnSubmit);

19
swad_agenda.c
View File

@ -1312,11 +1312,11 @@ void Agd_RequestCreatOrEditEvent (void)
/***** Event *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"Event\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"Event\""
"<input type=\"text\" id=\"Event\" name=\"Event\""
" size=\"45\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />"
"</td>"
@ -1327,11 +1327,11 @@ void Agd_RequestCreatOrEditEvent (void)
/***** Location *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"Location\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"Location\""
"<input type=\"text\" id=\"Location\" name=\"Location\""
" size=\"45\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />"
"</td>"
@ -1346,11 +1346,12 @@ void Agd_RequestCreatOrEditEvent (void)
/***** Text *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"<td class=\"RIGHT_TOP\">"
"<label for=\"Txt\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_TOP\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"10\">",
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewEvent)

3
swad_changelog.h
View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.105.4 (2016-12-20)"
#define Log_PLATFORM_VERSION "SWAD 16.105.5 (2016-12-20)"
#define CSS_FILE "swad16.105.3.css"
#define JS_FILE "swad16.101.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.105.5: Dec 20, 2016 Changes in behaviour of labels in forms. (211299 lines)
Version 16.105.4: Dec 20, 2016 Changes in behaviour of labels in forms. (211281 lines)
Version 16.105.3: Dec 20, 2016 Changes in contextual checkboxes. (211280 lines)
Version 16.105.2: Dec 20, 2016 Changes in behaviour of labels in forms. (211279 lines)