diff --git a/icon/500px-brands.svg b/icon/500px-brands.svg
new file mode 100644
index 000000000..592fc06ea
--- /dev/null
+++ b/icon/500px-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/delicious-brands.svg b/icon/delicious-brands.svg
new file mode 100644
index 000000000..f9f8a32f3
--- /dev/null
+++ b/icon/delicious-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/deviantart-brands.svg b/icon/deviantart-brands.svg
new file mode 100644
index 000000000..420e00dee
--- /dev/null
+++ b/icon/deviantart-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/diaspora-brands.svg b/icon/diaspora-brands.svg
new file mode 100644
index 000000000..0e62820fe
--- /dev/null
+++ b/icon/diaspora-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/edmodo64x64.png b/icon/edmodo64x64.png
new file mode 100644
index 000000000..0dd5d305f
Binary files /dev/null and b/icon/edmodo64x64.png differ
diff --git a/icon/facebook-brands.svg b/icon/facebook-brands.svg
new file mode 100644
index 000000000..e0e5de7e0
--- /dev/null
+++ b/icon/facebook-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/flickr-brands.svg b/icon/flickr-brands.svg
new file mode 100644
index 000000000..de8bfab97
--- /dev/null
+++ b/icon/flickr-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/foursquare-brands.svg b/icon/foursquare-brands.svg
new file mode 100644
index 000000000..cc6f07396
--- /dev/null
+++ b/icon/foursquare-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/github-brands.svg b/icon/github-brands.svg
new file mode 100644
index 000000000..6975073d0
--- /dev/null
+++ b/icon/github-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/gnusocial64x64.png b/icon/gnusocial64x64.png
new file mode 100644
index 000000000..e5be22c7e
Binary files /dev/null and b/icon/gnusocial64x64.png differ
diff --git a/icon/google-plus-brands.svg b/icon/google-plus-brands.svg
new file mode 100644
index 000000000..f410a71e8
--- /dev/null
+++ b/icon/google-plus-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/googlescholar.svg b/icon/googlescholar.svg
new file mode 100644
index 000000000..0dede22c7
--- /dev/null
+++ b/icon/googlescholar.svg
@@ -0,0 +1,66 @@
+
+
+
+
diff --git a/icon/identica64x64.png b/icon/identica64x64.png
new file mode 100644
index 000000000..70aef0fe5
Binary files /dev/null and b/icon/identica64x64.png differ
diff --git a/icon/instagram-brands.svg b/icon/instagram-brands.svg
new file mode 100644
index 000000000..639850ad6
--- /dev/null
+++ b/icon/instagram-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/linkedin-brands.svg b/icon/linkedin-brands.svg
new file mode 100644
index 000000000..454a7f436
--- /dev/null
+++ b/icon/linkedin-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/orcid64x64.png b/icon/orcid64x64.png
new file mode 100644
index 000000000..919863638
Binary files /dev/null and b/icon/orcid64x64.png differ
diff --git a/icon/paperli64x64.png b/icon/paperli64x64.png
new file mode 100644
index 000000000..6148f2014
Binary files /dev/null and b/icon/paperli64x64.png differ
diff --git a/icon/pinterest-brands.svg b/icon/pinterest-brands.svg
new file mode 100644
index 000000000..5821dab53
--- /dev/null
+++ b/icon/pinterest-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/researcherid64x64.png b/icon/researcherid64x64.png
new file mode 100644
index 000000000..2d82db709
Binary files /dev/null and b/icon/researcherid64x64.png differ
diff --git a/icon/researchgate-brands.svg b/icon/researchgate-brands.svg
new file mode 100644
index 000000000..640485108
--- /dev/null
+++ b/icon/researchgate-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/scoopit64x64.png b/icon/scoopit64x64.png
new file mode 100644
index 000000000..45a5f35dc
Binary files /dev/null and b/icon/scoopit64x64.png differ
diff --git a/icon/slideshare-brands.svg b/icon/slideshare-brands.svg
new file mode 100644
index 000000000..4f4d95c87
--- /dev/null
+++ b/icon/slideshare-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/stack-overflow-brands.svg b/icon/stack-overflow-brands.svg
new file mode 100644
index 000000000..88bef379f
--- /dev/null
+++ b/icon/stack-overflow-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/storify64x64.png b/icon/storify64x64.png
new file mode 100644
index 000000000..3460f3b75
Binary files /dev/null and b/icon/storify64x64.png differ
diff --git a/icon/swad64x64.png b/icon/swad64x64.png
index 0bb933d27..1e46becf6 100644
Binary files a/icon/swad64x64.png and b/icon/swad64x64.png differ
diff --git a/icon/tumblr-brands.svg b/icon/tumblr-brands.svg
new file mode 100644
index 000000000..dd94af493
--- /dev/null
+++ b/icon/tumblr-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/twitter-brands.svg b/icon/twitter-brands.svg
new file mode 100644
index 000000000..a1a0cf306
--- /dev/null
+++ b/icon/twitter-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/wikipedia-w-brands.svg b/icon/wikipedia-w-brands.svg
new file mode 100644
index 000000000..70fa98e5b
--- /dev/null
+++ b/icon/wikipedia-w-brands.svg
@@ -0,0 +1 @@
+
diff --git a/icon/youtube-brands.svg b/icon/youtube-brands.svg
new file mode 100644
index 000000000..4b41d721d
--- /dev/null
+++ b/icon/youtube-brands.svg
@@ -0,0 +1 @@
+
diff --git a/sql/swad.sql b/sql/swad.sql
index fe32542fd..28c3a1226 100644
--- a/sql/swad.sql
+++ b/sql/swad.sql
@@ -1429,7 +1429,6 @@ CREATE TABLE IF NOT EXISTS usr_webs (
'linkedin',
'orcid',
'paperli','pinterest',
- 'quitter',
'researchgate','researcherid',
'scoopit','slideshare','stackoverflow','storify',
'tumblr','twitter',
diff --git a/swad_changelog.h b/swad_changelog.h
index e6f771be1..3a628b869 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -338,7 +338,7 @@ Buenos d
// TODO: Pedro Villar Castro:
// Al asignar un TFG a alumnos, no escribir el DNI del alumno, sino escogerlo de una lista de entre los alumnos inscritos en la asignatura.
-// TODO: Cuando se muestre un usuario duplicado, que SWAD calcvule automáticamente sus cifras no calculadas sin tener que pulsar en Calcular
+// TODO: Cuando se muestre un usuario duplicado, que SWAD calcule automáticamente sus cifras no calculadas sin tener que pulsar en Calcular
// TODO: Miguel Damas Hermoso sugiere poder editar texto enriquecido (Markdown) en las preguntas de tipo test
@@ -355,12 +355,10 @@ Buenos d
// TODO: Fix bug: Al mostrar una orla con todos los profesores de SWAD, se muestran primeros los profesores y luego los no editores (repetidos algunos)
-// TODO: Chequear todos los iconos .gif y .png que restan, concretamente los de file_browser y los de redes sociales
+// TODO: Chequear todos los iconos .gif y .png que restan, concretamente los de file_browser
// TODO: Sale de vez en cuando un mensaje "Can not get information about a file or folder.", por ejemplo en el timeline.
-// TODO: Cambiar Favorito a "Me gusta"
-
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
@@ -380,10 +378,46 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
-#define Log_PLATFORM_VERSION "SWAD 18.37 (2019-02-12)"
+#define Log_PLATFORM_VERSION "SWAD 18.38 (2019-02-13)"
#define CSS_FILE "swad18.33.css"
#define JS_FILE "swad18.32.1.js"
/*
+ Version 18.38: Feb 13, 2019 New icons for social networks. (? lines)
+ 2 changes necessary in database:
+DELETE FROM usr_webs WHERE Web='quitter';
+ALTER TABLE usr_webs CHANGE Web Web ENUM('www', '500px', 'delicious', 'deviantart', 'diaspora', 'edmodo', 'facebook', 'flickr', 'foursquare', 'github', 'gnusocial', 'googleplus', 'googlescholar', 'identica', 'instagram', 'linkedin', 'orcid', 'paperli', 'pinterest', 'researchgate', 'researcherid', 'scoopit', 'slideshare', 'stackoverflow', 'storify', 'tumblr', 'twitter', 'wikipedia', 'youtube') NOT NULL;
+
+ Copy the following icons to icon public directory:
+sudo cp icon/swad64x64.png /var/www/html/swad/icon/
+sudo cp icon/500px-brands.svg /var/www/html/swad/icon/
+sudo cp icon/delicious-brands.svg /var/www/html/swad/icon/
+sudo cp icon/deviantart-brands.svg /var/www/html/swad/icon/
+sudo cp icon/diaspora-brands.svg /var/www/html/swad/icon/
+sudo cp icon/edmodo64x64.png /var/www/html/swad/icon/
+sudo cp icon/facebook-brands.svg /var/www/html/swad/icon/
+sudo cp icon/flickr-brands.svg /var/www/html/swad/icon/
+sudo cp icon/foursquare-brands.svg /var/www/html/swad/icon/
+sudo cp icon/github-brands.svg /var/www/html/swad/icon/
+sudo cp icon/gnusocial64x64.png /var/www/html/swad/icon/
+sudo cp icon/google-plus-brands.svg /var/www/html/swad/icon/
+sudo cp icon/googlescholar.svg /var/www/html/swad/icon/
+sudo cp icon/identica64x64.png /var/www/html/swad/icon/
+sudo cp icon/instagram-brands.svg /var/www/html/swad/icon/
+sudo cp icon/linkedin-brands.svg /var/www/html/swad/icon/
+sudo cp icon/orcid64x64.png /var/www/html/swad/icon/
+sudo cp icon/paperli64x64.png /var/www/html/swad/icon/
+sudo cp icon/pinterest-brands.svg /var/www/html/swad/icon/
+sudo cp icon/researchgate-brands.svg /var/www/html/swad/icon/
+sudo cp icon/researcherid64x64.png /var/www/html/swad/icon/
+sudo cp icon/scoopit64x64.png /var/www/html/swad/icon/
+sudo cp icon/slideshare-brands.svg /var/www/html/swad/icon/
+sudo cp icon/stack-overflow-brands.svg /var/www/html/swad/icon/
+sudo cp icon/storify64x64.png /var/www/html/swad/icon/
+sudo cp icon/tumblr-brands.svg /var/www/html/swad/icon/
+sudo cp icon/twitter-brands.svg /var/www/html/swad/icon/
+sudo cp icon/wikipedia-w-brands.svg /var/www/html/swad/icon/
+sudo cp icon/youtube-brands.svg /var/www/html/swad/icon/
+
Version 18.37: Feb 12, 2019 New layout for figure about folders and files. (238913 lines)
Version 18.36: Feb 12, 2019 New module swad_figure for global big figures (stats). (238839 lines)
Version 18.35.2: Feb 12, 2019 Code refactoring in hierarchy stats. (238761 lines)
diff --git a/swad_database.c b/swad_database.c
index 51293cb9a..cda6da24c 100644
--- a/swad_database.c
+++ b/swad_database.c
@@ -2994,14 +2994,14 @@ mysql> DESCRIBE usr_report;
/***** Table usr_webs *****/
/*
mysql> DESCRIBE usr_webs;
-+--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
-| Field | Type | Null | Key | Default | Extra |
-+--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
-| UsrCod | int(11) | NO | PRI | NULL | |
-| Web | enum('www','500px','delicious','deviantart','diaspora','edmodo','facebook','flickr','foursquare','github','googleplus','googlescholar','instagram','linkedin','paperli','pinterest','quitter','researchgate','scoopit','slideshare','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | |
-| URL | varchar(255) | NO | | NULL | |
-+--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
-3 rows in set (0.00 sec)
++--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
+| Field | Type | Null | Key | Default | Extra |
++--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
+| UsrCod | int(11) | NO | PRI | NULL | |
+| Web | enum('www','500px','delicious','deviantart','diaspora','edmodo','facebook','flickr','foursquare','github','gnusocial','googleplus','googlescholar','identica','instagram','linkedin','orcid','paperli','pinterest','researchgate','researcherid','scoopit','slideshare','stackoverflow','storify','tumblr','twitter','wikipedia','youtube') | NO | PRI | NULL | |
+| URL | varchar(255) | NO | | NULL | |
++--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+-------+
+3 rows in set (0.01 sec)
*/
DB_CreateTable ("CREATE TABLE IF NOT EXISTS usr_webs ("
"UsrCod INT NOT NULL,"
@@ -3016,7 +3016,6 @@ mysql> DESCRIBE usr_webs;
"'linkedin',"
"'orcid',"
"'paperli','pinterest',"
- "'quitter',"
"'researchgate','researcherid',"
"'scoopit','slideshare','stackoverflow','storify',"
"'tumblr','twitter',"
diff --git a/swad_network.c b/swad_network.c
index 3aec710b5..5f3f17ee7 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -47,7 +47,7 @@ extern struct Globals Gbl;
/***************************** Private constants *****************************/
/*****************************************************************************/
-#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 30
+#define Net_NUM_WEBS_AND_SOCIAL_NETWORKS 29
typedef enum
{
Net_WWW, // Personal web page
@@ -69,7 +69,6 @@ typedef enum
Net_ORCID,
Net_PAPERLI,
Net_PINTEREST,
- Net_QUITTER,
Net_RESEARCH_GATE,
Net_RESEARCHERID,
Net_SCOOPIT,
@@ -106,7 +105,6 @@ const char *Net_WebsAndSocialNetworksDB[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
"orcid", // Net_ORCID
"paperli", // Net_PAPERLI
"pinterest", // Net_PINTEREST
- "quitter", // Net_QUITTER
"researchgate", // Net_RESEARCH_GATE
"researcherid", // Net_RESEARCHERID
"scoopit", // Net_SCOOPIT
@@ -121,36 +119,35 @@ const char *Net_WebsAndSocialNetworksDB[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
const char *Net_WebsAndSocialNetworksIcons[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
{
- "www16x16.gif", // Net_WWW
- "500px16x16.gif", // Net_500PX
- "delicious16x16.gif", // Net_DELICIOUS
- "deviantart16x16.gif", // Net_DEVIANTART
- "diaspora16x16.gif", // Net_DIASPORA
- "edmodo16x16.gif", // Net_EDMODO
- "facebook16x16.gif", // Net_FACEBOOK
- "flickr16x16.gif", // Net_FLICKR
- "foursquare16x16.gif", // Net_FOURSQUAREhub
- "github16x16.gif", // Net_GITHUB
- "gnusocial16x16.gif", // Net_GNU_SOCIAL
- "googleplus16x16.gif", // Net_GOOGLE_PLUS
- "googlescholar16x16.gif", // Net_GOOGLE_SCHOLAR
- "identica16x16.gif", // Net_IDENTICA
- "instagram16x16.gif", // Net_INSTAGRAM
- "linkedin16x16.gif", // Net_LINKEDIN
- "orcid16x16.gif", // Net_ORCID
- "paperli16x16.gif", // Net_PAPERLI
- "pinterest16x16.gif", // Net_PINTEREST
- "quitter16x16.gif", // Net_QUITTER
- "researchgate16x16.gif", // Net_RESEARCH_GATE
- "researcherid16x16.gif", // Net_RESEARCHERID
- "scoopit16x16.gif", // Net_SCOOPIT
- "slideshare16x16.gif", // Net_SLIDESHARE
- "stackoverflow64x64.png", // Net_STACK_OVERFLOW
- "storify16x16.gif", // Net_STORIFY
- "tumblr16x16.gif", // Net_TUMBLR
- "twitter16x16.gif", // Net_TWITTER
- "wikipedia16x16.gif", // Net_WIKIPEDIA
- "youtube16x16.gif", // Net_YOUTUBE
+ "globe.svg", // Net_WWW
+ "500px-brands.svg", // Net_500PX
+ "delicious-brands.svg", // Net_DELICIOUS
+ "deviantart-brands.svg", // Net_DEVIANTART
+ "diaspora-brands.svg", // Net_DIASPORA
+ "edmodo64x64.png", // Net_EDMODO
+ "facebook-brands.svg", // Net_FACEBOOK
+ "flickr-brands.svg", // Net_FLICKR
+ "foursquare-brands.svg", // Net_FOURSQUAREhub
+ "github-brands.svg", // Net_GITHUB
+ "gnusocial64x64.png", // Net_GNU_SOCIAL
+ "google-plus-brands.svg", // Net_GOOGLE_PLUS
+ "googlescholar.svg", // Net_GOOGLE_SCHOLAR
+ "identica64x64.png", // Net_IDENTICA
+ "instagram-brands.svg", // Net_INSTAGRAM
+ "linkedin-brands.svg", // Net_LINKEDIN
+ "orcid64x64.png", // Net_ORCID
+ "paperli64x64.png", // Net_PAPERLI
+ "pinterest-brands.svg", // Net_PINTEREST
+ "researchgate-brands.svg", // Net_RESEARCH_GATE
+ "researcherid64x64.png", // Net_RESEARCHERID
+ "scoopit64x64.png", // Net_SCOOPIT
+ "slideshare-brands.svg", // Net_SLIDESHARE
+ "stack-overflow-brands.svg", // Net_STACK_OVERFLOW
+ "storify64x64.png", // Net_STORIFY
+ "tumblr-brands.svg", // Net_TUMBLR
+ "twitter-brands.svg", // Net_TWITTER
+ "wikipedia-w-brands.svg", // Net_WIKIPEDIA
+ "youtube-brands.svg", // Net_YOUTUBE
};
const char *Net_WebsAndSocialNetworksTitle[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
@@ -174,7 +171,6 @@ const char *Net_WebsAndSocialNetworksTitle[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
"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
@@ -261,7 +257,7 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
""
"![\"%s\"](\"%s/%s\"" "\\"%s\\"\"")
"
+ " class=\"ICO16x16\" />"
""
"",
URL,Title,
@@ -325,7 +321,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
""
@@ -582,8 +578,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
""
""
+ " class=\"CONTEXT_ICO_16x16\""
+ " style=\"margin-right:6px;\" />"
"%s | "
""
"%u"
|