diff --git a/css/swad16.177.css b/css/swad16.181.css similarity index 99% rename from css/swad16.177.css rename to css/swad16.181.css index 27d62f3ed..27cfd9e5b 100644 --- a/css/swad16.177.css +++ b/css/swad16.181.css @@ -1548,7 +1548,7 @@ a:hover /* Default ==> underlined */ .FRAME_CONTAINER { box-sizing:border-box; - width:100%%; + width:100%; text-align:center; vertical-align:middle; } @@ -1594,17 +1594,26 @@ a:hover /* Default ==> underlined */ display:inline-block; float:right; } -.FRAME_TBL +.FRAME_TBL_WIDE { box-sizing:border-box; width:100%; } -.FRAME_TBL_MARGIN +.FRAME_TBL_WIDE_MARGIN { box-sizing:border-box; width:100%; margin-bottom:20px; } +.FRAME_TBL_CENTER + { + margin:0 auto; + } +.FRAME_TBL_CENTER_MARGIN + { + margin:0 auto; + margin-bottom:20px; + } .FRAME_TITLE { display:table; @@ -1853,10 +1862,10 @@ a:hover img.CENTRE_PHOTO_SHOW .NO_BR {white-space:nowrap;} /********************************* Messages **********************************/ -.MSG_SUBJECT, .MSG_CONTENT +.MSG_RECIPIENTS, .MSG_SUBJECT, .MSG_CONTENT { box-sizing:border-box; - width:480px; + width:640px; } .BG_MSG_BLUE { diff --git a/js/swad16.144.js b/js/swad16.181.js similarity index 99% rename from js/swad16.144.js rename to js/swad16.181.js index 9c393cd37..510c40cdf 100644 --- a/js/swad16.144.js +++ b/js/swad16.181.js @@ -125,10 +125,9 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday, if (WriteWeekDay) { DayOfWeek = d.getDay(); DayOfWeek = (DayOfWeek == 0) ? 6 : DayOfWeek - 1; - StrDate = StrDate + Separator + DAYS[DayOfWeek] + Separator; + StrDate = StrDate + Separator + DAYS[DayOfWeek]; } - else - StrDate = StrDate + Separator; + StrDate = StrDate + Separator; } else StrDate = ''; @@ -138,15 +137,12 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,Separator,StrToday, Min = d.getMinutes(); StrHou = ((Hou < 10) ? '0' : '') + Hou; StrMin = ((Min < 10) ? ':0' : ':') + Min; + StrSec = ''; if (WriteSeconds) { Sec = d.getSeconds(); if (Sec) StrSec = ((Sec < 10) ? ':0' : ':') + Sec; - else - StrSec = ''; } - else - StrSec = ''; /* Write date and time */ document.getElementById(id).innerHTML = StrDate + StrHou + StrMin + StrSec; diff --git a/swad_ID.c b/swad_ID.c index 4b7728a7c..66114bd5b 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -529,7 +529,7 @@ void ID_ShowFormOthIDs (void) Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /***** Form with the user's ID *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); ID_ShowFormChangeUsrID (&Gbl.Usrs.Other.UsrDat, (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me? fprintf (Gbl.F.Out,"
"); diff --git a/swad_agenda.c b/swad_agenda.c index ae8fb54c0..9618caedc 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -472,7 +472,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) if (Gbl.Agenda.Num) { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); /***** Table head *****/ Agd_WriteHeaderListEvents (AgendaType); diff --git a/swad_assignment.c b/swad_assignment.c index 74a2177d2..526de6529 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -151,7 +151,7 @@ static void Asg_ShowAllAssignments (void) if (Gbl.Asgs.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); for (Order = Dat_START_TIME; Order <= Dat_END_TIME; diff --git a/swad_attendance.c b/swad_attendance.c index 9cfae87f3..c5e174625 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -231,7 +231,7 @@ static void Att_ShowAllAttEvents (void) if (Gbl.AttEvents.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); for (Order = Dat_START_TIME; Order <= Dat_END_TIME; @@ -1946,7 +1946,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Grp_PutParamsCodGrps (); /***** List students' data *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "" "" @@ -2644,7 +2644,7 @@ void Usr_ReqListStdsAttendanceCrs (void) Grp_PutParamsCodGrps (); /* Write list of students to select some of them */ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Usr_ListUsersToSelect (Rol_STUDENT); fprintf (Gbl.F.Out,"
"); @@ -3175,8 +3175,8 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, TypeOfView == Att_PRINT_VIEW ? NULL : Hlp_USERS_Attendance_attendance_list); fprintf (Gbl.F.Out,"", - PutButtonShowDetails ? "FRAME_TBL_MARGIN" : - "FRAME_TBL"); + PutButtonShowDetails ? "FRAME_TBL_WIDE_MARGIN" : + "FRAME_TBL_WIDE"); /***** Heading row *****/ Att_WriteTableHeadSeveralAttEvents (); diff --git a/swad_centre.c b/swad_centre.c index 153bc3277..7e6a0612f 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -377,7 +377,7 @@ static void Ctr_Configuration (bool PrintView) } /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Institution *****/ fprintf (Gbl.F.Out,"" @@ -759,7 +759,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 *****/ @@ -2425,7 +2425,7 @@ static void Ctr_PutFormToCreateCentre (void) Lay_ShowErrorAndExit ("You can not edit centres."); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Table head *****/ Ctr_PutHeadCentresForEdition (); diff --git a/swad_changelog.h b/swad_changelog.h index 12bd10556..f8b3c0b65 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -214,13 +214,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.180.1 (2017-04-17)" -#define CSS_FILE "swad16.177.css" -#define JS_FILE "swad16.144.js" +#define Log_PLATFORM_VERSION "SWAD 16.181 (2017-04-17)" +#define CSS_FILE "swad16.181.css" +#define JS_FILE "swad16.181.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 16.181: Apr 17, 2017 Changes in layout of messages. + Changes in layout of some tables. + Fixed bug in forums. (217560 lines) Version 16.180.1: Apr 17, 2017 New '+' icon in list of thread posts to add a new post. (217558 lines) Version 16.180: Apr 17, 2017 Code refactoring in forums. (217521 lines) Version 16.179: Apr 16, 2017 Code refactoring in forums. (217444 lines) diff --git a/swad_country.c b/swad_country.c index d64057b09..7e8bcecca 100644 --- a/swad_country.c +++ b/swad_country.c @@ -297,7 +297,7 @@ static void Cty_Configuration (bool PrintView) } /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Country name (an link to WWW if exists) *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_course.c b/swad_course.c index 958827685..3433eb543 100644 --- a/swad_course.c +++ b/swad_course.c @@ -216,7 +216,7 @@ static void Crs_Configuration (bool PrintView) Gbl.CurrentCrs.Crs.FullName); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Degree *****/ fprintf (Gbl.F.Out,"" @@ -1161,7 +1161,7 @@ static void Crs_ListCourses (void) if (Gbl.CurrentDeg.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 3a88f7e55..e294625a5 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -312,7 +312,7 @@ static void Deg_Configuration (bool PrintView) fprintf (Gbl.F.Out,""); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Centre *****/ fprintf (Gbl.F.Out,"" @@ -949,7 +949,7 @@ static void Deg_PutFormToCreateDegree (void) Lay_ShowErrorAndExit ("You can not edit degrees."); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Table head *****/ Deg_PutHeadDegreesForEdition (); @@ -1192,7 +1192,7 @@ static void Deg_ListDegrees (void) if (Gbl.CurrentCtr.Ctr.Degs.Num) // 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_enrolment.c b/swad_enrolment.c index 5740f8e45..3c7d76e0a 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -822,7 +822,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void) extern const char *Txt_List_of_nicks_emails_or_IDs; /***** Text area for users' IDs *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "
" "" @@ -2207,7 +2207,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) /***** Selection of scope and roles *****/ /* Start form */ Act_FormStart (ActUpdSignUpReq); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); /* Scope (whole platform, current centre, current degree or current course) */ fprintf (Gbl.F.Out,"" @@ -2678,8 +2678,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) Usr_UsrDataConstructor (&UsrDat); /* Start table */ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "
" "%s" diff --git a/swad_file_browser.c b/swad_file_browser.c index 947a06a69..8f74f5865 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3120,7 +3120,7 @@ void Brw_AskEditWorksCrs (void) Brw_PutHiddenParamFullTreeIfSelected (); /* Put list of users to select some of them */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_STUDENT); fprintf (Gbl.F.Out,"
"); diff --git a/swad_forum.c b/swad_forum.c index e552fce85..e7655ff19 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1061,7 +1061,7 @@ static void For_ShowThreadPosts (long ThrCod) &PaginationPsts); /***** Start table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); /***** Show posts from this page, the author and the date of last reply *****/ mysql_data_seek (mysql_res,(my_ulonglong) (PaginationPsts.FirstItemVisible - 1)); @@ -2542,7 +2542,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted) &PaginationThrs); /***** Heading row *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "", @@ -3779,15 +3779,15 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) { extern const char *Hlp_SOCIAL_Forums; extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_New_message; + extern const char *Txt_New_post; extern const char *Txt_New_thread; extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Message; - extern const char *Txt_Send_message; + extern const char *Txt_Send; /***** Start frame *****/ Lay_StartRoundFrame (NULL, - IsReply ? Txt_New_message : + IsReply ? Txt_New_post : Txt_New_thread, NULL,Hlp_SOCIAL_Forums); @@ -3848,7 +3848,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) Img_PutImageUploader (-1,"FOR_IMG_TIT_URL"); /***** Send button *****/ - Lay_PutCreateButton (Txt_Send_message); + Lay_PutCreateButton (Txt_Send); /***** End form *****/ Act_FormEnd (); diff --git a/swad_group.c b/swad_group.c index fa17c7106..d4404ba9f 100644 --- a/swad_group.c +++ b/swad_group.c @@ -274,7 +274,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction) Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); /***** List the groups for each group type *****/ - fprintf (Gbl.F.Out,"
" @@ -3342,9 +3342,9 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], /* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */ TimeUTC = Thr.WriteTime[Order]; UniqueId++; - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" "
"); + fprintf (Gbl.F.Out,"
"); for (NumGrpTyp = 0; NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp++) @@ -1548,7 +1548,7 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents) Act_FormStart (ActChgGrp); /***** List the groups the user belongs to for change *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); for (NumGrpTyp = 0; NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp++) diff --git a/swad_hierarchy.c b/swad_hierarchy.c index a8220c3d7..9b0e833de 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -97,8 +97,7 @@ void Hie_WriteMenuHierarchy (void) extern const char *Txt_Course; /***** Start of table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Write a 1st selector with all the countries *****/ diff --git a/swad_holiday.c b/swad_holiday.c index 7b1e2adad..3711d90c3 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -104,7 +104,7 @@ void Hld_SeeHolidays (void) Hlp_INSTITUTION_Holidays); if (Gbl.Hlds.Num) { - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" ""); for (Order = Hld_ORDER_BY_PLACE; Order <= Hld_ORDER_BY_START_DATE; diff --git a/swad_indicator.c b/swad_indicator.c index 8f5864d8f..47e92b5fd 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -110,7 +110,7 @@ void Ind_ReqIndicatorsCourses (void) /***** Form to update indicators *****/ /* Start form */ Act_FormStart (ActReqStaCrs); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Scope */ fprintf (Gbl.F.Out,"" diff --git a/swad_institution.c b/swad_institution.c index 0987b2229..cb613d7ca 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -323,7 +323,7 @@ static void Ins_Configuration (bool PrintView) fprintf (Gbl.F.Out,""); /***** Start table *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Country *****/ fprintf (Gbl.F.Out,"" @@ -684,7 +684,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_layout.c b/swad_layout.c index 194444a2c..5f3dea14d 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1357,7 +1357,7 @@ void Lay_StartRoundFrameTable (const char *Width,const char *Title, { Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,HelpLink); - fprintf (Gbl.F.Out,"
"); @@ -1370,7 +1370,7 @@ void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title, { Lay_StartRoundFrameShadow (Width,Title,FunctionToDrawContextualIcons,HelpLink); - fprintf (Gbl.F.Out,"
"); diff --git a/swad_mail.c b/swad_mail.c index 1f059e579..e0ecd34c4 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1170,7 +1170,7 @@ void Mai_ShowFormOthEmail (void) Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /***** Form with the user's email *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Mai_ShowFormChangeUsrEmail (&Gbl.Usrs.Other.UsrDat, (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me? fprintf (Gbl.F.Out,"
"); diff --git a/swad_message.c b/swad_message.c index 4bf06e0e6..8a53286a6 100644 --- a/swad_message.c +++ b/swad_message.c @@ -272,7 +272,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) } /***** Start table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); /***** "To:" section (recipients) *****/ fprintf (Gbl.F.Out,"" @@ -457,7 +457,7 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan); fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE\">" "