From e07f87181d82fb2e497c0bde544dc92ed59d38d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 6 Sep 2015 15:34:44 +0200 Subject: [PATCH] Version 14.127.3 --- css/swad_desktop.css | 13 +++- css/swad_mobile.css | 9 +++ swad_assignment.c | 13 +--- swad_attendance.c | 14 ++-- swad_changelog.h | 3 +- swad_indicator.c | 12 +--- swad_layout.c | 2 +- swad_statistic.c | 164 ++++++++++++++++++++----------------------- swad_survey.c | 2 +- swad_test.c | 26 ++----- 10 files changed, 118 insertions(+), 140 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 544357244..0a6f9adaa 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -403,7 +403,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .CONTEXT_OPT { display:inline; - margin:0 5px; + margin-right:10px; } /********************************* Frame 10 **********************************/ @@ -451,7 +451,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .CELLS_PAD_4 td {padding:4px;} .CELLS_PAD_8 th {padding:8px;} .CELLS_PAD_8 td {padding:8px;} - + /*********************************** Title ***********************************/ .TIT { @@ -937,6 +937,15 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_N {color:#404040; font-size:11pt;} .DAT_NOBR_N {color:#404040; font-size:11pt; white-space:nowrap;} +/*********************** Line in top part of a table row *********************/ +.DAT_N_LINE_TOP + { + color:#404040; + font-size:11pt; + border-style:solid none none none; + border-width:1px; + } + .DAT_SMALL {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt;} .DAT_SMALL_LIGHT {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#A0A0A0; font-size:10pt;} .DAT_SMALL_NOBR {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:10pt; white-space:nowrap;} diff --git a/css/swad_mobile.css b/css/swad_mobile.css index f63ca2639..403783a7d 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -746,6 +746,15 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_N {color:#404040; font-size:16pt;} .DAT_NOBR_N {color:#404040; font-size:16pt; white-space:nowrap;} +/*********************** Line in top part of a table row *********************/ +.LINE_TOP + { + color:#404040; + font-size:16pt; + border-style:solid none none none; + border-width:1px; + } + .DAT_SMALL {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt;} .DAT_SMALL_LIGHT {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#A0A0A0; font-size:14pt;} .DAT_SMALL_NOBR {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#707070; font-size:14pt; white-space:nowrap;} diff --git a/swad_assignment.c b/swad_assignment.c index 2a71514d6..8db4da870 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -297,7 +297,7 @@ static void Asg_ShowOneAssignment (long AsgCod) Txt_No); /* Assignment folder */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); Asg_WriteAssignmentFolder (&Asg); fprintf (Gbl.F.Out,"" @@ -407,9 +407,6 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg) if (Asg->SendWork == Asg_SEND_WORK) { /***** Folder icon *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - "
"); if (Asg->Open && Asg->ICanDo) // I can send files to this assignment folder { @@ -433,11 +430,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg) Txt_Folder,Txt_Folder); /***** Folder name *****/ - fprintf (Gbl.F.Out,"%s
", - Asg->Folder); + fprintf (Gbl.F.Out,"%s",Asg->Folder); } } @@ -499,7 +492,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) extern const char *Txt_Hide; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Put form to remove assignment *****/ Act_FormStart (ActReqRemAsg); diff --git a/swad_attendance.c b/swad_attendance.c index a4ec23935..0a130b4d5 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -489,7 +489,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden) extern const char *Txt_Hide; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Put form to remove attendance event *****/ Act_FormStart (ActReqRemAtt); @@ -3047,9 +3047,7 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte /***** Last row with the total of students present in each event *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "", Gbl.Usrs.Listing.WithPhotos ? 4 : @@ -3060,17 +3058,13 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte NumAttEvent++) if (Gbl.AttEvents.Lst[NumAttEvent].Selected) { - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "", Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList; } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "" "", diff --git a/swad_changelog.h b/swad_changelog.h index 7c138b030..0ec242a98 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.127.2 (2015/09/06)" +#define Log_PLATFORM_VERSION "SWAD 14.127.3 (2015/09/06)" // 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.127.3: Sep 06, 2015 Changes in styles. (184219 lines) Version 14.127.2: Sep 06, 2015 Changes in styles. (184244 lines) Version 14.127.1: Sep 06, 2015 Justify alignment is no longer used. (184259 lines) Version 14.127: Sep 05, 2015 Changes in styles. (184273 lines) diff --git a/swad_indicator.c b/swad_indicator.c index ab02c724b..8323fb57b 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -1211,19 +1211,13 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat NumCrss ? (float) NumCrssWithIndicatorYes[Ind] * 100.0 / (float) NumCrss : 0.0); fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "(%.1f%%)" "" "" diff --git a/swad_layout.c b/swad_layout.c index 07784cb49..ea0ead3c0 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -985,7 +985,7 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text) Alt,Text ? Text : Alt); if (Text) if (Text[0]) - fprintf (Gbl.F.Out," %s", + fprintf (Gbl.F.Out," %s", Text); fprintf (Gbl.F.Out,"
" ""); diff --git a/swad_statistic.c b/swad_statistic.c index c13cea020..382f81cfd 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -5045,11 +5045,8 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char char StrNumFilesPerCrs[10+1]; char StrNumFilesPerUsr[10+1]; struct Sta_SizeOfFileZones SizeOfFileZones; - char *ClassData = (FileZone == Brw_UNKNOWN) ? "DAT_N" : - "DAT"; - char *StyleTableCell = (FileZone == Brw_UNKNOWN) ? " border-style:solid none none none;" - " border-width:1px;" : - ""; + char *Class = (FileZone == Brw_UNKNOWN) ? "DAT_N_LINE_TOP" : + "DAT"; Sta_GetSizeOfFileZoneFromDB (Gbl.Scope.Current,FileZone,&SizeOfFileZones); if (SizeOfFileZones.NumCrss == -1) @@ -5095,48 +5092,48 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char 0.0); } fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "%lu" "" - "" + "" "%lu" "" - "", - ClassData,StyleTableCell,NameOfFileZones, - ClassData,StyleTableCell,StrNumCrss, - ClassData,StyleTableCell,StrNumGrps, - ClassData,StyleTableCell,StrNumUsrs, - ClassData,StyleTableCell,SizeOfFileZones.MaxLevels, - ClassData,StyleTableCell,SizeOfFileZones.NumFolders, - ClassData,StyleTableCell,SizeOfFileZones.NumFiles, - ClassData,StyleTableCell); + "", + Class,NameOfFileZones, + Class,StrNumCrss, + Class,StrNumGrps, + Class,StrNumUsrs, + Class,SizeOfFileZones.MaxLevels, + Class,SizeOfFileZones.NumFolders, + Class,SizeOfFileZones.NumFiles, + Class); Str_WriteSizeInBytesFull ((double) SizeOfFileZones.Size); fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%s" "" - "", - ClassData,StyleTableCell,StrNumFoldersPerCrs, - ClassData,StyleTableCell,StrNumFilesPerCrs, - ClassData,StyleTableCell); + "", + Class,StrNumFoldersPerCrs, + Class,StrNumFilesPerCrs, + Class); if (SizeOfFileZones.NumCrss == -1) fprintf (Gbl.F.Out,"-"); else @@ -5144,16 +5141,16 @@ static void Sta_WriteRowStatsFileBrowsers (Brw_FileBrowser_t FileZone,const char (double) SizeOfFileZones.NumCrss : 0.0); fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%s" "" - "", - ClassData,StyleTableCell,StrNumFoldersPerUsr, - ClassData,StyleTableCell,StrNumFilesPerUsr, - ClassData,StyleTableCell); + "", + Class,StrNumFoldersPerUsr, + Class,StrNumFilesPerUsr, + Class); if (SizeOfFileZones.NumUsrs == -1) fprintf (Gbl.F.Out,"-"); else @@ -6022,8 +6019,6 @@ static void Sta_GetAndShowTestsStats (void) extern const char *Txt_Total; Tst_AnswerType_t AnsType; struct Tst_Stats Stats; - char *StyleTableCell = " border-style:solid none none none;" - " border-width:1px;"; /***** Table start *****/ Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_TESTS]); @@ -6126,46 +6121,46 @@ static void Sta_GetAndShowTestsStats (void) /***** Write number of assignments *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "%u (%.1f%%)" "" - "" + "" "%u" "" - "" + "" "%.2f" "" - "" + "" "%lu" "" - "" + "" "%.2f" "" - "" + "" "%.2f" "" - "" + "" "%.2f" "" "", - StyleTableCell,Txt_Total, - StyleTableCell,Stats.NumCoursesWithQuestions, - StyleTableCell,Stats.NumCoursesWithPluggableQuestions, + Txt_Total, + Stats.NumCoursesWithQuestions, + Stats.NumCoursesWithPluggableQuestions, Stats.NumCoursesWithQuestions ? (float) Stats.NumCoursesWithPluggableQuestions * 100.0 / (float) Stats.NumCoursesWithQuestions : 0.0, - StyleTableCell,Stats.NumQsts, - StyleTableCell,Stats.AvgQstsPerCourse, - StyleTableCell,Stats.NumHits, - StyleTableCell,Stats.AvgHitsPerCourse, - StyleTableCell,Stats.AvgHitsPerQuestion, - StyleTableCell,Stats.AvgScorePerQuestion); + Stats.NumQsts, + Stats.AvgQstsPerCourse, + Stats.NumHits, + Stats.AvgHitsPerCourse, + Stats.AvgHitsPerQuestion, + Stats.AvgScorePerQuestion); /***** End table *****/ Lay_EndRoundFrameTable (); @@ -6196,8 +6191,6 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void) unsigned NumEvents[Ntf_NUM_NOTIFY_EVENTS]; unsigned NumMailsTotal = 0; unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS]; - char *StyleTableCell = " border-style:solid none none none;" - " border-width:1px;"; Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS]); @@ -6473,29 +6466,29 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void) /***** Write total number of users who want to be notified by e-mail on some event *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "%5.2f%%" "" - "" + "" "%u" "" - "" + "" "%u" "" "", - StyleTableCell,Txt_Total, - StyleTableCell,NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent, - StyleTableCell,NumUsrsTotalInPlatform ? (float) NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent * 100.0 / - (float) NumUsrsTotalInPlatform : - 0.0, - StyleTableCell,NumEventsTotal, - StyleTableCell,NumMailsTotal); + Txt_Total, + NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent, + NumUsrsTotalInPlatform ? (float) NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent * 100.0 / + (float) NumUsrsTotalInPlatform : + 0.0, + NumEventsTotal, + NumMailsTotal); Lay_EndRoundFrameTable (); } @@ -6993,8 +6986,6 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum) float NumThrsPerForum; float NumPostsPerThread; float NumPostsPerForum; - char *StyleTableCell = " border-style:solid none none none;" - " border-width:1px;"; /***** Compute number of threads per forum, number of posts per forum and number of posts per thread *****/ NumThrsPerForum = (StatsForum->NumForums ? (float) StatsForum->NumThreads / (float) StatsForum->NumForums : @@ -7006,42 +6997,41 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum) /***** Write forum name and stats *****/ fprintf (Gbl.F.Out,"" - "" + "" "" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "%u" "" - "" + "" "%u" "" - "" + "" "%u" "" - "" + "" "%.2f" "" - "" + "" "%.2f" "" - "" + "" "%.2f" "" "", - StyleTableCell, - StyleTableCell,Txt_Total, - StyleTableCell,StatsForum->NumForums, - StyleTableCell,StatsForum->NumThreads, - StyleTableCell,StatsForum->NumPosts, - StyleTableCell,StatsForum->NumUsrsToBeNotifiedByEMail, - StyleTableCell,NumThrsPerForum, - StyleTableCell,NumPostsPerThread, - StyleTableCell,NumPostsPerForum); + Txt_Total, + StatsForum->NumForums, + StatsForum->NumThreads, + StatsForum->NumPosts, + StatsForum->NumUsrsToBeNotifiedByEMail, + NumThrsPerForum, + NumPostsPerThread, + NumPostsPerForum); } /*****************************************************************************/ diff --git a/swad_survey.c b/swad_survey.c index 4504e836e..ffea835a6 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -728,7 +728,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) extern const char *Txt_Hide; extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Put form to remove survey *****/ Act_FormStart (ActReqRemSvy); diff --git a/swad_test.c b/swad_test.c index 7f0fd1cec..300fff306 100644 --- a/swad_test.c +++ b/swad_test.c @@ -6309,45 +6309,35 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat) Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING); fprintf (Gbl.F.Out,"" - "" + "" "%s: %u" "", Gbl.RowEvenOdd, Txt_Visible_exams,NumExamsVisibleByTchs); /* Write total number of questions */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (NumExamsVisibleByTchs) fprintf (Gbl.F.Out,"%u",NumTotalQsts); fprintf (Gbl.F.Out,""); /* Write total number of questions not blank */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (NumExamsVisibleByTchs) fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank); fprintf (Gbl.F.Out,""); /* Write total score */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (ICanViewScore) fprintf (Gbl.F.Out,"%.2lf",TotalScoreOfAllExams); fprintf (Gbl.F.Out,""); /* Write average score per question */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (ICanViewScore) fprintf (Gbl.F.Out,"%.2lf", @@ -6356,9 +6346,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /* Write score over Tst_SCORE_MAX */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (ICanViewScore) fprintf (Gbl.F.Out,"%.2lf", @@ -6367,7 +6355,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /* Last cell */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "", Gbl.RowEvenOdd); }