diff --git a/sql/swad.sql b/sql/swad.sql index 3bf59869e..5a2c1bfda 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -1189,7 +1189,7 @@ CREATE TABLE IF NOT EXISTS usr_nicknames ( -- CREATE TABLE IF NOT EXISTS usr_webs ( UsrCod INT NOT NULL, - Web ENUM('www','edmodo','facebook','flickr','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL, + Web ENUM('www','edmodo','facebook','flickr','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL, URL VARCHAR(255) NOT NULL, UNIQUE INDEX(UsrCod,Web)); -- diff --git a/swad_changelog.h b/swad_changelog.h index 5b4667168..eddc18893 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,12 +35,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.32 (2014/12/06)" +#define Log_PLATFORM_VERSION "SWAD 14.32.1 (2014/12/06)" // 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 | tail -1 /* + Version 13.32.1 :Dic 06, 2014 Added new social network. (170518 lines) + 1 change necessary in database: +ALTER TABLE usr_webs CHANGE Web Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL; + Version 14.32 :Dic 06, 2014 Changes in listing of attendance. (170509 lines) Version 14.31.1 :Dic 05, 2014 Comments are shown in list of attendances when several students are listed. (170450 lines) Version 14.31 :Dic 04, 2014 Comments are shown in list of attendances when one unique student is listed. (170353 lines) diff --git a/swad_database.c b/swad_database.c index cb28f541f..d3fd43fa6 100644 --- a/swad_database.c +++ b/swad_database.c @@ -2409,18 +2409,18 @@ mysql> DESCRIBE usr_nicknames; /***** Table usr_webs *****/ /* mysql> DESCRIBE usr_webs; -+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ -| Field | Type | Null | Key | Default | Extra | -+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ -| UsrCod | int(11) | NO | PRI | NULL | | -| Web | enum('www','delicious','edmodo','facebook','flickr','foursquare','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | | -| URL | varchar(255) | NO | | NULL | | -+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ -3 rows in set (0.01 sec) ++--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +| Field | Type | Null | Key | Default | Extra | ++--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +| UsrCod | int(11) | NO | PRI | NULL | | +| Web | enum('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | | +| URL | varchar(255) | NO | | NULL | | ++--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+ +3 rows in set (0.00 sec) */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_webs (" "UsrCod INT NOT NULL," - "Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL," + "Web ENUM('www','delicious','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') NOT NULL," "URL VARCHAR(255) NOT NULL," "UNIQUE INDEX(UsrCod,Web))"); diff --git a/swad_network.c b/swad_network.c index 1c5d04a7e..a3a450c9b 100644 --- a/swad_network.c +++ b/swad_network.c @@ -42,7 +42,7 @@ extern struct Globals Gbl; /***************************** Private constants *****************************/ /*****************************************************************************/ -#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 20 +#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 21 typedef enum { Net_WWW, // Personal web page @@ -51,6 +51,7 @@ typedef enum Net_FACEBOOK, Net_FLICKR, Net_FOURSQUARE, + Net_GITHUB, Net_GOOGLE_PLUS, Net_GOOGLE_SCHOLAR, Net_INSTAGRAM, @@ -74,7 +75,8 @@ const char *Net_WebsAndSocialNetworksDB[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] = "edmodo", // Net_EDMODO "facebook", // Net_FACEBOOK "flickr", // Net_FLICKR - "foursquare", // Net_FOURSQUARE + "foursquare", // Net_FOURSQUAREhub + "github", // Net_GITHUB "googleplus", // Net_GOOGLE_PLUS "googlescholar", // Net_GOOGLE_SCHOLAR "instagram", // Net_INSTAGRAM @@ -99,6 +101,7 @@ const char *Net_TitleWebsAndSocialNetworks[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] = "Facebook", // Net_FACEBOOK "Flickr", // Net_FLICKR "Foursquare", // Net_FOURSQUARE + "GitHub", // Net_GITHUB "Google+", // Net_GOOGLE_PLUS "Google Scholar", // Net_GOOGLE_SCHOLAR "Instagram", // Net_INSTAGRAM @@ -177,7 +180,7 @@ void Net_ShowWebsAndSocialNets (long UsrCod) /********************* Show form to edit my social networks ******************/ /*****************************************************************************/ -#define COL2_WIDTH 400 +#define Net_COL2_WIDTH 400 void Net_ShowFormMyWebsAndSocialNets (void) { @@ -223,14 +226,15 @@ void Net_ShowFormMyWebsAndSocialNets (void) fprintf (Gbl.F.Out,"" "" "\"\"" + " style=\"width:16px;height:16px;margin-right:10px;vertical-align:middle;\"" + " alt=\"\" title=\"%s\" />" "%s:" "", ClassForm, Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksDB[NumURL], Net_TitleWebsAndSocialNetworks[NumURL], Net_TitleWebsAndSocialNetworks[NumURL], - COL2_WIDTH); + Net_COL2_WIDTH); Act_FormStart (ActChgMyNet); Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL); fprintf (Gbl.F.Out,"" "" "\"\"" + " style=\"width:16px;height:16px;margin:0 2px;vertical-align:middle;\"" + " alt=\"\" title=\"%s\" />" "%s" "%u" "%.2f%%"