diff --git a/js/swad17.17.js b/js/swad17.17.1.js similarity index 98% rename from js/swad17.17.js rename to js/swad17.17.1.js index fab47813d..24d913bda 100644 --- a/js/swad17.17.js +++ b/js/swad17.17.1.js @@ -1319,15 +1319,19 @@ Children ids: idRow = 'file_browser_1_1_2_1_2_1' */ function ExpandFolder (idParent) { - var parent = document.getElementById(idParent); - var iconToExpand = document.getElementById('expand_' + idParent); - var iconToContract = document.getElementById('contract_' + idParent); + var parent = document.getElementById(idParent); + var iconToExpand = document.getElementById('expand_' + idParent); + var iconToContract = document.getElementById('contract_' + idParent); + var iconFolderClosed = document.getElementById('folder_closed_' + idParent); + var iconFolderOpen = document.getElementById('folder_open_' + idParent); if (parent.dataset.folder == 'contracted') { ExpandChildren (idParent); parent.dataset.folder = 'expanded'; - iconToExpand.style.display = 'none'; - iconToContract.style.display = ''; + iconToExpand.style.display = 'none'; + iconToContract.style.display = ''; + iconFolderClosed.style.display = 'none'; + iconFolderOpen.style.display = ''; } } @@ -1363,14 +1367,18 @@ function ExpandChildren (idParent) { function ContractFolder (idParent) { var parent = document.getElementById(idParent); - var iconToExpand = document.getElementById('expand_' + idParent); - var iconToContract = document.getElementById('contract_' + idParent); + var iconToExpand = document.getElementById('expand_' + idParent); + var iconToContract = document.getElementById('contract_' + idParent); + var iconFolderClosed = document.getElementById('folder_closed_' + idParent); + var iconFolderOpen = document.getElementById('folder_open_' + idParent); if (parent.dataset.folder == 'expanded') { ContractChildren (idParent); parent.dataset.folder = 'contracted'; - iconToContract.style.display = 'none'; - iconToExpand.style.display = ''; + iconToContract.style.display = 'none'; + iconToExpand.style.display = ''; + iconFolderOpen.style.display = 'none'; + iconFolderClosed.style.display = ''; } } diff --git a/swad_ID.c b/swad_ID.c index 3cb17fe97..5bb562d2a 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -372,7 +372,7 @@ void ID_WriteUsrIDs (struct UsrData *UsrDat,const char *Anchor) ICanConfirmUsrID = ICanSeeUsrID && (UsrDat->UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod) && // Not me !Gbl.Form.Inside && // Not inside another form - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB; // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB; // Only in main browser tab for (NumID = 0; NumID < UsrDat->IDs.Num; diff --git a/swad_action.c b/swad_action.c index 3296fa732..31c25c193 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1555,7 +1555,7 @@ struct Act_Actions unsigned PermissionCty; unsigned PermissionSys; Act_Content_t ContentType; - Act_BrowserTab_t BrowserWindow; + Act_BrowserTab_t BrowserTab; void (*FunctionPriori)(); void (*FunctionPosteriori)(); const char *Icon; @@ -2076,8 +2076,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgToSeeDocIns */{1308,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, /* ActSeeDocIns */{1309,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeDocIns */{1310,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeDocIns */{1311,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeDocIns */{1310,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeDocIns */{1311,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPSeeDocIns */{1312,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatSeeDocIns*/{1313,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActDowSeeDocIns */{1314,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL}, @@ -2097,8 +2097,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolDocIns */{1326,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilDocInsDZ */{1327,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilDocInsCla*/{1328,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmDocIns */{1329,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmDocIns */{1330,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmDocIns */{1329,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmDocIns */{1330,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmDocIns */{1331,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoDocIns */{1332,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidDocIns */{1333,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2118,8 +2118,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolShaIns */{1392,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilShaInsDZ */{1393,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilShaInsCla*/{1394,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpShaIns */{1395,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConShaIns */{1396,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpShaIns */{1395,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConShaIns */{1396,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPShaIns */{1397,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatShaIns */{1398,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatShaIns */{1399,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2128,8 +2128,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgToSeeDocCtr */{1279,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, /* ActSeeDocCtr */{1280,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeDocCtr */{1281,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeDocCtr */{1282,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeDocCtr */{1281,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeDocCtr */{1282,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPSeeDocCtr */{1283,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatSeeDocCtr*/{1284,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActDowSeeDocCtr */{1285,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL}, @@ -2149,8 +2149,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolDocCtr */{1297,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilDocCtrDZ */{1298,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilDocCtrCla*/{1299,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmDocCtr */{1300,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmDocCtr */{1301,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmDocCtr */{1300,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmDocCtr */{1301,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmDocCtr */{1302,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoDocCtr */{1303,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidDocCtr */{1304,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2170,8 +2170,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolShaCtr */{1373,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilShaCtrDZ */{1374,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilShaCtrCla*/{1375,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpShaCtr */{1376,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConShaCtr */{1377,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpShaCtr */{1376,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConShaCtr */{1377,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPShaCtr */{1378,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatShaCtr */{1379,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatShaCtr */{1380,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2180,8 +2180,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgToSeeDocDeg */{1250,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, /* ActSeeDocDeg */{1251,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeDocDeg */{1252,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeDocDeg */{1253,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeDocDeg */{1252,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeDocDeg */{1253,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPSeeDocDeg */{1254,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatSeeDocDeg*/{1255,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActDowSeeDocDeg */{1256,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL}, @@ -2201,8 +2201,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolDocDeg */{1268,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilDocDegDZ */{1269,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilDocDegCla*/{1270,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmDocDeg */{1271,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmDocDeg */{1272,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmDocDeg */{1271,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmDocDeg */{1272,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmDocDeg */{1273,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoDocDeg */{1274,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidDocDeg */{1275,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2222,8 +2222,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolShaDeg */{1354,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilShaDegDZ */{1355,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilShaDegCla*/{1356,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpShaDeg */{1357,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConShaDeg */{1358,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpShaDeg */{1357,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConShaDeg */{1358,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPShaDeg */{1359,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatShaDeg */{1360,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatShaDeg */{1361,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2232,15 +2232,15 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgToSeeDocCrs */{1195,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, /* ActSeeDocCrs */{1078,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeDocCrs */{ 462,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeDocCrs */{ 476,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeDocCrs */{ 462,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeDocCrs */{ 476,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPSeeDocCrs */{1124,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatSeeDocCrs*/{1033,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActDowSeeDocCrs */{1111,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL}, /* ActSeeDocGrp */{1200,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeDocGrp */{ 488,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeDocGrp */{ 489,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeDocGrp */{ 488,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeDocGrp */{ 489,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPSeeDocGrp */{1125,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatSeeDocGrp*/{1034,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActDowSeeDocGrp */{1112,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL}, @@ -2260,8 +2260,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolDocCrs */{ 535,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilDocCrsDZ */{1214,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilDocCrsCla*/{ 482,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmDocCrs */{ 477,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmDocCrs */{ 494,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmDocCrs */{ 477,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmDocCrs */{ 494,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmDocCrs */{1126,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoDocCrs */{ 464,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidDocCrs */{ 465,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2282,8 +2282,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolDocGrp */{ 490,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilDocGrpDZ */{1215,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilDocGrpCla*/{ 483,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmDocGrp */{ 486,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmDocGrp */{ 487,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmDocGrp */{ 486,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmDocGrp */{ 487,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmDocGrp */{1127,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoDocGrp */{ 493,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidDocGrp */{ 492,-1,TabUnk,ActSeeAdmDocCrsGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2306,8 +2306,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolTchCrs */{1537,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilTchCrsDZ */{1538,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilTchCrsCla*/{1539,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpTchCrs */{1540,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConTchCrs */{1541,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpTchCrs */{1540,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConTchCrs */{1541,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPTchCrs */{1542,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatTchCrs */{1543,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatTchCrs */{1544,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2326,8 +2326,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolTchGrp */{1556,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilTchGrpDZ */{1557,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilTchGrpCla*/{1558,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpTchGrp */{1559,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConTchGrp */{1560,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpTchGrp */{1559,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConTchGrp */{1560,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPTchGrp */{1561,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatTchGrp */{1562,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatTchGrp */{1563,-1,TabUnk,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2348,8 +2348,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolShaCrs */{ 329,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilShaCrsDZ */{1216,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilShaCrsCla*/{ 326,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpShaCrs */{ 421,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConShaCrs */{ 422,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpShaCrs */{ 421,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConShaCrs */{ 422,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPShaCrs */{1128,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatShaCrs */{1031,-1,TabUnk,ActAdmShaCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatShaCrs */{1000,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2368,8 +2368,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolShaGrp */{ 340,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilShaGrpDZ */{1217,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilShaGrpCla*/{ 335,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpShaGrp */{ 427,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConShaGrp */{ 426,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpShaGrp */{ 427,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConShaGrp */{ 426,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPShaGrp */{1129,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatShaGrp */{1032,-1,TabUnk,ActAdmShaCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatShaGrp */{1002,-1,TabUnk,ActAdmShaCrsGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2389,8 +2389,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolAsgUsr */{ 839,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilAsgUsrDZ */{1218,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilAsgUsrCla*/{ 832,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAsgUsr */{ 824,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAsgUsr */{ 831,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAsgUsr */{ 824,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAsgUsr */{ 831,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAsgUsr */{1130,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatAsgUsr */{1039,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatAsgUsr */{1040,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2408,8 +2408,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolWrkUsr */{ 204,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilWrkUsrDZ */{1219,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilWrkUsrCla*/{ 148,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpWrkUsr */{ 423,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConWrkUsr */{ 425,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpWrkUsr */{ 423,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConWrkUsr */{ 425,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPWrkUsr */{1131,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatWrkUsr */{1041,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatWrkUsr */{1042,-1,TabUnk,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2427,8 +2427,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolAsgCrs */{ 823,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilAsgCrsDZ */{1220,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilAsgCrsCla*/{ 846,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAsgCrs */{ 819,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAsgCrs */{ 835,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAsgCrs */{ 819,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAsgCrs */{ 835,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAsgCrs */{1132,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatAsgCrs */{1043,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatAsgCrs */{1044,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2446,8 +2446,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolWrkCrs */{ 208,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilWrkCrsDZ */{1221,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilWrkCrsCla*/{ 207,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpWrkCrs */{ 416,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConWrkCrs */{ 424,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpWrkCrs */{ 416,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConWrkCrs */{ 424,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPWrkCrs */{1133,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatWrkCrs */{1045,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatWrkCrs */{1046,-1,TabUnk,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -2456,14 +2456,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgToSeeMrk */{1198,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, /* ActSeeMrkCrs */{1079,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeMrkCrs */{ 528,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeMrkCrs */{ 527,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeMrkCrs */{ 528,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeMrkCrs */{ 527,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActReqDatSeeMrkCrs*/{1086,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActSeeMyMrkCrs */{ 523,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Mrk_ShowMyMarks ,NULL ,NULL}, /* ActSeeMrkGrp */{1204,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL}, - /* ActExpSeeMrkGrp */{ 605,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConSeeMrkGrp */{ 609,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpSeeMrkGrp */{ 605,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConSeeMrkGrp */{ 609,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActReqDatSeeMrkGrp*/{1087,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActSeeMyMrkGrp */{ 524,-1,TabUnk,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Mrk_ShowMyMarks ,NULL ,NULL}, @@ -2481,8 +2481,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolMrkCrs */{ 574,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilMrkCrsDZ */{1222,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilMrkCrsCla*/{ 516,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmMrkCrs */{ 607,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmMrkCrs */{ 621,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmMrkCrs */{ 607,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmMrkCrs */{ 621,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmMrkCrs */{1134,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoMrkCrs */{1191,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidMrkCrs */{1192,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2504,8 +2504,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolMrkGrp */{ 529,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilMrkGrpDZ */{1223,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilMrkGrpCla*/{ 514,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpAdmMrkGrp */{ 631,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConAdmMrkGrp */{ 900,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpAdmMrkGrp */{ 631,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConAdmMrkGrp */{ 900,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPAdmMrkGrp */{1135,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActShoMrkGrp */{1193,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsVisible ,NULL}, /* ActHidMrkGrp */{1194,-1,TabUnk,ActSeeAdmMrk ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_SetDocumentAsHidden ,NULL}, @@ -2527,8 +2527,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenFolBrf */{ 197,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_RenFolderFileBrowser ,NULL}, /* ActRcvFilBrfDZ */{1224,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_DATA,Act_UPLOAD_FILE,Brw_RcvFileInFileBrwDropzone ,NULL ,NULL}, /* ActRcvFilBrfCla */{ 153,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic ,NULL}, - /* ActExpBrf */{ 410,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ExpandFileTree ,NULL ,NULL}, - /* ActConBrf */{ 411,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Brw_ContractFileTree ,NULL ,NULL}, + /* ActExpBrf */{ 410,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_204_NO_CONT,Brw_ExpandFileTree ,NULL ,NULL}, + /* ActConBrf */{ 411,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_204_NO_CONT,Brw_ContractFileTree ,NULL ,NULL}, /* ActZIPBrf */{1136,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ZIP_CompressFileTree ,NULL}, /* ActReqDatBrf */{1047,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileMetadata ,NULL}, /* ActChgDatBrf */{1048,-1,TabUnk,ActAdmBrf ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ChgFileMetadata ,NULL}, @@ -4986,7 +4986,7 @@ static void Act_FormStartInternal (Act_Action_t NextAction,bool PutParameterLoca if (OnSubmit) if (OnSubmit[0]) fprintf (Gbl.F.Out," onsubmit=\"%s;\"",OnSubmit); - switch (Act_Actions[NextAction].BrowserWindow) + switch (Act_Actions[NextAction].BrowserTab) { case Act_BRW_NEW_TAB: case Act_DOWNLD_FILE: diff --git a/swad_action.h b/swad_action.h index eb2aa3625..9bf44c11e 100644 --- a/swad_action.h +++ b/swad_action.h @@ -54,6 +54,7 @@ typedef enum Act_BRW_2ND_TAB, // The second tab in the browser Act_UPLOAD_FILE, // Upload a file. Do not write HTML content. Write Status code instead for Dropzone.js Act_DOWNLD_FILE, // Download a file in a new tab. Do not write HTML content. + Act_204_NO_CONT, // Do not write HTML content. HTTP will return Status 204 No Content } Act_BrowserTab_t; typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action @@ -1593,7 +1594,7 @@ struct Act_Actions unsigned PermissionCty; unsigned PermissionSys; Act_Content_t ContentType; - Act_BrowserTab_t BrowserWindow; + Act_BrowserTab_t BrowserTab; void (*FunctionPriori)(); void (*FunctionPosteriori)(); const char *Icon; diff --git a/swad_changelog.h b/swad_changelog.h index 6a93b3178..7c7449773 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -254,13 +254,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 17.17 (2017-10-04)" +#define Log_PLATFORM_VERSION "SWAD 17.17.2 (2017-10-04)" #define CSS_FILE "swad17.0.css" -#define JS_FILE "swad17.17.js" +#define JS_FILE "swad17.17.1.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 17.17.2: Oct 04, 2017 Changes related with output with status 204 No Content. (232332 lines) + Version 17.17.1: Oct 04, 2017 Changed folder icon when expanding / contracting a folder. (232330 lines) Version 17.17: Oct 04, 2017 Changing expansion of file subtrees. (232273 lines) Version 17.16.3: Oct 03, 2017 Changing expansion of file subtrees. Not finished. (232113 lines) Version 17.16.2: Oct 03, 2017 Fixed bug in pagination of projects. (232061 lines) diff --git a/swad_connected.c b/swad_connected.c index 9b0164af5..7791a6eae 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -270,7 +270,7 @@ void Con_GetAndShowLastClicks (void) ActCod = Str_ConvertStrCodToLongCod (row[1]); /* Use a special color for this row depending on the action */ - ClassRow = (Act_Actions[Act_GetActionFromActCod (ActCod)].BrowserWindow == Act_DOWNLD_FILE) ? "DAT_SMALL_YELLOW LEFT_MIDDLE" : + ClassRow = (Act_Actions[Act_GetActionFromActCod (ActCod)].BrowserTab == Act_DOWNLD_FILE) ? "DAT_SMALL_YELLOW LEFT_MIDDLE" : (ActCod == Act_Actions[ActLogIn ].ActCod || ActCod == Act_Actions[ActLogInNew].ActCod) ? "DAT_SMALL_GREEN" : (ActCod == Act_Actions[ActLogOut ].ActCod) ? "DAT_SMALL_RED" : diff --git a/swad_country.c b/swad_country.c index caddf1546..e85bd931a 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1221,7 +1221,7 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink) char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1]; bool PutForm = ClassLink && !Gbl.Form.Inside && // Only if not inside another form - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB; // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB; // Only in main browser tab /***** Get country name *****/ Cty_GetCountryName (CtyCod,CtyName); diff --git a/swad_file_browser.c b/swad_file_browser.c index d9aba45de..20eee7a30 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1402,7 +1402,7 @@ const char *Brw_MIMETypesAllowed[] = "image/x-rgb", // RGB image rgb "image/x-xbitmap", // X Bitmap xbm "image/x-xpixmap", // X Pixmap xpm - "image/x-xwindowdump", // X BrowserWindow System dump xwd + "image/x-xwindowdump", // X Window System dump xwd "message/rfc822", // Files .mht and .mhtml "mime/pdf", // Adobe Acrobat pdf "multipart/x-gzip", // GNU ZIP archive gzip @@ -1510,7 +1510,8 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1], static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1], const char *FileName,const char *FileNameToShow); static void Brw_PutIconPasteOff (void); -static void Brw_IndentAndWriteIconExpandContract (unsigned Level,const char *RowId, +static void Brw_IndentAndWriteIconExpandContract (unsigned Level, + const char *FileBrowserId,const char *RowId, Brw_IconTree_t IconThisRow, const char PathInTree[PATH_MAX + 1], const char *FileName, @@ -1530,8 +1531,18 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *FileName,const char *FileNameToShow); static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *FileName,const char *FileNameToShow); static bool Brw_CheckIfAnyUpperLevelIsHidden (unsigned CurrentLevel); -static void Brw_PutIconFolder (unsigned Level,Brw_IconTree_t IconSubtree, - const char *PathInTree,const char *FileName,const char *FileNameToShow); +static void Brw_PutIconFolder (unsigned Level, + const char *FileBrowserId,const char *RowId, + Brw_IconTree_t IconSubtree, + const char *PathInTree, + const char *FileName, + const char *FileNameToShow); +static void Brw_PutIconToCreateIntoFolder (const char *FileBrowserId,const char *RowId, + const char *OpenOrClosed, + bool Hidden, + const char PathInTree[PATH_MAX + 1], + const char *FileName, + const char *FileNameToShow); static void Brw_PutIconNewFileOrFolder (void); static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, struct FileMetadata *FileMetadata, @@ -5214,6 +5225,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, bool IsRecent = false; struct FileMetadata FileMetadata; char FileNameToShow[NAME_MAX + 1]; + char FileBrowserId[32]; bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_INS || Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CTR || Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_DEG || @@ -5236,7 +5248,9 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, bool AdminMarks = Gbl.FileBrowser.Type == Brw_ADMI_MARKS_CRS || Gbl.FileBrowser.Type == Brw_ADMI_MARKS_GRP; + /***** Initializations *****/ Gbl.FileBrowser.Clipboard.IsThisFile = false; + sprintf (FileBrowserId,"file_browser_%u",Gbl.FileBrowser.Id); /***** Is this row hidden or visible? *****/ if (SeeDocsZone || AdminDocsZone || @@ -5363,11 +5377,8 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, /* Indent depending on level */ if (Level) - Brw_IndentAndWriteIconExpandContract (Level,RowId, - IconThisRow, - PathInTree, - FileName, - FileNameToShow); + Brw_IndentAndWriteIconExpandContract (Level,FileBrowserId,RowId,IconThisRow, + PathInTree,FileName,FileNameToShow); /* Put icon to show/hide file or folder */ if (AdminDocsZone || AdminMarks) @@ -5381,7 +5392,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, /***** File or folder icon *****/ if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER) /* Icon with folder */ - Brw_PutIconFolder (Level,IconThisRow, + Brw_PutIconFolder (Level,FileBrowserId,RowId,IconThisRow, PathInTree,FileName,FileNameToShow); else // File or link { @@ -5690,14 +5701,13 @@ static void Brw_PutIconPasteOff (void) /*************** Indent and write icon to expand/contract folder *************/ /*****************************************************************************/ -static void Brw_IndentAndWriteIconExpandContract (unsigned Level,const char *RowId, +static void Brw_IndentAndWriteIconExpandContract (unsigned Level, + const char *FileBrowserId,const char *RowId, Brw_IconTree_t IconThisRow, const char PathInTree[PATH_MAX + 1], const char *FileName, const char *FileNameToShow) { - char FileBrowserId[32]; - fprintf (Gbl.F.Out,"" "" ""); @@ -5714,8 +5724,6 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,const char *Row Gbl.Prefs.IconsURL); break; case Brw_ICON_TREE_EXPAND: - sprintf (FileBrowserId,"file_browser_%u",Gbl.FileBrowser.Id); - /***** Visible icon to expand folder *****/ Brw_PutIconToExpandFolder (FileBrowserId,RowId, false, // Visible @@ -5727,8 +5735,6 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,const char *Row PathInTree,FileName,FileNameToShow); break; case Brw_ICON_TREE_CONTRACT: - sprintf (FileBrowserId,"file_browser_%u",Gbl.FileBrowser.Id); - /***** Hidden icon to expand folder *****/ Brw_PutIconToExpandFolder (FileBrowserId,RowId, true, // Hidden @@ -5923,10 +5929,13 @@ static bool Brw_CheckIfAnyUpperLevelIsHidden (unsigned CurrentLevel) /** Write link e icon to upload or paste files, or to create folder or link **/ /*****************************************************************************/ -static void Brw_PutIconFolder (unsigned Level,Brw_IconTree_t IconSubtree, - const char *PathInTree,const char *FileName,const char *FileNameToShow) +static void Brw_PutIconFolder (unsigned Level, + const char *FileBrowserId,const char *RowId, + Brw_IconTree_t IconSubtree, + const char *PathInTree, + const char *FileName, + const char *FileNameToShow) { - extern const char *Txt_Upload_file_or_create_folder_in_FOLDER; extern const char *Txt_Folder; bool ICanCreate; @@ -5934,25 +5943,33 @@ static void Brw_PutIconFolder (unsigned Level,Brw_IconTree_t IconSubtree, fprintf (Gbl.F.Out,"
", Level * 20); - /***** Put icon *****/ + /***** Put icon to create a new file or folder *****/ if ((ICanCreate = Brw_CheckIfICanCreateIntoFolder (Level))) // I can create a new file or folder { - /***** Form to create a new file or folder *****/ - Act_FormStart (Brw_ActFormCreate[Gbl.FileBrowser.Type]); - Brw_PutParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type], - PathInTree,FileName, - Brw_IS_FOLDER,-1L); - sprintf (Gbl.Title,Txt_Upload_file_or_create_folder_in_FOLDER,FileNameToShow); - fprintf (Gbl.F.Out,"", - Gbl.Prefs.IconsURL, - (IconSubtree == Brw_ICON_TREE_EXPAND) ? "closed" : - "open", - Gbl.Title, - Gbl.Title); - Act_FormEnd (); + if (IconSubtree == Brw_ICON_TREE_EXPAND) + { + /***** Visible icon with folder closed *****/ + Brw_PutIconToCreateIntoFolder (FileBrowserId,RowId,"closed", + false, // Visible + PathInTree,FileName,FileNameToShow); + + /***** Hidden icon with folder open *****/ + Brw_PutIconToCreateIntoFolder (FileBrowserId,RowId,"open", + true, // Hidden + PathInTree,FileName,FileNameToShow); + } + else + { + /***** Hidden icon with folder closed *****/ + Brw_PutIconToCreateIntoFolder (FileBrowserId,RowId,"closed", + true, // Hidden + PathInTree,FileName,FileNameToShow); + + /***** Visible icon with folder open *****/ + Brw_PutIconToCreateIntoFolder (FileBrowserId,RowId,"open", + false, // Visible + PathInTree,FileName,FileNameToShow); + } } else // I can't create a new file or folder fprintf (Gbl.F.Out,""); } +/*****************************************************************************/ +/************************ Put icon to expand a folder ************************/ +/*****************************************************************************/ + +static void Brw_PutIconToCreateIntoFolder (const char *FileBrowserId,const char *RowId, + const char *OpenOrClosed, + bool Hidden, + const char PathInTree[PATH_MAX + 1], + const char *FileName, + const char *FileNameToShow) + { + extern const char *Txt_Upload_file_or_create_folder_in_FOLDER; + + /***** Start container *****/ + fprintf (Gbl.F.Out,"
"); + + /***** Form and icon *****/ + Act_FormStart (Brw_ActFormCreate[Gbl.FileBrowser.Type]); + Brw_PutParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type], + PathInTree,FileName, + Brw_IS_FOLDER,-1L); + sprintf (Gbl.Title,Txt_Upload_file_or_create_folder_in_FOLDER,FileNameToShow); + fprintf (Gbl.F.Out,"", + Gbl.Prefs.IconsURL,OpenOrClosed, + Gbl.Title, + Gbl.Title); + Act_FormEnd (); + + /***** End container *****/ + fprintf (Gbl.F.Out,"
"); + } + /*****************************************************************************/ /**************** Write icon to indicate that the file is new ****************/ /*****************************************************************************/ @@ -6589,6 +6645,7 @@ void Brw_RemSubtreeInFileBrowser (void) /*****************************************************************************/ /********************* Expand a folder in a file browser *********************/ /*****************************************************************************/ +// A priori function. Changes database. No HTML output. void Brw_ExpandFileTree (void) { @@ -6597,29 +6654,12 @@ void Brw_ExpandFileTree (void) /***** Add path to table of expanded folders *****/ Brw_InsFoldersInPathAndUpdOtherFoldersInExpandedFolders (Gbl.FileBrowser.Priv.FullPathInTree); - - /***** The HTTP response is a code status *****/ - /* Don't write HTML at all */ - Gbl.Layout.HTMLStartWritten = - Gbl.Layout.DivsEndWritten = - Gbl.Layout.HTMLEndWritten = true; - - /* Start HTTP response */ - fprintf (stdout,"Content-type: text/plain; charset=windows-1252\n"); - - /* Return HTTP status code 204 No Content: - The server has successfully fulfilled the request - and there is no additional content to send - in the response payload body. */ - fprintf (stdout,"Status: 204\r\n\r\n"); - - /***** Show again file browser *****/ - // Brw_ShowAgainFileBrowserOrWorks (); } /*****************************************************************************/ /******************* Contract a folder in a file browser *********************/ /*****************************************************************************/ +// A priori function. Changes database. No HTML output. void Brw_ContractFileTree (void) { @@ -6628,24 +6668,6 @@ void Brw_ContractFileTree (void) /***** Remove path where the user has clicked from table of expanded folders *****/ Brw_RemThisFolderAndUpdOtherFoldersFromExpandedFolders (Gbl.FileBrowser.Priv.FullPathInTree); - - /***** The HTTP response is a code status *****/ - /* Don't write HTML at all */ - Gbl.Layout.HTMLStartWritten = - Gbl.Layout.DivsEndWritten = - Gbl.Layout.HTMLEndWritten = true; - - /* Start HTTP response */ - fprintf (stdout,"Content-type: text/plain; charset=windows-1252\n"); - - /* Return HTTP status code 204 No Content: - The server has successfully fulfilled the request - and there is no additional content to send - in the response payload body. */ - fprintf (stdout,"Status: 204\r\n\r\n"); - - /***** Show again file browser *****/ - // Brw_ShowAgainFileBrowserOrWorks (); } /*****************************************************************************/ diff --git a/swad_global.c b/swad_global.c index fb771b808..10c03beba 100644 --- a/swad_global.c +++ b/swad_global.c @@ -479,7 +479,7 @@ void Gbl_Cleanup (void) if (!Gbl.Action.UsesAJAX && !Gbl.WebService.IsWebService && - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) Ses_RemoveHiddenParFromThisSession (); Usr_FreeMyCourses (); Usr_FreeMyDegrees (); diff --git a/swad_layout.c b/swad_layout.c index 4ccf43b1e..cb768f768 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -250,7 +250,7 @@ void Lay_WriteStartOfPage (void) fprintf (Gbl.F.Out,"\n"); /***** HTML body *****/ - if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) fprintf (Gbl.F.Out,"\n" "
" ""); // main_zone_central_container /***** Write page footer *****/ - if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) Lay_WriteFootFromHTMLFile (); /***** End of main zone and page *****/ @@ -1240,7 +1263,7 @@ void Lay_ShowErrorAndExit (const char *Txt) if (!Gbl.Layout.HTMLEndWritten) { // Here Gbl.F.Out is stdout - if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) Lay_WriteAboutZone (); fprintf (Gbl.F.Out,"\n" diff --git a/swad_layout.h b/swad_layout.h index b69ec65ce..36a5c5931 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -50,6 +50,8 @@ void Lay_WriteStartOfPage (void); +void Lay_WriteHTTPStatus204NoContent (void); + void Lay_PutContextualLink (Act_Action_t NextAction,const char *Anchor, void (*FuncParams) (), const char *Icon, diff --git a/swad_main.c b/swad_main.c index 4e0ccd0f9..b4c0cc39e 100644 --- a/swad_main.c +++ b/swad_main.c @@ -121,7 +121,7 @@ int main (void) Con_RemoveOldConnected (); /***** Get number of sessions *****/ - if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) Ses_GetNumSessions (); /***** Check user and get user's data *****/ @@ -139,6 +139,10 @@ int main (void) if (Act_Actions[Gbl.Action.Act].FunctionPriori != NULL) Act_Actions[Gbl.Action.Act].FunctionPriori (); + if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_204_NO_CONT) + /***** Write HTTP Status 204 No Content *****/ + Lay_WriteHTTPStatus204NoContent (); + /***** Start writing HTML output *****/ Lay_WriteStartOfPage (); diff --git a/swad_photo.c b/swad_photo.c index b79a6ee3c..7f7787649 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1176,9 +1176,9 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS]; bool PhotoExists; bool PutLinkToPublicProfile = !Gbl.Form.Inside && // Only if not inside another form - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB; // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB; // Only in main browser tab bool PutZoomCode = Zoom == Pho_ZOOM && // Make zoom - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB; // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB; // Only in main browser tab char IdCaption[Act_MAX_BYTES_ID]; /***** Start form to go to public profile *****/ diff --git a/swad_record.c b/swad_record.c index cfb6bf730..3bc2c6cc0 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2306,7 +2306,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, Rec_RecordHelp[Rec_SHA_RECORD_LIST] = Rec_RecordListHelp[UsrDat->Roles.InCurrentCrs.Role]; PutFormLinks = !Gbl.Form.Inside && // Only if not inside another form - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB; // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB; // Only in main browser tab Ins.InsCod = UsrDat->InsCod; if (Ins.InsCod > 0) @@ -2551,7 +2551,7 @@ static void Rec_PutIconsCommands (void) Act_Action_t NextAction; if (!Gbl.Form.Inside && // Only if not inside another form - Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB && // Only in main browser tab + Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB && // Only in main browser tab Gbl.Usrs.Me.Logged) // Only if I am logged { ICanViewUsrProfile = Pri_ShowingIsAllowed (Gbl.Record.UsrDat->ProfileVisibility, diff --git a/swad_user.c b/swad_user.c index 81fb984cb..7cdc22374 100644 --- a/swad_user.c +++ b/swad_user.c @@ -258,7 +258,7 @@ void Usr_InformAboutNumClicksBeforePhoto (void) { if (Gbl.Usrs.Me.NumAccWithoutPhoto >= Pho_MAX_CLICKS_WITHOUT_PHOTO) Ale_ShowAlert (Ale_WARNING,Txt_You_must_send_your_photo_because_); - else if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_BRW_1ST_TAB) + else if (Act_Actions[Gbl.Action.Act].BrowserTab == Act_BRW_1ST_TAB) { sprintf (Message,Txt_You_can_only_perform_X_further_actions_, Pho_MAX_CLICKS_WITHOUT_PHOTO - Gbl.Usrs.Me.NumAccWithoutPhoto);