diff --git a/swad_changelog.h b/swad_changelog.h index cc3c8f86..2f114b48 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,11 +98,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.6.1 (2015/10/03)" +#define Log_PLATFORM_VERSION "SWAD 15.6.2 (2015/10/03)" // 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.6.2: Oct 03, 2015 Changes in layout of file browsers. (184963 lines) Version 15.6.1: Oct 03, 2015 Changes in layout of file browsers. (184956 lines) Version 15.6 : Oct 02, 2015 Now a click in a form may go to a part of the destination page. (184959 lines) Version 15.5.2: Oct 02, 2015 Changes in layout of tests exams. (184934 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 170220d1..27ce83be 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3312,7 +3312,8 @@ static void Brw_ShowFileBrowser (void) Gbl.FileBrowser.Clipboard.IsThisTree = Brw_CheckIfClipboardIsInThisTree (); /***** Start frame *****/ - fprintf (Gbl.F.Out,"
"); + Gbl.FileBrowser.Id++; + fprintf (Gbl.F.Out,"
",Gbl.FileBrowser.Id); Lay_StartRoundFrameTable ("95%",0,Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type]); /***** Title *****/ @@ -5203,6 +5204,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ { extern const char *Txt_Expand_FOLDER_X; extern const char *Txt_Contract_FOLDER_X; + char Anchor[32]; fprintf (Gbl.F.Out,"" "" @@ -5220,7 +5222,8 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ break; case Brw_EXPAND_TREE_PLUS: /***** Form to expand folder *****/ - Act_FormStartAnchor (Brw_ActExpandFolder[Gbl.FileBrowser.Type],"file_browser"); + sprintf (Anchor,"file_browser_%u",Gbl.FileBrowser.Id); + Act_FormStartAnchor (Brw_ActExpandFolder[Gbl.FileBrowser.Type],Anchor); switch (Gbl.FileBrowser.Type) { case Brw_SHOW_DOCUM_GRP: @@ -5251,7 +5254,8 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ break; case Brw_EXPAND_TREE_MINUS: /***** Form to contract folder *****/ - Act_FormStartAnchor (Brw_ActContractFolder[Gbl.FileBrowser.Type],"file_browser"); + sprintf (Anchor,"file_browser_%u",Gbl.FileBrowser.Id); + Act_FormStartAnchor (Brw_ActContractFolder[Gbl.FileBrowser.Type],Anchor); switch (Gbl.FileBrowser.Type) { case Brw_SHOW_DOCUM_GRP: diff --git a/swad_global.c b/swad_global.c index 71019855..25e07fbb 100644 --- a/swad_global.c +++ b/swad_global.c @@ -427,6 +427,7 @@ void Gbl_InitializeGlobals (void) Gbl.Usrs.Me.UsrDat.Nickname[0] = '\0'; /* File browser */ + Gbl.FileBrowser.Id = 0; Gbl.FileBrowser.Type = Brw_UNKNOWN; Gbl.FileBrowser.FileType = Brw_IS_UNKNOWN; Gbl.FileBrowser.UploadingWithDropzone = false; diff --git a/swad_global.h b/swad_global.h index e8f25379..17340cd6 100644 --- a/swad_global.h +++ b/swad_global.h @@ -484,6 +484,7 @@ struct Globals } LstExamAnnouncements; struct { + unsigned Id; // Each file browser in the page has a unique identifier Brw_FileBrowser_t Type; bool FullTree; // Show full tree? bool ShowOnlyPublicFiles; // Show only public files?