diff --git a/css/swad15.145.3.css b/css/swad15.146.css similarity index 99% rename from css/swad15.145.3.css rename to css/swad15.146.css index eafd4913a..1161e60b4 100644 --- a/css/swad15.145.3.css +++ b/css/swad15.146.css @@ -1295,6 +1295,10 @@ a:hover /* Default ==> underlined */ text-align:center; overflow:hidden; } +.FRAME_ICONS + { + float:left; + } .FRAME_TABLE { box-sizing:border-box; diff --git a/swad_ID.c b/swad_ID.c index 47ccefdbf..96f809155 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -404,7 +404,7 @@ void ID_ShowFormOthIDs (void) if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ID); + Lay_StartRoundFrame (NULL,Txt_ID,NULL); /***** Show user's record *****/ Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); diff --git a/swad_announcement.c b/swad_announcement.c index 3e320b1b3..9091117e8 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -124,7 +124,7 @@ void Ann_ShowAllAnnouncements (void) if (NumAnnouncements) /***** Start frame *****/ - Lay_StartRoundFrame ("550px",Txt_Announcements); + Lay_StartRoundFrame ("550px",Txt_Announcements,NULL); else Lay_ShowAlert (Lay_INFO,Txt_No_announcements); diff --git a/swad_attendance.c b/swad_attendance.c index 0bff55d71..67fb54ebb 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -2518,7 +2518,7 @@ void Usr_ReqListStdsAttendanceCrs (void) /***** Draw a class photo with students of the course *****/ /* Start frame */ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL); /* Form to select type of list used for select several users */ Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt); diff --git a/swad_banner.c b/swad_banner.c index d643a0425..b5fdf98f6 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -85,14 +85,11 @@ void Ban_SeeBanners (void) " WHERE Hidden='N'" " ORDER BY ShortName"); - /***** Put banner (form) to edit banners *****/ - if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) - Ban_PutFormToEditBanners (); - - /***** Table head *****/ - Lay_StartRoundFrameTable (NULL,2,Txt_Banners); + /***** Frame head *****/ + Lay_StartRoundFrame ("300px",Txt_Banners,Ban_PutFormToEditBanners); /***** Write all the banners *****/ + fprintf (Gbl.F.Out,""); for (NumBan = 0; NumBan < Gbl.Banners.Num; NumBan++) @@ -112,9 +109,10 @@ void Ban_SeeBanners (void) Gbl.Banners.Lst[NumBan].Img, Gbl.Banners.Lst[NumBan].ShortName, Gbl.Banners.Lst[NumBan].FullName); + fprintf (Gbl.F.Out,"
"); - /***** Table end *****/ - Lay_EndRoundFrameTable (); + /***** Frame end *****/ + Lay_EndRoundFrame (); /***** Free list of banners *****/ Ban_FreeListBanners (); @@ -128,11 +126,9 @@ static void Ban_PutFormToEditBanners (void) { extern const char *Txt_Edit; - /***** Link to edit banners *****/ - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png", - Txt_Edit,Txt_Edit); - fprintf (Gbl.F.Out,"
"); + if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) + /***** Link to edit banners *****/ + Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",Txt_Edit,NULL); } /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index bac6b26ca..d4a0fe780 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,13 +129,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.145.6 (2016-03-16)" -#define CSS_FILE "swad15.145.3.css" +#define Log_PLATFORM_VERSION "SWAD 15.146 (2016-03-16)" +#define CSS_FILE "swad15.146.css" #define JS_FILE "swad15.131.3.js" // 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 15.146: Mar 16, 2016 Now frame rectangles can have icons at top. + Icon to edit banners integrated in frame. (195772 lines) Version 15.145.6: Mar 16, 2016 Fixed bug in connected users. (195757 lines) Version 15.145.5: Mar 15, 2016 Removed links in right column. (195752 lines) Version 15.145.4: Mar 15, 2016 Link to RSS file is moved to the end of notices in left column. (195751 lines) diff --git a/swad_chat.c b/swad_chat.c index 5f51aa34b..749f174ab 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -116,7 +116,7 @@ void Cht_ShowListOfAvailableChatRooms (void) Usr_GetMyDegrees (); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Chat_rooms); + Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL); fprintf (Gbl.F.Out,"
" "