From 45e0de303a7bd9dd7cd2cfb74e1a4839337193ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 9 Sep 2015 23:44:58 +0200 Subject: [PATCH] Version 14.128 --- css/swad_desktop.css | 5 ++++- sql/cambios.sql | 7 ++++++- swad_centre.c | 1 + swad_changelog.h | 9 ++++++++- swad_connected.c | 2 +- swad_database.c | 3 ++- swad_institution.c | 2 +- swad_network.c | 8 +++++++- 8 files changed, 30 insertions(+), 7 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 282e3f639..3e1079291 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -623,9 +623,12 @@ a:hover img.CENTRE_PHOTO_SHOW { opacity:1; } -.ICON_SCALING:hover +.ICON_SCALING { display:inline-block; + } +.ICON_SCALING:hover + { opacity:1; transform:scale(1.15,1.15); } diff --git a/sql/cambios.sql b/sql/cambios.sql index 44e1f10a7..37bce49fb 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -10602,4 +10602,9 @@ SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuf - \ No newline at end of file + + +----- 2015-09-09, swad14.128 + +ALTER TABLE usr_webs CHANGE Web Web ENUM('www','500px','delicious','deviantart','diaspora','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','orcid','paperli','pinterest','quitter','researchgate','researcherid','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL; + diff --git a/swad_centre.c b/swad_centre.c index d85ce4bce..e478d9880 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -2316,6 +2316,7 @@ unsigned Ctr_GetNumCtrsInIns (long InsCod) { char Query[128]; + /***** Get number of centres of an institution from database *****/ sprintf (Query,"SELECT COUNT(*) FROM centres" " WHERE InsCod='%ld'", diff --git a/swad_changelog.h b/swad_changelog.h index 2cd4d6bcb..fb438ab1a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.127.6 (2015/09/07)" +#define Log_PLATFORM_VERSION "SWAD 14.128 (2015/09/09)" // 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.128: Sep 06, 2015 Fixed some bugs in layout. + Two new social networks. (184269 lines) + 1 change necessary in database: +ALTER TABLE usr_webs CHANGE Web Web ENUM('www','500px','delicious','deviantart','diaspora','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','orcid','paperli','pinterest','quitter','researchgate','researcherid','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL; + + Version 14.127.7: Sep 09, 2015 Fixed some bugs in layout. + Fixed bug in information about an institution. (184258 lines) Version 14.127.6: Sep 06, 2015 Fixed some bugs in layout. (184253 lines) Version 14.127.5: Sep 06, 2015 Changes in styles. (184252 lines) Version 14.127.4: Sep 06, 2015 Changes in styles. (184245 lines) diff --git a/swad_connected.c b/swad_connected.c index b05285df5..095deb892 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -215,7 +215,7 @@ void Con_GetAndShowLastClicks (void) ActCod = Str_ConvertStrCodToLongCod (row[1]); /* Use a special color for this row depending on the action */ - ClassRow = (Act_Actions[Act_FromActCodToAction[ActCod]].BrowserWindow == Act_DOWNLD_FILE) ? "DAT_SMALL_YELLOW" : + ClassRow = (Act_Actions[Act_FromActCodToAction[ActCod]].BrowserWindow == Act_DOWNLD_FILE) ? "DAT_SMALL_YELLOW LEFT_MIDDLE" : (ActCod == Act_Actions[ActAutUsrInt].ActCod || ActCod == Act_Actions[ActAutUsrExt].ActCod) ? "DAT_SMALL_GREEN LEFT_MIDDLE" : (ActCod == Act_Actions[ActLogOut].ActCod ) ? "DAT_SMALL_RED LEFT_MIDDLE" : diff --git a/swad_database.c b/swad_database.c index dd4ae1edf..ee97d7702 100644 --- a/swad_database.c +++ b/swad_database.c @@ -2483,9 +2483,10 @@ mysql> DESCRIBE usr_webs; "'github','googleplus','googlescholar'," "'instagram'," "'linkedin'," + "'orcid'," "'paperli','pinterest'," "'quitter'," - "'researchgate'," + "'researchgate','researcherid'," "'scoopit','slideshare','storify'," "'tumblr','twitter'," "'wikipedia'," diff --git a/swad_institution.c b/swad_institution.c index 8bd71b7cb..8fad6bffc 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -352,7 +352,7 @@ static void Ins_Configuration (bool PrintView) "" "%s:" "" - "", The_ClassForm[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (200,"ins",Gbl.CurrentIns.Ins.InsCod); diff --git a/swad_network.c b/swad_network.c index 1ce2a804d..f90a6a945 100644 --- a/swad_network.c +++ b/swad_network.c @@ -43,7 +43,7 @@ extern struct Globals Gbl; /***************************** Private constants *****************************/ /*****************************************************************************/ -#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 25 +#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 27 typedef enum { Net_WWW, // Personal web page @@ -60,10 +60,12 @@ typedef enum Net_GOOGLE_SCHOLAR, Net_INSTAGRAM, Net_LINKEDIN, + Net_ORCID, Net_PAPERLI, Net_PINTEREST, Net_QUITTER, Net_RESEARCH_GATE, + Net_RESEARCHERID, Net_SCOOPIT, Net_SLIDESHARE, Net_STORIFY, @@ -89,10 +91,12 @@ const char *Net_WebsAndSocialNetworksDB[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] = "googlescholar", // Net_GOOGLE_SCHOLAR "instagram", // Net_INSTAGRAM "linkedin", // Net_LINKEDIN + "orcid", // Net_ORCID "paperli", // Net_PAPERLI "pinterest", // Net_PINTEREST "quitter", // Net_QUITTER "researchgate", // Net_RESEARCH_GATE + "researcherid", // Net_RESEARCHERID "scoopit", // Net_SCOOPIT "slideshare", // Net_SLIDESHARE "storify", // Net_STORIFY @@ -118,10 +122,12 @@ const char *Net_TitleWebsAndSocialNetworks[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] = "Google Scholar", // Net_GOOGLE_SCHOLAR "Instagram", // Net_INSTAGRAM "LinkedIn", // Net_LINKEDIN + "ORCID", // Net_ORCID "Paper.li", // Net_PAPERLI "Pinterest", // Net_PINTEREST "quitter", // Net_QUITTER "Research Gate", // Net_RESEARCH_GATE + "ResearcherID", // Net_RESEARCHERID "Scoop.it", // Net_SCOOPIT "Slideshare", // Net_SLIDESHARE "Storify", // Net_STORIFY