From a135132719eebba74d1ecbdc0bf41d8bdcdd2b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Tue, 24 Mar 2015 20:26:31 +0100
Subject: [PATCH] Version 14.102.1

---
 swad_attendance.c |  3 +--
 swad_changelog.h  |  3 ++-
 swad_enrollment.c | 12 +++++++++---
 swad_group.c      |  5 ++---
 swad_record.c     | 17 ++++++++++-------
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/swad_attendance.c b/swad_attendance.c
index 3d76f175e..1316b3b65 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -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>"
diff --git a/swad_changelog.h b/swad_changelog.h
index d92a0cfb4..1346b4c46 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -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.
diff --git a/swad_enrollment.c b/swad_enrollment.c
index 5a45b9846..6dafcb37c 100644
--- a/swad_enrollment.c
+++ b/swad_enrollment.c
@@ -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 *****/
diff --git a/swad_group.c b/swad_group.c
index 2518fc858..35ea948b3 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -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>"
diff --git a/swad_record.c b/swad_record.c
index e1940832a..8ac76054f 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -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);