diff --git a/css/swad16.201.css b/css/swad16.202.css similarity index 99% rename from css/swad16.201.css rename to css/swad16.202.css index 40232585..2bf6e6c1 100644 --- a/css/swad16.201.css +++ b/css/swad16.202.css @@ -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; diff --git a/icon/warning64x64.gif b/icon/warning64x64.gif index 8b0c18bf..5c9238d3 100644 Binary files a/icon/warning64x64.gif and b/icon/warning64x64.gif differ diff --git a/swad_action.c b/swad_action.c index 0a7e73c1..55554997 100644 --- a/swad_action.c +++ b/swad_action.c @@ -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}, diff --git a/swad_changelog.h b/swad_changelog.h index b737cf44..91ef53f7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_course.c b/swad_course.c index f7d8ea68..d267f713 100644 --- a/swad_course.c +++ b/swad_course.c @@ -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 " - "", 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,"" diff --git a/swad_help_URL.c b/swad_help_URL.c index 6c83e15d..fbdf0c2c 100644 --- a/swad_help_URL.c +++ b/swad_help_URL.c @@ -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"; diff --git a/swad_indicator.c b/swad_indicator.c index 5d4a2427..c8f85da3 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -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,"