From 5c071e4109f81990f578d54536749d28160372d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 6 Sep 2015 19:51:06 +0200 Subject: [PATCH] Version 14.127.4 --- css/swad_desktop.css | 3 +- swad_calendar.c | 2 +- swad_centre.c | 3 +- swad_changelog.h | 3 +- swad_connected.c | 3 +- swad_country.c | 2 +- swad_course.c | 21 +++++++++----- swad_degree.c | 6 ++-- swad_enrollment.c | 6 ++-- swad_forum.c | 9 ++++-- swad_group.c | 12 +++++--- swad_holiday.c | 2 +- swad_indicator.c | 4 +-- swad_info.c | 4 +-- swad_institution.c | 3 +- swad_layout.c | 8 ++---- swad_message.c | 3 +- swad_preference.c | 8 +++--- swad_profile.c | 6 ++-- swad_record.c | 68 +++++++++++++++++++++++++------------------- swad_statistic.c | 3 +- swad_timetable.c | 3 +- 22 files changed, 104 insertions(+), 78 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 0a6f9adaa..e059e1950 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -91,7 +91,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} /************************* Users connected globally **************************/ .CONNECTED { - margin:0; + margin:0 auto; border-style:solid; border-width:1px; border-color:#80C040; @@ -391,6 +391,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .ICON48x48 {width:48px; height:48px; vertical-align:middle;} .ICON64x64 {width:64px; height:64px; vertical-align:middle;} .ICON128x128 {width:128px; height:128px; vertical-align:middle;} +.ICON8x800 {width:8px; height:800px;} .BANNER {width:120px; height:40px;} .BANNER_SMALL {width:60px; height:20px;} diff --git a/swad_calendar.c b/swad_calendar.c index 82d8e6af4..62e7581d8 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -142,7 +142,7 @@ void Cal_DrawCalendar (void) /***** Draw several months *****/ fprintf (Gbl.F.Out,"" "" - ""); + "
"); for (Row = 0; Row < 4; Row++) diff --git a/swad_centre.c b/swad_centre.c index 00812f750..08a3c4b4b 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1966,7 +1966,8 @@ static void Ctr_PutFormToCreateCentre (void) /***** Institution *****/ fprintf (Gbl.F.Out,"
" - "" "" diff --git a/swad_changelog.h b/swad_changelog.h index 0ec242a98..e9cbea88d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.127.3 (2015/09/06)" +#define Log_PLATFORM_VERSION "SWAD 14.127.4 (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.4: Sep 06, 2015 Changes in styles. (184245 lines) 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) diff --git a/swad_connected.c b/swad_connected.c index e236557df..5ae26f089 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -275,8 +275,7 @@ void Con_ShowGlobalConnectedUsrs (void) /***** Start table *****/ fprintf (Gbl.F.Out,"
" + " style=\"width:110px; \">" ""); /***** Write total number of sessions *****/ diff --git a/swad_country.c b/swad_country.c index fd56c9840..1f9024983 100644 --- a/swad_country.c +++ b/swad_country.c @@ -757,7 +757,7 @@ void Cty_WriteScriptGoogleGeochart (void) " height:300,\n" " backgroundColor:'white',\n" " datalessRegionColor:'white',\n" - " colorAxis:{colors:['black','black'],minValue:0,maxValue:%u}};\n" + " colorAxis:{colors:['white','black'],minValue:0,maxValue:%u}};\n" " var chart = new google.visualization.GeoChart(document.getElementById('chart_div'));\n" " chart.draw(data, options);\n" " };\n" diff --git a/swad_course.c b/swad_course.c index 646c078b0..773ec029b 100644 --- a/swad_course.c +++ b/swad_course.c @@ -563,7 +563,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) /***** Table start *****/ Lay_StartRoundFrame (NULL,Txt_My_courses); - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "
    "); /***** Write link to platform *****/ @@ -1148,7 +1149,8 @@ void Crs_WriteSelectorMyCourses (void) ActSysReqSch); /***** Start of selector of courses *****/ - fprintf (Gbl.F.Out,"", Gbl.FormId); for (NumDeg = 0; @@ -1475,7 +1478,8 @@ static void Crs_ListCoursesForEdition (void) { Act_FormStart (ActChgCrsYea); Crs_PutParamOtherCrsCod (Crs->CrsCod); - fprintf (Gbl.F.Out,"" "" "" @@ -1590,8 +1595,10 @@ static void Crs_ListCoursesForEdition (void) /* Course requester */ UsrDat.UsrCod = Crs->RequesterUsrCod; Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); - fprintf (Gbl.F.Out,"
" - "" + fprintf (Gbl.F.Out,"
" + "" ""); Msg_WriteMsgAuthor (&UsrDat,80,10,"DAT",true,NULL); fprintf (Gbl.F.Out,"" diff --git a/swad_degree.c b/swad_degree.c index bbc35ead9..4cd5ea832 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1477,7 +1477,8 @@ static void Deg_ListDegreesForEdition (void) { Act_FormStart (ActChgDegTyp); Deg_PutParamOtherDegCod (Deg->DegCod); - fprintf (Gbl.F.Out,"" "", diff --git a/swad_indicator.c b/swad_indicator.c index 8323fb57b..889d8d798 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -99,7 +99,7 @@ void Ind_ReqIndicatorsCourses (void) /* Start form */ Act_FormStart (ActReqStaCrs); - fprintf (Gbl.F.Out,"
" - "" "" diff --git a/swad_enrollment.c b/swad_enrollment.c index ee918a333..b538da089 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -834,7 +834,8 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) } /***** Start list of options *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "
    ", The_ClassForm[Gbl.Prefs.Theme]); @@ -1051,7 +1052,8 @@ static void Enr_PutActionsRegRemSeveralUsrs (void) extern const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1; /***** Start list of options *****/ - fprintf (Gbl.F.Out,"
    " + fprintf (Gbl.F.Out,"
    " "
      ", The_ClassForm[Gbl.Prefs.Theme]); diff --git a/swad_forum.c b/swad_forum.c index 37fbcf373..fe90dcce7 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -906,7 +906,8 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) For_PutFormWhichForums (); /* Write a link to top level of forums */ - fprintf (Gbl.F.Out,"
      " + fprintf (Gbl.F.Out,"
      " "
        "); For_WriteLinkToTopLevelOfForums (); @@ -1617,7 +1618,8 @@ void For_ShowForumList (void) For_PutFormWhichForums (); /***** Write a link to top level of forums *****/ - fprintf (Gbl.F.Out,"
        " + fprintf (Gbl.F.Out,"
        " "
          "); For_WriteLinkToTopLevelOfForums (); @@ -2462,7 +2464,8 @@ void For_ShowForumThrs (void) For_PutFormWhichForums (); /* Write a link to top level of forums */ - fprintf (Gbl.F.Out,"
          " + fprintf (Gbl.F.Out,"
          " "
            "); For_WriteLinkToTopLevelOfForums (); diff --git a/swad_group.c b/swad_group.c index 7a1cf03d7..fc8e47c65 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1158,7 +1158,8 @@ static void Grp_ListGroupTypesForEdition (void) fprintf (Gbl.F.Out,"
"); Act_FormStart (ActChgMdtGrpTyp); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); - fprintf (Gbl.F.Out,"" "" + "" " %s" "
" + fprintf (Gbl.F.Out,"
" "" "
" "%s:" @@ -1182,7 +1182,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat /***** Write number of courses with each number of indicators valid *****/ fprintf (Gbl.F.Out,"" + " style=\"margin:0 auto;\">" "" "
" "%s" diff --git a/swad_info.c b/swad_info.c index dd5177b9f..8d981d863 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1039,7 +1039,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) Act_FormStart (Inf_ActionsInfo[InfoSrc][InfoType]); /***** File *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" "" "
" "%s:" @@ -1074,7 +1074,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) Act_FormStart (Inf_ActionsInfo[InfoSrc][InfoType]); /***** Link *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" "" ""); /***** User's web and social networks *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" ""); if (ShowIDRows || @@ -2676,10 +2674,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ClassData,Rec_C2_BOTTOM_WIDE); if (DataForm) fprintf (Gbl.F.Out,"", - Rec_C2_BOTTOM_WIDE - 60, + " maxlength=\"%u\" value=\"%s\"" + " style=\"width:%upx;\" />", Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, - UsrDat->Surname1); + UsrDat->Surname1, + Rec_C2_BOTTOM_WIDE - 60); else if (UsrDat->Surname1[0]) fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); fprintf (Gbl.F.Out,"" @@ -2698,10 +2697,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ClassData,Rec_C2_BOTTOM_WIDE); if (DataForm) fprintf (Gbl.F.Out,"", - Rec_C2_BOTTOM_WIDE - 60, + " maxlength=\"%u\" value=\"%s\"" + " style=\"width:%upx;\" />", Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, - UsrDat->Surname2); + UsrDat->Surname2, + Rec_C2_BOTTOM_WIDE - 60); else if (UsrDat->Surname2[0]) fprintf (Gbl.F.Out,"%s", UsrDat->Surname2); @@ -2722,10 +2722,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ClassData,Rec_C2_BOTTOM_WIDE); if (DataForm) fprintf (Gbl.F.Out,"", - Rec_C2_BOTTOM_WIDE - 60, + " maxlength=\"%u\" value=\"%s\"" + " style=\"width:%upx;\" />", Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, - UsrDat->FirstName); + UsrDat->FirstName, + Rec_C2_BOTTOM_WIDE - 60); else if (UsrDat->FirstName[0]) fprintf (Gbl.F.Out,"%s",UsrDat->FirstName); fprintf (Gbl.F.Out,"" @@ -2754,7 +2755,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ClassData,Rec_C2_BOTTOM_WIDE); /* Selector of country */ - fprintf (Gbl.F.Out,"" "" "
" "%s:" diff --git a/swad_institution.c b/swad_institution.c index ab1836f13..0f0f75641 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -1743,7 +1743,8 @@ static void Ins_PutFormToCreateInstitution (void) /***** Country *****/ fprintf (Gbl.F.Out,"" - "" "" diff --git a/swad_layout.c b/swad_layout.c index ea0ead3c0..9abd0b92f 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1169,8 +1169,7 @@ void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding) fprintf (Gbl.F.Out,"
" "
" "", + fprintf (Gbl.F.Out,"
", Layout == Gbl.Prefs.Layout ? "LAYOUT_ON" : "LAYOUT_OFF"); Act_FormStart (ActChgLay); Par_PutHiddenParamUnsigned ("Layout",(unsigned) Layout); fprintf (Gbl.F.Out,"", + " alt=\"%s\" title=\"%s\" class=\"ICON32x32B\" />", Gbl.Prefs.IconsURL, Lay_LayoutIcons[Layout], Txt_LAYOUT_NAMES[Layout], diff --git a/swad_message.c b/swad_message.c index c6beb8a0e..111ad1471 100644 --- a/swad_message.c +++ b/swad_message.c @@ -2861,8 +2861,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,unsigned WidthOfNameColumn,unsig Style); if (BgColor) fprintf (Gbl.F.Out," %s",BgColor); - fprintf (Gbl.F.Out,"\" style=\"width:%upx;\">" - " ", + fprintf (Gbl.F.Out,"\" style=\"width:%upx;\">", WidthOfNameColumn); } diff --git a/swad_preference.c b/swad_preference.c index 6ca863e4d..4f9a9a378 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -378,7 +378,7 @@ void Pre_PutLeftIconToHideShowCols (void) Act_FormStart (ActHidLftCol); fprintf (Gbl.F.Out,"", + " title=\"%s\" class=\"ICON8x800\" />", Gbl.Prefs.IconsURL, Txt_Hide_left_column, Txt_Hide_left_column); @@ -388,7 +388,7 @@ void Pre_PutLeftIconToHideShowCols (void) Act_FormStart (ActShoLftCol); fprintf (Gbl.F.Out,"", + " title=\"%s\" class=\"ICON8x800\" />", Gbl.Prefs.IconsURL, Txt_Show_left_column, Txt_Show_left_column); @@ -410,7 +410,7 @@ void Pre_PutRigthIconToHideShowCols (void) Act_FormStart (ActHidRgtCol); fprintf (Gbl.F.Out,"", + " title=\"%s\" class=\"ICON8x800\" />", Gbl.Prefs.IconsURL, Txt_Hide_right_column, Txt_Hide_right_column); @@ -420,7 +420,7 @@ void Pre_PutRigthIconToHideShowCols (void) Act_FormStart (ActShoRgtCol); fprintf (Gbl.F.Out,"", + " title=\"%s\" class=\"ICON8x800\" />", Gbl.Prefs.IconsURL, Txt_Show_right_column, Txt_Show_right_column); diff --git a/swad_profile.c b/swad_profile.c index d0cf843ef..cbe50b8b1 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -225,8 +225,7 @@ bool Prf_ShowUserProfile (void) Gbl.Usrs.Other.UsrDat.Accepted = Usr_GetIfUserHasAcceptedEnrollmentInCurrentCrs (Gbl.Usrs.Other.UsrDat.UsrCod); } - fprintf (Gbl.F.Out,"
" - "" + fprintf (Gbl.F.Out,"
" "" "" "" - "
"); @@ -250,8 +249,7 @@ bool Prf_ShowUserProfile (void) fprintf (Gbl.F.Out,"
" - "
"); + "
"); return true; } diff --git a/swad_record.c b/swad_record.c index 4a428a8e9..0c484d001 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2427,12 +2427,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, fprintf (Gbl.F.Out,"
" - "
", + fprintf (Gbl.F.Out,"
", TopC3Width); Net_ShowWebsAndSocialNets (UsrDat); - fprintf (Gbl.F.Out,"" - "
" + fprintf (Gbl.F.Out,"" "" "%s %lu-%lu %s %lu (%s %ld %s %lu)" "" diff --git a/swad_timetable.c b/swad_timetable.c index 5db76a458..7f84c1aa8 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -1216,7 +1216,8 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns { /***** Group *****/ fprintf (Gbl.F.Out,"
%s" - "