From f9b025dafce5c2e417676bc55a306a279542a4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 27 Jul 2015 19:42:24 +0200 Subject: [PATCH] Version 14.120.9 --- swad_changelog.h | 5 +++-- swad_group.c | 5 +++-- swad_record.c | 39 ++++++++++++------------------------ swad_test.c | 49 ++++++++++++++++++++-------------------------- swad_test_import.c | 2 +- swad_user.c | 9 +++------ swad_zip.c | 7 ++----- 7 files changed, 45 insertions(+), 71 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 1bec433ae..e6657ca61 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,12 +103,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.120.8 (2015/07/26)" +#define Log_PLATFORM_VERSION "SWAD 14.120.9 (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.120.8: Jul 26, 2015 Changes in CSS of assignments. (? lines) + Version 14.120.9: Jul 27, 2015 Changes in CSS of forms. (184855 lines) + Version 14.120.8: Jul 26, 2015 Changes in CSS of assignments. (184881 lines) Version 14.120.7: Jul 26, 2015 Changes in CSS of forms. Changes in CSS of surveys. (184877 lines) Version 14.120.6: Jul 26, 2015 Changes in CSS of forms. (184889 lines) diff --git a/swad_group.c b/swad_group.c index 743e3ac2e..ff4f1c34f 100644 --- a/swad_group.c +++ b/swad_group.c @@ -251,7 +251,8 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) /***** Select all groups *****/ fprintf (Gbl.F.Out,"" - "" + "" "" - ""); Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students); diff --git a/swad_record.c b/swad_record.c index 94afa7e15..f11215fa3 100644 --- a/swad_record.c +++ b/swad_record.c @@ -3299,7 +3299,6 @@ static void Rec_PutLinkToChangeMySocialNetworks (void) /********* Show form to edit my institution, centre and department ***********/ /*****************************************************************************/ -#define COL1_WIDTH 140 #define COL2_WIDTH 400 void Rec_ShowFormMyInsCtrDpt (void) @@ -3340,10 +3339,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Country *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Country_of_institution, + ClassForm,Txt_Country_of_institution, COL2_WIDTH); /* If list of countries is empty, try to get it */ @@ -3380,11 +3378,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Institution *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" - "" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Institution, + ClassForm,Txt_Institution, COL2_WIDTH); /* Get list of institutions in this country */ @@ -3426,12 +3422,9 @@ void Rec_ShowFormMyInsCtrDpt (void) { /***** Centre *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" - "" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Centre, + ClassForm,Txt_Centre, COL2_WIDTH); /* Get list of centres in this institution */ @@ -3471,12 +3464,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Department *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" - "" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Department, + ClassForm,Txt_Department, COL2_WIDTH); /* Get list of departments in this institution */ @@ -3516,12 +3506,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Office *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" - "" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Office, + ClassForm,Txt_Office, COL2_WIDTH); Act_FormGoToStart (ActChgMyOff); fprintf (Gbl.F.Out,"" - "" - "%s:" - "" + "%s:" "", - ClassForm,COL1_WIDTH,Txt_Phone, + ClassForm,Txt_Phone, COL2_WIDTH); Act_FormGoToStart (ActChgMyOffPho); fprintf (Gbl.F.Out,"" - "%s: " + fprintf (Gbl.F.Out,"
" + "" "" + fprintf (Gbl.F.Out,"
" ""); if (!ShowOnlyEnabledTags) fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" - "" + "" "%s:" "" - "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Plugins); + "", + The_ClassFormul[Gbl.Prefs.Theme], + Txt_Plugins); for (Pluggable = Tst_PLUGGABLE_NO; Pluggable <= Tst_PLUGGABLE_YES; Pluggable++) @@ -1615,7 +1615,7 @@ static void Tst_ShowFormConfigTst (void) /***** Number of questions *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" @@ -1661,10 +1661,10 @@ static void Tst_ShowFormConfigTst (void) /***** Minimum time between test exams per question *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" - "" + "" "" "" "", @@ -1674,10 +1674,10 @@ static void Tst_ShowFormConfigTst (void) /***** Feedback to students *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" - "", + "", The_ClassFormul[Gbl.Prefs.Theme],Txt_Feedback_to_students); for (FeedbTyp = (Tst_Feedback_t) 0; FeedbTyp < Tst_NUM_TYPES_FEEDBACK; @@ -2001,8 +2001,7 @@ static void Tst_ShowFormAnswerTypes (void) /***** Select all types of answers *****/ fprintf (Gbl.F.Out,"" - "" + "" "" - "" + "" "%s:" "" "" @@ -4302,8 +4299,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) /***** Stem *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" @@ -4318,8 +4314,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) /***** Feedback *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" @@ -4335,8 +4330,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) /***** Type of answer *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "" "" - "" + "" "%s:" "" "" diff --git a/swad_user.c b/swad_user.c index e62061dd6..a3ae990d0 100644 --- a/swad_user.c +++ b/swad_user.c @@ -5022,7 +5022,6 @@ static void Usr_SetUsrDatMainFieldNames (void) static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr) { - extern const char *The_ClassFormul[The_NUM_THEMES]; unsigned NumCol; unsigned NumUsr; struct UsrData UsrDat; @@ -5091,7 +5090,6 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr) static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) { - extern const char *The_ClassFormul[The_NUM_THEMES]; unsigned NumCol; unsigned NumUsr; char *GroupNames; @@ -5180,7 +5178,6 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr) { - extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_No_users_found[Rol_NUM_ROLES]; unsigned NumColumns; unsigned NumCol; @@ -5893,10 +5890,10 @@ void Usr_ListDataAdms (void) Usr_GetAndUpdatePrefsAboutUsrList (); /***** Get scope *****/ - Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | - 1 << Sco_SCOPE_CTY | + Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | + 1 << Sco_SCOPE_CTY | 1 << Sco_SCOPE_INS | - 1 << Sco_SCOPE_CTR | + 1 << Sco_SCOPE_CTR | 1 << Sco_SCOPE_DEG; Gbl.Scope.Default = Sco_SCOPE_DEG; Sco_GetScope (); diff --git a/swad_zip.c b/swad_zip.c index a86e0f7f0..4dabd7c9c 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -363,7 +363,6 @@ void ZIP_CompressFileTree (void) static void ZIP_CompressFolderIntoZIP (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER]; extern const char *Txt_The_folder_is_empty; extern const char *Txt_The_contents_of_the_folder_are_too_big; @@ -596,8 +595,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, /***** Filename *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" - "" + "" "%s:" "" "