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 22.49: Oct 16, 2022 Changes in project review form.

This commit is contained in:
acanas 2022-10-16 13:47:53 +02:00
parent 62fc35435e
commit 91347b87ec
5 changed files with 48 additions and 7302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5091
css/swad22.48.css
View File

File diff suppressed because it is too large Load Diff

2171
js/swad21.100.js
View File

File diff suppressed because it is too large Load Diff

4
swad_autolink.c
View File

@ -140,9 +140,9 @@ The web site of <a href="https://openswad.org/?usr=@rms">@rms</a> is <a href="ht
<form action="https://localhost/swad/es" method="post"> <form action="https://localhost/swad/es" method="post">
<input type="hidden" name="ses" value="2jb9CGhIJ81_qhDyeQ6MWDFKQ5ZaA_F68tq22ZAjYww"> <input type="hidden" name="ses" value="2jb9CGhIJ81_qhDyeQ6MWDFKQ5ZaA_F68tq22ZAjYww">
<input type="hidden" name="usr" value="@acanas"> <input type="hidden" name="usr" value="@acanas">
<a href="" onclick="this.closest('form').submit();return false;"> <button type="submit" class="NICK_WHITE">
@acanas @acanas
</a> </button>
</form> </form>
*/ */

7
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 22.48 (2022-10-15)" #define Log_PLATFORM_VERSION "SWAD 22.49 (2022-10-16)"
#define CSS_FILE "swad22.48.css" #define CSS_FILE "swad22.49.css"
#define JS_FILE "swad21.100.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.49: Oct 16, 2022 Changes in project review form. (333161 lines)
Version 22.48: Oct 15, 2022 Code optimization related to nick links. (333157 lines) Version 22.48: Oct 15, 2022 Code optimization related to nick links. (333157 lines)
Version 22.47.2: Oct 15, 2022 Code optimization related to forms. (333124 lines) Version 22.47.2: Oct 15, 2022 Code optimization related to forms. (333124 lines)
Version 22.47.1: Oct 15, 2022 Removed unused code. (333126 lines) Version 22.47.1: Oct 15, 2022 Removed unused code. (333126 lines)

77
swad_project.c
View File

@ -1633,6 +1633,7 @@ static void Prj_ShowProjectReviewStatus (struct Prj_Projects *Projects,
extern const char *Txt_Review; extern const char *Txt_Review;
extern const char *Txt_PROJECT_REVIEW_SINGUL[Prj_NUM_REVIEW_STATUS]; extern const char *Txt_PROJECT_REVIEW_SINGUL[Prj_NUM_REVIEW_STATUS];
extern const char *Txt_Comments; extern const char *Txt_Comments;
extern const char *Txt_Save_changes;
bool PutForm; bool PutForm;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -1710,49 +1711,54 @@ static void Prj_ShowProjectReviewStatus (struct Prj_Projects *Projects,
true,true,false,0x6); true,true,false,0x6);
HTM_DIV_End (); HTM_DIV_End ();
free (Id); free (Id);
}
/***** Show warning icon depending on modify time *****/ /***** Show warning icon depending on modify time *****/
if (Faults->WrongModifTime) if (Faults->WrongModifTime)
Prj_PutWarningIcon (); Prj_PutWarningIcon ();
/***** Revision text *****/ /***** Revision text *****/
if (PutForm) if (PutForm)
{ {
/* Show text form */ /* Show text form */
HTM_BR (); HTM_BR ();
HTM_TEXTAREA_Begin ("name=\"ReviewTxt\" rows=\"1\"" HTM_TEXTAREA_Begin ("name=\"ReviewTxt\" rows=\"1\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"" " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
" placeholder=\"%s&hellip;\"" " placeholder=\"%s&hellip;\""
" onchange=\"this.form.submit();return false;\"", " onchange=\"unhideElement('prj_rev_%ld');return false;\"",
The_GetSuffix (), The_GetSuffix (),Txt_Comments,
Txt_Comments); Projects->Prj.PrjCod);
HTM_Txt (Projects->Prj.Review.Txt); HTM_Txt (Projects->Prj.Review.Txt);
HTM_TEXTAREA_End (); HTM_TEXTAREA_End ();
}
else if (Projects->Prj.Review.Status != Prj_UNREVIEWED &&
Projects->Prj.Review.Txt[0])
{
/* Change text format */
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Projects->Prj.Review.Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
switch (Projects->View)
{
case Prj_PRINT_ONE_PROJECT:
break;
default:
ALn_InsertLinks (Projects->Prj.Review.Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
break;
}
/* Show text */ /* Button to save changes.
HTM_BR (); Initially hidden, is shown when clicking on selector or text */
HTM_Txt (Projects->Prj.Review.Txt); HTM_DIV_Begin ("id=\"prj_rev_%ld\" style=\"display:none;\"",
} Projects->Prj.PrjCod);
} Btn_PutConfirmButtonInline (Txt_Save_changes);
HTM_DIV_End ();
/****** End form *****/ /* End form */
if (PutForm)
Frm_EndForm (); Frm_EndForm ();
}
else if (Projects->Prj.Review.Txt[0])
{
/* Change text format */
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Projects->Prj.Review.Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
switch (Projects->View)
{
case Prj_PRINT_ONE_PROJECT:
break;
default:
ALn_InsertLinks (Projects->Prj.Review.Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
break;
}
/* Show text */
HTM_BR ();
HTM_Txt (Projects->Prj.Review.Txt);
}
HTM_TD_End (); HTM_TD_End ();
@ -1770,10 +1776,11 @@ static void Prj_PutSelectorReviewStatus (struct Prj_Projects *Projects)
unsigned ReviewStatusUnsigned; unsigned ReviewStatusUnsigned;
/* Selector for review status */ /* Selector for review status */
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"ReviewStatus\" name=\"ReviewStatus\"" "id=\"ReviewStatus\" name=\"ReviewStatus\""
" class=\"INPUT_%s\"", " class=\"INPUT_%s\""
The_GetSuffix ()); " onchange=\"unhideElement('prj_rev_%ld');return false;\"",
The_GetSuffix (),Projects->Prj.PrjCod);
for (ReviewStatus = (Prj_ReviewStatus_t) 0; for (ReviewStatus = (Prj_ReviewStatus_t) 0;
ReviewStatus <= (Prj_ReviewStatus_t) (Prj_NUM_REVIEW_STATUS - 1); ReviewStatus <= (Prj_ReviewStatus_t) (Prj_NUM_REVIEW_STATUS - 1);
ReviewStatus++) ReviewStatus++)