Skip to content

GitLab

Commit 8f96de63 authored by François Jacquet's avatar François Jacquet
Browse files

JS bug tipmessage return false 

- prevent returning on top of page
parent 01b831e4
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
functions/GetStuList.fnc.php
View file @ 8f96de63
......@@ -315,7 +315,7 @@ function makeContactInfo($student_id,$column)
}
else
$tipmessage = _('This student has no contact information.');
return button('phone','','"#" onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
return button('phone','','"#" onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
function removeDot00($value,$column)
......
modules/Attendance/Administration.php
View file @ 8f96de63
......@@ -351,7 +351,7 @@ function _makePhone($value,$column)
}
else
$tipmessage = _('This student has no contact information.');
return button('phone','','"#" onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
return button('phone','','"#" onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
function _makeCodePulldown($value,$title)
......
modules/Attendance/Administration_fast.old.php
View file @ 8f96de63
......@@ -187,7 +187,7 @@ function _makePhone($value,$column)
}
else
$tipmessage = _('This student has no contact information.');
return button('phone','','# onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
return button('phone','','# onMouseOver=\'stm(["'._('Contact Information').'","'.str_replace('"','\"',str_replace("'",''',$tipmessage)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
function _makeCodePulldown($value,$title)
......
modules/Attendance/TakeAttendance.php
View file @ 8f96de63
......@@ -192,7 +192,7 @@ function _makeTipMessage($value,$title)
{ global $THIS_RET,$StudentPicturesPath;
if($StudentPicturesPath && ($file = @fopen($picture_path=$StudentPicturesPath.UserSyear().'/'.$THIS_RET['STUDENT_ID'].'.jpg','r') || $file = @fopen($picture_path=$StudentPicturesPath.(UserSyear()-1).'/'.$THIS_RET['STUDENT_ID'].'.jpg','r')))
return '<DIV onMouseOver=\'stm(["'.str_replace('"','\"',str_replace("'",'&#39;',$THIS_RET['FULL_NAME'])).'","<IMG SRC=\"'.str_replace('\\','\\\\',$picture_path).'\" width=\"150\">"],tipmessageStyle);\' onMouseOut=\'htm()\'>'.$value.'</DIV>';
return '<DIV onMouseOver=\'stm(["'.str_replace('"','\"',str_replace("'",'&#39;',$THIS_RET['FULL_NAME'])).'","<IMG SRC=\"'.str_replace('\\','\\\\',$picture_path).'\" width=\"150\">"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'>'.$value.'</DIV>';
else
return $value;
}
......
modules/Attendance/TeacherCompletion.php
View file @ 8f96de63
......@@ -76,7 +76,7 @@ if(!$_REQUEST['period'])
foreach($periods as $period)
{
if(!isset($_REQUEST['_ROSARIO_PDF']))
$staff_RET[$i][$period['PERIOD_ID']] .= button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle);\' onMouseOut=\'htm()\'').' ';
$staff_RET[$i][$period['PERIOD_ID']] .= button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'').' ';
else
$staff_RET[$i][$period['PERIOD_ID']] = ($period['COMPLETED']=='Y'?_('Yes'):_('No'))." ";
}
......@@ -98,7 +98,7 @@ else
foreach($periods as $id=>$period)
{
if(!isset($_REQUEST['_ROSARIO_PDF']))
$RET[$staff_id][$id]['COMPLETED'] = button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle);\' onMouseOut=\'htm()\'').' ';
$RET[$staff_id][$id]['COMPLETED'] = button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'').' ';
else
$RET[$staff_id][$id]['COMPLETED'] = ($period['COMPLETED']=='Y'?_('Yes'):_('No'))." ";
}
......
modules/Food_Service/Student.inc.php
View file @ 8f96de63
......@@ -48,7 +48,7 @@ if(!$_REQUEST['modfunc'] && UserStudentID())
{
echo TextInput(array($student['ACCOUNT_ID'],'<span style="color:red">'.$student['ACCOUNT_ID'].'</span>'),'food_service[ACCOUNT_ID]',_('Account ID'),'size=12 maxlength=10');
$warning = _('Non-existent account!');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
else
echo TextInput($student['ACCOUNT_ID'],'food_service[ACCOUNT_ID]','Account ID','size=12 maxlength=10');
......@@ -58,7 +58,7 @@ if(!$_REQUEST['modfunc'] && UserStudentID())
$warning = Localize('colon',_('Other students associated with the same account')).'<BR />';
foreach($xstudents as $xstudent)
$warning .= '&nbsp;'.str_replace('\'','&#39;',$xstudent['FULL_NAME']).'<BR />';
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
echo '</TD>';
$options = array('Inactive'=>_('Inactive'),'Disabled'=>_('Disabled'),'Closed'=>_('Closed'));
......
modules/Food_Service/Students/Accounts.php
View file @ 8f96de63
......@@ -116,7 +116,7 @@ if(!$_REQUEST['modfunc'] && UserStudentID())
//var_dump($student['ACCOUNT_ID']);
echo TextInput(array($student['ACCOUNT_ID'],'<span style="color:red">'.$student['ACCOUNT_ID'].'</span>'),'food_service[ACCOUNT_ID]',_('Account ID'),'size=12 maxlength=10');
$warning = _('Non-existent account!');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
else
echo TextInput($student['ACCOUNT_ID'],'food_service[ACCOUNT_ID]',_('Account ID'),'size=12 maxlength=10');
......@@ -126,7 +126,7 @@ if(!$_REQUEST['modfunc'] && UserStudentID())
$warning = Localize('colon',_('Other students associated with the same account')).'<BR />';
foreach($xstudents as $xstudent)
$warning .= '&nbsp;'.str_replace('\'','&#39;',$xstudent['FULL_NAME']).'<BR />';
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
echo '</TD>';
$options = array('Inactive'=>_('Inactive'),'Disabled'=>_('Disabled'),'Closed'=>_('Closed'));
......
modules/Food_Service/User.inc.php
View file @ 8f96de63
......@@ -32,7 +32,7 @@ if(!$_REQUEST['modfunc'] && UserStaffID())
if(!$staff['ACCOUNT_ID'])
{
$warning = _('This user does not have a Meal Account.');
echo '<BR />'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo '<BR />'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
echo '</TD>';
......
modules/Food_Service/Users/Accounts.php
View file @ 8f96de63
......@@ -118,7 +118,7 @@ if(!$_REQUEST['modfunc'] && UserStaffID())
if(!$staff['ACCOUNT_ID'])
{
$warning = _('This user does not have a Meal Account.');
echo '<BR />'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
echo '<BR />'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
echo '</TD>';
......
modules/Grades/FinalGrades.php
View file @ 8f96de63
......@@ -171,7 +171,7 @@ if(isset($_REQUEST['modfunc']) && $_REQUEST['modfunc']=='save')
{
foreach($commentsB_RET as $comment)
$tipmessage .= $comment[1]['SORT_ORDER'].' - '.str_replace("'",'&acute;',$comment[1]['TITLE']).'<BR />';
$tipmessage = button('comment',_('Comment Codes'),'"#" onmouseover=\'stm(["'._('Report Card Comments').'","'.str_replace('"','\"',str_replace("'",'&#39;',$tipmessage)).'"],tipmessageStyle);\' onmouseout=\'htm()\'',24);
$tipmessage = button('comment',_('Comment Codes'),'"#" onmouseover=\'stm(["'._('Report Card Comments').'","'.str_replace('"','\"',str_replace("'",'&#39;',$tipmessage)).'"],tipmessageStyle); return false;\' onmouseout=\'htm()\'',24);
DrawHeader('',$tipmessage);
}
}
......
modules/Grades/InputFinalGrades.php
View file @ 8f96de63
......@@ -554,7 +554,7 @@ if(!isset($_REQUEST['_ROSARIO_PDF']))
foreach($commentsB_RET as $comment)
$tipmessage .= $comment[1]['SORT_ORDER'].' - '.str_replace("'",'&acute;',$comment[1]['TITLE']).'<BR />';
// $tipmessage = button('comment','Comment Codes','# onClick=\'stm(["Report Card Comments","'.$tipmessage.'"],["white","#333366","","","",,"black","#e8e8ff","","","",,,,2,"#333366",2,,,,,"",5,3,50,50]);\'','');
$tipmessage = button('comment',_('Comment Codes'),'"#" onmouseover=\'stm(["'._('Report Card Comments').'","'.str_replace('"','\"',str_replace("'",'&#39;',$tipmessage)).'"],tipmessageStyle);\' onmouseout=\'htm()\'',24);
$tipmessage = button('comment',_('Comment Codes'),'"#" onmouseover=\'stm(["'._('Report Card Comments').'","'.str_replace('"','\"',str_replace("'",'&#39;',$tipmessage)).'"],tipmessageStyle); return false;\' onmouseout=\'htm()\'',24);
}
//modif Francois: add label on checkbox
......
modules/Grades/TeacherCompletion.php
View file @ 8f96de63
......@@ -68,7 +68,7 @@ if(!$_REQUEST['period'])
foreach($periods as $period)
{
if(!isset($_REQUEST['_ROSARIO_PDF']))
$staff_RET[$i][$period['PERIOD_ID']] .= button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle);\' onMouseOut=\'htm()\'').' ';
$staff_RET[$i][$period['PERIOD_ID']] .= button($period['COMPLETED']=='Y'?'check':'x','','"#" onMouseOver=\'stm(["'._('Course Title').'","'.str_replace('"','\"',str_replace("'",'&#39;',$period['COURSE_TITLE'])).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'').' ';
else
$staff_RET[$i][$period['PERIOD_ID']] = $period['COMPLETED']=='Y'?_('Yes').' ':_('No').' ';
}
......
modules/Students/includes/Address.inc.php
View file @ 8f96de63
......@@ -331,7 +331,7 @@ if(empty($_REQUEST['modfunc']))
$ximages .= ' <IMG SRC="assets/mailbox_button.png" height="24">';
$warning .= '<b>'.str_replace(array("'",'"'),array('&#39;','&rdquo;'),$xstudent['FULL_NAME']).'</b>'.$ximages.'';
}
echo '<TH>'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'').'</TH>';
echo '<TH>'.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'').'</TH>';
}
else
echo '<TH>&nbsp;</TH>';
......@@ -481,7 +481,7 @@ if(empty($_REQUEST['modfunc']))
$ximages .= ' <IMG SRC="assets/emergency_button.png" height="24">';
$warning .= '<b>'.str_replace(array("'",'"'),array('&#39;','&rdquo;'),$xstudent['FULL_NAME']).'</b> ('.($xstudent['STUDENT_RELATION']?str_replace(array("'",'"'),array('&#39;','&rdquo;'),$xstudent['STUDENT_RELATION']):'---').')'.$ximages.'<BR />';
}
$images .= ' '.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle);\' onMouseOut=\'htm()\'');
$images .= ' '.button('warning','','"#" onMouseOver=\'stm(["'._('Warning').'","'.str_replace('"','\"',str_replace("'",'&#39;',$warning)).'"],tipmessageStyle); return false;\' onMouseOut=\'htm()\'');
}
if($contact['CUSTODY']=='Y')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment