Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.68

This commit is contained in:
Antonio Cañas Vargas 2016-11-22 10:19:10 +01:00
parent a2387c68b1
commit 78d25d8ad1
4 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad16.60.1.css → css/swad16.68.css
View File

@ -1559,16 +1559,16 @@ a:hover img.CENTRE_PHOTO_SHOW
.BLUE_TITLE {color:#4D88A1; font-size:18pt;}
.YELLOW_TITLE {color:#BD4815; font-size:18pt;}
/**************************** Icon highlighting ******************************/
/*********************** Icon and checkbox highlighting **********************/
.ICO_HIDDEN
{
opacity:0.2;
}
.ICO_HIGHLIGHT
.ICO_HIGHLIGHT, .CHECKBOX_UNCHECKED
{
opacity:0.67;
}
.ICO_HIGHLIGHT:hover
.ICO_HIGHLIGHT:hover, .CHECKBOX_CHECKED
{
opacity:1;
}

6
swad_changelog.h
View File

@ -172,13 +172,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.67.3 (2016-11-22)"
#define CSS_FILE "swad16.60.1.css"
#define Log_PLATFORM_VERSION "SWAD 16.68 (2016-11-22)"
#define CSS_FILE "swad16.68.css"
#define JS_FILE "swad16.46.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 16.68: Nov 22, 2016 Change in text related to notifications.
Changes in contextual links in notifications. (207406 lines)
Version 16.67.3: Nov 22, 2016 Contextual help on notifications. (207355 lines)
Version 16.67.2: Nov 21, 2016 Contextual help on sign up in a course and enrollment requests. (207351 lines)
Version 16.67.1: Nov 21, 2016 Contextual help on connected users and last clicks in real time. (207346 lines)

57
swad_notification.c
View File

@ -286,7 +286,9 @@ void Ntf_ShowMyNotifications (void)
{
extern const char *Hlp_MESSAGES_Notifications;
extern const char *Txt_Change_preferences;
extern const char *Txt_Preferences;
extern const char *Txt_Mark_all_notifications_as_read;
extern const char *Txt_Mark_all_NOTIFICATIONS_as_read;
extern const char *Txt_Notifications;
extern const char *Txt_Date;
extern const char *Txt_Event;
@ -342,25 +344,29 @@ void Ntf_ShowMyNotifications (void)
Gbl.Usrs.Me.UsrDat.UsrCod,SubQuery);
NumNotifications = DB_QuerySELECT (Query,&mysql_res,"can not get your notifications");
/***** Buttons to change preferences and to mark all notifications as seen *****/
/***** Links to mark all notifications as read
and to change preferences *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
// Put form to change notification preferences
Lay_PutContextualLink (ActEdiPrf,NULL,
"heart64x64.gif",
Txt_Change_preferences,Txt_Change_preferences,
NULL);
if (NumNotifications)
// Put form to change notification preferences
Lay_PutContextualLink (ActMrkNtfSee,NULL,
"eye-on64x64.png",
Txt_Mark_all_notifications_as_read,
Txt_Mark_all_notifications_as_read,
NULL);
fprintf (Gbl.F.Out,"</div>");
/***** Write form to show all notifications *****/
Ntf_WriteFormAllNotifications (AllNotifications);
if (NumNotifications)
/* Put form to change notification preferences */
Lay_PutContextualLink (ActMrkNtfSee,NULL,
"eye-on64x64.png",
Txt_Mark_all_notifications_as_read,
Txt_Mark_all_NOTIFICATIONS_as_read,
NULL);
/* Put form to change notification preferences */
Lay_PutContextualLink (ActEdiPrf,NULL,
"heart64x64.gif",
Txt_Change_preferences,Txt_Preferences,
NULL);
fprintf (Gbl.F.Out,"</div>");
/***** List my notifications *****/
if (NumNotifications) // Notifications found
{
@ -650,24 +656,33 @@ static void Ntf_PutIconsNotif (void)
static void Ntf_WriteFormAllNotifications (bool AllNotifications)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Show_all_notifications;
extern const char *Txt_Show_all_NOTIFICATIONS;
/***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
Act_FormStart (ActSeeNtf);
/***** End form *****/
/***** Start container *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT %s %s\" title=\"%s\">",
AllNotifications ? "CHECKBOX_CHECKED" :
"CHECKBOX_UNCHECKED",
The_ClassFormBold[Gbl.Prefs.Theme],
Txt_Show_all_notifications);
/****** Checkbox and text *****/
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"All\" value=\"Y\"");
if (AllNotifications)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
" %s",
Gbl.Form.Id,
Txt_Show_all_notifications);
Act_FormEnd ();
Gbl.Form.Id,Txt_Show_all_NOTIFICATIONS);
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");
/***** End form *****/
Act_FormEnd ();
}
/*****************************************************************************/

42
swad_text.c
View File

@ -17256,6 +17256,27 @@ const char *Txt_Mandatory_enrollment = // (to a type of group)
"Inscri&ccedil;&atilde;o obrigat&oacute;ria?";
#endif
const char *Txt_Mark_all_NOTIFICATIONS_as_read =
#if L==1
"Marca totes com llegides";
#elif L==2
"Markieren Sie alle als gelesen";
#elif L==3
"Mark all as read";
#elif L==4
"Marcar todas como le&iacute;das";
#elif L==5
"Marquer tous comme lus";
#elif L==6
"Marcar todas como le&iacute;das"; // Okoteve traducción
#elif L==7
"Segnare tutte come gi&grave; letti";
#elif L==8
"Oznacz wszystko jako czytasz";
#elif L==9
"Marcar todas como lidas";
#endif
const char *Txt_Mark_all_notifications_as_read =
#if L==1
"Marca totes les notificacions com llegides";
@ -36462,6 +36483,27 @@ const char *Txt_Show_all_files =
"Mostrar todos os arquivos";
#endif
const char *Txt_Show_all_NOTIFICATIONS =
#if L==1
"Mostrar tots";
#elif L==2
"Alle anzeigen";
#elif L==3
"Show all";
#elif L==4
"Mostrar todas";
#elif L==5
"Afficher tous";
#elif L==6
"Mostrar todas"; // Okoteve traducción
#elif L==7
"Mostra tutti";
#elif L==8
"Poka&zdot; wszystkie";
#elif L==9
"Mostrar todas";
#endif
const char *Txt_Show_all_notifications =
#if L==1
"Mostrar tots les notificacions";