Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-29 04:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.120.7

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-07-26 10:11:55 +02:00
parent 69ce9263eb
commit 6bccbd4a78
4 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.6 (2015/07/26)"
#define Log_PLATFORM_VERSION "SWAD 14.120.7 (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.7: Jul 26, 2015 Changes in CSS of forms.
Changes in CSS of surveys. (184877 lines)
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)

8
swad_search.c
View File

@ -238,11 +238,11 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_DEG |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_DEG |
1 << Sco_SCOPE_CRS;
Gbl.Scope.Default = DefaultScope;
Sco_GetScope ();

36
swad_statistic.c
View File

@ -459,8 +459,7 @@ void Sta_AskSeeCrsAccesses (void)
/***** Type of statistic *****/
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\""
@ -486,8 +485,7 @@ void Sta_AskSeeCrsAccesses (void)
/* Listing of clicks to this course */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"%s\""
" style=\"text-align:center; vertical-align:middle;\">"
"<td colspan=\"2\" class=\"%s\">"
"<input type=\"radio\" name=\"ClickStatType\" value=\"%u\"",
The_ClassFormul[Gbl.Prefs.Theme],(unsigned) Sta_ACC_CRS_LISTING);
if (Gbl.Stat.ClicksStatType == Sta_ACC_CRS_LISTING)
@ -572,8 +570,7 @@ void Sta_AskSeeGblAccesses (void)
/***** Users' roles whose accesses we want to see *****/
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;\">"
@ -597,8 +594,7 @@ void Sta_AskSeeGblAccesses (void)
/***** Clicks made from anywhere, current centre, current degree or current course *****/
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;\">",
@ -620,8 +616,7 @@ void Sta_AskSeeGblAccesses (void)
/***** Type of statistic *****/
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\""
@ -665,8 +660,7 @@ static void Sta_WriteSelectorCountType (void)
/**** Count type *****/
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;\">"
@ -699,8 +693,7 @@ static void Sta_WriteSelectorAction (void)
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
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;\">"
@ -3614,14 +3607,14 @@ void Sta_ReqUseOfPlatform (void)
Act_FormStart (ActSeeUseGbl);
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">"
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_DEG |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_DEG |
1 << Sco_SCOPE_CRS;
Gbl.Scope.Default = Sco_SCOPE_SYS;
Sco_GetScope ();
@ -4535,7 +4528,6 @@ static void Sta_GetAndShowInstitutionsStats (void)
static void Sta_GetAndShowInssOrderedByNumCtrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions_by_number_of_centres;
extern const char *Txt_Centres;
char Query[1024];
@ -4587,7 +4579,6 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
static void Sta_GetAndShowInssOrderedByNumDegs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions_by_number_of_degrees;
extern const char *Txt_Degrees;
char Query[1024];
@ -4642,7 +4633,6 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
static void Sta_GetAndShowInssOrderedByNumCrss (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions_by_number_of_courses;
extern const char *Txt_Courses;
char Query[1024];
@ -4700,7 +4690,6 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions_by_number_of_users_in_courses;
extern const char *Txt_Users;
char Query[1024];
@ -4762,7 +4751,6 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them;
extern const char *Txt_Users;
char Query[1024];

40
swad_survey.c
View File

@ -1493,6 +1493,7 @@ static bool Svy_CheckIfSimilarSurveyExists (struct Survey *Svy)
void Svy_RequestCreatOrEditSvy (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
extern const char *Txt_Edit_survey;
@ -1586,11 +1587,11 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Scope);
if (!Svy_SetDefaultAndAllowedForEdition ())
Lay_ShowErrorAndExit ("You don't have permission to edit surveys here.");
@ -1601,14 +1602,14 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Title,
Svy_MAX_LENGTH_SURVEY_TITLE,Svy.Title);
@ -1618,14 +1619,14 @@ void Svy_RequestCreatOrEditSvy (void)
StartOrEndTime++)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Dates[StartOrEndTime]);
Dat_WriteFormDate (Gbl.Now.Date.Year-1,
Gbl.Now.Date.Year+1,
@ -1649,12 +1650,12 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey text *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"10\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewSurvey)
fprintf (Gbl.F.Out,"%s",Txt);
@ -1664,12 +1665,12 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Users' roles who can answer the survey *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (Svy.Roles);
fprintf (Gbl.F.Out,"</td>"
@ -1740,6 +1741,7 @@ static bool Svy_SetDefaultAndAllowedForEdition (void)
static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1751,11 +1753,11 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Groups);
Lay_StartRoundFrameTable ("95%",0,NULL);
@ -2441,8 +2443,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
/***** Stem *****/
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;\">"
@ -2456,14 +2457,12 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
/***** Type of answer *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Type);
fprintf (Gbl.F.Out,"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0;
AnsType < Svy_NUM_ANS_TYPES;
@ -2491,8 +2490,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
{
/* Label with the number of the answer */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%u)"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],NumAns+1);