From a3c3ff57abe1ff98bcf6ea3592560eebd1481677 Mon Sep 17 00:00:00 2001 From: Carlos Vargas Date: Wed, 28 Apr 2010 15:40:30 -0500 Subject: [PATCH] Improve Gradebook Tool part 2 CT#968 --- main/css/blue_lagoon/default.css | 1 + main/css/chamilo/default.css | 1 + main/css/chamilo_green/default.css | 1 + main/css/chamilo_red/default.css | 1 + main/css/cool_blue/default.css | 1 + main/css/corporate/default.css | 1 + main/css/delicious_bordeaux/default.css | 1 + main/css/dokeos_blue/default.css | 1 + main/css/dokeos_classic/default.css | 1 + main/css/dokeos_classic_2D/default.css | 1 + main/css/empire_green/default.css | 1 + main/css/fruity_orange/default.css | 1 + main/css/medical/default.css | 1 + main/css/public_admin/default.css | 1 + main/css/royal_purple/default.css | 1 + main/css/silver_line/default.css | 1 + main/css/sober_brown/default.css | 1 + main/css/steel_grey/default.css | 1 + main/css/tasty_olive/default.css | 1 + main/gradebook/lib/fe/displaygradebook.php | 9 +++------ main/gradebook/lib/fe/evalform.class.php | 12 ++++++------ main/img/nocertificate.png | Bin 798 -> 803 bytes 22 files changed, 28 insertions(+), 12 deletions(-) diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 198a3b6009..837a7a2c61 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2155,6 +2155,7 @@ span.radio { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index b8fe2189c1..db462815ba 100755 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -2379,6 +2379,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css index 8e20e4e648..85520ead31 100755 --- a/main/css/chamilo_green/default.css +++ b/main/css/chamilo_green/default.css @@ -2387,6 +2387,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css index e3a7c22ac6..dc98c74acc 100755 --- a/main/css/chamilo_red/default.css +++ b/main/css/chamilo_red/default.css @@ -2383,6 +2383,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index 55ba4a69ba..3a2ebff493 100755 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -2043,6 +2043,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index 52965f1486..b492a14cfd 100755 --- a/main/css/corporate/default.css +++ b/main/css/corporate/default.css @@ -1499,6 +1499,7 @@ span.radio { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index 5a7ad128a3..4f580dc9c7 100755 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -2036,6 +2036,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index 86bfbb3912..a041a9b77a 100755 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -2049,6 +2049,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index eacbb6b505..a6f949f7ce 100755 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -2118,6 +2118,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index 5345fc9244..4ba49d6103 100755 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -2152,6 +2152,7 @@ input.forms { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index 22a613160c..88c50d4f7e 100755 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -2060,6 +2060,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 79227a2c44..58f3b7eb9b 100755 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -2060,6 +2060,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/medical/default.css b/main/css/medical/default.css index 937acedbee..df7ec7a403 100755 --- a/main/css/medical/default.css +++ b/main/css/medical/default.css @@ -2077,6 +2077,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index e9c6267e67..24a7bf9860 100755 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -2097,6 +2097,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index ed6003eaa3..f58d76901e 100755 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -2056,6 +2056,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index a84eb53cf3..f4e3c5cc74 100755 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -1764,6 +1764,7 @@ div.system_announcement { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 0e83493bda..db3f380193 100755 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -2116,6 +2116,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css index 6cc29f8f1f..6ec86c1e5b 100755 --- a/main/css/steel_grey/default.css +++ b/main/css/steel_grey/default.css @@ -2061,6 +2061,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index 4382069dce..9061e0f2aa 100755 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -2041,6 +2041,7 @@ div.comments { float: left; width: 25%; text-align: left; + padding-top:8px; } .formw_result { width: 75%; diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index b6cf260052..686267ccca 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -302,11 +302,9 @@ class DisplayGradebook $header .= ''.Display::return_icon('statistics.gif', get_lang('EditAllWeights')).' ' . get_lang('EditAllWeights') . ''; $my_course_id=api_get_course_id(); $my_file= substr($_SESSION['gradebook_dest'],0,5); - if ($my_file!='index' || api_is_platform_admin()) { - $header .= ''.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . ''; - - } + if (api_is_allowed_to_edit(null, true)) { + $header .= ''.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . ''; $header .= ''.Display::return_icon('stats_access.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . ''; $header .= ''.Display::return_icon('certificate.png', get_lang('AttachCertificate')).' ' . get_lang('AttachCertificate') . ''; $header .= ''.Display::return_icon('gradebook_eval_not_empty.gif', get_lang('GradebookSeeListOfStudentsCertificates')).' ' . get_lang('GradebookSeeListOfStudentsCertificates') . ''; @@ -344,8 +342,7 @@ class DisplayGradebook if ($is_course_admin) { $header .= ''.Display::return_icon('stats_access.gif', get_lang('FlatView')).' '. get_lang('FlatView') . ''; - if ( api_is_platform_admin() /*$is_platform_admin || $is_course_admin*/) - $header .= ''.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . ''; + $header .= ''.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . ''; } elseif (!(isset ($_GET['studentoverview']))) { $header .= ''.Display::return_icon('view_list.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . ''; } else { diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php index caff914c80..94ba060a39 100755 --- a/main/gradebook/lib/fe/evalform.class.php +++ b/main/gradebook/lib/fe/evalform.class.php @@ -120,14 +120,14 @@ class EvalForm extends FormValidator $this->addElement('hidden', 'minvalue', 0); $this->addElement('header','h1',''.get_lang('EditResult').''); $renderer = $this->defaultRenderer(); - $elementTemplateTwoLabel = '
'; $results_and_users = array(); foreach ($this->result_object as $result) { @@ -192,14 +192,14 @@ class EvalForm extends FormValidator $this->addElement('header','h1',''.get_lang('AddResult').''); $renderer = $this->defaultRenderer(); - $elementTemplateTwoLabel = '
-
+ $elementTemplateTwoLabel = '
    +
  • * {label}
    {error}
    {element} / '.$this->evaluation_object->get_max().' -
    -
'; +
+
'; foreach ($tblusers as $user) { //user_id, user.username, lastname, firstname $this->add_textfield('score[' . $user[0] . ']', diff --git a/main/img/nocertificate.png b/main/img/nocertificate.png index 063746d702a7e3adc89b064d73c67ab99f4195b9..5fdc9c6dd566b44f5f63641adc22bcb3cdcc1e30 100755 GIT binary patch delta 787 zcmV+u1MK{s2BQWpiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxI{*Lx0drDE zLIAGL9O;oj9)H>d926uU_whXO0008DNklHWz$*ug&VwFmz zAHZsK9vmE?lp>B}9LGUxjg%7Gwvkd|7zU967WyR zFFt5U0o@#Xn#}_MG*iiD=VCwobdGYgw~oc3|U-U zWN&W|fWyN>ve_(!LV;+uH#c85!Z|=!mVYEvBZXs8*}Y&dzdv zevVR#$Hzwsg#y)T72o&i?d|3E_BIig0t+Ds!w`VZ&Q3hf!}B}6BLU@%3S3#*VosdEuc*Z@ojT+^W%T{IW8|Rxxc@s zudnZVeSQ5O1Ly_3*Du|l*zoZ1$ko-=mmmlp0S#1*f9u>1*!&%ffhYbi`wrE<5fp}r RaiRbK002ovPDHLkV1lKIa;g9T delta 782 zcmV+p1M&Q$2A&2$iBL{Q4GJ0x0000DNk~Le0000K0000G2m$~A0GWEoOaK4?0drDE zLIAGL9O(c600v@9M??Vs0RI60puMM)kuDy8*#-j-CJQ@2pqKyv0-i}kK~yNub&^d> zD=`#?lT6x~Ov|*+SVaUEbs_k%b)#+sLGW++A4LCwD;F+A3bPRr1wnA(q9BEWI<(g5 z*qKb4ue&&<_ik<$2|3}sdCoa6w$>VB5JJ{kjPZOYgrNVd`74FH);dko@p#NRCxj4x zLbTQp#~4FIDdoDZ=Xs4rqtR$!jH$KOTI)E@{r&x5Fj!bv@H|gS={OETNGbI%g%Dyi z8tw1zZ*OnUl7TZ#)02~vR;#78rj%N15keSa-~@?0&u?yS(liCF8Mc(t^Sm$&-{0Rk z=V2HEbHCrOR;%ml>%-x2X=$n1Y&M&J&7YqiP^9oJ2xE*}trkLvQVOV16d7YGmCDM> z3KYT^D~bY$D6qM%tF?95d=Y5mYnl?z20uO%d%WtTpSDrkVOF77~}iCwRSR@}# zJ)WCxG#Yg}ogfJI_V$7xSY2Iz-P+npl0*m*MNu5bS(bf$ecj&P!XW=*PbQNr%g)Zu zPESv>EF*-#gtXSRT5V%vqb$pAx4W~mQxt_#3V5+G1{jo5lu{Vx+&Ps>rPJx$-Q9&@ z`1||IIX^x=J~%i4U(mS+9mi2hNhv|jbzO{c9LI4S`@Vm4bX2d`udlB~pPrsJH#egw zveqJFj4?(CA%sv$8Dq58Qc5W$=iFL591gFpuHgFk_^7qc^Bg|-14Zh`!g@yG#Q*>R M07*qoM6N<$g5Mczod5s;