From bc6d99efb9ae9ba3759f1b4d86a5799e323fbd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 8 Jan 2019 13:13:04 +0100 Subject: [PATCH] Version 18.29 --- css/{swad18.22.css => swad18.29.css} | 1 + icon/clipboard.svg | 1 + icon/close.svg | 1 + icon/copy.svg | 1 + icon/download.svg | 1 + icon/paste.svg | 1 + icon/trash.svg | 1 + swad_account.c | 2 +- swad_alert.c | 6 +++--- swad_announcement.c | 2 +- swad_box.c | 4 ++-- swad_changelog.h | 13 +++++++++++-- swad_course.c | 2 +- swad_enrolment.c | 4 ++-- swad_file_browser.c | 24 ++++++++++++------------ swad_game.c | 4 ++-- swad_icon.c | 22 +++++++++++----------- swad_icon.h | 2 +- swad_logo.c | 2 +- swad_photo.c | 4 ++-- swad_profile.c | 2 +- swad_project.c | 2 +- swad_social.c | 8 ++++---- swad_syllabus.c | 8 ++++---- swad_zip.c | 8 ++++---- 25 files changed, 71 insertions(+), 55 deletions(-) rename css/{swad18.22.css => swad18.29.css} (99%) create mode 100644 icon/clipboard.svg create mode 100644 icon/close.svg create mode 100644 icon/copy.svg create mode 100644 icon/download.svg create mode 100644 icon/paste.svg create mode 100644 icon/trash.svg diff --git a/css/swad18.22.css b/css/swad18.29.css similarity index 99% rename from css/swad18.22.css rename to css/swad18.29.css index 2d703a7d5..5c1369cb7 100644 --- a/css/swad18.22.css +++ b/css/swad18.29.css @@ -1531,6 +1531,7 @@ a:hover /* Default ==> underlined */ /*********************************** Icons ***********************************/ .ICO20x15 {width:20px; height:15px; vertical-align:middle;} +.ICO16x16 {width:16px; height:16px; vertical-align:middle;} .ICO20x20 {width:20px; height:20px; vertical-align:middle;} .ICO25x25 {width:25px; height:25px; vertical-align:middle;} .ICO40x25 {width:40px; height:25px; vertical-align:middle;} diff --git a/icon/clipboard.svg b/icon/clipboard.svg new file mode 100644 index 000000000..e56eb0058 --- /dev/null +++ b/icon/clipboard.svg @@ -0,0 +1 @@ + diff --git a/icon/close.svg b/icon/close.svg new file mode 100644 index 000000000..58af90587 --- /dev/null +++ b/icon/close.svg @@ -0,0 +1 @@ + diff --git a/icon/copy.svg b/icon/copy.svg new file mode 100644 index 000000000..aca8c187f --- /dev/null +++ b/icon/copy.svg @@ -0,0 +1 @@ + diff --git a/icon/download.svg b/icon/download.svg new file mode 100644 index 000000000..07fb52ac1 --- /dev/null +++ b/icon/download.svg @@ -0,0 +1 @@ + diff --git a/icon/paste.svg b/icon/paste.svg new file mode 100644 index 000000000..758dcc510 --- /dev/null +++ b/icon/paste.svg @@ -0,0 +1 @@ + diff --git a/icon/trash.svg b/icon/trash.svg new file mode 100644 index 000000000..1fdb216e4 --- /dev/null +++ b/icon/trash.svg @@ -0,0 +1 @@ + diff --git a/swad_account.c b/swad_account.c index a02b63ee8..fd61b80ef 100644 --- a/swad_account.c +++ b/swad_account.c @@ -533,7 +533,7 @@ void Acc_PutLinkToRemoveMyAccount (void) if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Me.UsrDat.UsrCod)) Lay_PutContextualLink (ActReqRemMyAcc,NULL,Acc_PutParamsToRemoveMyAccount, - "remove-on64x64.png", + "trash.svg", Txt_Remove_account,NULL, NULL); } diff --git a/swad_alert.c b/swad_alert.c index 4b63a3c75..2a009ea0c 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -48,7 +48,7 @@ extern struct Globals Gbl; static const char *Ale_AlertIcons[Ale_NUM_ALERT_TYPES] = { NULL, // Ale_NONE - "copy_on16x16.gif", // Ale_CLIPBOARD + "clipboard.svg", // Ale_CLIPBOARD "info64x64.png", // Ale_INFO "success64x64.png", // Ale_SUCCESS "question64x64.gif", // Ale_QUESTION animated gif @@ -148,9 +148,9 @@ void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *Txt) fprintf (Gbl.F.Out,"
" "" - "\"%s\"" + " class=\"ICO16x16\" />" "" "
", IdAlert, diff --git a/swad_announcement.c b/swad_announcement.c index 094182611..4e6ad15a8 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -363,7 +363,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, else /***** Put form to mark announcement as seen *****/ Lay_PutContextualLink (ActAnnSee,NULL,Ann_PutParams, - "remove-on64x64.png", + "trash.svg", Txt_Do_not_show_again,Txt_Do_not_show_again, NULL); diff --git a/swad_box.c b/swad_box.c index f9e795b10..87cfe4326 100644 --- a/swad_box.c +++ b/swad_box.c @@ -163,9 +163,9 @@ static void Box_StartBoxInternal (const char *Width,const char *Title, fprintf (Gbl.F.Out,"" "
" - "\"%s\"" + " class=\"ICO16x16\" />" "
" "", IdFrame, diff --git a/swad_changelog.h b/swad_changelog.h index 761fca4e3..1b78c32e6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -365,10 +365,19 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.28.3 (2019-01-07)" -#define CSS_FILE "swad18.22.css" +#define Log_PLATFORM_VERSION "SWAD 18.29 (2019-01-07)" +#define CSS_FILE "swad18.29.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.29: Jan 07, 2019 Some new SVG icons. (239251 lines) + Copy the following icons to icon public directory: +sudo cp icon/trash.svg /var/www/html/swad/icon/ +sudo cp icon/copy.svg /var/www/html/swad/icon/ +sudo cp icon/paste.svg /var/www/html/swad/icon/ +sudo cp icon/download.svg /var/www/html/swad/icon/ +sudo cp icon/clipboard.svg /var/www/html/swad/icon/ +sudo cp icon/close.svg /var/www/html/swad/icon/ + Version 18.28.3: Jan 07, 2019 New SVG icon for search. (239242 lines) Copy the following icons to icon public directory: sudo cp icon/iconset/awesome/bell.svg /var/www/html/swad/icon/iconset/awesome/ diff --git a/swad_course.c b/swad_course.c index 7684ef90c..1a3a5c74d 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3401,7 +3401,7 @@ void Crs_PutLinkToRemoveOldCrss (void) /***** Put form to remove old courses *****/ Lay_PutContextualLink (ActReqRemOldCrs,NULL,NULL, - "remove-on64x64.png", + "trash.svg", Txt_Eliminate_old_courses,Txt_Eliminate_old_courses, NULL); } diff --git a/swad_enrolment.c b/swad_enrolment.c index 64de1ee87..c0df03c49 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -781,7 +781,7 @@ void Enr_PutLinkToRemOldUsrs (void) /***** Put form to remove old users *****/ Lay_PutContextualLink (ActReqRemOldUsr,NULL,NULL, - "remove-on64x64.png", + "trash.svg", Txt_Eliminate_old_users,Txt_Eliminate_old_users, NULL); } @@ -1863,7 +1863,7 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void) /***** Put form to remove all the students in the current course *****/ Lay_PutContextualLink (ActReqRemAllStdCrs,NULL,NULL, - "remove-on64x64.png", + "trash.svg", Txt_Remove_all_students,Txt_Remove_all_students, NULL); } diff --git a/swad_file_browser.c b/swad_file_browser.c index b0d97d433..5bc616a97 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -5877,9 +5877,9 @@ static void Brw_PutIconRemoveFile (const char PathInTree[PATH_MAX + 1], snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Remove_FILE_OR_LINK_X, FileNameToShow); - fprintf (Gbl.F.Out,"", + " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO16x16\" />", Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); @@ -5912,9 +5912,9 @@ static void Brw_PutIconRemoveDir (const char PathInTree[PATH_MAX + 1], snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Remove_folder_X, FileNameToShow); - fprintf (Gbl.F.Out,"", + " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO16x16\" />", Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); @@ -5945,9 +5945,9 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1], snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Copy_FOLDER_FILE_OR_LINK_X, FileNameToShow); - fprintf (Gbl.F.Out,"", + " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO16x16\" />", Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); @@ -5975,9 +5975,9 @@ static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1], snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Paste_in_X, FileNameToShow); - fprintf (Gbl.F.Out,"", + " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO16x16\" />", Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); @@ -5994,9 +5994,9 @@ static void Brw_PutIconPasteOff (void) extern const char *Txt_Copy_not_allowed; fprintf (Gbl.F.Out,"" - "\"%s\"" + " class=\"CONTEXT_OPT ICO_HIDDEN ICO16x16\" />" "", Gbl.RowEvenOdd,Gbl.Prefs.IconsURL, Txt_Copy_not_allowed, @@ -10467,7 +10467,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, FileNameToShow); Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName); fprintf (Gbl.F.Out," %s " - "\"%s\"" "", @@ -12586,7 +12586,7 @@ static void Brw_PutLinkToAskRemOldFiles (void) Lay_PutContextualLink (ActReqRemOldBrf,NULL, Brw_PutHiddenParamFullTreeIfSelected, - "remove-on64x64.png", + "trash.svg", Txt_Remove_old_files,Txt_Remove_old_files, NULL); } diff --git a/swad_game.c b/swad_game.c index 77772b60f..ac1436c69 100644 --- a/swad_game.c +++ b/swad_game.c @@ -2909,7 +2909,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Game *Game, NULL); } else - Ico_PutIcon ("up_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("up_off16x16.gif",Txt_Movement_not_allowed); /* Put icon to move down the question */ if (NumQst + 1 < NumQsts) @@ -2923,7 +2923,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Game *Game, NULL); } else - Ico_PutIcon ("down_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("down_off16x16.gif",Txt_Movement_not_allowed); /* Put icon to edit the question */ Gbl.Test.QstCod = QstCod; diff --git a/swad_icon.c b/swad_icon.c index adc27e3f8..0606485d4 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -186,7 +186,7 @@ void Ico_PutContextualIconToRemove (Act_Action_t NextAction,void (*FuncParams) ( extern const char *Txt_Remove; Lay_PutContextualLink (NextAction,NULL,FuncParams, - "remove-on64x64.png", + "trash.svg", Txt_Remove,NULL, NULL); } @@ -262,18 +262,20 @@ void Ico_PutIconLink (const char *Icon,const char *Title,const char *Text, if (Text) Ico_PutIconWithText (Icon,Title,Text); else - Ico_PutIcon (Icon,Title); + fprintf (Gbl.F.Out,"\"%s\"", + Gbl.Prefs.IconsURL,Icon,Title,Title); fprintf (Gbl.F.Out,""); } /*****************************************************************************/ -/********************** Put a icon to submit a form **************************/ +/********************** Put an inactive/disabled icon ************************/ /*****************************************************************************/ -void Ico_PutIcon (const char *Icon,const char *Alt) +void Ico_PutIconOff (const char *Icon,const char *Alt) { fprintf (Gbl.F.Out,"\"%s\"", + " class=\"CONTEXT_OPT ICO_HIDDEN ICO16x16\" />", Gbl.Prefs.IconsURL,Icon,Alt,Alt); } @@ -286,7 +288,7 @@ void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text) /***** Print icon and optional text *****/ fprintf (Gbl.F.Out,"
" "\"%s\"", + " class=\"ICO16x16\" />", Gbl.Prefs.IconsURL,Icon,Alt,Text ? Text : Alt); if (Text) @@ -346,7 +348,7 @@ void Ico_PutIconRemovalNotAllowed (void) { extern const char *Txt_Removal_not_allowed; - Ico_PutIcon ("remove-off64x64.png",Txt_Removal_not_allowed); + Ico_PutIconOff ("trash.svg",Txt_Removal_not_allowed); } /*****************************************************************************/ @@ -357,11 +359,9 @@ void Ico_PutIconRemove (void) { extern const char *Txt_Remove; - fprintf (Gbl.F.Out,"
" - "" - "
", + " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO16x16\" />", Gbl.Prefs.IconsURL, Txt_Remove, Txt_Remove); diff --git a/swad_icon.h b/swad_icon.h index a53562e0d..a973f136b 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -63,7 +63,7 @@ void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) () void Ico_PutIconLink (const char *Icon,const char *Title,const char *Text, const char *LinkStyle,const char *OnSubmit); -void Ico_PutIcon (const char *Icon,const char *Alt); +void Ico_PutIconOff (const char *Icon,const char *Alt); void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text); void Ico_PutCalculateIcon (const char *Alt); diff --git a/swad_logo.c b/swad_logo.c index a8e8f090c..dc5ea1bb7 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -280,7 +280,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) /***** Form to remove photo *****/ fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActionRem,NULL,NULL, - "remove-on64x64.png", + "trash.svg", Txt_Remove_logo,Txt_Remove_logo, NULL); fprintf (Gbl.F.Out,"
"); diff --git a/swad_photo.c b/swad_photo.c index cd39f41db..4fbe93568 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -224,7 +224,7 @@ static void Pho_PutIconToRequestRemoveMyPhoto (void) /***** Link to request the removal of my photo *****/ if (Gbl.Usrs.Me.MyPhotoExists) Lay_PutContextualLink (ActReqRemMyPho,NULL,NULL, - "remove-on64x64.png", + "trash.svg", Txt_Remove_photo,NULL, NULL); } @@ -259,7 +259,7 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void) } Lay_PutContextualLink (NextAction,NULL, Usr_PutParamOtherUsrCodEncrypted, - "remove-on64x64.png", + "trash.svg", Txt_Remove_photo,NULL, NULL); } diff --git a/swad_profile.c b/swad_profile.c index eaea5dced..53cdfba35 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -513,7 +513,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Number of file views *****/ fprintf (Gbl.F.Out,"
  • ", + " style=\"background-image:url('%s/download.svg');\">", Txt_Downloads, Gbl.Prefs.IconsURL); if (UsrFigures.NumFileViews >= 0) diff --git a/swad_project.c b/swad_project.c index 7be325db2..90ad58490 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1680,7 +1680,7 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj, { fprintf (Gbl.F.Out,""); Lay_PutContextualLink (ActionReqRemUsr[RoleInProject],NULL,Prj_PutCurrentParams, - "remove-on64x64.png", + "trash.svg", Txt_Remove,NULL, NULL); fprintf (Gbl.F.Out,""); diff --git a/swad_social.c b/swad_social.c index f738789ff..6b7ff1da9 100644 --- a/swad_social.c +++ b/swad_social.c @@ -2674,9 +2674,9 @@ static void Soc_PutFormToRemoveComment (long PubCod) Soc_PutHiddenParamPubCod (PubCod); fprintf (Gbl.F.Out,"
    " "" + " class=\"ICO16x16\" />" "
    ", Gbl.Prefs.IconsURL, Txt_Remove, @@ -2890,9 +2890,9 @@ static void Soc_PutFormToRemoveSocialPublishing (long NotCod) Soc_PutHiddenParamNotCod (NotCod); fprintf (Gbl.F.Out,"
    " "" + " class=\"ICO16x16\" />" "
    ", Gbl.Prefs.IconsURL, Txt_Remove, diff --git a/swad_syllabus.c b/swad_syllabus.c index b249ddb4e..4ccbad030 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -636,7 +636,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, NULL); } else - Ico_PutIcon ("up_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("up_off16x16.gif",Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to get down item *****/ @@ -656,7 +656,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, NULL); } else - Ico_PutIcon ("down_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("down_off16x16.gif",Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to increase the level of an item *****/ @@ -674,7 +674,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, NULL); } else - Ico_PutIcon ("left_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("left_off16x16.gif",Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to decrease level item *****/ @@ -693,7 +693,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, NULL); } else - Ico_PutIcon ("right_off16x16.gif",Txt_Movement_not_allowed); + Ico_PutIconOff ("right_off16x16.gif",Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); LastLevel = Level; diff --git a/swad_zip.c b/swad_zip.c index 84f3afd0e..036ffcad8 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -126,7 +126,7 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void) Lay_PutContextualLink (ActAdmAsgWrkCrs,NULL, ZIP_PutLinkToCreateZIPAsgWrkParams, - "download64x64.png", + "download.svg", Txt_Create_ZIP_file,Txt_Create_ZIP_file, NULL); } @@ -383,9 +383,9 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil PathInTree,FileName, Brw_IS_FOLDER,-1L); Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[Gbl.Prefs.Theme],NULL); - fprintf (Gbl.F.Out,"\"%s\"" + " class=\"ICO16x16\" />" "", Gbl.Prefs.IconsURL, Txt_Create_ZIP_file, @@ -645,7 +645,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, " alt=\"%s\" title=\"%s\"" " class=\"ICO40x40\" />" " %s " - "\"%s\"" ""