From 859c0a3375574cd87448d257755c36548ae6b1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Tue, 29 Mar 2016 10:24:14 +0200
Subject: [PATCH] Version 15.165.5

---
 css/{swad15.165.css => swad15.165.5.css} | 20 ++++++----
 swad_centre.c                            |  1 +
 swad_changelog.h                         |  6 ++-
 swad_test.c                              | 47 ++++++++++++++++++------
 swad_test_import.c                       | 10 ++---
 5 files changed, 58 insertions(+), 26 deletions(-)
 rename css/{swad15.165.css => swad15.165.5.css} (99%)

diff --git a/css/swad15.165.css b/css/swad15.165.5.css
similarity index 99%
rename from css/swad15.165.css
rename to css/swad15.165.5.css
index 2d0b18f5f..0372d824b 100644
--- a/css/swad15.165.css
+++ b/css/swad15.165.5.css
@@ -1720,14 +1720,18 @@ a:hover img.CENTRE_PHOTO_SHOW
 .STATUS_RED_LIGHT	{color:#F98A8A; font-size:12pt;}
 
 /********************************** Tests ************************************/
-.ANS			{color:#404040; font-size:13pt; font-weight:bold;}
-.ANS_OK			{color:#008000; font-size:13pt; font-weight:bold;}
-.ANS_BAD		{color:red;     font-size:13pt; font-weight:bold;}
-.TEST			{color:#404040; font-size:12pt;}
-.TEST_EXA		{color:#404040; font-size:12pt;}
-.TEST_EXA_LIGHT		{color:#A0A0A0; font-size:12pt;}
-.TEST_EDI		{color:#404040; font-size:12pt;}
-.TEST_EDI_LIGHT		{color:#A0A0A0; font-size:12pt;}
+.TAG_SEL	{width:347px;}
+.TAG_TXT	{width:347px;}
+.STEM		{width:700px;}
+.ANS		{color:#404040; font-size:13pt; font-weight:bold;}
+.ANS_OK		{color:#008000; font-size:13pt; font-weight:bold;}
+.ANS_BAD	{color:red;     font-size:13pt; font-weight:bold;}
+.ANS_STR	{width:308px;}
+.TEST		{color:#404040; font-size:12pt;}
+.TEST_EXA	{color:#404040; font-size:12pt;}
+.TEST_EXA_LIGHT	{color:#A0A0A0; font-size:12pt;}
+.TEST_EDI	{color:#404040; font-size:12pt;}
+.TEST_EDI_LIGHT	{color:#A0A0A0; font-size:12pt;}
 
 /******************************* Time table **********************************/
 #timetable
diff --git a/swad_centre.c b/swad_centre.c
index 3401cd60b..995449a0f 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -29,6 +29,7 @@
 #include <stdbool.h>		// For boolean type
 #include <stdlib.h>		// For calloc
 #include <string.h>		// For string functions
+#include <sys/wait.h>		// For the macro WEXITSTATUS
 #include <unistd.h>		// For unlink
 
 #include "swad_centre.h"
diff --git a/swad_changelog.h b/swad_changelog.h
index c3e42bbc8..000eb198e 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -137,13 +137,15 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.165.3 (2016-03-29)"
-#define CSS_FILE		"swad15.165.css"
+#define Log_PLATFORM_VERSION	"SWAD 15.165.5 (2016-03-29)"
+#define CSS_FILE		"swad15.165.5.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.5: Mar 29, 2016	Changes in form to edit a test question. (196843 lines)
+        Version 15.165.4: Mar 29, 2016	Changes in form to upload XML file to import questions. (196813 lines)
         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)
diff --git a/swad_test.c b/swad_test.c
index 7dabb2bc7..ec3420c5c 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -4099,6 +4099,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
    extern const char *Txt_Tags;
    extern const char *Txt_new_tag;
    extern const char *Txt_Stem;
+   extern const char *Txt_Image;
    extern const char *Txt_Feedback;
    extern const char *Txt_Type;
    extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
@@ -4253,8 +4254,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 
    /***** Write the tags *****/
    fprintf (Gbl.F.Out,"<tr>"
-                      "<td class=\"%s RIGHT_TOP\">"
+                      "<td class=\"RIGHT_TOP\">"
+	              "<label class=\"%s\">"
                       "%s:"
+                      "</label>"
                       "</td>"
                       "<td class=\"LEFT_TOP\">"
                       "<table>",
@@ -4268,7 +4271,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
       /***** Write the tags already existing in a selector *****/
       fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
 	                 "<select id=\"SelDesc%u\" name=\"SelDesc%u\""
-	                 " style=\"width:288px;\" onchange=\"changeTxtTag('%u')\">",
+	                 " class=\"TAG_SEL\" onchange=\"changeTxtTag('%u')\">",
                NumTag,NumTag,NumTag);
       fprintf (Gbl.F.Out,"<option value=\"\">&nbsp;</option>");
       mysql_data_seek (mysql_res, 0);
@@ -4299,7 +4302,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
       /***** Input of a new tag *****/
       fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
                          "<input type=\"text\" id=\"TagTxt%u\" name=\"TagTxt%u\""
-                         " size=\"36\" maxlength=\"%u\" value=\"%s\""
+                         " class=\"TAG_TXT\" maxlength=\"%u\" value=\"%s\""
                          " onchange=\"changeSelTag('%u')\" />"
                          "</td>",
 	       NumTag,NumTag,Tst_MAX_TAG_LENGTH,Gbl.Test.TagText[NumTag],NumTag);
@@ -4315,11 +4318,13 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 
    /***** Stem *****/
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_TOP\">"
+	              "<td class=\"RIGHT_TOP\">"
+	              "<label class=\"%s\">"
 	              "%s:"
+                      "</label>"
 	              "</td>"
                       "<td class=\"LEFT_TOP\">"
-                      "<textarea name=\"Stem\" cols=\"70\" rows=\"8\">"
+                      "<textarea name=\"Stem\" class=\"STEM\" rows=\"5\">"
                       "%s"
                       "</textarea>"
                       "</td>"
@@ -4328,13 +4333,29 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
             Txt_Stem,
             Stem);
 
+   /***** Image *****/
+   if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
+      fprintf (Gbl.F.Out,"<tr>"
+			 "<td class=\"RIGHT_TOP\">"
+			 "<label class=\"%s\">"
+			 "%s:"
+                         "</label>"
+			 "</td>"
+			 "<td class=\"LEFT_TOP\">"
+			 "</td>"
+			 "</tr>",
+	       The_ClassForm[Gbl.Prefs.Theme],
+	       Txt_Image);
+
    /***** Feedback *****/
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_TOP\">"
+	              "<td class=\"RIGHT_TOP\">"
+	              "<label class=\"%s\">"
 	              "%s:"
+                      "</label>"
 	              "</td>"
                       "<td class=\"LEFT_TOP\">"
-                      "<textarea name=\"Feedback\" cols=\"70\" rows=\"8\">",
+                      "<textarea name=\"Feedback\" class=\"STEM\" rows=\"3\">",
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_Feedback);
    if (Feedback)
@@ -4346,8 +4367,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 
    /***** Type of answer *****/
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_TOP\">"
+	              "<td class=\"RIGHT_TOP\">"
+	              "<label class=\"%s\">"
 	              "%s:"
+                      "</label>"
 	              "</td>"
                       "<td class=\"%s LEFT_TOP\">",
             The_ClassForm[Gbl.Prefs.Theme],
@@ -4370,8 +4393,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
    /***** Answers *****/
    /* Integer answer */
    fprintf (Gbl.F.Out,"<tr>"
-                      "<td class=\"%s RIGHT_TOP\">"
+                      "<td class=\"RIGHT_TOP\">"
+	              "<label class=\"%s\">"
                       "%s:"
+                      "</label>"
                       "</td>"
                       "<td class=\"%s LEFT_TOP\">"
                       "%s: "
@@ -4492,7 +4517,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 
       /* Answer text */
       fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
-	                 "<textarea name=\"AnsStr%u\" cols=\"30\" rows=\"5\"",
+	                 "<textarea name=\"AnsStr%u\" class=\"ANS_STR\" rows=\"5\"",
 	       NumOpt);
       if (OptionsDisabled)
          fprintf (Gbl.F.Out," disabled=\"disabled\"");
@@ -4504,7 +4529,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 
       /* Feedback */
       fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
-	                 "<textarea name=\"FbStr%u\" cols=\"30\" rows=\"5\"",
+	                 "<textarea name=\"FbStr%u\" class=\"ANS_STR\" rows=\"5\"",
 	       NumOpt);
       if (OptionsDisabled)
          fprintf (Gbl.F.Out," disabled=\"disabled\"");
diff --git a/swad_test_import.c b/swad_test_import.c
index 008421714..b7f1069dd 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -130,7 +130,6 @@ void TsI_ShowFormImportQstsFromXML (void)
    extern const char *The_ClassForm[The_NUM_THEMES];
    extern const char *Txt_Import_questions;
    extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions;
-   extern const char *Txt_Upload_file;
    extern const char *Txt_XML_file;
 
    /***** Start frame *****/
@@ -142,14 +141,15 @@ void TsI_ShowFormImportQstsFromXML (void)
    /***** Write a form to import questions *****/
    Act_FormStart (ActImpTstQst);
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
-                      "%s:"
+                      "%s: "
                       "</label>"
                       "<input type=\"file\" name=\"%s\""
-	              " size=\"40\" maxlength=\"100\" value=\"\" />",
+	              " size=\"40\" maxlength=\"100\" value=\"\""
+                      " onchange=\"document.getElementById('%s').submit();\" />",
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_XML_file,
-            Fil_NAME_OF_PARAM_FILENAME_ORG);
-   Lay_PutCreateButton (Txt_Upload_file);
+            Fil_NAME_OF_PARAM_FILENAME_ORG,
+            Gbl.Form.Id);
    Act_FormEnd ();
 
    /***** End frame *****/