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 16.202.1

This commit is contained in:
Antonio Cañas Vargas 2017-05-02 16:57:49 +02:00
parent 3e8d484789
commit b8b92a5ca8
13 changed files with 158 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad16.201.css → css/swad16.202.css
View File

@ -1505,10 +1505,8 @@ a:hover /* Default ==> underlined */
}
.ALERT_TXT
{
box-sizing:border-box;
margin:0 auto;
padding:12px 12px 12px 45px;
background-position:12px 12px;
padding:8px 8px 8px 40px;
background-position:8px 8px;
background-size:20px 20px;
background-repeat:no-repeat;
font-size:12pt;

BIN
icon/warning64x64.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 687 B

14
swad_action.c
View File

@ -2845,14 +2845,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActUnbUsrMsg */{1016,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenShowingMsgs ,NULL},
/* ActUnbUsrLst */{1018,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenListingUsrs ,NULL},
// TabAna ******************************************************************
// TabSta ******************************************************************
// Actions in menu:
/* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" },
/* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" },
/* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" },
/* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" },
/* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" },
/* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
/* ActReqUseGbl */{ 761, 0,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" },
/* ActSeePhoDeg */{ 447, 1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" },
/* ActReqStaCrs */{ 767, 2,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" },
/* ActReqAccGbl */{ 591, 3,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" },
/* ActReqMyUsgRep */{1586, 4,TabSta,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" },
/* ActMFUAct */{ 993, 5,TabSta,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
// Actions not in menu:
/* ActSeeUseGbl */{ 84,-1,TabUnk,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ShowFigures ,NULL},

13
swad_changelog.h
View File

@ -220,13 +220,22 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.201.5 (2017-05-02)"
#define CSS_FILE "swad16.201.css"
#define Log_PLATFORM_VERSION "SWAD 16.202.1 (2017-05-02)"
#define CSS_FILE "swad16.202.css"
#define JS_FILE "swad16.181.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 16.202.1: May 02, 2017 Changed help on surveys from STATS to ASSESSMENT. (218296 lines)
Version 16.202: May 02, 2017 Changes in layout of alerts. (218295 lines)
Copy the following icons to icon public directory:
sudo cp -a icon/info64x64.png /var/www/html/swad/icon/
sudo cp -a icon/success64x64.png /var/www/html/swad/icon/
sudo cp -a icon/question64x64.gif /var/www/html/swad/icon/
sudo cp -a icon/warning64x64.gif /var/www/html/swad/icon/
sudo cp -a icon/error64x64.gif /var/www/html/swad/icon/
Version 16.201.5: May 02, 2017 Changes in layout of assignment print view. (218270 lines)
Version 16.201.4: May 02, 2017 Icon to view course info when editing source of information. (218243 lines)
Version 16.201.3: May 02, 2017 Code refactoring in forums. (218237 lines)

6
swad_course.c
View File

@ -467,12 +467,12 @@ static void Crs_Configuration (bool PrintView)
Indicators.NumIndicators,Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
Act_LinkFormSubmit (Gbl.Title,"DAT",NULL);
fprintf (Gbl.F.Out,"%s "
"<img src=\"%s/%s16x16.gif\" alt=\"%s\""
"<img src=\"%s/%s\" alt=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Title,
Gbl.Prefs.IconsURL,
(Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green" :
"warning",
(Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green16x16.gif" :
"warning64x64.png",
Gbl.Title);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"

168
swad_help_URL.c
View File

@ -1009,6 +1009,90 @@ const char *Hlp_ASSESSMENT_Tests_test_results =
"ASSESSMENT.Tests.en#test-results";
#endif
const char *Hlp_ASSESSMENT_Surveys =
#if L==1
"ASSESSMENT.Surveys.es";
#elif L==2
"ASSESSMENT.Surveys.en";
#elif L==3
"ASSESSMENT.Surveys.en";
#elif L==4
"ASSESSMENT.Surveys.es";
#elif L==5
"ASSESSMENT.Surveys.en";
#elif L==6
"ASSESSMENT.Surveys.es";
#elif L==7
"ASSESSMENT.Surveys.en";
#elif L==8
"ASSESSMENT.Surveys.en";
#elif L==9
"ASSESSMENT.Surveys.en";
#endif
const char *Hlp_ASSESSMENT_Surveys_new_survey =
#if L==1
"ASSESSMENT.Surveys.es#nueva-encuesta";
#elif L==2
"ASSESSMENT.Surveys.en#new-survey";
#elif L==3
"ASSESSMENT.Surveys.en#new-survey";
#elif L==4
"ASSESSMENT.Surveys.es#nueva-encuesta";
#elif L==5
"ASSESSMENT.Surveys.en#new-survey";
#elif L==6
"ASSESSMENT.Surveys.es#nueva-encuesta";
#elif L==7
"ASSESSMENT.Surveys.en#new-survey";
#elif L==8
"ASSESSMENT.Surveys.en#new-survey";
#elif L==9
"ASSESSMENT.Surveys.en#new-survey";
#endif
const char *Hlp_ASSESSMENT_Surveys_edit_survey =
#if L==1
"ASSESSMENT.Surveys.es#editar-encuesta";
#elif L==2
"ASSESSMENT.Surveys.en#edit-survey";
#elif L==3
"ASSESSMENT.Surveys.en#edit-survey";
#elif L==4
"ASSESSMENT.Surveys.es#editar-encuesta";
#elif L==5
"ASSESSMENT.Surveys.en#edit-survey";
#elif L==6
"ASSESSMENT.Surveys.es#editar-encuesta";
#elif L==7
"ASSESSMENT.Surveys.en#edit-survey";
#elif L==8
"ASSESSMENT.Surveys.en#edit-survey";
#elif L==9
"ASSESSMENT.Surveys.en#edit-survey";
#endif
const char *Hlp_ASSESSMENT_Surveys_questions =
#if L==1
"ASSESSMENT.Surveys.es#preguntas";
#elif L==2
"ASSESSMENT.Surveys.en#questions";
#elif L==3
"ASSESSMENT.Surveys.en#questions";
#elif L==4
"ASSESSMENT.Surveys.es#preguntas";
#elif L==5
"ASSESSMENT.Surveys.en#questions";
#elif L==6
"ASSESSMENT.Surveys.es#preguntas";
#elif L==7
"ASSESSMENT.Surveys.en#questions";
#elif L==8
"ASSESSMENT.Surveys.en#questions";
#elif L==9
"ASSESSMENT.Surveys.en#questions";
#endif
const char *Hlp_ASSESSMENT_Announcements =
#if L==1
"ASSESSMENT.Announcements.es";
@ -2090,90 +2174,6 @@ const char *Hlp_MESSAGES_Email =
/***** STATS tab *****/
const char *Hlp_STATS_Surveys =
#if L==1
"STATS.Surveys.es";
#elif L==2
"STATS.Surveys.en";
#elif L==3
"STATS.Surveys.en";
#elif L==4
"STATS.Surveys.es";
#elif L==5
"STATS.Surveys.en";
#elif L==6
"STATS.Surveys.es";
#elif L==7
"STATS.Surveys.en";
#elif L==8
"STATS.Surveys.en";
#elif L==9
"STATS.Surveys.en";
#endif
const char *Hlp_STATS_Surveys_new_survey =
#if L==1
"STATS.Surveys.es#nueva-encuesta";
#elif L==2
"STATS.Surveys.en#new-survey";
#elif L==3
"STATS.Surveys.en#new-survey";
#elif L==4
"STATS.Surveys.es#nueva-encuesta";
#elif L==5
"STATS.Surveys.en#new-survey";
#elif L==6
"STATS.Surveys.es#nueva-encuesta";
#elif L==7
"STATS.Surveys.en#new-survey";
#elif L==8
"STATS.Surveys.en#new-survey";
#elif L==9
"STATS.Surveys.en#new-survey";
#endif
const char *Hlp_STATS_Surveys_edit_survey =
#if L==1
"STATS.Surveys.es#editar-encuesta";
#elif L==2
"STATS.Surveys.en#edit-survey";
#elif L==3
"STATS.Surveys.en#edit-survey";
#elif L==4
"STATS.Surveys.es#editar-encuesta";
#elif L==5
"STATS.Surveys.en#edit-survey";
#elif L==6
"STATS.Surveys.es#editar-encuesta";
#elif L==7
"STATS.Surveys.en#edit-survey";
#elif L==8
"STATS.Surveys.en#edit-survey";
#elif L==9
"STATS.Surveys.en#edit-survey";
#endif
const char *Hlp_STATS_Surveys_questions =
#if L==1
"STATS.Surveys.es#preguntas";
#elif L==2
"STATS.Surveys.en#questions";
#elif L==3
"STATS.Surveys.en#questions";
#elif L==4
"STATS.Surveys.es#preguntas";
#elif L==5
"STATS.Surveys.en#questions";
#elif L==6
"STATS.Surveys.es#preguntas";
#elif L==7
"STATS.Surveys.en#questions";
#elif L==8
"STATS.Surveys.en#questions";
#elif L==9
"STATS.Surveys.en#questions";
#endif
const char *Hlp_STATS_Figures =
#if L==1
"STATS.Figures.es";

3
swad_indicator.c
View File

@ -591,7 +591,7 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
const char *ClassHighlight = "DAT RIGHT_MIDDLE LIGHT_BLUE";
/***** Write number of courses with each number of indicators valid *****/
Lay_StartTableCenter (2);
Lay_StartTable (2);
fprintf (Gbl.F.Out,"<tr>");
if (PutForm)
@ -699,7 +699,6 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
extern const char *Txt_YES;
extern const char *Txt_NO;
extern const char *Txt_INFO_SRC_SHORT_TEXT[Inf_NUM_INFO_SOURCES];
extern const char *Txt_No_of_indicators;
extern const char *Txt_Courses;
MYSQL_ROW row;
unsigned NumCrs;

12
swad_layout.c
View File

@ -67,11 +67,11 @@ extern struct Globals Gbl;
static const char *Lay_AlertIcons[Lay_NUM_ALERT_TYPES] =
{
"info16x16.gif",
"success16x16.gif",
"question16x16.gif",
"warning16x16.gif",
"error16x16.gif",
"info64x64.png",
"success64x64.png",
"question64x64.gif", // animated
"warning64x64.gif", // animated
"error64x64.gif", // animated
"copy_on16x16.gif",
};
@ -1693,7 +1693,7 @@ void Lay_ShowAlertAndButton1 (Lay_AlertType_t AlertType,const char *Message)
/***** Write message *****/
fprintf (Gbl.F.Out,"<div class=\"ALERT_TXT\""
" style=\"background-image:url('%s/%s');\">",
" style=\"background-image:url('%s/%s'); background-size:20px 20px;\">",
Gbl.Prefs.IconsURL,Lay_AlertIcons[AlertType]);
if (Message)
fprintf (Gbl.F.Out,"%s",Message);

2
swad_menu.c
View File

@ -248,7 +248,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
0, // 10
0, // 11
},
// TabAna *******************
// TabSta *******************
{
ActReqUseGbl, // 0
ActSeePhoDeg, // 1

24
swad_survey.c
View File

@ -181,7 +181,7 @@ void Svy_SeeAllSurveys (void)
static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
{
extern const char *Hlp_STATS_Surveys;
extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *Txt_Surveys;
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@ -213,7 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Surveys,
Svy_PutIconsListSurveys,Hlp_STATS_Surveys);
Svy_PutIconsListSurveys,Hlp_ASSESSMENT_Surveys);
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -410,7 +410,7 @@ void Svy_SeeOneSurvey (void)
static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
bool ShowOnlyThisSvyComplete)
{
extern const char *Hlp_STATS_Surveys;
extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *Txt_Survey;
extern const char *Txt_Today;
extern const char *Txt_View_survey;
@ -431,7 +431,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Start frame *****/
if (ShowOnlyThisSvyComplete)
Lay_StartRoundFrame (NULL,Txt_Survey,NULL,Hlp_STATS_Surveys);
Lay_StartRoundFrame (NULL,Txt_Survey,NULL,Hlp_ASSESSMENT_Surveys);
/***** Get data of this survey *****/
Svy.SvyCod = SvyCod;
@ -1732,8 +1732,8 @@ static bool Svy_CheckIfSimilarSurveyExists (struct Survey *Svy)
void Svy_RequestCreatOrEditSvy (void)
{
extern const char *Hlp_STATS_Surveys_new_survey;
extern const char *Hlp_STATS_Surveys_edit_survey;
extern const char *Hlp_ASSESSMENT_Surveys_new_survey;
extern const char *Hlp_ASSESSMENT_Surveys_edit_survey;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
@ -1801,8 +1801,8 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,ItsANewSurvey ? Txt_New_survey :
Txt_Edit_survey,
NULL,ItsANewSurvey ? Hlp_STATS_Surveys_new_survey :
Hlp_STATS_Surveys_edit_survey,
NULL,ItsANewSurvey ? Hlp_ASSESSMENT_Surveys_new_survey :
Hlp_ASSESSMENT_Surveys_edit_survey,
2);
/***** Scope of the survey *****/
@ -2564,7 +2564,7 @@ void Svy_RequestEditQuestion (void)
static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
char Txt[Cns_MAX_BYTES_TEXT + 1])
{
extern const char *Hlp_STATS_Surveys_questions;
extern const char *Hlp_ASSESSMENT_Surveys_questions;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Question;
extern const char *Txt_New_question;
@ -2641,7 +2641,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
}
else
Lay_StartRoundFrame (NULL,Txt_New_question,
NULL,Hlp_STATS_Surveys_questions);
NULL,Hlp_ASSESSMENT_Surveys_questions);
/***** Start form *****/
Act_FormStart (ActRcvSvyQst);
@ -3129,7 +3129,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod)
static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst)
{
extern const char *Hlp_STATS_Surveys_questions;
extern const char *Hlp_ASSESSMENT_Surveys_questions;
extern const char *Txt_Questions;
extern const char *Txt_No_INDEX;
extern const char *Txt_Type;
@ -3159,7 +3159,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Lay_StartRoundFrame (NULL,Txt_Questions,
Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion :
NULL,
Hlp_STATS_Surveys_questions);
Hlp_ASSESSMENT_Surveys_questions);
if (NumQsts)
{

2
swad_tab.c
View File

@ -53,7 +53,7 @@ const char *Tab_TabIcons[Tab_NUM_TABS] =
/* TabUsr */ "usr64x64.gif",
/* TabSoc */ "soc64x64.png",
/* TabMsg */ "msg64x64.gif",
/* TabAna */ "sta64x64.gif",
/* TabSta */ "sta64x64.gif",
/* TabPrf */ "prf64x64.gif",
};

2
swad_tab.h
View File

@ -51,7 +51,7 @@ typedef enum
TabUsr = 9,
TabSoc = 10,
TabMsg = 11,
TabAna = 12,
TabSta = 12,
TabPrf = 13,
} Tab_Tab_t;

37
swad_text.c
View File

@ -19441,7 +19441,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
NULL, // 11
},
{
// TabAna **********************************************************************
// TabSta **********************************************************************
// 0: ActReqUseGbl
#if L==1
"Xifres"
@ -21407,7 +21407,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
NULL, // 11
},
{
// TabAna *****************************************************
// TabSta *****************************************************
// 0: ActReqUseGbl
#if L==1
"Grans nombres sobre l'&uacute;s actual de tota la plataforma,"
@ -40860,26 +40860,47 @@ const char *Txt_TABS_TXT[Tab_NUM_TABS] =
"Mensagens"
#endif
,
// TabAna
// TabSta
#if L==1
"An&agrave;lisis"
"Estad&iacute;stiques"
#elif L==2
"Statistik"
#elif L==3
"Statistics"
#elif L==4
"Estad&iacute;sticas"
#elif L==5
"Statistiques"
#elif L==6
"Papy'aporeko"
#elif L==7
"Statistiche"
#elif L==8
"Statystyki"
#elif L==9
"Estat&iacute;sticas"
#endif
/*
#if L==1
"Anal&iacute;tiques"
#elif L==2
"Analytik"
#elif L==3
"Analytics"
#elif L==4
"An&aacute;lisis"
"Anal&iacute;ticas"
#elif L==5
"Analyse"
"Analytiques"
#elif L==6
"&Ntilde;ehesa'&yuml;ijo"
#elif L==7
"Analisi"
"Analitiche"
#elif L==8
"Analizy"
#elif L==9
"An&aacute;lise"
"An&aacute;lises"
#endif
*/
,
// TabPrf
#if L==1