diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index 7515e39626..b71a089d3c 100755 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -595,7 +595,7 @@ if ($is_allowedToEdit && $origin != 'learnpath') { echo '' . Display :: return_icon('import_hotpotatoes.png', get_lang('ImportHotPotatoesQuiz'),'','32').''; // link to import qti2 ... echo '' . Display :: return_icon('import_qti2.png', get_lang('ImportQtiQuiz'),'','32') .''; - //echo '' . Display :: return_icon('show_test_results.gif', get_lang('Results')) . get_lang('Results') . ''; + //echo '' . Display :: return_icon('test_results.png', get_lang('Results'),'',32) .''; } // the actions for the statistics @@ -639,7 +639,7 @@ if ($is_allowedToEdit && $origin != 'learnpath') { if ($show == 'result') { echo '' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'','32').''; } else { - //echo '' . Display :: return_icon('show_test_results.gif', get_lang('Results')) . get_lang('Results') . ''; + //echo '' . Display :: return_icon('test_results.png', get_lang('Results'),'',32) . ''; } } @@ -800,31 +800,31 @@ if ($show == 'test') { //Settings //$actions = Display::url(Display::return_icon('edit.gif',get_lang('Edit'), array('width'=>'20px')), 'exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$row['id']); - $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),array('width' =>'22px')), 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id']); + $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),array(),22), 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id']); - $actions .='' . Display :: return_icon('show_test_results.gif', get_lang('Results')).''; + $actions .='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; //Export - $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); + $actions .= Display::url(Display::return_icon('duplicate_test.png', get_lang('CopyExercise'),'',22), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); //Clean exercise - $actions .= Display::url(Display::return_icon('clean_group.png', get_lang('CleanStudentResults')),'', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['id'])); + $actions .= Display::url(Display::return_icon('clean.png', get_lang('CleanStudentResults'),'',22),'', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['id'])); //Visible / invisible if ($row['active']) { - $actions .= Display::url(Display::return_icon('visible.gif', get_lang('Deactivate')) , 'exercice.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); + $actions .= Display::url(Display::return_icon('visible.png', get_lang('Deactivate'),'',22) , 'exercice.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); } else { // else if not active - $actions .= Display::url(Display::return_icon('invisible.gif', get_lang('Activate')) , 'exercice.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); + $actions .= Display::url(Display::return_icon('invisible.png', get_lang('Activate'),'',22) , 'exercice.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); } // Export qti ... $actions .= Display::url(Display::return_icon('export_qti2.png','IMS/QTI','','22'), 'exercice.php?choice=exportqti2&exerciseId='.$row['id']); } else { // not session resource $actions = Display::return_icon('edit_na.png', get_lang('ExerciseEditionNotAvailableInSession')); - $actions .='' . Display :: return_icon('show_test_results.gif', get_lang('Results')).''; + $actions .='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); } //Delete if ($session_id == $row['session_id']) { - $actions .= Display::url(Display::return_icon('delete.png', get_lang('Delete')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'])); + $actions .= Display::url(Display::return_icon('delete.png', get_lang('Delete'),'',22), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'])); } //$actions .= '
'; @@ -850,7 +850,7 @@ if ($show == 'test') { echo ' '; echo Display::url(Display::return_icon('preview.gif',get_lang('Preview'), array('width'=>'22px'))." ".get_lang('Preview'), 'exercice_submit.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$row['id']); echo ' '; - echo Display::url(Display::return_icon('show_test_results.gif',get_lang('Results'), array('width'=>'22px'))." ".get_lang('Results'), 'exercice.php?'.api_get_cidreq().'&show=result&exerciseId='.$row['id']); + echo Display::url(Display::return_icon('test_results.png',get_lang('Results'), array('width'=>'22px'),22)." ".get_lang('Results'), 'exercice.php?'.api_get_cidreq().'&show=result&exerciseId='.$row['id']); echo '';*/ echo Display::tag('tr',$item); } else { @@ -943,7 +943,7 @@ if ($show == 'test') { } $item .= Display::tag('td', $attempt_text); //See results - $actions ='' . Display :: return_icon('show_test_results.gif', get_lang('Results')).''; + $actions ='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; $item .= Display::tag('td', $actions); echo Display::tag('tr',$item); @@ -995,17 +995,19 @@ if ($show == 'test') { $item = Display::tag('td','HotPotatoes '.$title.' '); $item .= Display::tag('td','-'); - $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),array('width' =>'22px')), 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path); - $actions .='' . Display :: return_icon('show_test_results.gif', get_lang('Results')).''; + $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),array(),22), 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path); + $actions .='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; // if active if ($active) { $nbrActiveTests = $nbrActiveTests +1; - $actions .= ' '.api_htmlentities(get_lang('Deactivate'),ENT_QUOTES,$charset).''; + $actions .= ' '.Display :: return_icon('visible.png', get_lang('Deactivate'),'',22).''; } else { // else if not active - $actions .=' '.api_htmlentities(get_lang('Activate'),ENT_QUOTES,$charset).''; + $actions .=' '.Display :: return_icon('invisible.png', get_lang('Activate'),'',22).''; } - $actions .= ''.api_htmlentities(get_lang('Delete'),ENT_QUOTES,$charset).''; + $actions .= ''.Display :: return_icon('delete.png', get_lang('Delete'),'',22).''; + + //$actions .=''; $item .= Display::tag('td', $actions); @@ -1016,7 +1018,7 @@ if ($show == 'test') { $item .= Display::tag('td', ''.$title.''); $item .= Display::tag('td', ''); $item .= Display::tag('td', ''); - $actions ='' . Display :: return_icon('show_test_results.gif', get_lang('Results')).''; + $actions ='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; $item .= Display::tag('td', $actions); echo Display::tag('tr',$item); } diff --git a/main/img/icons/22/assessment.png b/main/img/icons/22/assessment.png new file mode 100644 index 0000000000..ce7d6b182f Binary files /dev/null and b/main/img/icons/22/assessment.png differ diff --git a/main/img/icons/22/duplicate_test.png b/main/img/icons/22/duplicate_test.png new file mode 100644 index 0000000000..5b6f20ca44 Binary files /dev/null and b/main/img/icons/22/duplicate_test.png differ diff --git a/main/img/icons/22/test_results.png b/main/img/icons/22/test_results.png new file mode 100644 index 0000000000..190b0323ec Binary files /dev/null and b/main/img/icons/22/test_results.png differ diff --git a/main/img/icons/32/test_results.png b/main/img/icons/32/test_results.png new file mode 100644 index 0000000000..a2b5c5d26f Binary files /dev/null and b/main/img/icons/32/test_results.png differ diff --git a/main/img/icons/48/_sum.txt b/main/img/icons/48/_sum.txt index e80cf485c0..4520d1409f 100644 --- a/main/img/icons/48/_sum.txt +++ b/main/img/icons/48/_sum.txt @@ -257,8 +257,8 @@ lp_publish crystal (only 22 px) lp_publish_na modif crystal (only 22 px) bug crystal bug_na modif crystal - - +test_results crystal +duplicate_test modif nuvola --julio star diff --git a/main/img/icons/48/duplicate_test.png b/main/img/icons/48/duplicate_test.png new file mode 100644 index 0000000000..44e6bcc74a Binary files /dev/null and b/main/img/icons/48/duplicate_test.png differ diff --git a/main/img/icons/48/test_results.png b/main/img/icons/48/test_results.png new file mode 100644 index 0000000000..18bf7a4834 Binary files /dev/null and b/main/img/icons/48/test_results.png differ