diff --git a/swad_changelog.h b/swad_changelog.h index 3da02e93b..1df7ba012 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.123.6 (2015/08/01)" +#define Log_PLATFORM_VERSION "SWAD 14.123.7 (2015/08/01)" // 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.123.7: Aug 01, 2015 Changes in CSS of forms. (184848 lines) Version 14.123.6: Aug 01, 2015 Changes in CSS of forms. (184874 lines) Version 14.123.5: Jul 31, 2015 Changes in CSS of forms. (184902 lines) Version 14.123.4: Jul 31, 2015 Changes in CSS of forms. (184905 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index e48486a16..a1753590e 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -2973,8 +2973,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) fprintf (Gbl.F.Out,""); Brw_ShowDataOwnerAsgWrk (&Gbl.Usrs.Other.UsrDat); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /***** Show the tree with the assignments *****/ Gbl.FileBrowser.Type = Brw_ADMI_ASSIG_CRS; @@ -3152,8 +3151,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) char PhotoURL[PATH_MAX+1]; /***** Show user's photo *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : NULL, @@ -3161,8 +3159,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /***** Start form to send a message to this user *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd : ActSeeRecOneTch); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); @@ -3307,7 +3304,7 @@ static void Brw_ShowFileBrowser (void) /***** Title *****/ fprintf (Gbl.F.Out,"" - "", + "", Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type]); Brw_WriteSubtitleOfFileBrowser (); fprintf (Gbl.F.Out,"" @@ -3675,8 +3672,7 @@ static void Brw_ShowSizeOfFileTree (void) extern const char *Txt_of_PART_OF_A_TOTAL; fprintf (Gbl.F.Out,"" - "" + "" "%u %s; %lu %s; %lu %s; ", Brw_NumColumnsInExpTree[Gbl.FileBrowser.Type], Gbl.FileBrowser.Size.NumLevls, @@ -4816,9 +4812,8 @@ static bool Brw_WriteRowFileBrowser (unsigned Level, /***** Indentation depending on level, icon, and file/folder name *****/ /* Start of the column */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" "", Gbl.ColorRows[Gbl.RowEvenOdd]); @@ -5192,7 +5187,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ extern const char *Txt_Expand_FOLDER_X; extern const char *Txt_Contract_FOLDER_X; - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"" "" ""); Brw_IndentDependingOnLevel (Level); @@ -5386,7 +5381,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree, bool ICanCreate; /***** Start cell *****/ - fprintf (Gbl.F.Out,""); /***** Write start date *****/ - fprintf (Gbl.F.Out,"", Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" : @@ -5767,8 +5759,7 @@ static void Brw_WriteDatesAssignment (void) Gbl.FileBrowser.Asg.DateTimes[Asg_START_TIME].Time.Minute); /***** Arrow *****/ - fprintf (Gbl.F.Out,"", Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" : @@ -5805,8 +5796,8 @@ static void Brw_WriteDatesAssignment (void) static void Brw_WriteFileSizeAndDate (Brw_FileType_t FileType,struct FileMetadata *FileMetadata) { /***** Write the file size *****/ - fprintf (Gbl.F.Out,""); /***** Write the date *****/ - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"", Level * 16); /***** Put icon *****/ @@ -5557,8 +5552,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,Brw_FileType_t FileT if (FileType == Brw_IS_FOLDER) { /***** Start of cell *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.FileBrowser.Asg.AsgCod > 0) @@ -5754,8 +5747,7 @@ static void Brw_WriteDatesAssignment (void) "
" + fprintf (Gbl.F.Out,"" " %02u/%02u/%02u %02u:%02u" "" + fprintf (Gbl.F.Out,"" "\"\"" @@ -5778,7 +5769,7 @@ static void Brw_WriteDatesAssignment (void) "red"); /***** Write start date *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%02u/%02u/%02u %02u:%02u" "" + fprintf (Gbl.F.Out,"" " ", Gbl.FileBrowser.TxtStyle,Gbl.ColorRows[Gbl.RowEvenOdd]); if (FileType == Brw_IS_FILE) @@ -5814,8 +5805,8 @@ static void Brw_WriteFileSizeAndDate (Brw_FileType_t FileType,struct FileMetadat fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " ", Gbl.FileBrowser.TxtStyle,Gbl.ColorRows[Gbl.RowEvenOdd]); if (FileType == Brw_IS_FILE || @@ -6270,7 +6261,7 @@ static void Brw_WriteCurrentClipboard (void) const char *Ptr; char FileNameToShow[NAME_MAX+1]; - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s: ", Txt_Copy_source); switch (Gbl.FileBrowser.Clipboard.FileBrowser) @@ -7909,10 +7900,10 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) /***** URL *****/ fprintf (Gbl.F.Out,"" "" - "" - "" @@ -7922,10 +7913,10 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) /***** Link name *****/ fprintf (Gbl.F.Out,"" - "" - "" @@ -8893,9 +8884,8 @@ void Brw_ShowFileMetadata (void) /***** Link to download the file *****/ fprintf (Gbl.F.Out,"" - "" @@ -8906,8 +8896,7 @@ void Brw_ShowFileMetadata (void) "" - "" @@ -8918,8 +8907,7 @@ void Brw_ShowFileMetadata (void) "" - "" - "" @@ -8960,8 +8947,7 @@ void Brw_ShowFileMetadata (void) "" - "" - "" - "" - "" "", @@ -9046,8 +9029,7 @@ void Brw_ShowFileMetadata (void) "" - "" "", @@ -9062,8 +9044,7 @@ void Brw_ShowFileMetadata (void) "" - "" "", @@ -10859,8 +10840,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) /* Write header with number of documents found */ fprintf (Gbl.F.Out,"" - "" "" - "" - "" - "" - "" - "" - "" "", @@ -10912,8 +10892,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) /***** Write footer *****/ /* Number of documents not hidden found */ fprintf (Gbl.F.Out,"" - "" - "", BgColor,++(*NumDocsNotHidden)); /***** Write institution logo, institution short name *****/ - fprintf (Gbl.F.Out,""); /***** Write centre logo, centre short name *****/ - fprintf (Gbl.F.Out,""); /***** Write degree logo, degree short name *****/ - fprintf (Gbl.F.Out,""); /***** Write course short name *****/ - fprintf (Gbl.F.Out,"", BgColor,Title); @@ -11127,8 +11106,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) Brw_LimitLengthFileNameToShow (FileMetadata.FileType,FileName,FileNameToShow); /***** Write file name using path (row[1]) *****/ - fprintf (Gbl.F.Out,""); /***** Check if I can see the public profile *****/ - fprintf (Gbl.F.Out,""); /***** Put form to go to public profile *****/ - fprintf (Gbl.F.Out,"" - "", @@ -1102,8 +1101,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst "MSG_TIT_BG"); /***** Write subject *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - "", Txt_MSG_Subject); @@ -2506,7 +2501,7 @@ void For_ShowForumThrs (void) Order <= For_LAST_MSG; Order++) { - fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"" - "" - "" - "" "", @@ -3247,8 +3242,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi /***** Show my photo if I have any posts in this thread *****/ fprintf (Gbl.F.Out,"" - ""); /***** Put an icon with thread status *****/ - fprintf (Gbl.F.Out,""); /***** Write subject and links to thread pages *****/ - fprintf (Gbl.F.Out,"", Style, ThisThreadIsInMyClipboard ? LIGHT_GREEN : @@ -3376,8 +3371,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi } /***** Write number of posts in this thread *****/ - fprintf (Gbl.F.Out,"", Style, @@ -3386,8 +3381,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi Thr.NumPosts); /***** Write number of new posts in this thread *****/ - fprintf (Gbl.F.Out,"", Style, @@ -3396,8 +3391,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi Thr.NumUnreadPosts); /***** Write number of users who have write posts in this thread *****/ - fprintf (Gbl.F.Out,"", Style, @@ -3406,8 +3401,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi Thr.NumWriters); /***** Write number of users who have read this thread *****/ - fprintf (Gbl.F.Out,"" "", @@ -3711,7 +3705,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) "" - ""
" + "" "" "" + "" "" "
" + "" "" "" + "" "" "
"); + ""); Brw_WriteBigLinkToDownloadFile (URL,FileMetadata.FileType, FileNameToShow); fprintf (Gbl.F.Out,"" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Filename); Brw_WriteSmallLinkToDownloadFile (URL,FileMetadata.FileType,FileNameToShow); fprintf (Gbl.F.Out,"" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Uploaded_by); if (FileHasPublisher) { @@ -8948,8 +8936,7 @@ void Brw_ShowFileMetadata (void) "" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_File_size); Str_WriteSizeInBytesFull ((double) FileMetadata.Size); fprintf (Gbl.F.Out,"" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Date_of_creation); Dat_GetLocalTimeFromClock (&(FileMetadata.Time)); Dat_WriteDateTimeFromtblock (); @@ -8973,8 +8959,7 @@ void Brw_ShowFileMetadata (void) "" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Availability); if (ICanChangePublic) // I can change file to public { @@ -9004,8 +8989,7 @@ void Brw_ShowFileMetadata (void) "" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_License); if (ICanChangeLicense) // I can edit file properties { @@ -9033,8 +9017,7 @@ void Brw_ShowFileMetadata (void) "" "%s:" "" + "" "%u" "
" "%s:" "" + "" "%u (%u %s)" "
" "%s:" "" + "" "%u" "
"); + ""); if (NumDocs == 1) fprintf (Gbl.F.Out,"1 %s",Txt_document); else @@ -10871,22 +10851,22 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) /* Heading row */ fprintf (Gbl.F.Out,"
" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "
" + "" "("); NumDocsHidden = NumDocs - NumDocsNotHidden; if (NumDocsHidden == 1) @@ -11008,15 +10987,15 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) /***** Write number of document in this search *****/ fprintf (Gbl.F.Out,"
" + "" "%u" "", + fprintf (Gbl.F.Out,"", BgColor); if (InsCod > 0) { @@ -11032,8 +11011,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); if (CtrCod > 0) { @@ -11049,8 +11028,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); if (DegCod > 0) { @@ -11066,8 +11045,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); if (CrsCod > 0) { @@ -11114,8 +11093,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) Title = ""; break; } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "", + fprintf (Gbl.F.Out,"", BgColor); /* Start form */ diff --git a/swad_follow.c b/swad_follow.c index dda91b1bb..3e658b189 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -131,8 +131,8 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, extern const char *The_ClassFormBold[The_NUM_THEMES]; - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /* Number */ fprintf (Gbl.F.Out,"
", (Gbl.CurrentAct == Action) ? "FOLLOW_B" : @@ -373,8 +373,8 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat) bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat->UsrCod); /***** Put form to follow / unfollow *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,""); if (Visible && Gbl.Usrs.Me.Logged && Gbl.Usrs.Me.UsrDat.UsrCod != UsrDat->UsrCod) @@ -414,8 +414,8 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Visible) { /***** User's photo *****/ @@ -427,8 +427,8 @@ static void Fol_ShowFollowedOrFollowed (const struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Visible && UsrDat->Nickname[0]) { diff --git a/swad_forum.c b/swad_forum.c index af93b7950..03ed44a58 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1079,8 +1079,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst /***** Put an icon with post status *****/ fprintf (Gbl.F.Out,"
" + "" "\"%s\"" "", + fprintf (Gbl.F.Out,"", NewPst ? "MSG_TIT_BG_NEW" : "MSG_TIT_BG"); if (Enabled) @@ -1120,8 +1118,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst /***** Form to remove post *****/ fprintf (Gbl.F.Out,"
"); + ""); if (LastPst && Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat.UsrCod) // Post can be removed if post is the last (without answers) and it's mine { @@ -1179,8 +1176,8 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst /***** Write author or destinatary, and form to reply (in case of received post) *****/ fprintf (Gbl.F.Out,"" + "" ""); /* Write author */ @@ -1199,8 +1196,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst /***** Write post content *****/ fprintf (Gbl.F.Out,"
" "		" + "" ""); if (Enabled) { @@ -1313,9 +1309,8 @@ static void For_WriteNumberOfPosts (For_ForumType_t ForumType,long UsrCod) unsigned NumPsts; /***** Star table cell *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /***** Get number of posts from database *****/ switch (ForumType) @@ -1760,8 +1755,8 @@ static void For_PutFormWhichForums (void) WhichForums < For_NUM_WHICH_FORUMS; WhichForums++) { - fprintf (Gbl.F.Out,"
  • " + fprintf (Gbl.F.Out,"
  • " "" - "
    		• " + "" " " "" + "" " " "" + "" "%s" ""); + fprintf (Gbl.F.Out,""); Act_FormStart (For_ActionsSeeFor[Gbl.Forum.ForumType]); Pag_PutHiddenParamPagNum (PaginationThrs.CurrentPage); For_PutParamWhichForum (); @@ -2522,16 +2517,16 @@ void For_ShowForumThrs (void) Act_FormEnd (); fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "" + "" "%s" "" + "" "%s" "" + "" "%s" "
    ", + "", ThisThreadIsInMyClipboard ? LIGHT_GREEN : Gbl.ColorRows[Gbl.RowEvenOdd]); if (Thr.NumMyPosts) @@ -3276,8 +3271,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "\"%s\"", @@ -3321,8 +3316,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", ThisThreadIsInMyClipboard ? LIGHT_GREEN : Gbl.ColorRows[Gbl.RowEvenOdd]); PaginationPsts.NumItems = Thr.NumPosts; @@ -3352,8 +3347,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi Gbl.ColorRows[Gbl.RowEvenOdd]); /* Write the date of first or last message (it's in YYYYMMDDHHMMSS format) */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Style, ThisThreadIsInMyClipboard ? LIGHT_GREEN : Gbl.ColorRows[Gbl.RowEvenOdd]); @@ -3367,8 +3362,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi for (Column = 1; Column <= 3; Column++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" + fprintf (Gbl.F.Out,"" "%u " "" + fprintf (Gbl.F.Out,"" "%u " "" + fprintf (Gbl.F.Out,"" "%u " "" + fprintf (Gbl.F.Out,"" "%u " "
    " "%s: " "" + "" "" "