mirror of https://github.com/acanas/swad-core.git
Version19.71.1
This commit is contained in:
parent
d7a0efea17
commit
158cff8439
|
@ -2230,8 +2230,7 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
vertical-align:middle;
|
||||
white-space:nowrap;
|
||||
overflow:hidden;
|
||||
text-overflow:ellipsis;
|
||||
}
|
||||
/* text-overflow:ellipsis; */
|
||||
}
|
||||
|
||||
.LIST_I_MUST_READ
|
||||
|
|
10
swad_MFU.c
10
swad_MFU.c
|
@ -208,7 +208,7 @@ void MFU_ShowMyMFUActions (void)
|
|||
void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
|
||||
{
|
||||
extern const char *Hlp_ANALYTICS_Frequent;
|
||||
extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES];
|
||||
extern const char *Txt_My_frequent_actions;
|
||||
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
|
||||
unsigned NumAct;
|
||||
|
@ -245,11 +245,11 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
|
|||
/* Icon and text */
|
||||
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
||||
Frm_StartForm (Action);
|
||||
Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL);
|
||||
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
|
||||
NULL);
|
||||
HTM_TxtF (" %s",TabMenuStr);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
}
|
||||
|
@ -306,11 +306,11 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
|
|||
/* Icon and text */
|
||||
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
||||
Frm_StartForm (Action);
|
||||
Frm_LinkFormSubmit (TabMenuStr,NULL,NULL);
|
||||
HTM_BUTTON_Begin (TabMenuStr,"BT_LINK",NULL);
|
||||
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
|
||||
NULL);
|
||||
HTM_TxtF (" %s",MenuStr);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
}
|
||||
|
|
|
@ -488,13 +488,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
|||
En OpenSWAD:
|
||||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.71 (2019-11-17)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.71.1 (2019-11-17)"
|
||||
#define CSS_FILE "swad19.71.css"
|
||||
#define JS_FILE "swad19.70.js"
|
||||
/*
|
||||
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
|
||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||
|
||||
Version 19.71.1: Nov 17, 2019 Converting links to buttons.
|
||||
Changes in forums. (247029 lines)
|
||||
Version 19.71: Nov 17, 2019 Converting links to buttons. (247076 lines)
|
||||
Version 19.70.7: Nov 17, 2019 Converting links to buttons. (247095 lines)
|
||||
Version 19.70.6: Nov 17, 2019 Converting links to buttons. (247093 lines)
|
||||
|
|
103
swad_forum.c
103
swad_forum.c
|
@ -338,7 +338,7 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
|
|||
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
|
||||
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
|
||||
static void For_WriteLinkToForum (struct Forum *Forum,
|
||||
bool Highlight,bool ShowNumOfPosts,
|
||||
bool Highlight,
|
||||
unsigned Level,
|
||||
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
|
||||
static unsigned For_GetNumThrsWithNewPstsInForum (struct Forum *Forum,
|
||||
|
@ -348,14 +348,12 @@ static unsigned For_GetNumOfThreadsInForumNewerThan (struct Forum *Forum,
|
|||
static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr);
|
||||
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
|
||||
|
||||
static void For_WriteNumThrsAndPsts (unsigned NumThrs,unsigned NumThrsWithNewPosts,unsigned NumPosts);
|
||||
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
|
||||
static void For_WriteNumberOfThrs (unsigned NumThrs);
|
||||
static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
|
||||
Ale_AlertType_t AlertType,const char *Message);
|
||||
static void For_PutIconNewThread (void);
|
||||
static void For_PutAllHiddenParamsNewThread (void);
|
||||
static unsigned For_GetNumThrsInForum (struct Forum *Forum);
|
||||
static unsigned For_GetNumPstsInForum (struct Forum *Forum);
|
||||
static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
|
||||
long ThrCodHighlighted,
|
||||
struct Pagination *PaginationThrs);
|
||||
|
@ -1787,7 +1785,7 @@ static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1 + For_FORUM_MAX_
|
|||
Forum.Location = -1L;
|
||||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_GLOBAL_USRS);
|
||||
IsLastItemInLevel[1] = false;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,0,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,0,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers global *****/
|
||||
Rol_GetRolesInAllCrssIfNotYetGot (&Gbl.Usrs.Me.UsrDat);
|
||||
|
@ -1797,7 +1795,7 @@ static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1 + For_FORUM_MAX_
|
|||
Forum.Location = -1L;
|
||||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_GLOBAL_TCHS);
|
||||
IsLastItemInLevel[1] = false;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,0,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,0,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1823,7 +1821,7 @@ static void For_WriteLinksToPlatformForums (bool IsLastForum,
|
|||
Forum.Location = -1L;
|
||||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM__SWAD__USRS);
|
||||
IsLastItemInLevel[1] = (IsLastForum && !ICanSeeTeacherForum);
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,0,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,0,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers about the platform *****/
|
||||
if (ICanSeeTeacherForum)
|
||||
|
@ -1832,7 +1830,7 @@ static void For_WriteLinksToPlatformForums (bool IsLastForum,
|
|||
Forum.Location = -1L;
|
||||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM__SWAD__TCHS);
|
||||
IsLastItemInLevel[1] = IsLastForum;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,0,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,0,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1862,7 +1860,7 @@ static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_INSTIT_USRS &&
|
||||
Gbl.Forum.ForumSelected.Location == InsCod);
|
||||
IsLastItemInLevel[1] = (IsLastIns && !ICanSeeTeacherForum);
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,1,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,1,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers from this institution *****/
|
||||
if (ICanSeeTeacherForum)
|
||||
|
@ -1872,7 +1870,7 @@ static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_INSTIT_TCHS &&
|
||||
Gbl.Forum.ForumSelected.Location == InsCod);
|
||||
IsLastItemInLevel[1] = IsLastIns;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,1,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,1,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
return InsCod;
|
||||
|
@ -1904,7 +1902,7 @@ static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_CENTRE_USRS &&
|
||||
Gbl.Forum.ForumSelected.Location == CtrCod);
|
||||
IsLastItemInLevel[2] = (IsLastCtr && !ICanSeeTeacherForum);
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,2,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,2,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers from this centre *****/
|
||||
if (ICanSeeTeacherForum)
|
||||
|
@ -1914,7 +1912,7 @@ static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_CENTRE_TCHS &&
|
||||
Gbl.Forum.ForumSelected.Location == CtrCod);
|
||||
IsLastItemInLevel[2] = IsLastCtr;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,2,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,2,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
return CtrCod;
|
||||
|
@ -1946,7 +1944,7 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_DEGREE_USRS &&
|
||||
Gbl.Forum.ForumSelected.Location == DegCod);
|
||||
IsLastItemInLevel[3] = (IsLastDeg && !ICanSeeTeacherForum);
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,3,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,3,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers from this degree *****/
|
||||
if (ICanSeeTeacherForum)
|
||||
|
@ -1956,7 +1954,7 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_DEGREE_TCHS &&
|
||||
Gbl.Forum.ForumSelected.Location == DegCod);
|
||||
IsLastItemInLevel[3] = IsLastDeg;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,3,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,3,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
return DegCod;
|
||||
|
@ -1988,7 +1986,7 @@ static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_COURSE_USRS &&
|
||||
Gbl.Forum.ForumSelected.Location == CrsCod);
|
||||
IsLastItemInLevel[4] = (IsLastCrs && !ICanSeeTeacherForum);
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,4,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,4,IsLastItemInLevel);
|
||||
|
||||
/***** Link to forum of teachers from this course *****/
|
||||
if (ICanSeeTeacherForum)
|
||||
|
@ -1998,7 +1996,7 @@ static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
|
|||
Highlight = (Gbl.Forum.ForumSelected.Type == For_FORUM_COURSE_TCHS &&
|
||||
Gbl.Forum.ForumSelected.Location == CrsCod);
|
||||
IsLastItemInLevel[4] = IsLastCrs;
|
||||
For_WriteLinkToForum (&Forum,Highlight,false,4,IsLastItemInLevel);
|
||||
For_WriteLinkToForum (&Forum,Highlight,4,IsLastItemInLevel);
|
||||
}
|
||||
}
|
||||
return CrsCod;
|
||||
|
@ -2009,7 +2007,7 @@ static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
|
|||
/*****************************************************************************/
|
||||
|
||||
static void For_WriteLinkToForum (struct Forum *Forum,
|
||||
bool Highlight,bool ShowNumOfPosts,
|
||||
bool Highlight,
|
||||
unsigned Level,
|
||||
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
|
||||
{
|
||||
|
@ -2018,7 +2016,6 @@ static void For_WriteLinkToForum (struct Forum *Forum,
|
|||
extern const char *Txt_Copy_not_allowed;
|
||||
unsigned NumThrs;
|
||||
unsigned NumThrsWithNewPosts;
|
||||
unsigned NumPosts;
|
||||
char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
|
||||
const char *Class;
|
||||
char ForumName[For_MAX_BYTES_FORUM_NAME + 1];
|
||||
|
@ -2103,14 +2100,8 @@ static void For_WriteLinkToForum (struct Forum *Forum,
|
|||
HTM_TxtF (" %s",ForumName);
|
||||
|
||||
/***** Write total number of threads and posts in this forum *****/
|
||||
if (ShowNumOfPosts)
|
||||
{
|
||||
if ((NumPosts = For_GetNumPstsInForum (Forum)))
|
||||
For_WriteNumThrsAndPsts (NumThrs,NumThrsWithNewPosts,NumPosts);
|
||||
}
|
||||
else
|
||||
if (NumThrs)
|
||||
For_WriteNumberOfThrs (NumThrs,NumThrsWithNewPosts);
|
||||
For_WriteNumberOfThrs (NumThrs);
|
||||
|
||||
/***** End row *****/
|
||||
Frm_LinkFormEnd ();
|
||||
|
@ -2347,55 +2338,18 @@ static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time)
|
|||
ThrCod,Time);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*************** Get and write total number of threads and posts *************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void For_WriteNumThrsAndPsts (unsigned NumThrs,unsigned NumThrsWithNewPosts,unsigned NumPosts)
|
||||
{
|
||||
extern const char *Txt_thread;
|
||||
extern const char *Txt_threads;
|
||||
extern const char *Txt_FORUM_post;
|
||||
extern const char *Txt_FORUM_posts;
|
||||
extern const char *Txt_with_new_posts;
|
||||
|
||||
/***** Write number of threads and number of posts *****/
|
||||
HTM_Txt (" [");
|
||||
if (NumThrs == 1)
|
||||
{
|
||||
HTM_TxtF ("%u %s",1,Txt_thread);
|
||||
if (NumThrsWithNewPosts)
|
||||
HTM_TxtF (", 1 %s",Txt_with_new_posts);
|
||||
HTM_TxtF ("; %u %s",NumPosts,NumPosts == 1 ? Txt_FORUM_post :
|
||||
Txt_FORUM_posts);
|
||||
}
|
||||
else
|
||||
{
|
||||
HTM_TxtF ("%u %s",NumThrs,Txt_threads);
|
||||
if (NumThrsWithNewPosts)
|
||||
HTM_TxtF (", %u %s",NumThrsWithNewPosts,Txt_with_new_posts);
|
||||
HTM_TxtF ("; %u %s",NumPosts,Txt_FORUM_posts);
|
||||
}
|
||||
HTM_Txt ("]");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************** Get and write total number of threads and posts **************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts)
|
||||
static void For_WriteNumberOfThrs (unsigned NumThrs)
|
||||
{
|
||||
extern const char *Txt_thread;
|
||||
extern const char *Txt_threads;
|
||||
extern const char *Txt_with_new_posts;
|
||||
|
||||
/***** Write number of threads and number of posts *****/
|
||||
HTM_Txt (" [");
|
||||
HTM_TxtF ("%u %s",NumThrs,NumThrs == 1 ? Txt_thread :
|
||||
HTM_TxtF (" [%u %s]",NumThrs,NumThrs == 1 ? Txt_thread :
|
||||
Txt_threads);
|
||||
if (NumThrsWithNewPosts)
|
||||
HTM_TxtF (", %u %s",NumThrsWithNewPosts,Txt_with_new_posts);
|
||||
HTM_Txt ("]");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3287,27 +3241,6 @@ unsigned For_GetNumTotalPstsInForumsOfType (For_ForumType_t ForumType,
|
|||
return NumPosts;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********************* Get number of posts in a forum ************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static unsigned For_GetNumPstsInForum (struct Forum *Forum)
|
||||
{
|
||||
char SubQuery[256];
|
||||
|
||||
/***** Get number of posts in a forum from database *****/
|
||||
if (Forum->Location > 0)
|
||||
sprintf (SubQuery," AND forum_thread.Location=%ld",Forum->Location);
|
||||
else
|
||||
SubQuery[0] = '\0';
|
||||
return
|
||||
(unsigned) DB_QueryCOUNT ("can not get the number of posts in a forum",
|
||||
"SELECT COUNT(*) FROM forum_thread,forum_post "
|
||||
" WHERE forum_thread.ForumType=%u%s"
|
||||
" AND forum_thread.ThrCod=forum_post.ThrCod",
|
||||
(unsigned) Forum->Type,SubQuery);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************ List the threads of a forum ************************/
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -3157,10 +3157,11 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b
|
|||
ActExpSntMsg));
|
||||
Gbl.Msg.MsgCod = MsgCod; // Message to be contracted/expanded
|
||||
Msg_PutHiddenParamsOneMsg ();
|
||||
Frm_LinkFormSubmit (Expanded ? Txt_Hide_message :
|
||||
HTM_BUTTON_Begin (Expanded ? Txt_Hide_message :
|
||||
Txt_See_message,
|
||||
Open ? "MSG_TIT" :
|
||||
"MSG_TIT_NEW",NULL);
|
||||
Open ? "BT_LINK MSG_TIT" :
|
||||
"BT_LINK MSG_TIT_NEW",
|
||||
NULL);
|
||||
|
||||
/***** Write subject *****/
|
||||
if (Subject[0])
|
||||
|
@ -3169,7 +3170,7 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b
|
|||
HTM_TxtF ("[%s]",Txt_no_subject);
|
||||
|
||||
/***** End form to expand the message *****/
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
/***** End cell *****/
|
||||
|
@ -3283,9 +3284,9 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_Go_to_X,
|
||||
Crs.FullName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,"AUTHOR_TXT",NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK AUTHOR_TXT",NULL);
|
||||
HTM_Txt (Crs.ShrtName);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
HTM_Txt (")");
|
||||
HTM_DIV_End ();
|
||||
Frm_EndForm ();
|
||||
|
@ -3567,10 +3568,10 @@ static void Msg_WriteMsgTo (long MsgCod)
|
|||
Gbl.Msg.MsgCod = MsgCod; // Message to be expanded with all recipients visible
|
||||
Msg_PutHiddenParamsOneMsg ();
|
||||
Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
|
||||
Frm_LinkFormSubmit (Txt_View_all_recipients,"AUTHOR_TXT",NULL);
|
||||
HTM_BUTTON_Begin (Txt_View_all_recipients,"BT_LINK AUTHOR_TXT",NULL);
|
||||
HTM_TxtF (Txt_and_X_other_recipients,
|
||||
NumRecipientsKnown - NumRecipientsToShow);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
|
|
@ -618,7 +618,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
|
|||
"NOTICE_CONTAINER_ACTIVE", // Not_ACTIVE_NOTICE
|
||||
"NOTICE_CONTAINER_OBSOLETE", // Not_OBSOLETE_NOTICE
|
||||
};
|
||||
const char *ContainerWidthClass[Not_NUM_TYPES_LISTING] =
|
||||
static const char *ContainerWidthClass[Not_NUM_TYPES_LISTING] =
|
||||
{
|
||||
"NOTICE_CONTAINER_NARROW", // Not_LIST_BRIEF_NOTICES
|
||||
"NOTICE_CONTAINER_WIDE", // Not_LIST_FULL_NOTICES
|
||||
|
@ -689,7 +689,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
|
|||
/* Form to view full notice */
|
||||
Frm_StartFormAnchor (ActSeeOneNot,Anchor);
|
||||
Not_PutHiddenParamNotCod (NotCod);
|
||||
Frm_LinkFormSubmit (Txt_See_full_notice,DateClass[Status],NULL);
|
||||
HTM_BUTTON_Begin (Txt_See_full_notice,"BT_LINK RT",NULL);
|
||||
}
|
||||
if (asprintf (&Id,"not_date_%u",UniqueId) < 0)
|
||||
Lay_NotEnoughMemoryExit ();
|
||||
|
@ -697,7 +697,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
|
|||
HTM_SPAN_End ();
|
||||
if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
|
||||
|
|
|
@ -338,7 +338,8 @@ void Ntf_ShowMyNotifications (void)
|
|||
char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1];
|
||||
char *ContentStr;
|
||||
const char *ClassBackground;
|
||||
const char *ClassAnchor;
|
||||
const char *ClassText;
|
||||
const char *ClassLink;
|
||||
const char *ClassAuthorBg;
|
||||
bool PutLink;
|
||||
|
||||
|
@ -449,21 +450,24 @@ void Ntf_ShowMyNotifications (void)
|
|||
if (Status & Ntf_STATUS_BIT_REMOVED) // The source of the notification was removed
|
||||
{
|
||||
ClassBackground = "MSG_TIT_BG_REM";
|
||||
ClassAnchor = "MSG_TIT_REM";
|
||||
ClassText = "MSG_TIT_REM";
|
||||
ClassLink = "BT_LINK MSG_TIT_REM";
|
||||
ClassAuthorBg = "MSG_AUT_BG_REM";
|
||||
PutLink = false;
|
||||
}
|
||||
else if (Status & Ntf_STATUS_BIT_READ) // I have already seen the source of the notification
|
||||
{
|
||||
ClassBackground = "MSG_TIT_BG";
|
||||
ClassAnchor = "MSG_TIT";
|
||||
ClassText = "MSG_TIT";
|
||||
ClassLink = "BT_LINK MSG_TIT";
|
||||
ClassAuthorBg = "MSG_AUT_BG";
|
||||
PutLink = true;
|
||||
}
|
||||
else // I have not seen the source of the notification
|
||||
{
|
||||
ClassBackground = "MSG_TIT_BG_NEW";
|
||||
ClassAnchor = "MSG_TIT_NEW";
|
||||
ClassText = "MSG_TIT_NEW";
|
||||
ClassLink = "BT_LINK MSG_TIT_NEW";
|
||||
ClassAuthorBg = "MSG_AUT_BG_NEW";
|
||||
PutLink = true;
|
||||
}
|
||||
|
@ -489,19 +493,17 @@ void Ntf_ShowMyNotifications (void)
|
|||
|
||||
/* Write event type */
|
||||
HTM_TD_Begin ("class=\"%s LT\"",ClassBackground);
|
||||
if (PutLink)
|
||||
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
|
||||
|
||||
if (PutLink)
|
||||
{
|
||||
Frm_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor,NULL);
|
||||
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
|
||||
HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
|
||||
HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
{
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassAnchor);
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassText);
|
||||
HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
|
||||
HTM_SPAN_End ();
|
||||
}
|
||||
|
@ -521,13 +523,13 @@ void Ntf_ShowMyNotifications (void)
|
|||
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
|
||||
|
||||
if (PutLink)
|
||||
Frm_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor,NULL);
|
||||
HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
|
||||
else
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassAnchor);
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassText);
|
||||
HTM_TxtF ("%s: %s",Txt_Forum,ForumName);
|
||||
if (PutLink)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
|
@ -539,9 +541,9 @@ void Ntf_ShowMyNotifications (void)
|
|||
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
|
||||
|
||||
if (PutLink)
|
||||
Frm_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor,NULL);
|
||||
HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
|
||||
else
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassAnchor);
|
||||
HTM_SPAN_Begin ("class=\"%s\"",ClassText);
|
||||
|
||||
if (Crs.CrsCod > 0)
|
||||
HTM_TxtF ("%s: %s",Txt_Course,Crs.ShrtName);
|
||||
|
@ -556,7 +558,7 @@ void Ntf_ShowMyNotifications (void)
|
|||
|
||||
if (PutLink)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
|
|
|
@ -238,6 +238,15 @@ const char *The_ClassFormInBoxBold[The_NUM_THEMES] =
|
|||
"FORM_IN_PINK BOLD",
|
||||
};
|
||||
|
||||
const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_IN_WHITE NOWRAP",
|
||||
"BT_LINK FORM_IN_GREY NOWRAP",
|
||||
"BT_LINK FORM_IN_PURPLE NOWRAP",
|
||||
"BT_LINK FORM_IN_BLUE NOWRAP",
|
||||
"BT_LINK FORM_IN_YELLOW NOWRAP",
|
||||
"BT_LINK FORM_IN_PINK NOWRAP",
|
||||
};
|
||||
const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] =
|
||||
{
|
||||
"FORM_IN_WHITE NOWRAP",
|
||||
|
|
Loading…
Reference in New Issue