From 67553950d04ae2593cb72deb5c20b096e5bcf731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 31 Jul 2015 19:49:21 +0200 Subject: [PATCH] Version 14.123.4 --- swad_centre.c | 2 +- swad_changelog.h | 3 +- swad_degree.c | 259 +++++++++++++++++++++-------------------------- 3 files changed, 120 insertions(+), 144 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index c8876a6b3..63d6ccad0 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -600,7 +600,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) NumCtr); /***** Centre logo *****/ - fprintf (Gbl.F.Out,"" "", TxtClass,BgColor, diff --git a/swad_changelog.h b/swad_changelog.h index f0eaaa43a..d77a00585 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.123.3 (2015/07/27)" +#define Log_PLATFORM_VERSION "SWAD 14.123.4 (2015/07/31)" // 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.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) Version 14.123.2: Jul 28, 2015 Changes in CSS of forms. (184953 lines) Version 14.123.1: Jul 28, 2015 Changes in CSS of forms. (184984 lines) diff --git a/swad_degree.c b/swad_degree.c index a38367c48..5088d3ac0 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -191,10 +191,10 @@ void Deg_SeeDegWithPendingCrss (void) Lay_StartRoundFrameTable (NULL,2,Txt_Degrees_with_pending_courses); fprintf (Gbl.F.Out,"" "" - "" + "" "%s" "" - "" + "" "%s" "" "", @@ -219,8 +219,8 @@ void Deg_SeeDegWithPendingCrss (void) /* Degree logo */ fprintf (Gbl.F.Out,"" - "" + "" "", BgColor,Deg.WWW,Deg.FullName); @@ -230,8 +230,8 @@ void Deg_SeeDegWithPendingCrss (void) ""); /* Degree full name */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); Act_FormGoToStart (ActSeeCrs); Deg_PutParamDegCod (Deg.DegCod); @@ -244,8 +244,8 @@ void Deg_SeeDegWithPendingCrss (void) fprintf (Gbl.F.Out,""); /* Number of pending courses (row[1]) */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "" "", @@ -345,8 +345,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme], Txt_Degree); if (PutLink) @@ -366,8 +365,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "%s" "" "", @@ -382,8 +380,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "", The_ClassForm[Gbl.Prefs.Theme], Txt_Web, @@ -401,8 +398,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "" "%s/%s?deg=%ld" "" @@ -420,8 +416,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (200,"deg",Gbl.CurrentDeg.Deg.DegCod); @@ -435,8 +430,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "%u" "" "", @@ -448,8 +442,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "%u" "" "", @@ -462,8 +455,7 @@ static void Deg_Configuration (bool PrintView) "" "%s:" "" - "" + "" "%u" "" "", @@ -500,7 +492,7 @@ void Deg_WriteMenuAllCourses (void) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Country); Cty_WriteSelectorOfCountry (); fprintf (Gbl.F.Out,"" @@ -514,7 +506,7 @@ void Deg_WriteMenuAllCourses (void) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Institution); Ins_WriteSelectorOfInstitution (); fprintf (Gbl.F.Out,"" @@ -528,7 +520,7 @@ void Deg_WriteMenuAllCourses (void) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Centre); Ctr_WriteSelectorOfCentre (); fprintf (Gbl.F.Out,"" @@ -542,7 +534,7 @@ void Deg_WriteMenuAllCourses (void) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Degree); Deg_WriteSelectorOfDegree (); fprintf (Gbl.F.Out,"" @@ -556,7 +548,7 @@ void Deg_WriteMenuAllCourses (void) "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Course); Crs_WriteSelectorOfCourse (); fprintf (Gbl.F.Out,"" @@ -1108,15 +1100,15 @@ static void Deg_ListDegreeTypesForSeeing (void) Txt_TYPES_OF_DEGREE_Without_degrees); /* Name of degree type */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "", BgColor,Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypName); /* Direct log in is allowed for this degree type? */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "\"%s\"" "", @@ -1130,8 +1122,8 @@ static void Deg_ListDegreeTypesForSeeing (void) Txt_Direct_authentication_not_allowed); /* Number of degrees of this type */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "" "", @@ -1176,15 +1168,13 @@ static void Deg_ListDegreeTypesForEdition (void) /* Degree type code */ fprintf (Gbl.F.Out,"" - "" + "" "%ld" "", Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); /* Name of degree type */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActRenDegTyp); Deg_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); fprintf (Gbl.F.Out,""); /* Direct log in is allowed for this degree type? */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActChgDegTypLog); Deg_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); fprintf (Gbl.F.Out,""); /* Number of degrees of this type */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "" "", @@ -1274,7 +1262,8 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) /***** Put green tip if degree has courses *****/ fprintf (Gbl.F.Out,"" - "" + "" "\"%s\"" "", @@ -1288,18 +1277,18 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) Txt_DEGREE_Without_courses); /***** Number of degree in this list *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", TxtClass,BgColor, NumDeg); /***** Degree logo *****/ - fprintf (Gbl.F.Out,"" - "", - TxtClass,BgColor, + fprintf (Gbl.F.Out,"" + "", + BgColor, Deg->WWW,Deg->FullName); Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName, 16,"vertical-align:top;",true); @@ -1307,8 +1296,8 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) ""); /* Degree full name */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", TxtClass,BgColor); Act_FormGoToStart (ActSeeDegInf); Deg_PutParamDegCod (Deg->DegCod); @@ -1319,28 +1308,29 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) fprintf (Gbl.F.Out,""); /* Type of degree */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "", TxtClass,BgColor,DegTyp.DegTypName); /* Degree first year */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", TxtClass,BgColor,Deg->FirstYear); /* Degree last year */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", TxtClass,BgColor,Deg->LastYear); /* Degree optional year */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "\"%s\"" "", @@ -1354,16 +1344,16 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) Txt_DEGREE_Without_year_for_optional_courses); /* Current number of courses in this degree */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", TxtClass,BgColor,Deg->NumCourses); /* Degree status */ StatusTxt = Deg_GetStatusTxtFromStatusBits (Deg->Status); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "" "", @@ -1429,22 +1419,20 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree code */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%ld" "", Deg->DegCod); /* Degree logo */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Deg->FullName); Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,16,NULL,true); fprintf (Gbl.F.Out,""); /* Centre */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // I can select centre { Act_FormStart (ActChgDegCtr); @@ -1468,8 +1456,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree short name */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActRenDegSho); @@ -1484,8 +1471,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree full name */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActRenDegFul); @@ -1500,8 +1486,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree type */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActChgDegTyp); @@ -1532,8 +1517,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree first year */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /* Degree last year */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActChgDegLstYea); @@ -1582,8 +1565,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree optional year */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActChgDegOptYea); @@ -1610,8 +1592,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree WWW */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActChgDegWWW); @@ -1634,16 +1615,14 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Current number of courses in this degree */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", Deg->NumCourses); /* Degree status */ StatusTxt = Deg_GetStatusTxtFromStatusBits (Deg->Status); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM && StatusTxt == Deg_STATUS_PENDING) { @@ -1668,8 +1647,7 @@ static void Deg_ListDegreesForEdition (void) /* Degree requester */ UsrDat.UsrCod = Deg->RequesterUsrCod; Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" ""); Msg_WriteMsgAuthor (&UsrDat,80,10,"DAT",true,NULL); @@ -1758,10 +1736,10 @@ static void Deg_PutFormToCreateDegType (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "" - "" "", @@ -1770,13 +1748,13 @@ static void Deg_PutFormToCreateDegType (void) /***** Degree type name *****/ fprintf (Gbl.F.Out,"" - "", Deg_MAX_LENGTH_DEGREE_TYPE_NAME,Gbl.Degs.EditingDegTyp.DegTypName); /***** Direct log in is allowed for this degree type? *****/ - fprintf (Gbl.F.Out,"" "" @@ -1832,17 +1810,16 @@ static void Deg_PutFormToCreateDegree (void) fprintf (Gbl.F.Out,""); /***** Degree code *****/ - fprintf (Gbl.F.Out,""); /***** Degree logo *****/ - fprintf (Gbl.F.Out,""); /***** Centre *****/ - fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_SHORT_NAME,Deg->ShortName); /***** Degree full name *****/ - fprintf (Gbl.F.Out,"", Deg_MAX_LENGTH_DEGREE_FULL_NAME,Deg->FullName); /***** Degree type *****/ - fprintf (Gbl.F.Out,""); /***** First year *****/ - fprintf (Gbl.F.Out,""); /***** Last year *****/ - fprintf (Gbl.F.Out,""); /***** Degree optional year *****/ - fprintf (Gbl.F.Out,"", Deg->OptYear ? " checked=\"checked\"" : ""); /***** Degree WWW *****/ - fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Deg->WWW); /***** Current number of courses in this degree *****/ - fprintf (Gbl.F.Out,""); /***** Degree status *****/ - fprintf (Gbl.F.Out,"", Txt_DEGREE_STATUS[Deg_STATUS_PENDING]); /***** Degree requester *****/ - fprintf (Gbl.F.Out,"
" + "" "%s" "" + "" "%s" "
" + "" "" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" ""); + fprintf (Gbl.F.Out,""); Log_DrawLogo (Sco_SCOPE_DEG,-1L,"",16,NULL,true); fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "0" "" + fprintf (Gbl.F.Out,"" "%s" "" + fprintf (Gbl.F.Out,"" "" ""); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,80,10,"DAT",true,NULL); @@ -1963,13 +1938,13 @@ static void Deg_PutHeadDegreeTypesForSeeing (void) fprintf (Gbl.F.Out,"" "" - "" - "" - "" "", @@ -1991,16 +1966,16 @@ static void Deg_PutHeadDegreeTypesForEdition (void) fprintf (Gbl.F.Out,"" "" - "" - "" - "" - "" "", @@ -2028,25 +2003,25 @@ static void Deg_PutHeadDegreesForSeeing (void) "" "" "" - "" - "" - "" - "" - "" - "" - "" "", @@ -2080,41 +2055,41 @@ static void Deg_PutHeadDegreesForEdition (void) fprintf (Gbl.F.Out,"" "" - "" "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" "", @@ -3962,8 +3937,8 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan) { /***** Indent *****/ fprintf (Gbl.F.Out,"" - "" - "
" + "" "%s" "" + "" "%s" "" + "" "%s" "
" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "
" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "
" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "
" + "" "\"\"", + fprintf (Gbl.F.Out,"", ColSpan - 1,Gbl.ColorRows[Gbl.RowEvenOdd]); /* Get next degree */ @@ -4037,8 +4012,8 @@ unsigned Deg_ListDegsFound (const char *Query) /* Number of degrees found */ fprintf (Gbl.F.Out,"
"); + ""); if (NumDegs == 1) fprintf (Gbl.F.Out,"1 %s",Txt_degree); else