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 14.117.5

This commit is contained in:
Antonio Cañas Vargas 2015-07-21 12:40:41 +02:00
parent 023cf96e48
commit 9038a3cb7f
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/cambios.sql
View File

@ -10586,4 +10586,20 @@ SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuf
SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuffle, tst_questions.Stem,tst_questions.Feedback,tst_questions.NumHits/tst_questions.Score AS S FROM courses,tst_questions WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_questions.CrsCod AND tst_questions.AnsType='unique_choice' AND tst_questions.NumHits>'0' AND tst_questions.QstCod NOT IN (SELECT tst_question_tags.QstCod FROM courses,tst_tags,tst_question_tags WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_tags.CrsCod AND tst_tags.TagHidden='Y' AND tst_tags.TagCod=tst_question_tags.TagCod) HAVING S>='0.0' AND S<='1.0' ORDER BY RAND(NOW()) LIMIT 1;
SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuffle, tst_questions.Stem,tst_questions.Feedback,tst_questions.NumHits/tst_questions.Score AS S FROM courses,tst_questions WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_questions.CrsCod AND tst_questions.AnsType='unique_choice' AND tst_questions.NumHits>'0' AND tst_questions.QstCod NOT IN (SELECT tst_question_tags.QstCod FROM courses,tst_tags,tst_question_tags WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_tags.CrsCod AND tst_tags.TagHidden='Y' AND tst_tags.TagCod=tst_question_tags.TagCod) HAVING S>='0.0' AND S<='1.0' ORDER BY RAND(NOW()) LIMIT 1;
<form method="post" action="https://openswad.org/en" id="form_16">
<input type="hidden" name="act" value="1163" />
<div style="text-align:center;">
<div class="FRAME10">
<div class="TIT_TBL_10" style="text-align:center;">
New on OpenSWAD? Sign up
</div>
<div style="text-align:center;">
<button type="submit" class="BT_SUBMIT BT_CREATE">Create account</button>
</div>
</div>
</div>
</form>

4
swad_account.c
View File

@ -100,7 +100,7 @@ void Acc_ShowFormAccount (void)
/***** Form to send students to be enrolled / removed *****/
Act_FormStart (ActEdiPrf);
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,"Change language");
Lay_PutConfirmButton ("Change language");
Act_FormEnd ();
}
}
@ -128,7 +128,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
fprintf (Gbl.F.Out,"</div>");
/***** Form to enter some data of the new user *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActCreUsrAcc);
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
@ -177,7 +176,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Send button and form end *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.117.4 (2015/07/17)"
#define Log_PLATFORM_VERSION "SWAD 14.117.5 (2015/07/21)"
// 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.117.5: Jul 21, 2015 Fixed HTML bug in account form. (184930 lines)
Version 14.117.4: Jul 17, 2015 Fixed bug in course record, reported by Antonio Peña Freire. (184929 lines)
Version 14.117.3: Jul 17, 2015 Fixed recent bug in cache control. (184893 lines)
Version 14.117.2: Jul 16, 2015 Changes in cache control. (184893 lines)

4
swad_config.h
View File

@ -28,8 +28,8 @@
/** Uncomment one of the following installations of SWAD or create your own **/
/*****************************************************************************/
#define LOCALHOST_UBUNTU // Comment this line if not applicable
//#define OPENSWAD_ORG // Comment this line if not applicable
//#define LOCALHOST_UBUNTU // Comment this line if not applicable
#define OPENSWAD_ORG // Comment this line if not applicable
//#define SWAD_UGR_ES // Comment this line if not applicable
//#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable

6
swad_user.c
View File

@ -1380,7 +1380,7 @@ void Usr_WriteFormLogin (void)
/***** User's ID/nickname and password *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\">"
"<img src=\"%s/user16x16.gif\" title=\"%s\""
"<img src=\"%s/user16x16.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
@ -1391,7 +1391,7 @@ void Usr_WriteFormLogin (void)
"</tr>"
"<tr>"
"<td class=\"BM\">"
"<img src=\"%s/key16x16.gif\" title=\"%s\""
"<img src=\"%s/key16x16.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
@ -1401,11 +1401,13 @@ void Usr_WriteFormLogin (void)
"</tr>",
Gbl.Prefs.IconsURL,
Txt_User,
Txt_User,
Usr_MAX_LENGTH_USR_LOGIN,
Txt_nick_email_or_ID,
Gbl.Usrs.Me.UsrIdLogin,
Gbl.Prefs.IconsURL,
Txt_Password,
Txt_Password,
Pwd_MAX_LENGTH_PLAIN_PASSWORD,
Txt_password);