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.102.1

This commit is contained in:
Antonio Cañas Vargas 2015-03-24 20:26:31 +01:00
parent b386ab9b24
commit a135132719
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_attendance.c
View File

@ -3047,8 +3047,7 @@ static void Att_ListEventsToSelect (void)
if (Gbl.CurrentAct == ActSeeLstAttStd)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" class=\"DAT\""
" style=\"text-align:center;\">");
"<td colspan=\"4\" style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance);
fprintf (Gbl.F.Out,"</td>"

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.102 (2015/03/24)"
#define Log_PLATFORM_VERSION "SWAD 14.102.1 (2015/03/24)"
// 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.102.1: Mar 24, 2015 Fixed minor bugs. (183871 lines)
Version 14.102: Mar 24, 2015 Changes in some update buttons. (183865 lines)
Version 14.101: Mar 24, 2015 Fixed bug in form to create a new account.
Fixed bug in statistics.

12
swad_enrollment.c
View File

@ -2181,10 +2181,16 @@ void Enr_ShowEnrollmentRequests (void)
}
Rol_WriteSelectorRoles (Roles);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
"</tr>"
"</table>");
/* Send button */
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update,Txt_Update);
fprintf (Gbl.F.Out,"</div>");
/* Form end */
fprintf (Gbl.F.Out,"</table>");
Lay_PutConfirmButton (Txt_Update);
Act_FormEnd ();
/***** Build query *****/

5
swad_group.c
View File

@ -276,9 +276,8 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Submit button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" class=\"%s\""
" style=\"padding-top:10px; text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
"<td colspan=\"7\" style=\"padding-top:10px;"
" text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_students_according_to_selected_groups,Txt_Update_students);
fprintf (Gbl.F.Out,"</td>"

17
swad_record.c
View File

@ -2015,6 +2015,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Unfollow;
extern const char *Txt_Follow;
extern const char *Txt_View_public_profile;
extern const char *Txt_Country;
extern const char *Txt_Email;
extern const char *Txt_Sex;
extern const char *Txt_Role;
@ -2054,14 +2055,15 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
UsrDat->RoleInCurrentCrsDB == Rol_ROLE_TEACHER);
bool CountryForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR);
bool RoleForm = (TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR);
bool RoleForm = (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
(TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR));
bool DataForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
(TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR &&
!(IAmLoggedAsTeacher && HeIsTeacherInAnyCourse))); // A teacher can not modify another teacher's data
Gbl.Usrs.Me.LoggedRole > Rol_ROLE_TEACHER));
bool PutFormLinks; // Put links (forms) inside record card
bool ShowEmail = (IAmLoggedAsDegAdm || IAmLoggedAsSysAdm || DataForm ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
@ -2486,9 +2488,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
fprintf (Gbl.F.Out,"<select name=\"OthCtyCod\" style=\"width:%upx;\">"
"<option value=\"-1\">&nbsp;</option>"
"<option value=\"-1\">%s</option>"
"<option value=\"0\"",
C2Width + C3Width - 60);
C2Width + C3Width - 60,
Txt_Country);
if (UsrDat->CtyCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%s</option>",Txt_Another_country);