Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.119.3

This commit is contained in:
Antonio Cañas Vargas 2015-07-24 11:34:39 +02:00
parent e4b19ea48b
commit 288a672c69
9 changed files with 92 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
swad_action.c
View File

@ -4726,7 +4726,8 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
/* Icon and text */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left; vertical-align:middle; padding-left:2px;\">");
"<td style=\"text-align:left;"
" vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (TabMenuStr,The_ClassFormulNB[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
@ -4771,7 +4772,9 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
Act_FormEnd ();
fprintf (Gbl.F.Out,"<div id=\"MFU_actions\">"
"<table style=\"width:120px;\">");
"<ul style=\"list-style-type:none;"
" padding:0 0 2px 0; margin:0;"
" text-align:left; vertical-align:middle;\">");
/***** Write list of frequently used actions *****/
for (NumAct = 0;
@ -4782,13 +4785,6 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
if ((Title = Act_GetTitleAction (Action)) != NULL)
{
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:4px; text-align:left;"
" background-image:url('%s/mbw2_4x1.gif');"
" background-repeat:repeat-y;\">"
"</td>",
Gbl.Prefs.IconsURL);
/* Action string */
strncpy (TabStr,Txt_TABS_FULL_TXT[Act_Actions[Action].Tab],128);
TabStr[128] = '\0';
@ -4797,9 +4793,7 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
sprintf (TabMenuStr,"%s &gt; %s",TabStr,MenuStr);
/* Icon and text */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:110px; text-align:left;"
" vertical-align:middle; padding-left:2px;\">");
fprintf (Gbl.F.Out,"<li>");
Act_FormStart (Action);
Act_LinkFormSubmit (Title,"MFU_ACT");
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
@ -4812,13 +4806,12 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions)
fprintf (Gbl.F.Out," %s</a>",
MenuStr);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</li>");
}
}
/***** End table *****/
fprintf (Gbl.F.Out,"</table>"
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}

5
swad_changelog.h
View File

@ -103,11 +103,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.119 (2015/07/22)"
#define Log_PLATFORM_VERSION "SWAD 14.119.3 (2015/07/24)"
// 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.119.3: Jul 24, 2015 New layout of MFU actions as a list. (184875 lines)
Version 14.119.2: Jul 22, 2015 Changes in page title and platform name. (184880 lines)
Version 14.119.1: Jul 22, 2015 Undo some changes in file browsers. (184883 lines)
Version 14.119: Jul 22, 2015 Function to put an icon to remove. (184828 lines)
Version 14.118: Jul 22, 2015 Function to put a disabled icon indicating that removal is not allowed. (185361 lines)
Version 14.117.17:Jul 22, 2015 Checking "alt" and "title" in all images. (185437 lines)

4
swad_config.h
View File

@ -95,8 +95,8 @@
#elif defined OPENSWAD_ORG // openswad.org ************************
#define Cfg_PLATFORM_SHORT_NAME "OpenSWAD"
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD" // This title will appear on browser top
#define Cfg_PLATFORM_FULL_NAME "OpenSWAD (Open Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD (free platform for learning & educational management)" // This title will appear on browser top
#define Cfg_PLATFORM_SERVER "openswad.org" // Server name (main part of the URL)
#define Cfg_HTTPS_URL_SWAD_CGI "https://openswad.org" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_PUBLIC "https://openswad.org/swad" // Without ending slash

36
swad_file_browser.c
View File

@ -1352,8 +1352,8 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,Brw_FileType_t FileType,
const char *PathInTree,const char *FileName,const char *FileNameToShow);
static bool Brw_CheckIfCanPasteIn (unsigned Level);
static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
const char *PathInTree,const char *FileName);
static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName);
const char *PathInTree,const char *FileName,const char *FileNameToShow);
static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName,const char *FileNameToShow);
static void Brw_PutIconCopy (Brw_FileType_t FileType,
const char *PathInTree,const char *FileName,const char *FileNameShow);
static void Brw_PutIconPasteOn (const char *PathInTree,const char *FileName,const char *FileNameToShow);
@ -4934,10 +4934,10 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,Brw_FileType_t FileType,
/***** Icon to remove folder, file or link *****/
if (FileType == Brw_IS_FOLDER)
/* Icon to remove a folder */
Brw_PutIconRemoveDir (PathInTree,FileName);
Brw_PutIconRemoveDir (PathInTree,FileName,FileNameToShow);
else // File or link
/* Icon to remove a file or link */
Brw_PutIconRemoveFile (FileType,PathInTree,FileName);
Brw_PutIconRemoveFile (FileType,PathInTree,FileName,FileNameToShow);
/***** Icon to copy *****/
Brw_PutIconCopy (FileType,PathInTree,FileName,FileNameToShow);
@ -4995,8 +4995,10 @@ static bool Brw_CheckIfCanPasteIn (unsigned Level)
// FileType can be Brw_IS_FILE or Brw_IS_LINK
static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
const char *PathInTree,const char *FileName)
const char *PathInTree,const char *FileName,const char *FileNameToShow)
{
extern const char *Txt_Remove_FILE_OR_LINK_X;
fprintf (Gbl.F.Out,"<td class=\"BM%d\">",Gbl.RowEvenOdd);
if (Gbl.FileBrowser.ICanRemoveFileOrFolder) // Can I remove this file?
@ -5019,11 +5021,17 @@ static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
break;
}
Brw_ParamListFiles (FileType,PathInTree,FileName);
Lay_PutIconBRemove ();
sprintf (Gbl.Title,Txt_Remove_FILE_OR_LINK_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16B\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
}
else
Lay_PutIconBRemovalNotAllowed ();
Lay_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}
@ -5031,8 +5039,10 @@ static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
/****************** Write link and icon to remove a folder *******************/
/*****************************************************************************/
static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName)
static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName,const char *FileNameToShow)
{
extern const char *Txt_Remove_folder_X;
fprintf (Gbl.F.Out,"<td class=\"BM%d\">",Gbl.RowEvenOdd);
if (Gbl.FileBrowser.ICanRemoveFileOrFolder) // Can I remove this folder?
@ -5055,11 +5065,17 @@ static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName)
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName);
Lay_PutIconBRemove ();
sprintf (Gbl.Title,Txt_Remove_folder_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16B\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
}
else
Lay_PutIconBRemovalNotAllowed ();
Lay_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}

18
swad_layout.c
View File

@ -157,19 +157,15 @@ void Lay_WriteStartOfPage (void)
fprintf (Gbl.F.Out,"<html lang=\"%s\">\n"
"<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=windows-1252\" />\n"
"<meta name=\"description\" content=\"SWAD is a free-software platform for learning and educational management\" />\n"
"<meta name=\"description\" content=\"A free-software, educational, online tool for managing courses and students.\" />\n"
"<meta name=\"keywords\" content=\""
"%s,"
"SWAD platform,shared workspace at a distance,sistema web de apoyo a la docencia,"
"SWAD,"
"shared workspace at a distance,"
"sistema web de apoyo a la docencia,"
"SWADroid,"
"LMS,Learning Management System,"
"VLE,Virtual Learning Environment,"
"e-learning,b-learning,m-learning,"
"platform,plataforma,"
"teaching,docencia,"
"learning,aprendizaje,"
"open source,free software,software libre,"
"virtual\" />\n",
"LMS,"
"Learning Management System\" />\n",
Txt_STR_LANG_ID[Gbl.Prefs.Language],
Cfg_PLATFORM_SHORT_NAME);
@ -649,7 +645,7 @@ static void Lay_WritePageTopHeading (void)
"</a>",
Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme,
LogoLayout[Gbl.Prefs.Layout].Icon,
Cfg_PLATFORM_FULL_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
LogoLayout[Gbl.Prefs.Layout].Width,
LogoLayout[Gbl.Prefs.Layout].Height);
fprintf (Gbl.F.Out,"</td>");

2
swad_mail.c
View File

@ -1416,6 +1416,6 @@ void Mai_WriteFootNoteEMail (Txt_Language_t Language)
"%s\n"
"%s\n",
Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[Language],
Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_SHORT_NAME,
Cfg_HTTPS_URL_SWAD_CGI);
}

2
swad_main.c
View File

@ -86,7 +86,7 @@ int main (int argc, char *argv[])
"<h2 style=\"text-align:center;\">Intente acceder m&aacute;s tarde, por favor.</h2>"
"</body>"
"</html>",
Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_PAGE_TITLE,
Cfg_PLATFORM_SHORT_NAME);
exit (0);
}

2
swad_scope.c
View File

@ -136,7 +136,7 @@ void Sco_PutSelectorScope (bool SendOnChange)
{
case Sco_SCOPE_SYS:
fprintf (Gbl.F.Out,"%s: %s",
Txt_System,Cfg_PLATFORM_PAGE_TITLE);
Txt_System,Cfg_PLATFORM_SHORT_NAME);
break;
case Sco_SCOPE_CTY:
fprintf (Gbl.F.Out,"%s: %s",

42
swad_text.c
View File

@ -28669,6 +28669,27 @@ const char *Txt_Remove_file =
"Remover arquivo";
#endif
const char *Txt_Remove_FILE_OR_LINK_X = // Warning: it is very important to include %s in the following sentences
#if L==0
"Eliminar %s";
#elif L==1
"Datei %s";
#elif L==2
"Remove %s";
#elif L==3
"Eliminar %s";
#elif L==4
"Supprimer %s";
#elif L==5
"Eliminar %s"; // Okoteve traducción
#elif L==6
"Rimuovere %s";
#elif L==7
"Usu&nacute; %s";
#elif L==8
"Remover %s";
#endif
const char *Txt_Remove_folder =
#if L==0
"Eliminar carpeta";
@ -28690,6 +28711,27 @@ const char *Txt_Remove_folder =
"Remover diret&oacute;rio";
#endif
const char *Txt_Remove_folder_X = // Warning: it is very important to include %s in the following sentences
#if L==0
"Eliminar carpeta %s";
#elif L==1
"Verzeichnis entfernen %s";
#elif L==2
"Remove folder %s";
#elif L==3
"Eliminar carpeta %s";
#elif L==4
"Supprimer r&eacute;pertoire %s";
#elif L==5
"Eliminar carpeta %s"; // Okoteve traducción
#elif L==6
"Rimuovere cartella %s";
#elif L==7
"Usu&nacute; folder %s";
#elif L==8
"Remover diret&oacute;rio %s";
#endif
const char *Txt_Remove_group =
#if L==0
"Eliminar grupo"; // Necessita traduccio