Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.123.6

This commit is contained in:
Antonio Cañas Vargas 2015-08-01 08:40:58 +02:00
parent 1cf7465218
commit de5afe3ab7
3 changed files with 48 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.123.5 (2015/07/31)"
#define Log_PLATFORM_VERSION "SWAD 14.123.6 (2015/08/01)"
// 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.6: Aug 01, 2015 Changes in CSS of forms. (184874 lines)
Version 14.123.5: Jul 31, 2015 Changes in CSS of forms. (184902 lines)
Version 14.123.4: Jul 31, 2015 Changes in CSS of forms. (184905 lines)
Version 14.123.3: Jul 28, 2015 Changes in CSS of forms. (184929 lines)

65
swad_enrollment.c
View File

@ -532,7 +532,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Lay_StartRoundFrame (NULL,Txt_Admin_several_users);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -541,7 +541,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
if (ExternalUsrsServiceAvailable)
{
/* Option a: get students from official lists */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -550,7 +550,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Imp_ListMyImpGrpsAndStdsForm ();
/* Option b: get students' IDs from pasted text */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -561,7 +561,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Enr_PutAreaToEnterUsrsIDs ();
/***** Step 2: Select type of user to register/remove to/from current course *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -570,7 +570,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Rol_PutAllRolesRegRemUsrsCrs ();
/***** Step 3: Put different actions to register/remove students to/from current course *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -578,7 +578,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Enr_PutActionsRegRemSeveralUsrs ();
/***** Step 4: Select groups in which register / remove students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -600,7 +600,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
}
/***** Step 5: Confirm register / remove students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
@ -640,7 +640,7 @@ void Enr_AskRemoveOldUsrs (void)
unsigned Months;
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRemOldUsr);
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
The_ClassForm[Gbl.Prefs.Theme],
@ -763,7 +763,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
"<td class=\"LEFT_TOP\">"
"<textarea name=\"UsrsIDs\" cols=\"72\" rows=\"10\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_List_of_nicks_emails_or_IDs);
@ -2117,7 +2117,7 @@ void Enr_ShowEnrollmentRequests (void)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
@ -2137,8 +2137,7 @@ void Enr_ShowEnrollmentRequests (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Users);
Rol_GetSelectedRoles (&Roles);
@ -2371,24 +2370,19 @@ void Enr_ShowEnrollmentRequests (void)
Lay_StartRoundFrameTable (NULL,2,NULL);
fprintf (Gbl.F.Out,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\""
" style=\"text-align:left; vertical-align:top;\">"
"<th class=\"TIT_TBL LEFT_TOP\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<th class=\"TIT_TBL RIGHT_TOP\">"
"%s"
"</th>"
"<th colspan=\"2\" class=\"TIT_TBL\""
" style=\"text-align:left; vertical-align:top;\">"
"<th colspan=\"2\" class=\"TIT_TBL LEFT_TOP\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\""
" style=\"text-align:left; vertical-align:top;\">"
"<th class=\"TIT_TBL LEFT_TOP\">"
"%s"
"</th>"
"<th class=\"TIT_TBL\""
" style=\"text-align:center; vertical-align:top;\">"
"<th class=\"TIT_TBL CENTER_TOP\">"
"%s"
"</th>"
"<th></th>"
@ -2427,8 +2421,7 @@ void Enr_ShowEnrollmentRequests (void)
{
/***** Number *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"DAT RIGHT_TOP\">"
"%u"
"</td>",
NumRequests - NumReq);
@ -2437,8 +2430,7 @@ void Enr_ShowEnrollmentRequests (void)
Crs_GetDataOfCourseByCod (&Crs);
Deg.DegCod = Crs.DegCod;
Deg_GetDataOfDegreeByCod (&Deg);
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
Act_FormGoToStart (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs.CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Crs.FullName);
@ -2450,15 +2442,14 @@ void Enr_ShowEnrollmentRequests (void)
fprintf (Gbl.F.Out,"</td>");
/***** Number of teachers in the course *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;"
" vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP\">"
"%u"
"</td>",
Crs.NumTchs);
/***** User photo *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"width:18px;"
" text-align:center; vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP\""
" style=\"width:18px;\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
@ -2466,14 +2457,12 @@ void Enr_ShowEnrollmentRequests (void)
fprintf (Gbl.F.Out,"</td>");
/***** User name *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
Usr_RestrictLengthAndWriteName (&UsrDat,20);
/***** Requested role (row[3]) *****/
DesiredRole = Rol_ConvertUnsignedStrToRole (row[3]);
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">"
"%s"
"</td>",
Txt_ROLES_SINGUL_abc[DesiredRole][UsrDat.Sex]);
@ -2482,8 +2471,7 @@ void Enr_ShowEnrollmentRequests (void)
Msg_WriteMsgDate (row[4],"DAT");
/***** Button to confirm the request *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
Act_FormStart (ActReqMdfUsr);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
@ -2492,8 +2480,7 @@ void Enr_ShowEnrollmentRequests (void)
fprintf (Gbl.F.Out,"</td>");
/***** Button to reject the request *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:top;\">");
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\">");
Act_FormStart (ActReqRejSignUp);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
@ -3409,7 +3396,7 @@ static void Enr_AskIfRemoveUsrFromCrs (struct UsrData *UsrDat,bool ItsMe)
Rec_ShowCommonRecordUnmodifiable (UsrDat);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRemUsrCrs);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Pwd_AskForConfirmationOnDangerousAction ();

56
swad_exam.c
View File

@ -767,7 +767,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW)
{
fprintf (Gbl.F.Out,"<tr>" \
"<td style=\"text-align:left;\">");
"<td class=\"LEFT_MIDDLE\">");
if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
@ -793,7 +793,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
}
fprintf (Gbl.F.Out,"<tr>" \
"<td style=\"text-align:center;\">");
"<td class=\"CENTER_MIDDLE\">");
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
@ -808,7 +808,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Institution logo *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td colspan=\"2\" style=\"text-align:center;\">");
"<td colspan=\"2\" class=\"CENTER_MIDDLE\">");
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
fprintf (Gbl.F.Out,"<span class=\"%s\">",StyleTitle);
else
@ -824,8 +824,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Degree *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td colspan=\"2\" class=\"%s\""
" style=\"text-align:center;\">",
"<td colspan=\"2\" class=\"%s CENTER_MIDDLE\">",
StyleTitle);
if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
@ -838,16 +837,14 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td colspan=\"2\" class=\"%s\""
" style=\"text-align:center;\">"
"<td colspan=\"2\" class=\"%s CENTER_MIDDLE\">"
"&nbsp;<br />"
"<strong>%s</strong>"
"</td>" \
"</tr>",
StyleNormal,Txt_EXAM_ANNOUNCEMENT);
fprintf (Gbl.F.Out,"<tr>" \
"<td colspan=\"2\" class=\"%s\""
" style=\"text-align:left;\">"
"<td colspan=\"2\" class=\"%s LEFT_MIDDLE\">"
"&nbsp;"
"</td>" \
"</tr>",
@ -858,8 +855,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Course,
StyleNormal);
@ -879,8 +875,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Year,
StyleNormal);
@ -908,8 +903,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Session,
StyleNormal);
@ -931,7 +925,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
Txt_EXAM_ANNOUNCEMENT_Exam_date);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
Dat_WriteFormDate (Gbl.ExamAnnouncement.ExamDate.Year < Gbl.Now.Date.Year ? Gbl.ExamAnnouncement.ExamDate.Year :
Gbl.Now.Date.Year,
Gbl.Now.Date.Year+1,
@ -943,8 +937,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
else
{
Dat_ConvDateToDateStr (&Gbl.ExamAnnouncement.ExamDate,StrExamDate);
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">"
"%s"
"</td>",
StyleNormal,StrExamDate);
@ -956,8 +949,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Start_time,
StyleNormal);
@ -1003,8 +995,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Approximate_duration,
StyleNormal);
@ -1067,8 +1058,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Place_of_exam,
StyleNormal);
@ -1089,8 +1079,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Mode,
StyleNormal);
@ -1111,8 +1100,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam,
StyleNormal);
@ -1133,8 +1121,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Documentation_required,
StyleNormal);
@ -1155,8 +1142,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Material_required,
StyleNormal);
@ -1177,8 +1163,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Material_allowed,
StyleNormal);
@ -1199,8 +1184,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
"<td class=\"%s LEFT_TOP\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Other_information,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)