From 793aabb27dc405100dfdfa30a559fefbcba4f75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 21 Mar 2016 18:37:28 +0100 Subject: [PATCH] Version 15.159.5 --- css/{swad15.157.css => swad15.159.5.css} | 11 +++++++++++ swad_assignment.c | 2 +- swad_attendance.c | 15 ++++++++------- swad_centre.c | 3 +-- swad_changelog.h | 5 +++-- swad_course.c | 3 +-- swad_degree.c | 3 +-- swad_file_browser.c | 2 +- swad_info.c | 15 --------------- swad_institution.c | 3 +-- swad_record.c | 2 -- swad_survey.c | 3 +-- swad_test.c | 3 +-- 13 files changed, 30 insertions(+), 40 deletions(-) rename css/{swad15.157.css => swad15.159.5.css} (99%) diff --git a/css/swad15.157.css b/css/swad15.159.5.css similarity index 99% rename from css/swad15.157.css rename to css/swad15.159.5.css index 4a811eb41..c392ee0a2 100644 --- a/css/swad15.157.css +++ b/css/swad15.159.5.css @@ -1330,6 +1330,12 @@ a:hover /* Default ==> underlined */ box-sizing:border-box; width:100%; } +.FRAME_TABLE_MARGIN + { + box-sizing:border-box; + width:100%; + margin-bottom:20px; + } .FRAME_TABLE_TITLE { display:table; @@ -1620,6 +1626,11 @@ a:hover img.CENTRE_PHOTO_SHOW .BROWSER_TITLE {color:#94745C; font-size:13pt; font-weight:bold;} .BROWSER_TITLE_LIGHT {color:#D5C6BB; font-size:13pt; font-weight:bold;} .BROWSER_SUBTITLE {color:#94745C; font-size:12pt;} +.BROWSER_TABLE + { + box-sizing:border-box; + width:100%; + } .T1 {color:#404040; font-size:15pt;} .T2 {color:#404040; font-size:13pt;} diff --git a/swad_assignment.c b/swad_assignment.c index face2f371..c08c807ac 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -147,7 +147,7 @@ static void Asg_ShowAllAssignments (void) if (Gbl.Asgs.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" ""); for (Order = Asg_ORDER_BY_START_DATE; Order <= Asg_ORDER_BY_END_DATE; diff --git a/swad_attendance.c b/swad_attendance.c index 43c0f712d..be401f818 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -214,7 +214,7 @@ static void Att_ShowAllAttEvents (void) if (Gbl.AttEvents.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); for (Order = Att_ORDER_BY_START_DATE; Order <= Att_ORDER_BY_END_DATE; @@ -2928,7 +2928,6 @@ static void Att_PutButtonToShowDetails (void) extern const char *Txt_Show_more_details; /***** Button to show more details *****/ - fprintf (Gbl.F.Out,"
"); Act_FormStart (Gbl.Action.Act); Par_PutHiddenParamChar ("ShowDetails",'Y'); Grp_PutParamsCodGrps (); @@ -2937,7 +2936,6 @@ static void Att_PutButtonToShowDetails (void) Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); Lay_PutConfirmButton (Txt_Show_more_details); Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -3061,6 +3059,9 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, unsigned NumStd; unsigned NumAttEvent; unsigned Total; + bool PutButtonShowDetails = (!Gbl.AttEvents.ShowDetails && + (TypeOfView == Att_NORMAL_VIEW_ONLY_ME || + TypeOfView == Att_NORMAL_VIEW_STUDENTS)); /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&UsrDat); @@ -3070,7 +3071,9 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, (TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList : ((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList : NULL)); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
", + PutButtonShowDetails ? "FRAME_TABLE_MARGIN" : + "FRAME_TABLE"); /***** Heading row *****/ Att_WriteTableHeadSeveralAttEvents (); @@ -3122,9 +3125,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, fprintf (Gbl.F.Out,"
"); /***** Button to show more details *****/ - if (!Gbl.AttEvents.ShowDetails && - (TypeOfView == Att_NORMAL_VIEW_ONLY_ME || - TypeOfView == Att_NORMAL_VIEW_STUDENTS)) + if (PutButtonShowDetails) Att_PutButtonToShowDetails (); /***** End frame *****/ diff --git a/swad_centre.c b/swad_centre.c index 01fd6c7b8..197889d42 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -607,8 +607,7 @@ static void Ctr_ListCentres (void) if (Gbl.Ctrs.Num) // There are centres in the current institution { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); Ctr_PutHeadCentresForSeeing (true); // Order selectable /***** Write all the centres and their nuber of teachers *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 048ce110a..feb3a4682 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.159.4 (2016-03-21)" -#define CSS_FILE "swad15.157.css" +#define Log_PLATFORM_VERSION "SWAD 15.159.5 (2016-03-21)" +#define CSS_FILE "swad15.159.5.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.159.5: Mar 21, 2016 Changes in CSS related to tables. (196423 lines) Version 15.159.4: Mar 21, 2016 Icon to print stats on degrees integrated in frame. (196426 lines) Version 15.159.3: Mar 21, 2016 Icon to add new announcement integrated in frame. Button to add new announcement. (196427 lines) diff --git a/swad_course.c b/swad_course.c index b6724f59a..75dfba44c 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1131,8 +1131,7 @@ static void Crs_ListCourses (void) if (Gbl.CurrentDeg.Deg.NumCrss) // There are courses in the current degree { /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Crs_PutHeadCoursesForSeeing (); /***** List the courses *****/ diff --git a/swad_degree.c b/swad_degree.c index 1b9a2d6c1..a431a620e 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1598,8 +1598,7 @@ static void Deg_ListDegrees (void) if (Gbl.CurrentCtr.Ctr.NumDegs) // There are degrees in the current centre { /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Deg_PutHeadDegreesForSeeing (); /***** List the degrees *****/ diff --git a/swad_file_browser.c b/swad_file_browser.c index a82b66bdf..4f6a43e5d 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3478,7 +3478,7 @@ static void Brw_ShowFileBrowser (void) FunctionToDrawContextualIcons); /***** Title *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "
", Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type]); diff --git a/swad_info.c b/swad_info.c index f905f7942..759e9c1ca 100644 --- a/swad_info.c +++ b/swad_info.c @@ -990,13 +990,8 @@ void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit; - /***** Start form *****/ Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); - - /***** Send button *****/ Lay_PutConfirmButton (Txt_Edit); - - /***** End form *****/ Act_FormEnd (); } @@ -1008,13 +1003,8 @@ void Inf_FormToEnterPlainTextEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit_plain_text; - /***** Start form *****/ Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); - - /***** Send button *****/ Lay_PutConfirmButton (Txt_Edit_plain_text); - - /***** End form *****/ Act_FormEnd (); } @@ -1026,13 +1016,8 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit_rich_text; - /***** Start form *****/ Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); - - /***** Send button *****/ Lay_PutConfirmButton (Txt_Edit_rich_text); - - /***** End form *****/ Act_FormEnd (); } diff --git a/swad_institution.c b/swad_institution.c index dc287fd60..97ed1e7fd 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -550,8 +550,7 @@ static void Ins_ListInstitutions (void) if (Gbl.Inss.Num) // There are institutions in the current country { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); Ins_PutHeadInstitutionsForSeeing (true); // Order selectable /***** Write all the institutions and their nuber of users *****/ diff --git a/swad_record.c b/swad_record.c index e3b2f9353..06a2d3944 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1854,12 +1854,10 @@ void Rec_ShowFormSignUpWithMyCommonRecord (void) extern const char *Txt_Sign_up; /***** Show the form *****/ - fprintf (Gbl.F.Out,"
"); Act_FormStart (ActSignUp); Rec_ShowSharedUsrRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat); Lay_PutConfirmButton (Txt_Sign_up); Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ diff --git a/swad_survey.c b/swad_survey.c index 4c67f0558..891e00b1a 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -213,8 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) if (Gbl.Svys.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); for (Order = Svy_ORDER_BY_START_DATE; Order <= Svy_ORDER_BY_END_DATE; diff --git a/swad_test.c b/swad_test.c index ff8b71671..7dabb2bc7 100644 --- a/swad_test.c +++ b/swad_test.c @@ -2459,8 +2459,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconToCreateNewTstQst); /***** Write the heading *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "" "
"