Version 16.111.5

This commit is contained in:
Antonio Cañas Vargas 2016-12-28 17:22:25 +01:00
parent 241932cf9a
commit bca8d666bd
9 changed files with 28 additions and 3127 deletions

File diff suppressed because it is too large Load Diff

View File

@ -207,7 +207,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
extern const char *Hlp_STATS_Frequent;
extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
extern const char *Txt_My_frequent_actions;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
unsigned NumAct;
Act_Action_t Action;
Act_Action_t SuperAction;
@ -232,7 +232,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
{
/* Action string */
SuperAction = Act_Actions[Action].SuperAction;
strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[SuperAction].Tab],128);
strncpy (TabStr,Txt_TABS_TXT[Act_Actions[SuperAction].Tab],128);
TabStr[128] = '\0';
strncpy (MenuStr,Title,128);
MenuStr[128] = '\0';
@ -266,7 +266,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_My_frequent_actions;
extern const char *Txt_Frequent_ACTIONS;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
unsigned NumAct;
Act_Action_t Action;
Act_Action_t SuperAction;
@ -296,7 +296,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
{
/* Action string */
SuperAction = Act_Actions[Action].SuperAction;
strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[SuperAction].Tab],128);
strncpy (TabStr,Txt_TABS_TXT[Act_Actions[SuperAction].Tab],128);
TabStr[128] = '\0';
strncpy (MenuStr,Title,128);
MenuStr[128] = '\0';

View File

@ -189,13 +189,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.111.4 (2016-12-28)"
#define CSS_FILE "swad16.108.css"
#define Log_PLATFORM_VERSION "SWAD 16.111.5 (2016-12-28)"
#define CSS_FILE "swad16.111.5.css"
#define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.111.5: Dec 28, 2016 Changes in CSS related to tabs. (211084 lines)
Version 16.111.4: Dec 28, 2016 Fixed bug in file browser. (211336 lines)
Version 16.111.3: Dec 28, 2016 Unused code removed in file browsers. (211335 lines)
Version 16.111.2: Dec 28, 2016 Code refactoring in groups and course. (211352 lines)

View File

@ -924,7 +924,7 @@ static void Lay_WriteTitleAction (void)
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *The_ClassTitleAction[The_NUM_THEMES];
extern const char *The_ClassSubtitleAction[The_NUM_THEMES];
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
Act_Action_t SuperAction = Act_Actions[Gbl.Action.Act].SuperAction;
/***** Container start *****/
@ -936,7 +936,7 @@ static void Lay_WriteTitleAction (void)
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">%s &gt; %s</div>",
The_ClassTitleAction[Gbl.Prefs.Theme],
Txt_TABS_FULL_TXT[Act_Actions[SuperAction].Tab],
Txt_TABS_TXT[Act_Actions[SuperAction].Tab],
Act_GetTitleAction (Gbl.Action.Act));
/***** Subtitle *****/

View File

@ -349,7 +349,7 @@ void Mai_WriteWarningEmailNotifications (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_You_can_only_receive_email_notifications_if_;
extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
Act_Action_t SuperActionMyAccount = Act_Actions[ActFrmMyAcc].SuperAction;
Act_Action_t SuperActionMailDomains = Act_Actions[ActSeeMai ].SuperAction;
@ -357,9 +357,9 @@ void Mai_WriteWarningEmailNotifications (void)
Tab_Tab_t TabMailDomains = Act_Actions[SuperActionMailDomains].Tab;
sprintf (Gbl.Message,Txt_You_can_only_receive_email_notifications_if_,
Txt_TABS_SHORT_TXT[TabMyAccount ],
Txt_TABS_TXT[TabMyAccount ],
Txt_MENU_TITLE[TabMyAccount ][Act_Actions[SuperActionMyAccount ].IndexInMenu],
Txt_TABS_SHORT_TXT[TabMailDomains],
Txt_TABS_TXT[TabMailDomains],
Txt_MENU_TITLE[TabMailDomains][Act_Actions[SuperActionMailDomains].IndexInMenu]);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
}

View File

@ -755,7 +755,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD];
extern const char *Txt_Hits_per_action;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
extern const char *Txt_Other_actions;
char Query[512];
MYSQL_RES *mysql_res;
@ -813,8 +813,8 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
{
SuperAction = Act_Actions[Action].SuperAction;
Tab = Act_Actions[SuperAction].Tab;
if (Txt_TABS_FULL_TXT[Tab])
fprintf (Gbl.F.Rep,"%s &gt; ",Txt_TABS_FULL_TXT[Tab]);
if (Txt_TABS_TXT[Tab])
fprintf (Gbl.F.Rep,"%s &gt; ",Txt_TABS_TXT[Tab]);
}
fprintf (Gbl.F.Rep,"%s",Act_GetActionTextFromDB (ActCod,ActTxt));
}

View File

@ -741,7 +741,7 @@ static void Sta_WriteSelectorAction (void)
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Action;
extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
Act_Action_t Action;
Act_Action_t SuperAction;
Tab_Tab_t Tab;
@ -767,8 +767,8 @@ static void Sta_WriteSelectorAction (void)
fprintf (Gbl.F.Out,"%u: ",(unsigned) Action);
SuperAction = Act_Actions[Action].SuperAction;
Tab = Act_Actions[SuperAction].Tab;
if (Txt_TABS_SHORT_TXT[Tab])
fprintf (Gbl.F.Out,"%s &gt; ",Txt_TABS_SHORT_TXT[Tab]);
if (Txt_TABS_TXT[Tab])
fprintf (Gbl.F.Out,"%s &gt; ",Txt_TABS_TXT[Tab]);
fprintf (Gbl.F.Out,"%s",
Act_GetActionTextFromDB (Act_Actions[Action].ActCod,ActTxt));
}

View File

@ -84,8 +84,8 @@ void Tab_DrawTabs (void)
extern const char *The_ClassTxtTabOff[The_NUM_THEMES];
extern const char *The_TabOnBgColors[The_NUM_THEMES];
extern const char *The_TabOffBgColors[The_NUM_THEMES];
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
Tab_Tab_t NumTab;
bool ICanViewTab;
const char *ClassHeadRow3[The_NUM_THEMES] =
@ -132,7 +132,7 @@ void Tab_DrawTabs (void)
Act_FormStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) NumTab);
Act_LinkFormSubmit (Txt_TABS_FULL_TXT[NumTab],
Act_LinkFormSubmit (Txt_TABS_TXT[NumTab],
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s\" alt=\"%s\" title=\"%s\""
@ -141,11 +141,11 @@ void Tab_DrawTabs (void)
"</a>",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Tab_TabIcons[NumTab],
Txt_TABS_FULL_TXT[NumTab],
Txt_TABS_FULL_TXT[NumTab],
Txt_TABS_TXT[NumTab],
Txt_TABS_TXT[NumTab],
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
The_ClassTxtTabOff[Gbl.Prefs.Theme],
Txt_TABS_SHORT_TXT[NumTab]);
Txt_TABS_TXT[NumTab]);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>"
@ -250,15 +250,15 @@ static void Tab_WriteBreadcrumbHome (void)
static void Tab_WriteBreadcrumbTab (void)
{
extern const char *The_ClassTxtTabOn[The_NUM_THEMES];
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
/***** Start form *****/
Act_FormStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) Gbl.Action.Tab);
Act_LinkFormSubmit (Txt_TABS_FULL_TXT[Gbl.Action.Tab],The_ClassTxtTabOn[Gbl.Prefs.Theme],NULL);
Act_LinkFormSubmit (Txt_TABS_TXT[Gbl.Action.Tab],The_ClassTxtTabOn[Gbl.Prefs.Theme],NULL);
/***** Title and end of form *****/
fprintf (Gbl.F.Out,"%s</a>",Txt_TABS_FULL_TXT[Gbl.Action.Tab]);
fprintf (Gbl.F.Out,"%s</a>",Txt_TABS_TXT[Gbl.Action.Tab]);
Act_FormEnd ();
}

View File

@ -40461,7 +40461,7 @@ const char *Txt_Table_not_found_in_the_file_of_marks =
"Table not found in the file of marks."; // Necessita de tradução
#endif
const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS] =
const char *Txt_TABS_TXT[Tab_NUM_TABS] =
{
// TabUnk
NULL,
@ -40718,263 +40718,6 @@ const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS] =
#endif
};
const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS] = // Must be visible in 1024x768 without horizontal scroll bar
{
// TabUnk
NULL,
// TabSys
#if L==1
"PLATAFORMA"
#elif L==2
"PLATTFORM"
#elif L==3
"SYSTEM"
#elif L==4
"PLATAFORMA"
#elif L==5
"PLATE-FORME"
#elif L==6
"YPYKATU"
#elif L==7
"PIATTAFORMA"
#elif L==8
"SYSTEM"
#elif L==9
"SISTEMA"
#endif
,
// TabCty
#if L==1
"PA&Iacute;S"
#elif L==2
"LAND"
#elif L==3
"COUNTRY"
#elif L==4
"PA&Iacute;S"
#elif L==5
"PAYS"
#elif L==6
"TET&Atilde;"
#elif L==7
"PAESE"
#elif L==8
"KRAJ"
#elif L==9
"PA&Iacute;S"
#endif
,
// TabIns
#if L==1
"INSTITUCI&Oacute;"
#elif L==2
"HOCHSCHULE"
#elif L==3
"INSTITUTION"
#elif L==4
"INSTITUCI&Oacute;N"
#elif L==5
"&Eacute;TABLISSEMENT"
#elif L==6
"MBO'EHAO"
#elif L==7
"ISTITUZIONE"
#elif L==8
"INSTYTUCJI"
#elif L==9
"INSTITU&Ccedil;&Atilde;O"
#endif
,
// TabCtr
#if L==1
"CENTRE"
#elif L==2
"LEHRINSTITUT"
#elif L==3
"CENTRE"
#elif L==4
"CENTRO"
#elif L==5
"CENTRE"
#elif L==6
"MBO'EHAO"
#elif L==7
"CENTRO"
#elif L==8
"CENTRUM"
#elif L==9
"CENTRO"
#endif
,
// TabDeg
#if L==1
"TITULACI&Oacute;"
#elif L==2
"STUDIENGANG"
#elif L==3
"DEGREE"
#elif L==4
"TITULACI&Oacute;N"
#elif L==5
"&Eacute;TUDE"
#elif L==6
"ARANDUR&Atilde;"
#elif L==7
"LAUREA"
#elif L==8
"STOPIEN"
#elif L==9
"TITULA&Ccedil;&Atilde;O"
#endif
,
// TabCrs
#if L==1
"ASSIGNATURA"
#elif L==2
"VERANSTALTUNG"
#elif L==3
"COURSE"
#elif L==4
"ASIGNATURA"
#elif L==5
"MATI&Egrave;RE"
#elif L==6
"MBO'ESYRY"
#elif L==7
"CORSO"
#elif L==8
"KURS"
#elif L==9
"DISCIPLINA"
#endif
,
// TabAss
#if L==1
"AVALUACI&Oacute;"
#elif L==2
"BEWERTUNG"
#elif L==3
"ASSESSMENT"
#elif L==4
"EVALUACI&Oacute;N"
#elif L==5
"&Eacute;VALUATION"
#elif L==6
"MBOHEPY"
#elif L==7
"VALUTAZIONE"
#elif L==8
"OCENA"
#elif L==9
"AVALIA&Ccedil;&Atilde;O"
#endif
,
// TabUsr
#if L==1
"USUARIS"
#elif L==2
"BENUTZER"
#elif L==3
"USERS"
#elif L==4
"USUARIOS"
#elif L==5
"UTILISATEURS"
#elif L==6
"PURUH&Aacute;RA"
#elif L==7
"UTENTI"
#elif L==8
"U&Zdot;YTKOWNICY"
#elif L==9
"UTILIZADORES"
#endif
,
// TabSoc
#if L==1
"SOCIAL"
#elif L==2
"SOZIALES"
#elif L==3
"SOCIAL"
#elif L==4
"SOCIAL"
#elif L==5
"SOCIAL"
#elif L==6
"SOCIAL" // Okoteve traducción
#elif L==7
"SOCIAL"
#elif L==8
"SPO&Lstrok;ECZNA"
#elif L==9
"SOCIAL"
#endif
,
// TabMsg
#if L==1
"MISSATGES"
#elif L==2
"NACHRICHTEN"
#elif L==3
"MESSAGES"
#elif L==4
"MENSAJES"
#elif L==5
"MESSAGES"
#elif L==6
"MARANDU"
#elif L==7
"MESSAGGI"
#elif L==8
"WIADOMO&Sacute;CY"
#elif L==9
"MENSAGENS"
#endif
,
// TabSta
#if L==1
"ESTAD&Iacute;STIQUES"
#elif L==2
"STATISTIK"
#elif L==3
"STATS"
#elif L==4
"ESTAD&Iacute;STICAS"
#elif L==5
"STATISTIQUES"
#elif L==6
"PAPY'APOREKO"
#elif L==7
"STATISTICHE"
#elif L==8
"STATYSTYKI"
#elif L==9
"ESTAT&Iacute;STICAS"
#endif
,
// TabPrf
#if L==1
"PERFIL"
#elif L==2
"PROFIL"
#elif L==3
"PROFILE"
#elif L==4
"PERFIL"
#elif L==5
"PROFIL"
#elif L==6
"CHE"
#elif L==7
"PROFILO"
#elif L==8
"PROFIL"
#elif L==9
"PERFIL"
#endif
};
const char *Txt_Tag_allowed =
#if L==1
"Descriptor permitido"; // Necessita traduccio