Version 14.39

This commit is contained in:
Antonio Cañas Vargas 2014-12-20 13:24:12 +01:00
parent 17b68afffb
commit 8ee0410000
3 changed files with 18 additions and 72 deletions

View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.38.9 (2014/12/20)" #define Log_PLATFORM_VERSION "SWAD 14.39 (2014/12/20)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 14.39 :Dic 20, 2014 iframes removed from course info. (170746 lines)
Version 14.38.9 :Dic 20, 2014 The words "Course" and "Group" are removed from selection of course and groups in Documents and Shared files. (? lines) Version 14.38.9 :Dic 20, 2014 The words "Course" and "Group" are removed from selection of course and groups in Documents and Shared files. (? lines)
Version 14.38.8 :Dic 18, 2014 Fixed bug in banned users. (170793 lines) Version 14.38.8 :Dic 18, 2014 Fixed bug in banned users. (170793 lines)
Version 14.38.7 :Dic 17, 2014 Link to banned users is shown only if user has banned one or more users. (170792 lines) Version 14.38.7 :Dic 17, 2014 Link to banned users is shown only if user has banned one or more users. (170792 lines)

View File

@ -291,7 +291,6 @@ static void Inf_SetIHaveReadIntoDB (Inf_InfoType_t InfoType,bool IHaveRead);
static void Inf_CheckAndShowPage (Inf_InfoType_t InfoType); static void Inf_CheckAndShowPage (Inf_InfoType_t InfoType);
static void Inf_CheckAndShowURL (Inf_InfoType_t InfoType); static void Inf_CheckAndShowURL (Inf_InfoType_t InfoType);
static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL); static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL);
static bool Inf_CheckIfBrowserSupportIFrame (void);
static void Inf_ShowTxtInfo (Inf_InfoType_t InfoType); static void Inf_ShowTxtInfo (Inf_InfoType_t InfoType);
/*****************************************************************************/ /*****************************************************************************/
@ -697,7 +696,7 @@ void Inf_RemoveUsrFromCrsInfoRead (long UsrCod,long CrsCod)
} }
/*****************************************************************************/ /*****************************************************************************/
/*********** Check if exists and show central iframe with a page *************/ /**************** Check if exists and show link to a page ********************/
/*****************************************************************************/ /*****************************************************************************/
static void Inf_CheckAndShowPage (Inf_InfoType_t InfoType) static void Inf_CheckAndShowPage (Inf_InfoType_t InfoType)
@ -808,7 +807,7 @@ int Inf_WritePageIntoHTMLBuffer (Inf_InfoType_t InfoType,char **HTMLBuffer)
} }
/*****************************************************************************/ /*****************************************************************************/
/*********** Check if exists and show central iframe with a URL **************/ /**************** Check if exists and show link to a page ********************/
/*****************************************************************************/ /*****************************************************************************/
static void Inf_CheckAndShowURL (Inf_InfoType_t InfoType) static void Inf_CheckAndShowURL (Inf_InfoType_t InfoType)
@ -855,7 +854,7 @@ void Inf_WriteURLIntoTxtBuffer (Inf_InfoType_t InfoType,char TxtBuffer[Cns_MAX_B
} }
/*****************************************************************************/ /*****************************************************************************/
/*********************** Show central iframe with a page *********************/ /*************** Show link to a internal or external a page ******************/
/*****************************************************************************/ /*****************************************************************************/
static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL) static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
@ -863,56 +862,23 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window; extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES]; extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Txt_Your_browser_does_not_support_iframes;
/***** Link for view in a new window *****/ /***** Start of frame *****/
fprintf (Gbl.F.Out,"<div align=\"center\">" Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]);
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\">"
"<a href=\"%s\" target=\"_blank\" class=\"%s\">", "<a href=\"%s\" target=\"_blank\" class=\"%s\">",
URL,The_ClassFormul[Gbl.Prefs.Theme]); URL,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("fullscreen", Lay_PutSendIcon ("fullscreen",
Txt_View_in_a_new_window, Txt_View_in_a_new_window,
Txt_View_in_a_new_window); Txt_View_in_a_new_window);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</td>"
"</tr>");
if (Inf_CheckIfBrowserSupportIFrame ()) /***** End of frame *****/
{ Lay_EndRoundFrameTable10 ();
/***** Start of frame *****/
Lay_StartRoundFrameTable10 ("100%",0,Txt_INFO_TITLE[InfoType]);
/***** iframe with the page *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\">"
"<iframe onload=\"iFrameHeight();\" src=\"%s\""
" id=\"iframe_central\" name=\"iframe_central\""
" style=\"width:100%%; height:480px;\">"
"%s"
"</iframe>"
"</td>"
"</tr>",
URL,Txt_Your_browser_does_not_support_iframes);
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
}
}
/*****************************************************************************/
/*************************** Browse support iframe ***************************/
/*****************************************************************************/
#define MAX_LENGTH_HTTP_USER_AGENT 1024
static bool Inf_CheckIfBrowserSupportIFrame (void)
{
char HTTPUserAgent[MAX_LENGTH_HTTP_USER_AGENT+1];
strncpy (HTTPUserAgent,getenv ("HTTP_USER_AGENT"),MAX_LENGTH_HTTP_USER_AGENT);
HTTPUserAgent[MAX_LENGTH_HTTP_USER_AGENT] = '\0';
if (strstr (HTTPUserAgent,"MSIE 5"))
return false;
return true;
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -52228,27 +52228,6 @@ const char *Txt_You_were_already_enrolled_as_X_in_the_course_Y = // Warning: it
" in the course <strong>%s</strong>."; // Necessita de tradução " in the course <strong>%s</strong>."; // Necessita de tradução
#endif #endif
const char *Txt_Your_browser_does_not_support_iframes =
#if L==0
"Su navegador no admite <em>iframes</em>."; // Necessita traduccio
#elif L==1
"Your browser does not support <em>iframes</em>."; // Need Übersetzung
#elif L==2
"Your browser does not support <em>iframes</em>.";
#elif L==3
"Su navegador no admite <em>iframes</em>.";
#elif L==4
"Your browser does not support <em>iframes</em>."; // Besoin de traduction
#elif L==5
"Su navegador no admite <em>iframes</em>."; // Okoteve traducción
#elif L==6
"Il tuo browser non supporta <em>iframes</em>.";
#elif L==7
"Your browser does not support <em>iframes</em>."; // Potrzebujesz tlumaczenie
#elif L==8
"Your browser does not support <em>iframes</em>."; // Necessita de tradução
#endif
const char *Txt_Your_comment_has_been_updated = const char *Txt_Your_comment_has_been_updated =
#if L==0 #if L==0
"El seu comentari ha estat actualitzat."; "El seu comentari ha estat actualitzat.";