From f5507746c9ce5e841011cebd76a3c61193fb9f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 28 Jan 2015 01:14:14 +0100 Subject: [PATCH] Version 14.70.3 --- icon/iconset/awesome/action64x64/ins64x64.gif | Bin 424 -> 402 bytes icon/ins16x16.gif | Bin 159 -> 166 bytes swad_attendance.c | 6 +- swad_centre.c | 3 + swad_changelog.h | 4 +- swad_country.c | 3 + swad_course.c | 3 + swad_degree.c | 8 ++- swad_file_browser.c | 8 +-- swad_institution.c | 3 + swad_layout.c | 23 ++++++- swad_layout.h | 1 + swad_record.c | 6 +- swad_text.c | 62 +++++++++--------- 14 files changed, 84 insertions(+), 46 deletions(-) diff --git a/icon/iconset/awesome/action64x64/ins64x64.gif b/icon/iconset/awesome/action64x64/ins64x64.gif index 84458e540eba05459b1768055537ea25a8cc15e8..34f5d9695a8b8e8a7a6424b4b628d8911684410d 100644 GIT binary patch literal 402 zcmV;D0d4+ANk%w1VL$*t0J8u9KtMo4LqkSIMoUXePfkxzQBYi5Twh>cYinzCbaem! z|AK;ohK7cbk&&pVsJOVeA^8LW000UAEC2ui06+jh000F3P{~QFy*TU5yZ>M)j%4RN zWg0F401S;PV~*k8H-gSGi~lzmZ&U*sf4X7EcWmN>N=wm61tz1+s`dv}O}AjFnw5!_(mX?auh>>7zH# zn7nuY-~l_hkKnII3>`K!=r3PHiU~7XR0y%6z>7fTehBC_l3+=6E>3nh0OfCvOWz9J+3H}T-6Xnn_2#?zArBusJo=~Gool3PThX?=wJCCZy9RL6T literal 424 zcmV;Z0ayMUFZ%GK4?A^8LW000aCEC2ui06+jh000F3kjY7_y*TU5yZ>M)j$~<` zXo@~Y01%5RQwm_;$Sfmw|LQ1%&nEzu2E$>XVFWc?$)uv$sYS0jYKC|17PJ>(cRT=7 zkmK|c{7k!T)28+P&g!^yxB6v)9Q0zMYc zJ<-q=(l^f46xTM?)7IJ}+yLI#;NRQfBID)V=jQ3?;_3|S@9y#N^YRk*`S=t3?bFwf zp1^|qLL97Tuwg)8_=DJB{*M%9MnyTa*ZBfch!})l5^bKFX?Nk%w1VGsZi0J8u9KtMoFPEK50Ty1S_adC0~|Nnx5f{cuel$4a3nwq1d zqo}B;tgNiEv9i0nyUWYVA^8LW000F5EC2ui01yBW000D2u*gZPEhq$Zr5ivf5)PG# zsJInNkiJ0BNQ}ZTNrN|wO(g&YP#7Hkia`WYaU?p8li^V5Y)Y4u0|24rZo3nPU`#HL UXAgsV&1OFq<~VuQxkLZ}J8*bGK>z>% literal 159 zcmV;Q0AT+|Nk%w1VGsZi0J8u9KtMoBN=jK-S!QNtZ*OmmjEt3)m7boSq@<*^wY9ps zy8r+G#KgqQ%gfZ%)Y#bAA^8LW000XBEC2ui01yBW000C`aLGxlm8D!e02rI}2%Z-> zmlBk0QXOmz7?UB(+QJ-s@AHhwAO#`eF1%g|;T8ie N6u"); @@ -2924,8 +2924,8 @@ static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelecte Usr_PutHiddenParUsrCodAll (ActPrnLstAttStd,Gbl.Usrs.Select.All); if (StrAttCodsSelected[0]) Par_PutHiddenParamString ("AttCods",StrAttCodsSelected); - Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); + Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutSendIcon ("print",Txt_Print,Txt_Print); fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_centre.c b/swad_centre.c index 313125a70..51c8e2d5d 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -677,6 +677,9 @@ void Ctr_EditCentres (void) extern const char *Txt_There_is_no_list_of_institutions; extern const char *Txt_You_must_create_at_least_one_institution_before_creating_centres; + /***** Put link (form) to view centres *****/ + Lay_PutFormToView (ActSeeCtr); + /***** Get list of institutions of the current country *****/ Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_MINIMAL_DATA); if (Gbl.Inss.Num) diff --git a/swad_changelog.h b/swad_changelog.h index a0ee0c554..88d71b728 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -39,11 +39,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.70.2 (2015/01/27)" +#define Log_PLATFORM_VERSION "SWAD 14.70.3 (2015/01/28)" // 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 /* + Version 14.70.3: Jan 28, 2015 Some button messages changed. + Buttons to view when editing. (176217 lines) Version 14.70.2: Jan 27, 2015 Changed permissions in documents zones of institution, centre and degree. (176188 lines) Version 14.70.1: Jan 27, 2015 Fixed bug when removing a user from a course. (176187 lines) Version 14.70: Jan 26, 2015 Fixed bugs in statistics about sizes of file browsers. diff --git a/swad_country.c b/swad_country.c index 2504bcc85..d50cb8034 100644 --- a/swad_country.c +++ b/swad_country.c @@ -819,6 +819,9 @@ void Cty_EditCountries (void) { extern const char *Txt_No_countries_have_been_created; + /***** Put link (form) to view countries *****/ + Lay_PutFormToView (ActSeeCty); + /***** Get list of countries *****/ Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY; Cty_GetListCountries (Cty_GET_EXTRA_DATA); diff --git a/swad_course.c b/swad_course.c index 3fbc24e9e..7f0cfc16d 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1180,6 +1180,9 @@ static void Crs_EditCourses (void) { extern const char *Txt_No_courses_have_been_created_in_this_degree; + /***** Put link (form) to view courses *****/ + Lay_PutFormToView (ActSeeCrs); + /***** Help message *****/ if (!Gbl.CurrentDeg.Deg.NumCourses) // There aren't courses Lay_ShowAlert (Lay_INFO,Txt_No_courses_have_been_created_in_this_degree); diff --git a/swad_degree.c b/swad_degree.c index a97fdd0a4..15ec414c9 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1021,6 +1021,9 @@ static void Deg_EditDegreeTypes (void) { extern const char *Txt_There_are_no_types_of_degree; + /***** Put link (form) to view degree types *****/ + Lay_PutFormToView (ActSeeDegTyp); + /***** Help message *****/ if (!Gbl.Degs.DegTypes.Num) Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree); @@ -1734,7 +1737,7 @@ static void Deg_PutFormToCreateDegType (void) "" "%s" "" - "" + "" "%s" "" "", @@ -2236,6 +2239,9 @@ void Deg_EditDegrees (void) extern const char *Txt_There_is_no_list_of_types_of_degree; extern const char *Txt_You_must_create_at_least_one_type_of_degree_before_creating_degrees; + /***** Put link (form) to view degrees *****/ + Lay_PutFormToView (ActSeeDeg); + /***** Get list of degrees in the current centre *****/ Deg_GetListDegsOfCurrentCtr (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 9a39fb9d0..108cca550 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -4028,7 +4028,7 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin, Act_Action_t Action) { extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_View_as_a_student; + extern const char *Txt_View; extern const char *Txt_Edit; fprintf (Gbl.F.Out,"
"); @@ -4040,10 +4040,10 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin, switch (ShowOrAdmin) { case Brw_SHOW: - Act_LinkFormSubmit (Txt_View_as_a_student,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]); Lay_PutSendIcon ("visible_on", - Txt_View_as_a_student, - Txt_View_as_a_student); + Txt_View, + Txt_View); break; case Brw_ADMIN: Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]); diff --git a/swad_institution.c b/swad_institution.c index 7df8c0168..30ebc0703 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -685,6 +685,9 @@ void Ins_EditInstitutions (void) { extern const char *Txt_No_institutions_have_been_created_in_this_country; + /***** Put link (form) to view institutions *****/ + Lay_PutFormToView (ActSeeIns); + /***** Get list of institutions *****/ Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA); diff --git a/swad_layout.c b/swad_layout.c index 904751b4f..bec550b43 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -908,6 +908,23 @@ static void Lay_ShowRightColumn (void) ""); } +/*****************************************************************************/ +/************************* Put a link (form) to view *************************/ +/*****************************************************************************/ + +void Lay_PutFormToView (Act_Action_t Action) + { + extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *Txt_View; + + fprintf (Gbl.F.Out,"
"); + Act_FormStart (Action); + Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutSendIcon ("visible_on",Txt_View,Txt_View); + fprintf (Gbl.F.Out,"" + "
"); + } + /*****************************************************************************/ /************************* Put a link (form) to edit *************************/ /*****************************************************************************/ @@ -1438,10 +1455,10 @@ void Lay_PutLinkToPrintView1 (Act_Action_t NextAction) void Lay_PutLinkToPrintView2 (void) { extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Print_view; + extern const char *Txt_Print; - Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); + Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutSendIcon ("print",Txt_Print,Txt_Print); fprintf (Gbl.F.Out,""); } diff --git a/swad_layout.h b/swad_layout.h index 10bc684a2..a6ccf0b33 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -86,6 +86,7 @@ typedef enum void Lay_WriteStartOfPage (void); void Lay_WriteTitle (const char *Title); +void Lay_PutFormToView (Act_Action_t Action); void Lay_PutFormToEdit (Act_Action_t Action); void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text); void Lay_PutSendButton (const char *TextSendButton); diff --git a/swad_record.c b/swad_record.c index 16fa60a1b..8a983d45f 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1280,12 +1280,12 @@ void Rec_ListRecordsTchsCrs (void) void Rec_ShowLinkToPrintPreviewOfRecords (void) { extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Print_view; + extern const char *Txt_Print; extern const char *Txt_record_cards_per_page; unsigned i; - Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); + Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutSendIcon ("print",Txt_Print,Txt_Print); fprintf (Gbl.F.Out," (" "