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.124.3

This commit is contained in:
Antonio Cañas Vargas 2015-08-06 12:31:05 +02:00
parent b00af6897e
commit 2b6c7f5057
14 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/swad_desktop.css
View File

@ -57,6 +57,14 @@ hr.GREY_SEPARA {height:0; border-top:0; border-bottom:#707070 dotted 1px;}
hr.BLUE_SEPARA {height:0; border-top:0; border-bottom:#4D88A1 dotted 1px;}
hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
/************* Institution / Centre / Degree logo in top title ***************/
.TOP_LOGO
{
margin-right:8px;
text-align:left;
vertical-align:top;
}
/****************** Title of current action in main block ********************/
#action_title
{

8
css/swad_mobile.css
View File

@ -52,6 +52,14 @@ table td
img {border-width:0; border-style:none;}
form {margin:0; display:inline;}
/************* Institution / Centre / Degree logo in top title ***************/
.TOP_LOGO
{
margin-right:8px;
text-align:left;
vertical-align:top;
}
/************************* Users connected globally **************************/
.CONNECTED
{

4
swad_centre.c
View File

@ -174,7 +174,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ctr.WWW,Ctr.FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"</a>"
"</td>");
@ -606,7 +606,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
TxtClass,BgColor,
Ctr->WWW,Ctr->FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"</a>"
"</td>");

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.124.2 (2015/08/03)"
#define Log_PLATFORM_VERSION "SWAD 14.124.3 (2015/08/06)"
// 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.124.3: Aug 03, 2015 Changes in CSS of forms.
Changes in function to draw institution / centre / degree logo. (184782 lines)
Version 14.124.2: Aug 03, 2015 Changes in CSS of forms. (184768 lines)
Version 14.124.1: Aug 03, 2015 Changes in CSS of forms.
Fixed bug in edition of institutions. (184782 lines)

2
swad_course.c
View File

@ -3342,7 +3342,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,StyleNoBR);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out," %s (%s)"
"</a>",
row[2],row[7]);

15
swad_degree.c
View File

@ -225,7 +225,7 @@ void Deg_SeeDegWithPendingCrss (void)
" target=\"_blank\">",
BgColor,Deg.WWW,Deg.FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"</a>"
"</td>");
@ -754,16 +754,13 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
{
if (Gbl.CurrentDeg.Deg.DegCod > 0)
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName,32,
"vertical-align:top; margin-right:8px;",false);
Gbl.CurrentDeg.Deg.ShortName,32,"TOP_LOGO",false);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName,32,
"vertical-align:top; margin-right:8px;",false);
Gbl.CurrentCtr.Ctr.ShortName,32,"TOP_LOGO",false);
else if (Gbl.CurrentIns.Ins.InsCod > 0)
Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName,32,
"vertical-align:top; margin-right:8px;",false);
Gbl.CurrentIns.Ins.ShortName,32,"TOP_LOGO",false);
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
if (Cty_CheckIfCountryMapExists (&Gbl.CurrentCty.Cty))
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
@ -1291,7 +1288,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
BgColor,
Deg->WWW,Deg->FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"</a>"
"</td>");
@ -3966,7 +3963,7 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan)
sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,"DAT_SMALL_NOBR");
Log_DrawLogo (Sco_SCOPE_DEG,DegCod,row[1],
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",row[2]);
Act_FormEnd ();
}

6
swad_file_browser.c
View File

@ -11004,7 +11004,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
sprintf (Gbl.Title,Txt_Go_to_X,InsShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_INS,InsCod,InsShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",InsShortName);
Act_FormEnd ();
}
@ -11021,7 +11021,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
sprintf (Gbl.Title,Txt_Go_to_X,CtrShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_CTR,CtrCod,CtrShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",CtrShortName);
Act_FormEnd ();
}
@ -11038,7 +11038,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
sprintf (Gbl.Title,Txt_Go_to_X,DegShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_DEG,DegCod,DegShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",DegShortName);
Act_FormEnd ();
}

2
swad_institution.c
View File

@ -164,7 +164,7 @@ void Ins_SeeInsWithPendingCtrs (void)
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ins.WWW,Ins.FullName);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"</a>"
"</td>");

3
swad_layout.c
View File

@ -1546,7 +1546,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
if (DegCod > 0)
{
if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"TIT_CLASSPHOTO\">",
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TIT_CLASSPHOTO\">",
Deg.WWW);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,Size,NULL,true);
if (!PrintView)

40
swad_link.c
View File

@ -110,8 +110,8 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
if (Gbl.Links.Num)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"INS_LNK\" style=\"width:120px;"
" text-align:center;\">"
"<td class=\"INS_LNK CENTER_MIDDLE\""
" style=\"width:120px;\">"
"<div id=\"institutional_links\">");
Lnk_WriteListOfLinks ();
fprintf (Gbl.F.Out,"</div>"
@ -344,14 +344,13 @@ static void Lnk_ListLinksForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Link code */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:right;\">"
"%ld&nbsp;"
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE\">"
"%ld"
"</td>",
Lnk->LnkCod);
/* Link short name */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRenLnkSho);
Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\" size=\"15\" maxlength=\"%u\" value=\"%s\""
@ -362,8 +361,7 @@ static void Lnk_ListLinksForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Link full name */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRenLnkFul);
Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\" size=\"40\" maxlength=\"%u\" value=\"%s\""
@ -374,8 +372,7 @@ static void Lnk_ListLinksForEdition (void)
fprintf (Gbl.F.Out,"</td>");
/* Link WWW */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"
" vertical-align:middle;\">");
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">");
Act_FormStart (ActChgLnkWWW);
Lnk_PutParamLnkCod (Lnk->LnkCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"WWW\" size=\"40\" maxlength=\"%u\" value=\"%s\""
@ -635,20 +632,23 @@ static void Lnk_PutFormToCreateLink (void)
"<td></td>");
/***** Link short name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"ShortName\" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"ShortName\""
" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Lnk_MAX_LENGTH_LINK_SHORT_NAME,Lnk->ShortName);
/***** Link full name *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"FullName\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"FullName\""
" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
Lnk_MAX_LENGTH_LINK_FULL_NAME,Lnk->FullName);
/***** Link WWW *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:middle;\">"
"<input type=\"text\" name=\"WWW\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"
"<input type=\"text\" name=\"WWW\""
" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
Cns_MAX_LENGTH_WWW,Lnk->WWW);
@ -673,16 +673,16 @@ static void Lnk_PutHeadLinks (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\"></td>"
"<td class=\"TIT_TBL\" style=\"text-align:right;\">"
"<td class=\"TIT_TBL RIGHT_MIDDLE\">"
"%s"
"</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<td class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<td class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</td>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<td class=\"TIT_TBL LEFT_MIDDLE\">"
"%s"
"</td>"
"</tr>",

8
swad_logo.c
View File

@ -65,7 +65,7 @@ static void Log_PutLinkToRemoveLogo (Act_Action_t Action);
/*****************************************************************************/
void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
unsigned Size,const char *Style,bool PutIconIfNotExists)
unsigned Size,const char *Class,bool PutIconIfNotExists)
{
static const char *Icon[Sco_NUM_SCOPES] =
{
@ -161,9 +161,9 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
" class=\"ICON%ux%u\"",
AltText,AltText,
Size,Size);
if (Style)
if (Style[0])
fprintf (Gbl.F.Out," style=\"%s\"",Style);
if (Class)
if (Class[0])
fprintf (Gbl.F.Out," class=\"%s\"",Class);
fprintf (Gbl.F.Out," />");
}
}

2
swad_logo.h
View File

@ -40,7 +40,7 @@
/*****************************************************************************/
void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
unsigned Size,const char *Style,bool PutIconIfNotExists);
unsigned Size,const char *Class,bool PutIconIfNotExists);
void Log_PutFormToChangeLogo (Sco_Scope_t Scope);
void Log_RequestLogo (Sco_Scope_t Scope);
void Log_ReceiveLogo (Sco_Scope_t Scope);

2
swad_photo.c
View File

@ -2016,7 +2016,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
Deg.WWW,Deg.FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",
Deg.ShortName);
if (SeeOrPrint == Pho_DEGREES_SEE)

2
swad_statistic.c
View File

@ -3495,7 +3495,7 @@ static void Sta_WriteDegree (long DegCod)
"<a href=\"%s\" class=\"LOG\" target=\"_blank\">",
Deg.FullName,Deg.WWW);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
16,"vertical-align:top;",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;</a>",
Deg.ShortName);
}