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

This commit is contained in:
Antonio Cañas Vargas 2015-04-02 19:01:26 +02:00
parent 97358fffe5
commit 5a1f957255
6 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_QR.h
View File

@ -37,13 +37,6 @@
/******************************* Public types ********************************/
/*****************************************************************************/
typedef enum
{
QR_ID = 0,
QR_NICKNAME = 1,
QR_EMAIL = 2,
} QR_QRType_t;
/*****************************************************************************/
/***************************** Public prototypes *****************************/
/*****************************************************************************/

11
swad_action.c
View File

@ -4332,6 +4332,17 @@ void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
Act_FormEnd ();
}
/*****************************************************************************/
/****************** Show an icon with a link (without text) ******************/
/*****************************************************************************/
void Act_PutIconLink (const char *Icon,const char *Title)
{
Act_LinkFormSubmit (Title,NULL);
Lay_PutSendIcon (Icon,Title,NULL);
Act_FormEnd ();
}
/*****************************************************************************/
/***************** Adjust current action when no user's logged ***************/
/*****************************************************************************/

1
swad_action.h
View File

@ -1345,6 +1345,7 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle);
void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
const char *Icon,const char *Title);
void Act_PutIconLink (const char *Icon,const char *Title);
void Act_AdjustActionWhenNoUsrLogged (void);
void Act_AdjustCurrentAction (void);

39
swad_assignment.c
View File

@ -501,26 +501,17 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
extern const char *Txt_Hide;
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_4\">"
"<tr>");
fprintf (Gbl.F.Out,"<div style=\"padding:5px 0;\">");
/***** Put form to remove assignment *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActReqRemAsg);
Asg_PutParamAsgCod (AsgCod);
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Remove,
Txt_Remove);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
Act_PutIconLink ("delon",Txt_Remove);
/***** Put form to hide/show assignment *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (Hidden ? ActShoAsg :
ActHidAsg);
Asg_PutParamAsgCod (AsgCod);
@ -528,37 +519,19 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden)
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/hidden_on16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Show,
Txt_Show);
Act_PutIconLink ("hidden_on",Txt_Show);
else
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/visible_on16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Hide,
Txt_Hide);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
Act_PutIconLink ("visible_on",Txt_Hide);
/***** Put form to edit assignment *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActEdiOneAsg);
Asg_PutParamAsgCod (AsgCod);
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/edit16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Edit,
Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
Act_PutIconLink ("edit",Txt_Edit);
fprintf (Gbl.F.Out,"</tr>"
"</table>");
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.107 (2015/04/02)"
#define Log_PLATFORM_VERSION "SWAD 14.107.1 (2015/04/02)"
// 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.107.1: Apr 02, 2015 Changes in icons in assignments. (183748 lines)
Version 14.107: Apr 02, 2015 Refactoring contextual menus. (183776 lines)
Version 14.106.2: Apr 02, 2015 Refactoring some contextual menus. (183747 lines)
Version 14.106.1: Apr 02, 2015 Changes in layout of icon with links. (183925 lines)

12
swad_exam.c
View File

@ -775,24 +775,18 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Link to remove this exam announcement *****/
Act_FormStart (ActRemExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Remove,NULL);
Lay_PutSendIcon ("delon",Txt_Remove,NULL);
Act_FormEnd ();
Act_PutIconLink ("delon",Txt_Remove);
/***** Link to edit this exam announcement *****/
Act_FormStart (ActEdiExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Edit,NULL);
Lay_PutSendIcon ("edit",Txt_Edit,NULL);
Act_FormEnd ();
Act_PutIconLink ("edit",Txt_Edit);
}
/***** Link to print view *****/
Act_FormStart (ActPrnExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Print,NULL);
Lay_PutSendIcon ("print",Txt_Print,NULL);
Act_FormEnd ();
Act_PutIconLink ("print",Txt_Print);
fprintf (Gbl.F.Out,"</td>"
"</tr>");