mirror of https://github.com/acanas/swad-core.git
Version 15.165.3
This commit is contained in:
parent
b387377072
commit
98968229d7
|
@ -2028,7 +2028,7 @@ void Ctr_RequestPhoto (void)
|
|||
|
||||
/***** Upload photo *****/
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"file\" name=\"%s\""
|
||||
" size=\"40\" maxlength=\"100\" value=\"\""
|
||||
|
|
|
@ -137,13 +137,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.165.2 (2016-03-29)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.165.3 (2016-03-29)"
|
||||
#define CSS_FILE "swad15.165.css"
|
||||
#define JS_FILE "swad15.131.3.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 15.165.3: Mar 29, 2016 Changes in form to upload user's photo. (196811 lines)
|
||||
Version 15.165.2: Mar 29, 2016 Changes in forms to upload logos. (196805 lines)
|
||||
Version 15.165.1: Mar 29, 2016 Changes in form to upload photo of centre. (196803 lines)
|
||||
Version 15.165: Mar 28, 2016 Use ImageMagick 'convert' after uploading an image of a centre. (196805 lines)
|
||||
|
|
|
@ -323,7 +323,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
|
|||
/***** Form to request user's ID, @nickname or e-mail address *****/
|
||||
Act_FormStart (NextAction);
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"text\" name=\"OtherUsrIDNickOrEMail\""
|
||||
" size=\"20\" maxlength=\"%u\" />",
|
||||
|
@ -834,7 +834,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
|
|||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
||||
"<tr>"
|
||||
"<td class=\"%s RIGHT_TOP\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</td>"
|
||||
"<td class=\"LEFT_TOP\">"
|
||||
"<textarea name=\"UsrsIDs\" cols=\"72\" rows=\"10\">",
|
||||
|
|
|
@ -7856,7 +7856,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
|
|||
|
||||
/***** Folder *****/
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"text\" name=\"NewFolderName\""
|
||||
" size=\"32\" maxlength=\"40\" value=\"\" />",
|
||||
|
@ -8095,7 +8095,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
|
|||
fprintf (Gbl.F.Out,"<table>"
|
||||
"<tr>"
|
||||
"<td class=\"RIGHT_MIDDLE\">"
|
||||
"<label class=\"%s\">%s: </label>"
|
||||
"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td class=\"LEFT_MIDDLE\">"
|
||||
"<input type=\"text\" name=\"NewLinkURL\""
|
||||
|
|
|
@ -1760,11 +1760,11 @@ static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const ch
|
|||
extern const char *Txt_Equation_centered;
|
||||
|
||||
fprintf (Gbl.F.Out,"<div class=\"HELP_EDIT\">"
|
||||
"%s: %s"
|
||||
"%s: %s"
|
||||
" "
|
||||
"%s: <code>%s</code>"
|
||||
"%s: <code>%s</code>"
|
||||
" "
|
||||
"%s: <code>%s</code>"
|
||||
"%s: <code>%s</code>"
|
||||
"</div>",
|
||||
Txt_Text,Text,
|
||||
Txt_Inline_math,InlineMath,
|
||||
|
|
|
@ -294,7 +294,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
|
|||
|
||||
/***** Upload logo *****/
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"file\" name=\"%s\""
|
||||
" size=\"40\" maxlength=\"100\" value=\"\""
|
||||
|
|
|
@ -2501,8 +2501,10 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
|
|||
|
||||
/***** Authors/recipients of the message *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s: "
|
||||
"<td class=\"RIGHT_MIDDLE\">"
|
||||
"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td class=\"LEFT_MIDDLE\">"
|
||||
"<input type=\"text\" name=\"FilterFromTo\""
|
||||
|
@ -2516,8 +2518,10 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
|
|||
|
||||
/***** Authors/recipients of the message *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s: "
|
||||
"<td class=\"RIGHT_MIDDLE\">"
|
||||
"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td class=\"LEFT_MIDDLE\">"
|
||||
"<input type=\"text\" name=\"FilterContent\""
|
||||
|
@ -2858,8 +2862,10 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
|
|||
"</td>");
|
||||
|
||||
/***** Write "From:" *****/
|
||||
fprintf (Gbl.F.Out,"<td class=\"MSG_TIT RIGHT_TOP\">"
|
||||
"%s: "
|
||||
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
|
||||
"<label class=\"MSG_TIT\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td colspan=\"2\" class=\"LEFT_TOP\">",
|
||||
Txt_MSG_From);
|
||||
|
@ -2869,8 +2875,10 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
|
|||
|
||||
/***** Write "To:" *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"MSG_TIT RIGHT_TOP\">"
|
||||
"%s: "
|
||||
"<td class=\"RIGHT_TOP\">"
|
||||
"<label class=\"MSG_TIT\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td colspan=\"2\" class=\"LEFT_TOP\">",
|
||||
Txt_MSG_To);
|
||||
|
@ -2880,8 +2888,10 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
|
|||
|
||||
/***** Write "Message:" *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"MSG_TIT RIGHT_TOP\">"
|
||||
"%s: "
|
||||
"<td class=\"RIGHT_TOP\">"
|
||||
"<label class=\"MSG_TIT\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"</td>"
|
||||
"<td colspan=\"2\" class=\"MSG_TXT LEFT_TOP\">",
|
||||
Txt_MSG_Message);
|
||||
|
|
|
@ -250,7 +250,7 @@ void Pwd_ShowFormSendNewPwd (void)
|
|||
|
||||
/***** User's ID/nickname *****/
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"text\" name=\"UsrId\""
|
||||
" size=\"8\" maxlength=\"%u\" value=\"%s\" />",
|
||||
|
|
24
swad_photo.c
24
swad_photo.c
|
@ -306,35 +306,29 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
|
|||
}
|
||||
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrameTable (NULL,2,Txt_Photo);
|
||||
Lay_StartRoundFrame (NULL,Txt_Photo,NULL);
|
||||
|
||||
/***** Show current photo and help message *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"2\">");
|
||||
// if (PhotoExists)
|
||||
Pho_ShowUsrPhoto (UsrDat,PhotoURL,
|
||||
"PHOTO186x248",Pho_NO_ZOOM,false);
|
||||
Lay_ShowAlert (Lay_INFO,Txt_You_can_send_a_file_with_an_image_in_jpg_format_);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
|
||||
/***** Form to upload photo *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"%s RIGHT_MIDDLE\">"
|
||||
"%s:"
|
||||
"</td>"
|
||||
"<td class=\"LEFT_MIDDLE\">"
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"file\" name=\"%s\""
|
||||
" size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
" size=\"40\" maxlength=\"100\" value=\"%ld.jpg\""
|
||||
" onchange=\"document.getElementById('%s').submit();\" />",
|
||||
The_ClassForm[Gbl.Prefs.Theme],
|
||||
Txt_File_with_the_photo,
|
||||
Fil_NAME_OF_PARAM_FILENAME_ORG,
|
||||
UsrDat->UsrCod);
|
||||
UsrDat->UsrCod,
|
||||
Gbl.Form.Id);
|
||||
|
||||
/***** End frame *****/
|
||||
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Upload_photo);
|
||||
Lay_EndRoundFrame ();
|
||||
|
||||
/***** End form *****/
|
||||
Act_FormEnd ();
|
||||
|
|
|
@ -182,7 +182,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
|
|||
|
||||
/***** Form to request user's @nickname *****/
|
||||
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||
"%s: "
|
||||
"%s: "
|
||||
"</label>"
|
||||
"<input type=\"text\" name=\"usr\""
|
||||
" size=\"20\" maxlength=\"%u\" value=\"@%s\" />",
|
||||
|
|
Loading…
Reference in New Issue