Version18.116.2

This commit is contained in:
Antonio Cañas Vargas 2019-04-20 13:01:55 +02:00
parent 640040b622
commit e145998d88
5 changed files with 7 additions and 133 deletions

View File

@ -275,8 +275,6 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
{
extern const char *Txt_Users;
extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_NOTICE_Active_Mark_as_obsolete;
extern const char *Txt_NOTICE_Obsolete_Mark_as_active;
extern const char *Txt_Do_not_show_again;
static const char *ContainerClass[Ann_NUM_STATUS] =
{
@ -316,14 +314,10 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
switch (Status)
{
case Ann_ACTIVE_ANNOUNCEMENT:
Lay_PutContextualLinkOnlyIcon (ActHidAnn,NULL,Ann_PutParams,
"eye.svg",
Txt_NOTICE_Active_Mark_as_obsolete);
Ico_PutContextualIconToHide (ActHidAnn,NULL,Ann_PutParams);
break;
case Ann_OBSOLETE_ANNOUNCEMENT:
Lay_PutContextualLinkOnlyIcon (ActRevAnn,NULL,Ann_PutParams,
"eye-slash.svg",
Txt_NOTICE_Obsolete_Mark_as_active);
Ico_PutContextualIconToUnhide (ActRevAnn,NULL,Ann_PutParams);
break;
}
}

View File

@ -448,10 +448,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.116.1 (2019-04-20)"
#define Log_PLATFORM_VERSION "SWAD 18.116.2 (2019-04-20)"
#define CSS_FILE "swad18.112.1.css"
#define JS_FILE "swad18.114.js"
/*
Version 18.116.2: Apr 20, 2019 Code refactoring in announcements and notices. (243124 lines)
Version 18.116.1: Apr 20, 2019 Code refactoring in edition of banners. (243246 lines)
Version 18.116: Apr 19, 2019 Code refactoring related to actions and AJAX. (243246 lines)
Version 18.115: Apr 18, 2019 Contextual buttons to lock/unlock edition of all projects, suggested by Pedro Villar Castro. (243275 lines)

View File

@ -614,10 +614,6 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
long UsrCod,
Not_Status_t Status)
{
extern const char *Txt_NOTICE_Active_SINGULAR;
extern const char *Txt_NOTICE_Active_Mark_as_obsolete;
extern const char *Txt_NOTICE_Obsolete_SINGULAR;
extern const char *Txt_NOTICE_Obsolete_Mark_as_active;
extern const char *Txt_See_full_notice;
extern const char *Txt_Today;
static const char *ContainerClass[Not_NUM_STATUS] =
@ -663,7 +659,6 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/***** Write the date in the top part of the yellow note *****/
/* Write symbol to indicate if notice is obsolete or active */
if (TypeNoticesListing == Not_LIST_FULL_NOTICES)
{
if (Not_CheckIfICanEditNotices ())
{
Not_SetNotCodToEdit (NotCod); // To be used as parameter
@ -675,46 +670,14 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
switch (Status)
{
case Not_ACTIVE_NOTICE:
Lay_PutContextualLinkOnlyIcon (ActHidNot,Anchor,Not_PutParams,
"eye.svg",
Txt_NOTICE_Active_Mark_as_obsolete);
Ico_PutContextualIconToHide (ActHidNot,NULL,Not_PutParams);
break;
case Not_OBSOLETE_NOTICE:
Lay_PutContextualLinkOnlyIcon (ActRevNot,Anchor,Not_PutParams,
"eye-slash.svg",
Txt_NOTICE_Obsolete_Mark_as_active);
Ico_PutContextualIconToUnhide (ActRevNot,NULL,Not_PutParams);
break;
}
Frm_EndForm ();
}
else // Don't put forms
/* Status of the notice */
switch (Status)
{
case Not_ACTIVE_NOTICE:
fprintf (Gbl.F.Out,"<span title=\"%s\">"
"<img src=\"%s/eye.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO_HIDDEN ICO16x16\" />"
"</span>",
Txt_NOTICE_Active_SINGULAR,
Cfg_URL_ICON_PUBLIC,
Txt_NOTICE_Active_SINGULAR,
Txt_NOTICE_Active_SINGULAR);
break;
case Not_OBSOLETE_NOTICE:
fprintf (Gbl.F.Out,"<span title=\"%s\">"
"<img src=\"%s/eye-slash.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO_HIDDEN ICO16x16\" />"
"</span>",
Txt_NOTICE_Obsolete_SINGULAR,
Cfg_URL_ICON_PUBLIC,
Txt_NOTICE_Obsolete_SINGULAR,
Txt_NOTICE_Obsolete_SINGULAR);
break;
}
}
/* Write the date */
UniqueId++;

View File

@ -487,7 +487,7 @@ static void Prj_ShowFormToFilterByHidden (void)
Gbl.Prjs.CurrentPage,
-1L);
Ico_PutSettingIconLink (HiddenVisiblIcon[HidVis],
Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[HidVis]);
Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[HidVis]);
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -26076,27 +26076,6 @@ const char *Txt_Nothing_has_been_pasted_because_the_clipboard_is_empty_ =
" Tente copiar e colar novamente.";
#endif
const char *Txt_NOTICE_Active_SINGULAR =
#if L==1 // ca
"Activo"; // Necessita traduccio
#elif L==2 // de
"Aktive";
#elif L==3 // en
"Active";
#elif L==4 // es
"Activo";
#elif L==5 // fr
"Active";
#elif L==6 // gn
"Activo"; // Okoteve traducción
#elif L==7 // it
"Attivo";
#elif L==8 // pl
"Active";
#elif L==9 // pt
"Ativo";
#endif
const char *Txt_NOTICE_Active_BR_notices =
#if L==1 // ca
"Avisos<br />activos"; // Necessita traduccio
@ -26118,27 +26097,6 @@ const char *Txt_NOTICE_Active_BR_notices =
"Avisos<br />ativos";
#endif
const char *Txt_NOTICE_Active_Mark_as_obsolete =
#if L==1 // ca
"Actiu; marcar com obsolet";
#elif L==2 // de
"Aktive; marke als veraltet";
#elif L==3 // en
"Active; mark as obsolete";
#elif L==4 // es
"Activo; marcar como obsoleto";
#elif L==5 // fr
"Active; marquer comme obsol&egrave;te";
#elif L==6 // gn
"Activo; marcar como obsoleto"; // Okoteve traducción
#elif L==7 // it
"Attivo; segnare come obsoleto";
#elif L==8 // pl
"Active; zaznaczy jako przestarzale";
#elif L==9 // pt
"Ativo; marcar como obsoleto";
#endif
const char *Txt_NOTICE_Deleted_BR_notices =
#if L==1 // ca
"Avisos<br />eliminados"; // Necessita traduccio
@ -26160,27 +26118,6 @@ const char *Txt_NOTICE_Deleted_BR_notices =
"Avisos<br />suprimidos";
#endif
const char *Txt_NOTICE_Obsolete_SINGULAR =
#if L==1 // ca
"Obsoleto"; // Necessita traduccio
#elif L==2 // de
"Veraltet";
#elif L==3 // en
"Obsolete";
#elif L==4 // es
"Obsoleto";
#elif L==5 // fr
"Obsol&egrave;te";
#elif L==6 // gn
"Obsoleto"; // Okoteve traducción
#elif L==7 // it
"Obsoleto";
#elif L==8 // pl
"Przestarzaly";
#elif L==9 // pt
"Obsoleto";
#endif
const char *Txt_NOTICE_Obsolete_BR_notices =
#if L==1 // ca
"Avisos<br />obsoletos"; // Necessita traduccio
@ -26202,27 +26139,6 @@ const char *Txt_NOTICE_Obsolete_BR_notices =
"Avisos<br />obsoletos";
#endif
const char *Txt_NOTICE_Obsolete_Mark_as_active =
#if L==1 // ca
"Obsolet; marcar com actiu";
#elif L==2 // de
"Veraltet; marke als aktive";
#elif L==3 // en
"Obsolete; mark as active";
#elif L==4 // es
"Obsoleto; marcar como activo";
#elif L==5 // fr
"Obsol&egrave;te; marquer comme active";
#elif L==6 // gn
"Obsoleto; marcar como activo"; // Okoteve traducción
#elif L==7 // it
"Obsoleto; segnare come attivo";
#elif L==8 // pl
"Przestarzaly; znak towarowy jako aktywnych";
#elif L==9 // pt
"Obsoleto; marcar como ativo";
#endif
const char *Txt_Notice =
#if L==1 // ca
"Av&iacute;s";