From 802afdbd35f92e68bca054286a8e8477c8a23d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 1 Apr 2016 18:37:16 +0200 Subject: [PATCH] Version 15.173.1 --- css/{swad15.173.css => swad15.173.1.css} | 27 ++++++++++++------ swad_changelog.h | 12 ++++++-- swad_test.c | 36 ++++++++++++------------ 3 files changed, 46 insertions(+), 29 deletions(-) rename css/{swad15.173.css => swad15.173.1.css} (98%) diff --git a/css/swad15.173.css b/css/swad15.173.1.css similarity index 98% rename from css/swad15.173.css rename to css/swad15.173.1.css index 7b6695d8f..d9d963cef 100644 --- a/css/swad15.173.css +++ b/css/swad15.173.1.css @@ -1345,14 +1345,15 @@ a:hover /* Default ==> underlined */ font-weight:bold; } -.CELLS_PAD_1 th {padding:1px;} -.CELLS_PAD_1 td {padding:1px;} - -.CELLS_PAD_2 th {padding:2px;} -.CELLS_PAD_2 td {padding:2px;} - -.CELLS_PAD_5 th {padding:5px;} -.CELLS_PAD_5 td {padding:5px;} +/* Apply only to the first level of th and td */ +table.CELLS_PAD_1 > tbody > tr > th {padding: 1px;} +table.CELLS_PAD_1 > tbody > tr > td {padding: 1px;} +table.CELLS_PAD_2 > tbody > tr > th {padding: 2px;} +table.CELLS_PAD_2 > tbody > tr > td {padding: 2px;} +table.CELLS_PAD_5 > tbody > tr > th {padding: 5px;} +table.CELLS_PAD_5 > tbody > tr > td {padding: 5px;} +table.CELLS_PAD_10 > tbody > tr > th {padding:10px;} +table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} /*********************************** Title ***********************************/ .TIT @@ -1727,6 +1728,14 @@ a:hover img.CENTRE_PHOTO_SHOW .ANS_OK {color:#008000; font-size:13pt; font-weight:bold;} .ANS_BAD {color:red; font-size:13pt; font-weight:bold;} .ANS_STR {width:308px;} +.TEST_SUBTITLE + { + margin:10px; + color:#404040; + font-size:13pt; + text-align:center; + vertical-align:middle; + } .TEST {color:#404040; font-size:12pt;} .TEST_EXA {color:#404040; font-size:12pt;} .TEST_EXA_LIGHT {color:#A0A0A0; font-size:12pt;} @@ -1735,7 +1744,7 @@ a:hover img.CENTRE_PHOTO_SHOW .TEST_IMG_SHOW { width:600px; - margin:10px 0; + margin:10px; } .TEST_IMG_EDIT_LIST { diff --git a/swad_changelog.h b/swad_changelog.h index ec2197237..c3184821f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,17 +134,25 @@ // TODO: Optimize reading of parameters by doing one unique pass creating a dynamic list of parameters and their values // This is very important when there is a big file in the middle of the list of parameters +// TODO: In Statistics > Degrees, show only degrees with students + +// TODO: Put radio button to remove image when editing one test question +// TODO: Put icon to remove image when editing a list of test questions (similar to shuffle icon) +// TODO: Image in a test question is removed when the test question is removed + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.173 (2016-04-01)" -#define CSS_FILE "swad15.173.css" +#define Log_PLATFORM_VERSION "SWAD 15.173.1 (2016-04-01)" +#define CSS_FILE "swad15.173.1.css" #define JS_FILE "swad15.131.3.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 15.173.2: Apr 01, 2016 Old image in test question is removed when replaced by a new one. (? lines) + Version 15.173.1: Apr 01, 2016 Changes in CSS related to tests. (197452 lines) Version 15.173: Apr 01, 2016 Show image in test question, if present. (197435 lines) Version 15.172.1: Apr 01, 2016 Reception of test image. (197398 lines) Version 15.172: Apr 01, 2016 Reception of test image. Not finished. (197339 lines) diff --git a/swad_test.c b/swad_test.c index bf62ade52..86a167119 100644 --- a/swad_test.c +++ b/swad_test.c @@ -423,7 +423,7 @@ void Tst_ShowNewTestExam (void) Par_PutHiddenParamUnsigned ("NumQst",Gbl.Test.NumQsts); /***** List the questions *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); Tst_ShowTestQuestionsWhenSeeing (mysql_res); fprintf (Gbl.F.Out,"
"); @@ -514,13 +514,13 @@ void Tst_AssessTestExam (void) /***** Header *****/ if (Gbl.Usrs.Me.IBelongToCurrentCrs) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); fprintf (Gbl.F.Out,Txt_Test_No_X_that_you_make_in_this_course,NumTst); fprintf (Gbl.F.Out,"
"); } /***** Write answers and solutions *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); Tst_ShowTstResultAfterAssess (TstCod,&NumQstsNotBlank,&TotalScore); fprintf (Gbl.F.Out,"
"); @@ -1505,7 +1505,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, if (NumCols > 1) fprintf (Gbl.F.Out," colspan=\"%u\"",NumCols); fprintf (Gbl.F.Out," class=\"LEFT_TOP\">" - "" + "
" ""); if (!ShowOnlyEnabledTags) fprintf (Gbl.F.Out,""); @@ -2123,7 +2123,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) if (NumCols > 1) fprintf (Gbl.F.Out," colspan=\"%u\"",NumCols); fprintf (Gbl.F.Out," class=\"LEFT_TOP\">" - "
" + "
" "" "
" "" + fprintf (Gbl.F.Out,"" ""); Tst_WriteHeadUserCorrect (); fprintf (Gbl.F.Out,""); @@ -3151,7 +3151,7 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle) char ParamName[3+6+1]; /***** Start of table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Get answers of a question from database *****/ Gbl.Test.Answer.NumOptions = Tst_GetAnswersQst (QstCod,&mysql_res,Shuffle); // Result: AnsInd,Answer,Correct @@ -3311,7 +3311,7 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, } /***** Start of table *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); Tst_WriteHeadUserCorrect (); fprintf (Gbl.F.Out,"" @@ -3508,7 +3508,7 @@ static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, } /***** Header with the title of each column *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); Tst_WriteHeadUserCorrect (); fprintf (Gbl.F.Out,""); @@ -3557,7 +3557,7 @@ static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) { fprintf (Gbl.F.Out,"
" - ""); + "
"); for (NumOpt = 0; NumOpt < Gbl.Test.Answer.NumOptions; NumOpt++) @@ -3659,7 +3659,7 @@ static void Tst_WriteIntAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, Lay_ShowErrorAndExit ("Wrong integer answer."); /***** Header with the title of each column *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); Tst_WriteHeadUserCorrect (); fprintf (Gbl.F.Out,""); @@ -3777,7 +3777,7 @@ static void Tst_WriteFloatAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, } /***** Header with the title of each column *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); Tst_WriteHeadUserCorrect (); fprintf (Gbl.F.Out,""); @@ -3941,7 +3941,7 @@ static void Tst_GetAndWriteTagsQst (long QstCod) if ((NumRows = Tst_GetTagsQst (QstCod,&mysql_res))) // Result: TagTxt { /***** Write the tags *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); for (NumRow = 0; NumRow < NumRows; NumRow++) @@ -4356,7 +4356,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) "" "" "
" - "", + "
", The_ClassForm[Gbl.Prefs.Theme],Txt_Tags); for (NumTag = 0; NumTag < Tst_MAX_TAGS_PER_QUESTION; @@ -4535,7 +4535,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) fprintf (Gbl.F.Out,"" "" "
" - "" + "
" "" "" "
" "" "" - "" + "
" "" "" "" "
" @@ -6247,7 +6247,7 @@ void Tst_SelUsrsToSeeUsrsTstExams (void) "%s:" "" - "", + "
", The_ClassForm[Gbl.Prefs.Theme],Txt_Users, The_ClassForm[Gbl.Prefs.Theme]); Usr_ListUsersToSelect (Rol_TEACHER); @@ -6857,7 +6857,7 @@ void Tst_ShowOneTestExam (void) Gbl.CurrentCrs.Crs.CrsCod); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Header row *****/ /* Get data of the user who made the exam */