Issue #306 - Assignments tool, translation: Suppressing DLTT links inside javascripts in order to prevent errors. Another minor correction - changing href="#" with href="javascript: void(0);" in a link in order to prevent unexpected scrolling of the page on IE6.

skala
Ivan Tcholakov 17 years ago
parent f5f55e1b55
commit 4404f295f5
  1. 16
      main/work/work.lib.php
  2. 2
      main/work/work.php

@ -1185,10 +1185,10 @@ function to_javascript_work() {
function plus() {
if(document.getElementById(\'options\').style.display == \'none\') {
document.getElementById(\'options\').style.display = \'block\';
document.getElementById(\'plus\').innerHTML=\' '.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).' '.addslashes(get_lang('AdvancedParameters')).'\';
document.getElementById(\'plus\').innerHTML=\' '.Display::return_icon('div_hide.gif',get_lang('Hide', ''),array('style'=>'vertical-align:middle')).' '.addslashes(get_lang('AdvancedParameters', '')).'\';
} else {
document.getElementById(\'options\').style.display = \'none\';
document.getElementById(\'plus\').innerHTML=\' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.addslashes(get_lang('AdvancedParameters')).'\';
document.getElementById(\'options\').style.display = \'none\';
document.getElementById(\'plus\').innerHTML=\' '.Display::return_icon('div_show.gif',get_lang('Show', ''),array('style'=>'vertical-align:middle')).' '.addslashes(get_lang('AdvancedParameters', '')).'\';
}
}
@ -1286,25 +1286,25 @@ function to_javascript_work() {
if(new_dir==""){
msg_id1.style.display ="block";
msg_id1.innerHTML="'.get_lang('FieldRequired').'";
msg_id1.innerHTML="'.get_lang('FieldRequired', '').'";
msg_id2.innerHTML="";msg_id3.innerHTML="";msg_id4.innerHTML="";msg_id5.innerHTML="";
}
else if(document.form1.type1.checked==true && document.form1.type2.checked==true && expires_date > ends_date) {
msg_id2.style.display ="block";
msg_id2.innerHTML="'.get_lang('EndDateCannotBeBeforeTheExpireDate').'";
msg_id2.innerHTML="'.get_lang('EndDateCannotBeBeforeTheExpireDate', '').'";
msg_id1.innerHTML="";msg_id3.innerHTML="";msg_id4.innerHTML="";msg_id5.innerHTML="";
}
else if (checkDate(expires_month,expires_day,expires_year) == false)
{
msg_id3.style.display ="block";
msg_id3.innerHTML="'.get_lang('InvalidDate').'";
msg_id3.innerHTML="'.get_lang('InvalidDate', '').'";
msg_id1.innerHTML="";msg_id2.innerHTML="";msg_id4.innerHTML="";msg_id5.innerHTML="";
}
else if (checkDate(ends_month,ends_day,ends_year) == false)
{
msg_id4.style.display ="block";
msg_id4.innerHTML="'.get_lang('InvalidDate').'";
msg_id4.innerHTML="'.get_lang('InvalidDate', '').'";
msg_id1.innerHTML="";msg_id2.innerHTML="";msg_id3.innerHTML="";msg_id5.innerHTML="";
}
else
@ -1315,7 +1315,7 @@ function to_javascript_work() {
var weight = document.form1.weight.value;
if(weight==""){
msg_id5.style.display ="block";
msg_id5.innerHTML="'.get_lang('WeightNecessary').'";
msg_id5.innerHTML="'.get_lang('WeightNecessary', '').'";
msg_id1.innerHTML="";msg_id2.innerHTML="";msg_id3.innerHTML="";msg_id4.innerHTML="";
return false;
}

@ -1318,7 +1318,7 @@ function draw_date_picker($prefix,$default='') {
$new_folder_text .= '<div class="row">
<div class="label">
<a href="#" onclick=" return plus();"><span id="plus">'.Display::return_icon('div_show.gif',get_lang('AdvancedParameters'),array('style'=>'vertical-align:center')).' '.get_lang('AdvancedParameters').'</span></a><br />
<a href="javascript: void(0);" onclick="javascript: return plus();"><span id="plus">'.Display::return_icon('div_show.gif',get_lang('AdvancedParameters'),array('style'=>'vertical-align:center')).' '.get_lang('AdvancedParameters').'</span></a><br />
</div>
<div class="formw">
'.$addtext.'

Loading…
Cancel
Save