Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-27 02:45:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.120.6

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-07-26 01:13:38 +02:00
parent 1da00f49ad
commit 69ce9263eb
14 changed files with 46 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swad_ID.c
View File

@ -432,8 +432,7 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
{
if (NumID == 0)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td colspan=\"2\" style=\"text-align:left;"
@ -479,10 +478,6 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Gbl.Title,Gbl.Title);
}
/* Link to QR code */
// if (NumID == 0)
// QR_PutLinkToPrintMyQRCode (QR_ID);
if (NumID == UsrDat->IDs.Num - 1)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -492,8 +487,7 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
if (UsrDat->IDs.Num < ID_MAX_IDS_PER_USER)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;"

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.5 (2015/07/26)"
#define Log_PLATFORM_VERSION "SWAD 14.120.6 (2015/07/26)"
// 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 14.120.6: Jul 26, 2015 Changes in CSS of forms. (184889 lines)
Version 14.120.5: Jul 26, 2015 Changes in CSS of forms. (184924 lines)
Version 14.120.4: Jul 25, 2015 Changes in CSS of forms. (184937 lines)
Version 14.120.3: Jul 25, 2015 Changes in selectors of country, institution, centre, degree and course. (184893 lines)

4
swad_enrollment.c
View File

@ -782,6 +782,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Modify_me_in_the_course_X;
extern const char *Txt_Modify_user_in_the_course_X;
extern const char *Txt_Register_me_in_the_course_X;
@ -834,7 +835,8 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT\">");
"<ul class=\"LIST_LEFT %s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
/***** Register user in course / Modify user's data *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&

3
swad_group.c
View File

@ -251,8 +251,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Select all groups *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" class=\"%s\""
" style=\"text-align:center; vertical-align:middle;\">"
"<td colspan=\"7\" class=\"%s\">"
"<input type=\"checkbox\" id=\"AllGroups\" name=\"AllGroups\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
if (Gbl.Usrs.ClassPhoto.AllGroups)

11
swad_indicator.c
View File

@ -101,8 +101,7 @@ void Ind_ReqIndicatorsCourses (void)
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
@ -121,8 +120,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Compute stats for a type of degree */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -137,8 +135,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Compute stats for courses with teachers belonging to any department or to a particular departament? */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
@ -150,7 +147,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Show only courses with a numer of indicators */
Gbl.Stat.NumIndicators = Ind_GetParamNumIndicators ();
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"

7
swad_info.c
View File

@ -428,8 +428,7 @@ static void Inf_PutFormToForceStdsToReadInfo (Inf_InfoType_t InfoType,bool MustB
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Force_students_to_read_this_information;
fprintf (Gbl.F.Out,"<div class=\"%s\""
" style=\"text-align:center; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (Inf_ActionsChangeForceReadInfo[InfoType]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\"");
@ -1057,7 +1056,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
/***** File *****/
fprintf (Gbl.F.Out,"<table style=\"margin-left:auto; margin-right:auto;\">"
"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -1092,7 +1091,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
/***** Link *****/
fprintf (Gbl.F.Out,"<table style=\"margin-left:auto; margin-right:auto;\">"
"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"

33
swad_institution.c
View File

@ -282,8 +282,7 @@ static void Ins_Configuration (bool PrintView)
/***** Institution full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle; \">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT_N\" style=\"text-align:left;"
@ -304,8 +303,7 @@ static void Ins_Configuration (bool PrintView)
/***** Institution short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -321,8 +319,7 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -341,8 +338,7 @@ static void Ins_Configuration (bool PrintView)
/***** Shortcut to the institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -361,8 +357,7 @@ static void Ins_Configuration (bool PrintView)
{
/***** QR code with link to the institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -377,8 +372,7 @@ static void Ins_Configuration (bool PrintView)
{
/***** Number of centres *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -392,8 +386,7 @@ static void Ins_Configuration (bool PrintView)
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -407,8 +400,7 @@ static void Ins_Configuration (bool PrintView)
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -422,8 +414,7 @@ static void Ins_Configuration (bool PrintView)
/***** Number of departments *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -437,8 +428,7 @@ static void Ins_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -452,8 +442,7 @@ static void Ins_Configuration (bool PrintView)
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"

9
swad_mail.c
View File

@ -949,8 +949,7 @@ void Mai_ShowFormChangeUsrEmail (void)
{
/* The first mail is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td",
@ -965,8 +964,7 @@ void Mai_ShowFormChangeUsrEmail (void)
fprintf (Gbl.F.Out,"<tr>");
if (NumEmail == 2)
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"text-align:right;"
" vertical-align:top;\">"
" style=\"vertical-align:top;\">"
"%s:",
NumEmails - 1,
The_ClassFormul[Gbl.Prefs.Theme],
@ -1025,8 +1023,7 @@ void Mai_ShowFormChangeUsrEmail (void)
/***** Form to enter new e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",

16
swad_message.c
View File

@ -319,8 +319,7 @@ static void Msg_PutFormMsgUsrs (const char *Content)
/***** Draw lists of users with the recipients *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -439,8 +438,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Subject of new message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -471,8 +469,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Content of new message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -498,8 +495,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Content of new message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -2323,7 +2319,7 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
/***** Authors/recipients of the message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
@ -2337,7 +2333,7 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
/***** Authors/recipients of the message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"

9
swad_nickname.c
View File

@ -210,8 +210,7 @@ void Nck_ShowFormChangeUsrNickname (void)
if (NumNick == 1)
/* The first nickname is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td colspan=\"2\" style=\"text-align:left;"
@ -222,8 +221,7 @@ void Nck_ShowFormChangeUsrNickname (void)
fprintf (Gbl.F.Out,"<tr>");
if (NumNick == 2)
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"text-align:right;"
" vertical-align:top;\">"
" style=\"vertical-align:top;\">"
"%s:",
NumNicks - 1,
The_ClassFormul[Gbl.Prefs.Theme],
@ -269,8 +267,7 @@ void Nck_ShowFormChangeUsrNickname (void)
/***** Form to enter new nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",

3
swad_notice.c
View File

@ -101,8 +101,7 @@ void Not_ShowFormNotice (void)
/***** Message body *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"

5
swad_notification.c
View File

@ -594,8 +594,7 @@ static void Ntf_WriteFormAllNotifications (bool AllNotifications)
extern const char *Txt_Show_all_notifications;
/***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;"
" vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<div class=\"%s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (ActSeeNtf);
@ -1712,7 +1711,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
NotifyEvent++) // O is reserved for Ntf_EVENT_UNKNOWN
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:center;\">"

3
swad_password.c
View File

@ -687,7 +687,7 @@ void Pwd_ShowFormChgPwd (void)
/* Current password */
if (IHaveAPasswordInDB) // If I have a password in database...
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -770,7 +770,6 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
void Pwd_ShowFormOthPwd (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Changing_the_password_for_the_following_user;
extern const char *Txt_Save;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;

11
swad_photo.c
View File

@ -285,7 +285,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
/***** Form to upload photo *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -1517,8 +1517,7 @@ static void Pho_PutSelectorForTypeOfAvg (void)
Pho_AvgPhotoTypeOfAverage_t TypeOfAvg;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
@ -1587,8 +1586,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
Pho_HowComputePhotoSize_t PhoSi;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
@ -1657,8 +1655,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
Pho_HowOrderDegrees_t Order;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",