chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r18407] Style changes - Fixed event into agenda when it's sent from assignment and Improved display form when you create an assignment - see FS#3583

Browse Source
skala
Cristian Fasanando 17 years ago
parent 12f8679472
commit f763aca505
4 changed files with 81 additions and 72 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      documentation/changelog.html
  2. 98
      main/calendar/agenda.inc.php
  3. 16
      main/work/work.lib.php
  4. 38
      main/work/work.php

1
documentation/changelog.html
Unescape View File

@ -168,6 +168,7 @@
<li>Fixed folders by default into document tool must not be removed - see FS#3611</li>
<li>Fixed qualification of themes into forum tool - see FS#3609</li>
<li>allow show results with floating point,in exercice tool - (partial FS#3630) - SVN#18367</li>
<li>Fixed event into agenda when it's sent from assignment and Improved display form when you create an assignment - see FS#3583</li>
</ul>
<br />
<h3>CSS changes</h3>

98
main/calendar/agenda.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 18260 2009-02-05 20:12:36Z ivantcholakov $
<?php //$Id: agenda.inc.php 18407 2009-02-10 16:03:50Z cfasanando $
/*
==============================================================================
@ -2270,13 +2270,13 @@ function display_one_agenda_item($agenda_id)
--------------------------------------------------*/
if ($number_items==0)
{
echo "<table id=\"data_table\" ><tr><td>".get_lang("NoAgendaItems")."</td></tr></table>";
echo "<table id=\"data_table\" class=\"data_table\"><tr><td>".get_lang("NoAgendaItems")."</td></tr></table>";
}
/*--------------------------------------------------
DISPLAY: THE ITEMS
--------------------------------------------------*/
echo "<table id=\"data_table\">\n";
echo "<table id=\"data_table\" class=\"data_table\">\n";
/*--------------------------------------------------
DISPLAY : the icon, title, destinees of the item
@ -2308,7 +2308,7 @@ function display_one_agenda_item($agenda_id)
}
echo "\t\t<td class=\"".$style."\">\n";
echo "\t\t<th>\n";
// adding an internal anchor
echo "\t\t\t<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
@ -2322,19 +2322,25 @@ function display_one_agenda_item($agenda_id)
echo Display::return_icon('group.gif');
}
echo " ".$myrow['title']."\n";
echo "\t\t</td>\n";
echo "\t\t</th>\n";
// the message has been sent to
echo "\t\t<td class=\"".$stylenotbold."\">".get_lang("SentTo").": ";
echo "\t\t<th>".get_lang("SentTo").": ";
$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
$sent_to_form=sent_to_form($sent_to);
echo $sent_to_form;
echo "</td>\n\t</tr>\n";
echo "</th>";
if (api_is_allowed_to_edit()) {
if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) )
{ // a coach can only delete an element belonging to his session
echo '<th>'.get_lang('Modify');
echo '</th></tr>';
}
}
/*--------------------------------------------------
DISPLAY: the title
--------------------------------------------------*/
echo "\t<tr class=\"".$stylenotbold."\">\n";
echo "\t<tr class='row_odd'>\n";
echo "\t\t<td>".get_lang("StartTime").": ";
echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."&nbsp;&nbsp;&nbsp;";
echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["start_date"])))."";
@ -2343,14 +2349,44 @@ function display_one_agenda_item($agenda_id)
echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."&nbsp;&nbsp;&nbsp;";
echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["end_date"])))."";
echo "</td>\n";
echo "\n\t</tr>\n";
/*--------------------------------------------------
DISPLAY: the content
DISPLAY: edit delete button (course admin only)
--------------------------------------------------*/
$export_icon = '../img/export.png';
$export_icon = '../img/export.png';
$export_icon_low = '../img/export_low_fade.png';
$export_icon_high = '../img/export_high_fade.png';
if (api_is_allowed_to_edit()) {
echo '<td colspan="2">';
if (!$repeat && api_is_allowed_to_edit(false,true)) {
// edit
$mylink = api_get_self()."?".api_get_cidreq()."&amp;origin=".Security::remove_XSS($_GET['origin'])."&amp;id=".$myrow['id'];
echo "<a href=\"".$mylink."&amp;action=edit\">",
Display::return_icon('edit.gif', get_lang('ModifyCalendarItem')), "</a>",
"<a href=\"".$mylink."&amp;action=delete\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."')) return false;\">",
Display::return_icon('delete.gif', get_lang('Delete')),"</a>";
if ($myrow['visibility']==1) {
$image_visibility="visible";
} else {
$image_visibility="invisible";
}
echo '<a href="'.$mylink.'&amp;action=showhide">',Display::return_icon($image_visibility, get_lang('Visible')),'</a>';
}
$mylink = 'ical_export.php?'.api_get_cidreq().'&amp;type=course&amp;id='.$myrow['id'];
echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
echo "</td></tr>";
if($repeat) {
echo '<tr>';
echo '<td colspan="2">',get_lang('RepeatedEvent'),'<a href="',api_get_self(),'?',api_get_cidreq(),'&amp;agenda_id=',$repeat_id,'" alt="',get_lang('RepeatedEventViewOriginalEvent'),'">',get_lang('RepeatedEventViewOriginalEvent'),'</a></td>';
echo '</tr>';
}
}
/*--------------------------------------------------
DISPLAY: the content
--------------------------------------------------*/
$content = $myrow['content'];
$content = make_clickable($content);
@ -2359,16 +2395,15 @@ function display_one_agenda_item($agenda_id)
//echo $content;
//echo "</td></tr>";
echo "<tr class='row_even'>";
echo '<td colspan="2">';
echo '<td '.(api_is_allowed_to_edit()?'colspan="3"':'colspan="2"'). '>';
echo $content;
echo '</td></tr>';
/*--------------------------------------------------
DISPLAY: the added resources
--------------------------------------------------*/
if (check_added_resources("Agenda", $myrow["id"]))
{
echo "<tr><td colspan='2'>";
if (check_added_resources("Agenda", $myrow["id"])) {
echo "<tr><td colspan='3'>";
echo "<i>".get_lang("AddedResources")."</i><br/>";
if ($myrow['visibility']==0)
{
@ -2376,38 +2411,7 @@ function display_one_agenda_item($agenda_id)
}
display_added_resources("Agenda", $myrow["id"], $addedresource_style);
echo "</td></tr>";
}
/*--------------------------------------------------
DISPLAY: edit delete button (course admin only)
--------------------------------------------------*/
echo '<tr><td colspan="2">';
if (!$repeat && api_is_allowed_to_edit(false,true)) {
// edit
$mylink = api_get_self()."?".api_get_cidreq()."&amp;origin=".Security::remove_XSS($_GET['origin'])."&amp;id=".$myrow['id'];
echo "<a href=\"".$mylink."&amp;action=edit\">",
Display::return_icon('edit.gif', get_lang('ModifyCalendarItem')), "</a>",
"<a href=\"".$mylink."&amp;action=delete\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."')) return false;\">",
Display::return_icon('delete.gif', get_lang('Delete')),"</a>";
if ($myrow['visibility']==1) {
$image_visibility="visible";
} else {
$image_visibility="invisible";
}
echo '<a href="'.$mylink.'&amp;action=showhide">',Display::return_icon($image_visibility, get_lang('Visible')),'</a><br /><br />';
}
$mylink = 'ical_export.php?'.api_get_cidreq().'&amp;type=course&amp;id='.$myrow['id'];
echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
echo "</td>";
if($repeat) {
echo '<tr>';
echo '<td colspan="2">',get_lang('RepeatedEvent'),'<a href="',api_get_self(),'?',api_get_cidreq(),'&amp;agenda_id=',$repeat_id,'" alt="',get_lang('RepeatedEventViewOriginalEvent'),'">',get_lang('RepeatedEventViewOriginalEvent'),'</a></td>';
echo '</tr>';
}
echo "</table>";
// closing the layout table
echo "</td>",

16
main/work/work.lib.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: work.lib.php 18365 2009-02-09 16:39:01Z cvargas1 $
<?php //$Id: work.lib.php 18407 2009-02-10 16:03:50Z cfasanando $
/* For licensing terms, see /dokeos_license.txt */
/**
* @package dokeos.work
@ -6,7 +6,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.lib.php 18365 2009-02-09 16:39:01Z cvargas1 $
* @version $Id: work.lib.php 18407 2009-02-10 16:03:50Z cfasanando $
*/
/**
* Displays action links (for admins, authorized groups members and authorized students)
@ -421,7 +421,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$form_folder -> addElement('html','<div class="row">
<div class="label">&nbsp;</div>
<div class="formw">
<a href="javascript://" onclick="if(document.getElementById(\'options\').style.display == \'none\'){document.getElementById(\'options\').style.display = \'block\';}else{document.getElementById(\'options\').style.display = \'none\';}"><img src="../img/add_na.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</a>
<a href="javascript://" onclick=" return plus();" ><span id="plus">&nbsp;<img src="../img/nolines_plus.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</span></a>
</div>
</div> ');
@ -437,16 +437,18 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
if($homework['expires_on']='0000-00-00 00:00:00') {
$homework['expires_on']=date("Y-m-d H:i:s");
$there_is_a_expire_date = true;
$form_folder -> addElement('checkbox', 'enableExpiryDate', null, get_lang('EnableExpiryDate'),'1');
$form_folder -> addElement('checkbox', 'enableExpiryDate',null,get_lang('EnableExpiryDate'),'onclick="javascript:if(this.checked==true){document.getElementById(\'option1\').style.display = \'block\';}else{document.getElementById(\'option1\').style.display = \'none\';}"');
$form_folder -> addElement('html','<div id=\'option1\' style="display:none">');
$form_folder -> addGroup(create_group_date_select(),'expires',get_lang('ExpiresAt'));
$form_folder -> addElement('html','</div>');
}
if($homework['ends_on']='0000-00-00 00:00:00') {
$homework['ends_on']=date("Y-m-d H:i:s");
$there_is_a_end_date = true;
$form_folder -> addElement('checkbox', 'enableEndDate', null, get_lang('EnableEndDate'),'1');
$form_folder -> addElement('checkbox', 'enableEndDate', null, get_lang('EnableEndDate'),'onclick="javascript:if(this.checked==true){document.getElementById(\'option2\').style.display = \'block\';}else{document.getElementById(\'option2\').style.display = \'none\';}"');
$form_folder -> addElement('html','<div id=\'option2\' style="display:none">');
$form_folder -> addGroup(create_group_date_select(),'ends',get_lang('EndsAt'));
$form_folder -> addElement('html','</div>');
}
$form_folder -> addRule (array('expires','ends'), get_lang('DateExpiredNotBeLessDeadLine'), 'comparedate');

38
main/work/work.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: work.php 18365 2009-02-09 16:39:01Z cvargas1 $
<?php //$Id: work.php 18407 2009-02-10 16:03:50Z cfasanando $
/* For licensing terms, see /dokeos_license.txt */
/**
* @package dokeos.work
@ -6,7 +6,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 18365 2009-02-09 16:39:01Z cvargas1 $
* @version $Id: work.php 18407 2009-02-10 16:03:50Z cfasanando $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -509,7 +509,7 @@ if (api_is_allowed_to_edit(false,true)) {
include_once('../calendar/agenda.inc.php');
include_once('../resourcelinker/resourcelinker.inc.php');
isset($course_info)?$course=$course_info:$course=null;
$agenda_id = agenda_add_item($course,$_POST['new_dir'],$_POST['new_dir'],date('Y-m-d H:i:s'),get_date_from_select('ends'),0,$user_id);
$agenda_id = agenda_add_item($course,$_POST['new_dir'],$_POST['new_dir'],date('Y-m-d H:i:s'),get_date_from_select('ends'),null,0);
endif;
$sql_add_publication = "INSERT INTO " . $work_table . " SET " .
@ -1221,7 +1221,7 @@ function draw_date_picker($prefix,$default='') {
$new_folder_text .= '<input type="hidden" name="sec_token" value="'.$stok.'" />';
$new_folder_text .= '<div id="msg_error1" style="display:none;color:red"></div>';
$new_folder_text .= get_lang('NewDir') . ' ';
$new_folder_text .= '<input type="text" name="new_dir"/>';
$new_folder_text .= '<input type="text" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>';
$new_folder_text .= '<input type="button" name="create_dir" onClick="validate();" value="' . get_lang('Ok') . '"/>';
//new additional fields inside the "if condition" just to agroup
if(true):
@ -1236,26 +1236,28 @@ function draw_date_picker($prefix,$default='') {
$addtext .= '<div style="padding:10px">';
$addtext .= '<fieldset style="padding:5px"><legend>'.get_lang('QualificationOfAssignment').'</legend>';
$addtext .= make_checkbox('make_calification').get_lang('MakeQualifiable').'<br />';
$addtext .= '<fieldset style="padding:5px"><legend>'.get_lang('QualificationOfAssignment').'</legend>';
$addtext .= '<table cellspacing="0" cellpading="0" border="0"><tr>';
$addtext .= '<td colspan="2">'.get_lang('WeightInTheGradebook').'</td><td>';
$addtext .= '<td colspan="2">&nbsp;&nbsp;'.get_lang('QualificationNumberOver').'&nbsp;';
$addtext .= '<input type="text" name="qualification_value" value="" size="5"/></td><tr><td colspan="2">';
$addtext .= '<input type="checkbox" value="1" name="make_calification" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>'.get_lang('MakeQualifiable').'</td></tr><tr>';
$addtext .= '<td colspan="2"><div id="option1" style="display:none">';
$addtext .= '<div id="msg_error_weight" style="display:none;color:red"></div>';
$addtext .= '<input type="text" name="weight" value="" size="5"/></td></tr>';
$addtext .= '<td colspan="2">'.get_lang('QualificationNumberOver').'</td><td>';
$addtext .= '<input type="text" name="qualification_value" value="" size="5"/></td></tr></table>';
$addtext .= '&nbsp;&nbsp;'.get_lang('WeightInTheGradebook').'&nbsp;';
$addtext .= '<input type="text" name="weight" value="" size="5" onfocus="document.getElementById(\'msg_error_weight\').style.display=\'none\';"/></div></td></tr>';
$addtext .= '</tr></table>';
$addtext .= '</fieldset><br />';
$addtext .= '<fieldset style="padding:5px"><legend>'.get_lang('DatesAvailables').'</legend>';
$addtext .= '* '.get_lang('ExpiresAt').'';
$addtext .= '&nbsp;&nbsp;&nbsp;<div id="msg_error2" style="display:none;color:red"></div>';
$addtext .= '&nbsp;&nbsp;&nbsp;<div id="msg_error3" style="display:none;color:red"></div>';
$addtext .= '<div style="padding:4px"><input type="checkbox" value="1" name="type1" />';
$addtext .= '* <input type="checkbox" value="1" name="type1" onclick="if(this.checked==true){document.getElementById(\'option2\').style.display=\'block\';}else{document.getElementById(\'option2\').style.display=\'none\';}"/>'.get_lang('EnableExpiryDate').'';
$addtext .= '&nbsp;&nbsp;&nbsp;<span id="msg_error2" style="display:none;color:red"></span>';
$addtext .= '&nbsp;&nbsp;&nbsp;<span id="msg_error3" style="display:none;color:red"></span>';
$addtext .= '<div id="option2" style="padding:4px;display:none">&nbsp;&nbsp;';
$addtext .= draw_date_picker('expires').'</div>';
$addtext .= '<br />* '.get_lang('EndsAt').'<br />';
$addtext .= '<br />* <input type="checkbox" value="1" name="type2" onclick="if(this.checked==true){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/>'.get_lang('EnableEndDate').'';
$addtext .= '<div id="option3" style="padding:4px;display:none">';
$addtext .= '&nbsp;&nbsp;&nbsp;<div id="msg_error4" style="display:none;color:red"></div>';
$addtext .= '<div style="padding:4px"><input type="checkbox" value="1" name="type2" />';
$addtext .= draw_date_picker('ends').'</div>';
$addtext .= '&nbsp;'.make_checkbox('add_to_calendar').get_lang('AddToCalendar').'<br />';
$addtext .= draw_date_picker('ends').'<br />';
$addtext .= '&nbsp;&nbsp;'.make_checkbox('add_to_calendar').get_lang('AddToCalendar').'</div>';
$addtext .= '</fieldset>';
$addtext .= '</div>';
$addtext .= '</div>';

Write Preview
Loading…
Cancel
Save