Version 18.33.1

This commit is contained in:
Antonio Cañas Vargas 2019-01-15 01:34:37 +01:00
parent e5721c4560
commit dbf6d333e9
7 changed files with 38 additions and 26 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icon/folder-open-yellow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icon/folder-yellow-plus.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
icon/folder-yellow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 826 B

View File

@ -345,6 +345,8 @@ Buenos d
// TODO: Un administrador de centro ahora no tiene permisos para editar horario asignatura, pero le sale el icono de editar // TODO: Un administrador de centro ahora no tiene permisos para editar horario asignatura, pero le sale el icono de editar
// O le damos permisos o quitamos el icono de editar. Comprobar para admin. de titulaciones. // O le damos permisos o quitamos el icono de editar. Comprobar para admin. de titulaciones.
// TODO: Actualizar ayuda en GitHub, por ejemplo Preferencias ahora es Ajustes.
// TODO: Chequear todas las directivas <label> // TODO: Chequear todas las directivas <label>
// 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: Fix bug: Al mostrar una orla con todos los profesores de SWAD, se muestran primeros los profesores y luego los no editores (repetidos algunos)
@ -370,12 +372,20 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.33 (2019-01-12)" #define Log_PLATFORM_VERSION "SWAD 18.33.1 (2019-01-15)"
#define CSS_FILE "swad18.33.css" #define CSS_FILE "swad18.33.css"
#define JS_FILE "swad18.32.1.js" #define JS_FILE "swad18.32.1.js"
/* /*
Version 18.33.1: Jan 15, 2019 Fixed bug in file browser, reported by Miguel Damas.
SVG icons for folders in file browser. (239076 lines)
Copy the following icons to icon public directory:
sudo cp icon/folder-yellow.png /var/www/html/swad/icon/
sudo cp icon/folder-open-yellow.png /var/www/html/swad/icon/
sudo cp icon/folder-yellow-plus.png /var/www/html/swad/icon/
sudo cp icon/folder-open-yellow-plus.png /var/www/html/swad/icon/
Version 18.33: Jan 11, 2019 Code refactoring related to icons. (239066 lines) Version 18.33: Jan 11, 2019 Code refactoring related to icons. (239066 lines)
Copy the following icon to icon public directory: Copy the following icons to icon public directory:
sudo cp icon/square.svg /var/www/html/swad/icon/ sudo cp icon/square.svg /var/www/html/swad/icon/
sudo cp icon/check-square.svg /var/www/html/swad/icon/ sudo cp icon/check-square.svg /var/www/html/swad/icon/

View File

@ -81,7 +81,7 @@ struct Course
char InstitutionalCrsCod[Crs_MAX_BYTES_INSTITUTIONAL_CRS_COD + 1]; // Institutional code of the course char InstitutionalCrsCod[Crs_MAX_BYTES_INSTITUTIONAL_CRS_COD + 1]; // Institutional code of the course
long DegCod; long DegCod;
unsigned Year; // Year: 0 (optatives), 1, 2, 3... unsigned Year; // Year: 0 (optatives), 1, 2, 3...
Crs_Status_t Status; // Course status unsigned Status; // Course status
long RequesterUsrCod; // User code of the person who requested the creation of this course long RequesterUsrCod; // User code of the person who requested the creation of this course
char ShrtName[Hie_MAX_BYTES_SHRT_NAME + 1]; // Short name of course char ShrtName[Hie_MAX_BYTES_SHRT_NAME + 1]; // Short name of course
char FullName[Hie_MAX_BYTES_FULL_NAME + 1]; // Full name of course char FullName[Hie_MAX_BYTES_FULL_NAME + 1]; // Full name of course

View File

@ -6105,12 +6105,12 @@ static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *F
FileNameToShow); FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-slash.svg\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-slash.svg\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"%sCONTEXT_ICO\" />", " class=\"CONTEXT_OPT %s CONTEXT_ICO_16x16\" />",
Gbl.Prefs.URLIcons, Gbl.Prefs.URLIcons,
Gbl.Title, Gbl.Title,
Gbl.Title, Gbl.Title,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "ICO_HIDDEN " : Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "ICO_HIDDEN" :
""); "ICO_HIGHLIGHT");
Frm_EndForm (); Frm_EndForm ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -6133,12 +6133,12 @@ static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *F
FileNameToShow); FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye.svg\"" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye.svg\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"%sCONTEXT_ICO\" />", " class=\"CONTEXT_OPT %s CONTEXT_ICO_16x16\" />",
Gbl.Prefs.URLIcons, Gbl.Prefs.URLIcons,
Gbl.Title, Gbl.Title,
Gbl.Title, Gbl.Title,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "ICO_HIDDEN " : Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "ICO_HIDDEN" :
""); "ICO_HIGHLIGHT");
Frm_EndForm (); Frm_EndForm ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -6260,14 +6260,14 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *
fprintf (Gbl.F.Out,">"); fprintf (Gbl.F.Out,">");
/***** Form and icon *****/ /***** Form and icon *****/
fprintf (Gbl.F.Out,"<img src=\"%s/folder-%s16x16.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"CONTEXT_OPT CONTEXT_ICO_16x16\" />",
Gbl.Prefs.URLIcons, Gbl.Prefs.URLIcons,
Open ? "open" : Open ? "folder-open-yellow.png" :
"closed", "folder-yellow.png",
Txt_Folder, Txt_Folder,
Txt_Folder); Txt_Folder);
/***** End container *****/ /***** End container *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -6302,8 +6302,8 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Upload_file_or_create_folder_in_FOLDER, Txt_Upload_file_or_create_folder_in_FOLDER,
FileNameToShow); FileNameToShow);
Ico_PutIconLink (Open ? "folder-open-plus16x16.gif" : Ico_PutIconLink (Open ? "folder-open-yellow-plus.png" :
"folder-closed-plus16x16.gif", "folder-yellow-plus.png",
Gbl.Title); Gbl.Title);
Frm_EndForm (); Frm_EndForm ();
@ -6377,15 +6377,16 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
bool NotFound; bool NotFound;
/***** Icon depending on the file extension *****/ /***** Icon depending on the file extension *****/
fprintf (Gbl.F.Out,"<img src=\"%s/%s%ux%u/",
Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_FILEXT,
Size,Size);
if (FileType == Brw_IS_LINK) if (FileType == Brw_IS_LINK)
fprintf (Gbl.F.Out,"url%ux%u.gif\" alt=\"%s\" title=\"%s\"", fprintf (Gbl.F.Out,"<img src=\"%s/link.svg\""
Size,Size, " alt=\"%s\" title=\"%s\"",
Gbl.Prefs.URLIcons,
Txt_Link,Txt_Link); Txt_Link,Txt_Link);
else // FileType == Brw_IS_FILE else // FileType == Brw_IS_FILE
{ {
fprintf (Gbl.F.Out,"<img src=\"%s/%s%ux%u/",
Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_FILEXT,
Size,Size);
for (DocType = 0, NotFound = true; for (DocType = 0, NotFound = true;
DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound; DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound;
DocType++) DocType++)
@ -6402,8 +6403,9 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
fprintf (Gbl.F.Out,"xxx%ux%u.gif\" alt=\"\"", fprintf (Gbl.F.Out,"xxx%ux%u.gif\" alt=\"\"",
Size,Size); Size,Size);
} }
fprintf (Gbl.F.Out,(Size == 16) ? " class=\"CONTEXT_ICO_16x16\"/>" : fprintf (Gbl.F.Out," class=\"CONTEXT_OPT ICO_HIGHLIGHT %s\"/>",
" class=\"ICO40x40\"/>"); (Size == 16) ? "CONTEXT_ICO_16x16" :
"ICO40x40");
} }
/*****************************************************************************/ /*****************************************************************************/