diff --git a/icon/address-card.svg b/icon/address-card.svg
new file mode 100644
index 00000000..adb5af88
--- /dev/null
+++ b/icon/address-card.svg
@@ -0,0 +1 @@
+
diff --git a/icon/iconset/awesome/address-card.svg b/icon/iconset/awesome/address-card.svg
new file mode 100644
index 00000000..adb5af88
--- /dev/null
+++ b/icon/iconset/awesome/address-card.svg
@@ -0,0 +1 @@
+
diff --git a/icon/iconset/nuvola/address-card.svg b/icon/iconset/nuvola/address-card.svg
new file mode 100644
index 00000000..cd75c532
--- /dev/null
+++ b/icon/iconset/nuvola/address-card.svg
@@ -0,0 +1,1216 @@
+
+
+
+
\ No newline at end of file
diff --git a/swad_action.c b/swad_action.c
index 2f7ab1eb..8dff4f0c 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -1668,7 +1668,7 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
[ActSeeMyTT ] = { 408, 2,TabPrf,ActSeeMyTT ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock" },
[ActSeeMyAgd ] = {1602, 3,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Agd_GetParamsAndShowMyAgenda ,"calendar" },
[ActFrmMyAcc ] = { 36, 4,TabPrf,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormMyAccount ,"at" },
- [ActReqEdiRecSha ] = { 285, 5,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore ,"card" },
+ [ActReqEdiRecSha ] = { 285, 5,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore ,"address-card" },
[ActReqEdiSet ] = { 673, 6,TabPrf,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Set_EditSettings ,"cog" },
// Actions not in menu:
diff --git a/swad_agenda.c b/swad_agenda.c
index ce43887b..1d3d1efb 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -750,12 +750,12 @@ static void Agd_PutIconsOtherPublicAgenda (void *EncryptedUsrCod)
/* View student's records: common record card and course record card */
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL,
Usr_PutParamOtherUsrCodEncrypted,EncryptedUsrCod,
- "card.svg",
+ "address-card.svg",
Txt_View_record_for_this_course);
else if (Usr_CheckIfICanViewRecordTch (&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL,
Usr_PutParamOtherUsrCodEncrypted,EncryptedUsrCod,
- "card.svg",
+ "address-card.svg",
Txt_View_record_and_office_hours);
}
diff --git a/swad_changelog.h b/swad_changelog.h
index 2e8d0854..7c313592 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
-#define Log_PLATFORM_VERSION "SWAD 19.188 (2020-04-15)"
+#define Log_PLATFORM_VERSION "SWAD 19.188.1 (2020-04-16)"
#define CSS_FILE "swad19.187.css"
#define JS_FILE "swad19.172.1.js"
/*
@@ -547,6 +547,13 @@ Funci
// TODO: Miguel Damas: al principio de los exámenes tendría que poner cuánto resta cada pregunta
// TODO: Oresti Baños: cambiar ojos por candados en descriptores para prohibir/permitir y dejar los ojos para poder elegir descriptores
// TODO: Integrar pull requests con traducciones del alemán del usuario eruedin en GitHub
+// TODO: Cambiar icono de inicio a "house-user.svg", notificaciones nuevas con "bell-on.svg"
+
+ Version 19.188.1: Apr 16, 2020 Changed some icons. (287746 lines)
+ Copy the following icons to icon public directory:
+sudo cp icon/address-card.svg /var/www/html/swad/icon/
+sudo cp icon/iconset/awesome/address-card.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/nuvola/address-card.svg /var/www/html/swad/icon/iconset/nuvola/
Version 19.188: Apr 15, 2020 Changes in listing and edition of rooms. (287713 lines)
1 change necessary in database:
diff --git a/swad_record.c b/swad_record.c
index 1f3dba4f..e06cddf8 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -2474,12 +2474,12 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
/* View student's records: common record card and course record card */
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
- "card.svg",
+ "address-card.svg",
Txt_View_record_for_this_course);
else if (Usr_CheckIfICanViewRecordTch (Gbl.Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
- "card.svg",
+ "address-card.svg",
Txt_View_record_and_office_hours);
/***** Button to view user's agenda *****/
diff --git a/swad_room.h b/swad_room.h
index 8346c548..accff9d2 100644
--- a/swad_room.h
+++ b/swad_room.h
@@ -44,6 +44,34 @@
#define Roo_UNLIMITED_CAPACITY INT_MAX // This number can be stored in database as an integer...
// ...and means that a room has no limited capacity
+typedef enum
+ {
+ Roo_ADMINISTRATION = 0, // "user-tie.svg" // "Administración"
+ Roo_AUDITORIUM = 1, // "landmark.svg" "university.svg" "theater-masks.svg" // "Auditorio"
+ Roo_CAFETERIA = 2, // "coffee.svg" "mug-hot.svg" // "Cafetería"
+ Roo_CANTEEN = 3, // "utensils.svg" // "Comedor"
+ Roo_CLASSROOM = 4, // "chalkboard-teacher.svg" "chalkboard.svg" // "Aula"
+ Roo_CONCIERGE = 5, // "concierge-bell" "user-cog.svg" "house-user.svg" // "Conserjería/Portería"
+ Roo_CORRIDOR = 6, // "walking.svg" "map-signs.svg" "door-open.svg" // "Pasillo"
+ Roo_GYM = 7, // "dumbbell.svg" // "Gimnasio"
+ Roo_HALL = 8, // "map-signs.svg" "archway.svg" "hotel.svg" "concierge-bell.svg" "door-open.svg" "street-view.svg" // "Vestíbulo"
+ Roo_KINDERGARTEN = 9, // "child.svg" "baby.svg" "baby-carriage.svg" // "Guardería"
+ Roo_LABORATORY = 10, // "flask.svg" "microscope.svg" // "Laboratorio"
+ Roo_LIBRARY = 11, // "book.svg" "book-reader.svg" // "Biblioteca"
+ Roo_OFFICE = 12, // "house-user.svg" "door-open.svg" // "Oficina/Despacho"
+ Roo_OUTDOORS = 13, // "cloud-sun.svg" // "Exteriores"
+ Roo_PARKING = 14, // "car.svg" // "Parking"
+ Roo_PAVILION = 15, // "volleyball-ball.svg" "running.svg" // "Pabellón"
+ Roo_ROOM = 16, // // "Sala"
+ Roo_SECRETARIAT = 17, // "stamp.svg" "pen-alt.svg" "file-alt.svg" "user-tie.svg" // "Secretaría"
+ Roo_SEMINAR = 18, // "chalkboard-teacher.svg" "chalkboard.svg" // "Seminario"
+ Roo_SHOP = 19, // "shopping-cart.svg" "shopping-basket.svg" "store-alt.svg" shopping-bag // "Tienda"
+ Roo_STORE = 20, // "daily.svg" "boxes.svg" "box-open.svg" "box.svg" // "Almacén"
+ Roo_TOILETS = 21, // "toilet.svg" // "Aseos"
+ Roo_VIRTUAL = 22, // "laptop-house.svg" "cloud.svg" // "Virtual"
+ Roo_YARD = 23, // "canadian-mapple-leaf.svg" // "Patio/Jardín"
+ } Roo_RoomType_t;
+
struct Roo_Room
{
long RooCod; // Room code