Skip to content

GitLab

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

Add widget & hide + remove cellpadding-0/1/2/3/4/6 CSS classes 

Remove inline CSS
Rewrite switchMenu function (jQuery)
parent bf817b15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 318 deletions
Help.php
View file @ e882e26a
......@@ -71,7 +71,7 @@ foreach($help as $program=>$value)
?>
</h3>
<TABLE class="width-100p cellpadding-5"><TR><TD class="header2">
<TABLE class="width-100p"><TR><TD class="header2">
<?php if($student==true)
$value = str_replace('your child','yourself',str_replace('your child\'s','your',$value));
......
ProgramFunctions/PortalPollsNotes.fnc.php
View file @ e882e26a
......@@ -220,7 +220,7 @@ function makePublishing($value,$name)
}
//modif Francois: remove LO_field
$return .= '<TABLE class="cellpadding-0 cellspacing-0 widefat"><TR><TD><b>'._('Visible Between').':</b><BR />';
$return .= '<TABLE class="cellspacing-0 widefat"><TR><TD><b>'._('Visible Between').':</b><BR />';
$return .= DateInput($value,'values['.$id.']['.$name.']').' '._('to').' ';
$return .= DateInput($THIS_RET['END_DATE'],'values['.$id.'][END_DATE]').'</TD></TR>';
//modif Francois: css WPadmin
......@@ -229,7 +229,7 @@ function makePublishing($value,$name)
if(!$profiles_RET)
$profiles_RET = DBGet(DBQuery("SELECT ID,TITLE FROM USER_PROFILES ORDER BY ID WHERE"));
$return .= '<TABLE class="width-100p cellspacing-0 cellpadding-0"><TR><TD colspan="2"><b>'._('Visible To').':</b></TD></TR><TR class="st">';
$return .= '<TABLE class="width-100p cellspacing-0"><TR><TD colspan="2"><b>'._('Visible To').':</b></TD></TR><TR class="st">';
$i=0;
foreach(array('admin'=>_('Administrator w/Custom'),'teacher'=>_('Teacher w/Custom'),'parent'=>_('Parent w/Custom')) as $profile_id=>$profile)
{
......
ProgramFunctions/StudentsUsersInfo.fnc.php
View file @ e882e26a
......@@ -237,7 +237,7 @@ function _makeMultipleInput($column,$name,$request)
$return = '<DIV id="div'.$request.'['.$column.']"><div class="onclick" onclick=\'javascript:addHTML(html'.$request.$column;
}
$table = '<TABLE class="cellpadding-3">';
$table = '<TABLE class="cellpadding-5">';
if(count($options)>12)
{
$table .= '<TR><TD colspan="2">';
......
Side.php
View file @ e882e26a
......@@ -361,7 +361,7 @@ $addJavascripts .= 'var menuStudentID = "'.UserStudentID().'"; var menuStaffID =
?>
<A href="Modules.php?modname=<?php echo $modcat_menu['default']; ?>" class="menu-top"><IMG SRC="modules/<?php echo $key[$i]; ?>/icon.png" height="32" style="vertical-align:middle;">&nbsp;<?php echo $module_title; ?></A>
<DIV id="menu_<?php echo $key[$i]; ?>" class="wp-submenu">
<TABLE class="width-100p cellspacing-0 cellpadding-0">
<TABLE class="width-100p cellspacing-0">
<?php unset($modcat_menu['default']);
......
assets/js/warehouse.js
View file @ e882e26a
......@@ -15,14 +15,19 @@ function checkAll(form,value,name_like){
}
}
function switchMenu(id){
if(document.getElementById(id).style.display=='none'){
document.getElementById(id).style.display = 'block';
document.getElementById(id+'_arrow').src = 'assets/arrow_down.gif';
document.getElementById(id+'_arrow').height = 9;
var $id = $('#'+id);
if($id.css('display')=='none'){
$id.show();
$('#'+id+'_arrow').attr({
src: 'assets/arrow_down.gif',
height: 9
});
}else{
document.getElementById(id).style.display = 'none';
document.getElementById(id+'_arrow').src = 'assets/arrow_right.gif';
document.getElementById(id+'_arrow').height = 12;
$id.hide();
$('#'+id+'_arrow').attr({
src: 'assets/arrow_right.gif',
height: 12
});
}
}
......
assets/themes/WPadmin/stylesheet.css
View file @ e882e26a
......@@ -331,6 +331,9 @@ h3 span{
}
/*added*/
.hide{
display:none
}
#studentImg, #userImg{
max-width:150px;
max-height:150px
......@@ -420,30 +423,20 @@ table.cellspacing-0{
/*width="100%"*/
width:100%
}
table.cellpadding-0 > td{
padding:0px
}
table.cellpadding-1 > td{
padding:1px
}
table.cellpadding-2 > td{
padding:2px
}
table.cellpadding-3 > td{
padding:3px
}
table.cellpadding-5 > td{
padding:5px
}
table.cellpadding-6 > td{
padding:6px
table.cellpadding-5 td{
padding-right:5px;
padding-bottom:5px
}
td.popTable{
padding:5px;
padding:5px
}
td.valign-top,tr.valign-top{
vertical-align:top
}
table.col1-align-right td:first-child{
text-align:right;
vertical-align:middle
}
.center{
/*<CENTER> && <TD align="center">*/
text-align:center
......
assets/themes/WPadmin/stylesheet_wkhtmltopdf.css
View file @ e882e26a
......@@ -331,6 +331,9 @@ h3 span{
}
/*added*/
.hide{
display:none
}
#studentImg, #userImg{
max-width:150px;
max-height:150px
......@@ -420,30 +423,22 @@ table.cellspacing-0{
/*width="100%"*/
width:100%
}
table.cellpadding-0 > td{
table.> td{
padding:0px
}
table.cellpadding-1 > td{
padding:1px
}
table.cellpadding-2 > td{
padding:2px
}
table.cellpadding-3 > td{
padding:3px
}
table.cellpadding-5 > td{
table.cellpadding-5 td{
padding:5px
}
table.cellpadding-6 > td{
padding:6px
}
td.popTable{
padding:5px;
}
td.valign-top,tr.valign-top{
vertical-align:top
}
table.col1-align-right td:first-child{
text-align:right;
vertical-align:middle
}
.center{
/*<CENTER> && <TD align="center">*/
text-align:center
......
functions/DrawHeader.fnc.php
View file @ e882e26a
......@@ -3,7 +3,7 @@
function DrawHeader($left='',$right='',$center='')
{ global $_ROSARIO;
echo '<TABLE class="width-100p cellspacing-0 cellpadding-0"><TR class="st">';
echo '<TABLE class="width-100p cellspacing-0"><TR class="st">';
//modif Francois: CSS WPadmin
if($left)
echo '<TD '.$_ROSARIO['DrawHeader'].' style="text-align:left;">&nbsp;'.(empty($_ROSARIO['DrawHeader'])? (!empty($_ROSARIO['HeaderIcon']) ? '<H2>'.'<IMG src="'.$_ROSARIO['HeaderIcon'].'" class="headerIcon" /> '.$left.'</H2>' : '<H2>'.$left.'</H2>'):$left).'</TD>';
......
functions/GetStuList.fnc.php
View file @ e882e26a
......@@ -388,7 +388,7 @@ function makeParents($student_id,$column)
ORDER BY sjp.CUSTODY,sjp.STUDENT_RELATION,p.LAST_NAME,p.FIRST_NAME"));
if(count($people_RET))
{
$THIS_RET['PARENTS'] .= '<TABLE class="cellpadding-0 cellspacing-0">';
$THIS_RET['PARENTS'] .= '<TABLE class="cellspacing-0">';
foreach($people_RET as $person)
{
//modif Francois: PrintClassLists with all contacts
......
functions/Inputs.php
View file @ e882e26a
......@@ -313,7 +313,7 @@ function RadioInput($value,$name,$title='',$options,$allow_na='N/A',$extra='',$d
if($value!='' && $div)
$return = '<DIV id="div'.$name.'"><div class="onclick" onclick=\'javascript:addHTML(html'.str_replace(array('[',']','-'),'',$name);
$table = '<TABLE class="cellpadding-0 cellspacing-0" '.$extra.'><TR class="center">';
$table = '<TABLE class="cellspacing-0 cellpadding-5" '.$extra.'><TR class="center">';
if($allow_na!==false)
{
......
functions/ListOutput.fnc.php
View file @ e882e26a
......@@ -443,11 +443,11 @@ function ListOutput($result,$column_names,$singular='.',$plural='.',$link=false,
// SEARCH BOX & MORE HEADERS
if(!empty($options['header']))
echo '<TABLE class="postbox width-100p cellspacing-0 cellpadding-0" style="margin-bottom:0px; border-bottom:solid 1px #f1f1f1;"><TR><TD class="center">'.$options['header'].'</TD></TR></TABLE><div class="postbox" style="padding:5px; border-top:none; border-top-left-radius:0px; border-top-right-radius:0px; box-shadow: none;">';
echo '<TABLE class="postbox width-100p cellspacing-0" style="margin-bottom:0px; border-bottom:solid 1px #f1f1f1;"><TR><TD class="center">'.$options['header'].'</TD></TR></TABLE><div class="postbox" style="padding:5px; border-top:none; border-top-left-radius:0px; border-top-right-radius:0px; box-shadow: none;">';
if(!empty($where_message) || (($singular!='.') && ($plural!='.')) || (!isset($_REQUEST['_ROSARIO_PDF']) && $options['search']))
{
echo '<TABLE class="width-100p cellpadding-1">';
echo '<TABLE class="width-100p">';
echo '<TR class="st"><TD style="text-align:left;">';
if(($singular!='.') && ($plural!='.') && $options['count'])
{
......@@ -705,7 +705,7 @@ function ListOutput($result,$column_names,$singular='.',$plural='.',$link=false,
echo '</TD></TR></TBODY></TABLE>';
if(!empty($options['header']))
echo '<TABLE class="postbox width-100p cellspacing-0 cellpadding-0" style="margin-bottom:0px; border-bottom:0px;"><TR><TD class="center">'.$options['header'].'</TD></TR></TABLE><div class="postbox" style="padding:5px; border-top:none; border-top-left-radius:0px; border-top-right-radius:0px; box-shadow: none;">';
echo '<TABLE class="postbox width-100p cellspacing-0" style="margin-bottom:0px; border-bottom:0px;"><TR><TD class="center">'.$options['header'].'</TD></TR></TABLE><div class="postbox" style="padding:5px; border-top:none; border-top-left-radius:0px; border-top-right-radius:0px; box-shadow: none;">';
if($link['add']['link'] && !isset($_REQUEST['_ROSARIO_PDF']))
echo '<span class="center">' . button('add',$link['add']['title'],$link['add']['link']) . '</span>';
......
functions/PopTable.fnc.php
View file @ e882e26a
......@@ -9,20 +9,17 @@ function PopTable($action,$title='Search',$table_att='')
if($action=='header')
{
//modif Francois: css WPadmin
echo '<TABLE class="postbox cellspacing-0 cellpadding-0" '.$table_att.'>';
echo '<TR><TD class="center">';
echo '<TABLE class="postbox cellspacing-0" '.$table_att.'>';
echo '<THEAD><TR><TH class="center">';
if(is_array($title))
echo WrapTabs($title,$_ROSARIO['selected_tab']);
else
echo DrawTab($title);
echo '</TD></TR>
<TR><TD class="popTable">';
echo '</TH></TR></THEAD><TBODY><TR><TD class="popTable">';
}
elseif($action=='footer')
{
echo '</TD>
</TR>
</TABLE>';
echo '</TD></TR></TBODY></TABLE>';
}
}
?>
\ No newline at end of file
?>
functions/Search.fnc.php
View file @ e882e26a
......@@ -71,27 +71,31 @@ function Search($type,$extra=null)
break;
case 'general_info':
echo '<TR><TD style="text-align:right;"><label for="last">'._('Last Name').'</label></TD><TD><input type="text" name="last" id="last" size="30"></TD></TR>';
echo '<TR><TD style="text-align:right;"><label for="first">'._('First Name').'</label></TD><TD><input type="text" name="first" id="first" size="30"></TD></TR>';
echo '<TR><TD style="text-align:right;"><label for="stuid">'.sprintf(_('%s ID'),Config('NAME')).'</label></TD><TD><input type="text" name="stuid" id="stuid" size="30"></TD></TR>';
echo '<TR><TD style="text-align:right;"><label for="addr">'._('Address').'</label></TD><TD><input type="text" name="addr" id="addr" size="30"></TD></TR>';
echo '<TR><TD><label for="last">'._('Last Name').'</label></TD><TD><input type="text" name="last" id="last" size="30"></TD></TR>';
echo '<TR><TD><label for="first">'._('First Name').'</label></TD><TD><input type="text" name="first" id="first" size="30"></TD></TR>';
echo '<TR><TD><label for="stuid">'.sprintf(_('%s ID'),Config('NAME')).'</label></TD><TD><input type="text" name="stuid" id="stuid" size="30"></TD></TR>';
echo '<TR><TD><label for="addr">'._('Address').'</label></TD><TD><input type="text" name="addr" id="addr" size="30"></TD></TR>';
$list = DBGet(DBQuery("SELECT ID,TITLE,SHORT_NAME FROM SCHOOL_GRADELEVELS WHERE SCHOOL_ID='".UserSchool()."' ORDER BY SORT_ORDER"));
if($_REQUEST['advanced']=='Y' || is_array($extra))
{
//modif Francois: add <label> on checkbox
echo '<TR><TD style="text-align:right;">'._('Grade Levels').'</TD><TD><label><span class="nobr"><INPUT type="checkbox" name="grades_not" value="Y">&nbsp;'._('Not').'</span></label><BR /><label><span class="nobr"><INPUT type="checkbox" value="Y" name="controller" onclick="checkAll(this.form,this.form.controller.checked,\'grades[\');">&nbsp;'._('Check All').'</span></label></TD></TR><TR><TD colspan="2" style="max-width:120px;">';
echo '<TR><TD>'._('Grade Levels').'</TD><TD><label><span class="nobr"><INPUT type="checkbox" name="grades_not" value="Y">&nbsp;'._('Not').'</span></label><BR /><label><span class="nobr"><INPUT type="checkbox" value="Y" name="controller" onclick="checkAll(this.form,this.form.controller.checked,\'grades[\');">&nbsp;'._('Check All').'</span></label></TD></TR><TR><TD colspan="2" style="max-width:120px;">';
foreach($list as $value)
{
echo '<label><span class="nobr"><INPUT type="checkbox" name="grades['.$value['ID'].']" value="Y"'.(is_array($extra)?($extra[$value['ID']]?' checked':''):($extra==$value['ID']?' checked':'')).'>&nbsp;'.$value['SHORT_NAME'].'</span></label> ';
echo '<label><span class="nobr"><INPUT type="checkbox" name="grades['.$value['ID'].']" value="Y"'.(is_array($extra)?($extra[$value['ID']]?' checked':''):($extra==$value['ID']?' checked':'')).'>&nbsp;'.$value['SHORT_NAME'].'</span></label> ';
}
echo '</TD></TR>';
}
else
{
echo '<TR><TD style="text-align:right;"><label for="grade">'._('Grade Level').'</label></TD><TD><SELECT name="grade" id="grade"><OPTION value="">'._('Not Specified').'</OPTION>';
echo '<TR><TD><label for="grade">'._('Grade Level').'</label></TD><TD><SELECT name="grade" id="grade"><OPTION value="">'._('Not Specified').'</OPTION>';
foreach($list as $value)
echo '<OPTION value="'.$value['ID'].'"'.($extra==$value['ID']?' SELECTED':'').'>'.$value['TITLE'].'</OPTION>';
echo '<OPTION value="'.$value['ID'].'"'.($extra==$value['ID']?' SELECTED':'').'>'.$value['TITLE'].'</OPTION>';
echo '</SELECT></TD></TR>';
}
break;
......@@ -135,19 +139,20 @@ function Search($type,$extra=null)
if($type=='student_fields_all' || $type=='staff_fields_all')
{
//modif Francois: css WPadmin
echo '<TR><TD colspan="2"><TABLE style="border-collapse:separate; border-spacing:2px" class="width-100p cellpadding-2"><TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table\'); return false;" href="#"><IMG SRC="assets/arrow_right.gif" id="fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table_arrow" height="12"> <B>'.$search_fields_RET[key($search_fields_RET)][1]['CATEGORY_TITLE'].'</B></A><BR />';
echo '<TABLE id="fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table" style="display:none;" class="widefat width-100p cellspacing-0">';
echo '<TR><TD colspan="2"><TABLE style="border-collapse:separate; border-spacing:2px" class="width-100p"><TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table\'); return false;" href="#"><IMG SRC="assets/arrow_right.gif" id="fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table_arrow" height="12"> <B>'.$search_fields_RET[key($search_fields_RET)][1]['CATEGORY_TITLE'].'</B></A><BR />';
echo '<TABLE id="fields_'.$search_fields_RET[key($search_fields_RET)][1]['ID'].'_table" class="widefat width-100p cellspacing-0 col1-align-right hide">';
}
if(count($search_fields_RET['text']))
{
foreach($search_fields_RET['text'] as $column)
echo '<TR><TD style="text-align:right;"><label for="cust['.$column['COLUMN_NAME'].']">'.$column['TITLE'].'</label></TD><TD><INPUT type="text" name="cust['.$column['COLUMN_NAME'].']" id="cust['.$column['COLUMN_NAME'].']" size="30"></TD></TR>';
echo '<TR><TD><label for="cust['.$column['COLUMN_NAME'].']">'.$column['TITLE'].'</label></TD><TD><INPUT type="text" name="cust['.$column['COLUMN_NAME'].']" id="cust['.$column['COLUMN_NAME'].']" size="30"></TD></TR>';
}
if(count($search_fields_RET['numeric']))
{
foreach($search_fields_RET['numeric'] as $column)
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD><span class="sizep2">&ge;</span> <INPUT type="text" name="cust_begin['.$column['COLUMN_NAME'].']" size="3" maxlength="11"> <span class="sizep2">&le;</span> <INPUT type="text" name="cust_end['.$column['COLUMN_NAME'].']" size="3" maxlength="11"> <label>'._('No Value').' <INPUT type="checkbox" name="cust_null['.$column['COLUMN_NAME'].']"></label>&nbsp;</TD></TR>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD><span class="sizep2">&ge;</span> <INPUT type="text" name="cust_begin['.$column['COLUMN_NAME'].']" size="3" maxlength="11"> <span class="sizep2">&le;</span> <INPUT type="text" name="cust_end['.$column['COLUMN_NAME'].']" size="3" maxlength="11"> <label>'._('No Value').' <INPUT type="checkbox" name="cust_null['.$column['COLUMN_NAME'].']"></label>&nbsp;</TD></TR>';
}
if(count($search_fields_RET['codeds']))
{
......@@ -156,7 +161,7 @@ function Search($type,$extra=null)
$column['SELECT_OPTIONS'] = str_replace("\n","\r",str_replace("\r\n","\r",$column['SELECT_OPTIONS']));
$options = explode("\r",$column['SELECT_OPTIONS']);
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD>';
echo '<SELECT name="cust['.$column['COLUMN_NAME'].'] style="max-width:250;"><OPTION value="">'._('N/A').'</OPTION><OPTION value="!">'._('No Value').'</OPTION>';
foreach($options as $option)
{
......@@ -175,7 +180,7 @@ function Search($type,$extra=null)
$column['SELECT_OPTIONS'] = str_replace("\n","\r",str_replace("\r\n","\r",$column['SELECT_OPTIONS']));
$options = explode("\r",$column['SELECT_OPTIONS']);
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD>';
echo '<SELECT name="cust['.$column['COLUMN_NAME'].'] style="max-width:250;"><OPTION value="">'._('N/A').'</OPTION><OPTION value="!">'._('No Value').'</OPTION>';
foreach($options as $option)
{
......@@ -194,7 +199,7 @@ function Search($type,$extra=null)
$column['SELECT_OPTIONS'] = str_replace("\n","\r",str_replace("\r\n","\r",$column['SELECT_OPTIONS']));
$options = explode("\r",$column['SELECT_OPTIONS']);
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD>';
echo '<SELECT name="cust['.$column['COLUMN_NAME'].'] style="max-width:250;"><OPTION value="">'._('N/A').'</OPTION><OPTION value="!">'._('No Value').'</OPTION>';
foreach($options as $option)
echo '<OPTION value="'.$option.'">'.$option.'</OPTION>';
......@@ -214,7 +219,7 @@ function Search($type,$extra=null)
else
$options_RET = array();
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD>';
echo '<SELECT name="cust['.$column['COLUMN_NAME'].'] style="max-width:250;"><OPTION value="">'._('N/A').'</OPTION><OPTION value="!">'._('No Value').'</OPTION>';
$options = array();
foreach($options_RET as $option)
......@@ -253,7 +258,7 @@ function Search($type,$extra=null)
else
$options_RET = array();
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'</TD><TD>';
echo '<TR><TD>'.$column['TITLE'].'</TD><TD>';
echo '<SELECT name="cust['.$column['COLUMN_NAME'].'] style="max-width:250;"><OPTION value="">'._('N/A').'</OPTION><OPTION value="!">'._('No Value').'</OPTION>';
$options = array();
foreach($options_RET as $option)
......@@ -269,15 +274,15 @@ function Search($type,$extra=null)
if(count($search_fields_RET['date']))
{
foreach($search_fields_RET['date'] as $column)
echo '<TR><TD style="text-align:right;">'.$column['TITLE'].'<BR /><label>'._('No Value').'&nbsp;<INPUT type="checkbox" name="cust_null['.$column['COLUMN_NAME'].']"></label></TD><TD><table class="cellpadding-0 cellspacing-0"<tr><td><span class="sizep2">&ge;</span>&nbsp;</td><td>'.PrepareDate('','_cust_begin['.$column['COLUMN_NAME'].']',true,array('short'=>true)).'</td></tr><tr><td><span class="sizep2">&le;</span>&nbsp;</td><td>'.PrepareDate('','_cust_end['.$column['COLUMN_NAME'].']',true,array('short'=>true)).'</td></tr></table></TD></TR>';
echo '<TR><TD>'.$column['TITLE'].'<BR /><label>'._('No Value').'&nbsp;<INPUT type="checkbox" name="cust_null['.$column['COLUMN_NAME'].']"></label></TD><TD><table class="cellspacing-0"<tr><td><span class="sizep2">&ge;</span>&nbsp;</td><td>'.PrepareDate('','_cust_begin['.$column['COLUMN_NAME'].']',true,array('short'=>true)).'</td></tr><tr><td><span class="sizep2">&le;</span>&nbsp;</td><td>'.PrepareDate('','_cust_end['.$column['COLUMN_NAME'].']',true,array('short'=>true)).'</td></tr></table></TD></TR>';
}
if(count($search_fields_RET['radio']))
{
echo '<TR><TD colspan="2"><TABLE class="cellspacing-0">';
echo '<TR><TD style="width:120px;"></TD><TD><TABLE class="cellpadding-0 cellspacing-0"><tr><td style="width:25px;"><b>'._('All').'</b></td><td style="width:30px;"><b>'._('Yes').'</b></td><td style="width:25px;"><b>'._('No').'</b></td></tr></table></TD>';
echo '<TR><TD style="width:120px;"></TD><TD><TABLE class="cellspacing-0"><tr><td style="width:25px;"><b>'._('All').'</b></td><td style="width:30px;"><b>'._('Yes').'</b></td><td style="width:25px;"><b>'._('No').'</b></td></tr></table></TD>';
if(count($search_fields_RET['radio'])>1)
echo '<TD style="width:120px;"></TD><TD><TABLE class="cellpadding-0 cellspacing-0"><tr><td style="width:25px;"><b>'._('All').'</b></td><td style="width:30px;"><b>'._('Yes').'</b></td><td style="width:25px;"><b>'._('No').'</b></td></tr></table></TD>';
echo '<TD style="width:120px;"></TD><TD><TABLE class="cellspacing-0"><tr><td style="width:25px;"><b>'._('All').'</b></td><td style="width:30px;"><b>'._('Yes').'</b></td><td style="width:25px;"><b>'._('No').'</b></td></tr></table></TD>';
echo '</TR>';
$side = 0;
......@@ -285,8 +290,8 @@ function Search($type,$extra=null)
{
if(!$side)
echo '<TR>';
echo '<TD style="text-align:right; width:120px">'.$cust['TITLE'].'</TD><TD>
<TABLE class="cellpadding-0 cellspacing-0"><tr><td style="text-align:center; width:25px;">
echo '<TD style="width:120px">'.$cust['TITLE'].'</TD><TD>
<TABLE class="cellspacing-0"><tr><td style="text-align:center; width:25px;">
<input name="cust['.$cust['COLUMN_NAME'].']" type="radio" value="" checked />
</td><td style="text-align:center; width:30px;">
<input name="cust['.$cust['COLUMN_NAME'].']" type="radio" value="Y" />
......
functions/StaffWidgets.fnc.php
View file @ e882e26a
......@@ -21,17 +21,17 @@ function StaffWidgets($item,&$myextra=NULL)
case 'all':
//modif Francois: css WPadmin
// $extra['search'] .= '<TR><TD>';
$extra['search'] .= '<TR><TD><TABLE style="border-collapse:separate; border-spacing:2px" class="width-100p cellpadding-2">';
$extra['search'] .= '<TR><TD><TABLE style="border-collapse:separate; border-spacing:2px" class="width-100p">';
if($RosarioModules['Users'] && (!$_ROSARIO['StaffWidgets']['permissions']))
{
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'users_table\');" href="#"><IMG SRC="assets/arrow_right.gif" id="users_table_arrow" height="12"> <B>'._('Users').'</B></A><BR /><TABLE id="users_table" style="display:none;" class="widefat width-100p cellspacing-0">';
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'users_table\');" href="#"><IMG SRC="assets/arrow_right.gif" id="users_table_arrow" height="12"> <B>'._('Users').'</B></A><BR /><TABLE id="users_table" class="widefat width-100p cellspacing-0 col1-align-right hide">';
StaffWidgets('permissions',$extra);
$extra['search'] .= '</TABLE></TD></TR>';
}
if($RosarioModules['Food_Service'] && (!$_ROSARIO['StaffWidgets']['fsa_balance'] || !$_ROSARIO['StaffWidgets']['fsa_status'] || !$_ROSARIO['StaffWidgets']['fsa_barcode']))
{
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'food_service_table\');" href="#"><IMG SRC="assets/arrow_right.gif" id="food_service_table_arrow" height="12"> <B>'._('Food Service').'</B></A><BR /><TABLE id="food_service_table" style="display:none;" class="widefat width-100p cellspacing-0">';
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'food_service_table\');" href="#"><IMG SRC="assets/arrow_right.gif" id="food_service_table_arrow" height="12"> <B>'._('Food Service').'</B></A><BR /><TABLE id="food_service_table" class="widefat width-100p cellspacing-0 col1-align-right hide">';
StaffWidgets('fsa_balance',$extra);
StaffWidgets('fsa_status',$extra);
StaffWidgets('fsa_barcode',$extra);
......@@ -40,7 +40,7 @@ function StaffWidgets($item,&$myextra=NULL)
}
if($RosarioModules['Accounting'] && (!$_ROSARIO['Widgets']['staff_balance']) && AllowUse('Accounting/StaffBalances.php'))
{
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'accounting_table\'); return false;" href="#"><IMG SRC="assets/arrow_right.gif" id="accounting_table_arrow" height="12"> <B>'._('Accounting').'</B></A><BR /><TABLE id="accounting_table" style="display:none;" class="widefat width-100p cellspacing-0">';
$extra['search'] .= '<TR><TD colspan="2">&nbsp;<A onclick="switchMenu(\'accounting_table\'); return false;" href="#"><IMG SRC="assets/arrow_right.gif" id="accounting_table_arrow" height="12"> <B>'._('Accounting').'</B></A><BR /><TABLE id="accounting_table" class="widefat width-100p cellspacing-0 col1-align-right hide">';
StaffWidgets('staff_balance',$extra);
$extra['search'] .= '</TABLE></TD></TR>';
}
......@@ -67,7 +67,7 @@ function StaffWidgets($item,&$myextra=NULL)
$_ROSARIO['SearchTerms'] .= '<span style="color:gray"><b>'._('Permissions').': </b></span>'.($_REQUEST['permissions']=='Y'?_('Profile'):_('Custom')).'<BR />';
}
//modif Francois: add <label> on radio
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Permissions').'</TD><TD><label><INPUT type="radio" name="permissions" value=""'.(!$value?' checked':'').'> '._('All').'</label> &nbsp;<label><INPUT type="radio" name="permissions" value="Y"'.($value=='Y'?' checked':'').'> '._('Profile').'</label> &nbsp;<label><INPUT type="radio" name="permissions" value="N"'.($value=='N'?' checked':'').'> '._('Custom').'</label></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Permissions').'</TD><TD><label><INPUT type="radio" name="permissions" value=""'.(!$value?' checked':'').'> '._('All').'</label> &nbsp;<label><INPUT type="radio" name="permissions" value="Y"'.($value=='Y'?' checked':'').'> '._('Profile').'</label> &nbsp;<label><INPUT type="radio" name="permissions" value="N"'.($value=='N'?' checked':'').'> '._('Custom').'</label></TD></TR>';
}
break;
......@@ -88,7 +88,7 @@ function StaffWidgets($item,&$myextra=NULL)
if(!$extra['NoSearchTerms'])
$_ROSARIO['SearchTerms'] .= '<span style="color:gray"><b>'._('Food Service Balance').': </b></span><span class="sizep2">'.($_REQUEST['fsa_bal_ge']=='Y'?'&ge;':'&lt;').'</span>'.number_format($_REQUEST['fsa_balance'],2).'<BR />';
}
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Balance').'</TD><TD><table class="cellpadding-0 cellspacing-0"><tr><td><label><span class="sizep2">&lt;</span> <INPUT type="radio" name="fsa_bal_ge" value="" checked /></label></td><td rowspan="2"><INPUT type="text" name="fsa_balance" size="10"'.($value?' value="'.$value.'"':'').'></td></tr><tr><td><label><span class="sizep2">&ge;</span> <INPUT type="radio" name="fsa_bal_ge" value="Y"></label></td></tr></table></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Balance').'</TD><TD><table class="cellspacing-0"><tr><td><label><span class="sizep2">&lt;</span> <INPUT type="radio" name="fsa_bal_ge" value="" checked /></label></td><td rowspan="2"><INPUT type="text" name="fsa_balance" size="10"'.($value?' value="'.$value.'"':'').'></td></tr><tr><td><label><span class="sizep2">&ge;</span> <INPUT type="radio" name="fsa_bal_ge" value="Y"></label></td></tr></table></TD></TR>';
}
break;
......@@ -112,7 +112,7 @@ function StaffWidgets($item,&$myextra=NULL)
if(!$extra['NoSearchTerms'])
$_ROSARIO['SearchTerms'] .= '<span style="color:gray"><b>'._('Food Service Status').': </b></span>'.$_REQUEST['fsa_status'].'<BR />';
}
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Account Status').'</TD><TD><SELECT name="fsa_status"><OPTION value="">'._('Not Specified').'</OPTION><OPTION value="Active"'.($value=='active'?' SELECTED':'').'>'._('Active').'</OPTION><OPTION value="Inactive">'._('Inactive').'</OPTION><OPTION value="Disabled">'._('Disabled').'</OPTION><OPTION value="Closed">'._('Closed').'</OPTION></SELECT></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Account Status').'</TD><TD><SELECT name="fsa_status"><OPTION value="">'._('Not Specified').'</OPTION><OPTION value="Active"'.($value=='active'?' SELECTED':'').'>'._('Active').'</OPTION><OPTION value="Inactive">'._('Inactive').'</OPTION><OPTION value="Disabled">'._('Disabled').'</OPTION><OPTION value="Closed">'._('Closed').'</OPTION></SELECT></TD></TR>';
}
break;
......@@ -130,7 +130,7 @@ function StaffWidgets($item,&$myextra=NULL)
if(!$extra['NoSearchTerms'])
$_ROSARIO['SearchTerms'] .= '<span style="color:gray"><b>'._('Food Service Barcode').': </b></span>'.$_REQUEST['fsa_barcode'].'<BR />';
}
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Barcode').'</TD><TD><INPUT type="text" name="fsa_barcode" size="15"></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Barcode').'</TD><TD><INPUT type="text" name="fsa_barcode" size="15"></TD></TR>';
}
break;
......@@ -148,7 +148,7 @@ function StaffWidgets($item,&$myextra=NULL)
//modif Francois: add translation
$_ROSARIO['SearchTerms'] .= _('Food Service Account Exists').': '.($_REQUEST['fsa_exists']=='Y'?_('Yes'):_('No')).'<BR />';
}
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Has Account').'</TD><TD><label><INPUT type="radio" name="fsa_exists" value=""'.(!$value?' checked':'').'>'._('All').'</label> <label><INPUT type="radio" name="fsa_exists" value="Y"'.($value=='Y'?' checked':'').'>'._('Yes').'</label> <label><INPUT type="radio" name="fsa_exists" value="N"'.($value=='N'?' checked':'').'>'._('No').'</label></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Has Account').'</TD><TD><label><INPUT type="radio" name="fsa_exists" value=""'.(!$value?' checked':'').'>'._('All').'</label> <label><INPUT type="radio" name="fsa_exists" value="Y"'.($value=='Y'?' checked':'').'>'._('Yes').'</label> <label><INPUT type="radio" name="fsa_exists" value="N"'.($value=='N'?' checked':'').'>'._('No').'</label></TD></TR>';
}
break;
......@@ -167,11 +167,11 @@ function StaffWidgets($item,&$myextra=NULL)
if(!$extra['NoSearchTerms'])
$_ROSARIO['SearchTerms'] .= '<b>'._('Staff Payroll Balance').': </b>'._('Between').' '.$_REQUEST['balance_low'].' &amp; '.$_REQUEST['balance_high'].'<BR />';
}
$extra['search'] .= '<TR><TD style="text-align:right;">'._('Staff Payroll Balance').'</TD><TD>'._('Between').' <INPUT type="text" name="balance_low" size="5" maxlength="10"> &amp; <INPUT type="text" name="balance_high" size="5" maxlength="10"></TD></TR>';
$extra['search'] .= '<TR><TD>'._('Staff Payroll Balance').'</TD><TD>'._('Between').' <INPUT type="text" name="balance_low" size="5" maxlength="10"> &amp; <INPUT type="text" name="balance_high" size="5" maxlength="10"></TD></TR>';
}
break;
}
$_ROSARIO['StaffWidgets'][$item] = true;
}
}
?>
\ No newline at end of file
?>
functions/Widgets.fnc.php
View file @ e882e26a
This diff is collapsed.
index.php
View file @ e882e26a
......@@ -148,7 +148,7 @@ if(!$_SESSION['STAFF_ID'] && !$_SESSION['STUDENT_ID'] && $_REQUEST['modfunc']!='
<td class="center">
<form name="loginform" method="post" action="index.php" class="login">
<h4><?php echo ParseMLField(Config('TITLE')); ?></h4>
<table class="cellpadding-2 cellspacing-0" style="margin:0 auto;">
<table class="cellspacing-0" style="margin:0 auto;">
<?php // ng - choose language
if (sizeof($RosarioLocales) > 1) : ?>
......
modules/Attendance/AddAbsences.php
View file @ e882e26a
......@@ -118,7 +118,7 @@ if(empty($_REQUEST['modfunc']))
echo '<BR />';
//modif Francois: css WPadmin
echo '<TABLE class="postbox cellpadding-4" style="margin:0 auto;"><TR><TD style="text-align:right">'._('Add Absence to Periods').'</TD>';
echo '<TABLE class="postbox cellpadding-5" style="margin:0 auto;"><TR><TD style="text-align:right">'._('Add Absence to Periods').'</TD>';
echo '<TD><TABLE><TR>';
//modif Francois: multiple school periods for a course period
......@@ -191,4 +191,4 @@ function _makeChooseCheckbox($value,$title)
return '&nbsp;&nbsp;<INPUT type="checkbox" name="student['.$THIS_RET['STUDENT_ID'].']" value="Y" />';
}
?>
\ No newline at end of file
?>
modules/Attendance/Administration.php
View file @ e882e26a
......@@ -245,7 +245,7 @@ if(isset($_REQUEST['student_id']) && $_REQUEST['student_id']!='new')
DrawHeader(PrepareDate($date,'_date',false,array('submit'=>true)),SubmitButton(_('Update')));
$headerr = '<A HREF="Modules.php?modname='.$_REQUEST['modname'].'&month_date='.$_REQUEST['month_date'].'&day_date='.$_REQUEST['day_date'].'&year_date='.$_REQUEST['year_date'].'&table='.$_REQUEST['table'].'">'._('Student List').'</A>';
echo '<TABLE class="width-100p cellspacing-0 cellpadding-0"><TR><TD style="text-align:left; background-color: #fff">'.$headerl.'</TD><TD style="text-align:right; background-color: #fff">'.$headerr.'</TD></TR></TABLE>';
echo '<TABLE class="width-100p cellspacing-0"><TR><TD style="text-align:left; background-color: #fff">'.$headerl.'</TD><TD style="text-align:right; background-color: #fff">'.$headerr.'</TD></TR></TABLE>';
ListOutput($schedule_RET,$columns,'Course','Courses');
echo '</FORM>';
......@@ -352,7 +352,7 @@ else
if(UserStudentID())
$current_student_link = '<A HREF="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=student&month_date='.$_REQUEST['month_date'].'&day_date='.$_REQUEST['day_date'].'&year_date='.$_REQUEST['year_date'].'&student_id='.UserStudentID().'&table='.$_REQUEST['table'].'">'._('Current Student').'</A></TD><TD>';
$headerr = '<TABLE><TR><TD>'.$current_student_link.button('add','','"#" onclick=\'javascript:addHTML("'.str_replace('"','\"',_makeCodeSearch()).'","code_pulldowns"); return false;\'').'</TD><TD><DIV id=code_pulldowns>'.$code_pulldowns.'</DIV></TD></TR></TABLE>';
echo '<TABLE class="width-100p cellspacing-0 cellpadding-0"><TR><TD style="text-align:left; background-color: #fff">'.$headerl.'</TD><TD style="text-align:right; background-color: #fff">'.$headerr.'</TD></TR></TABLE>';
echo '<TABLE class="width-100p cellspacing-0"><TR><TD style="text-align:left; background-color: #fff">'.$headerl.'</TD><TD style="text-align:right; background-color: #fff">'.$headerr.'</TD></TR></TABLE>';
$_REQUEST['search_modfunc'] = 'list';
Search('student_id',$extra);
......
modules/Attendance/Percent.php
View file @ e882e26a
......@@ -51,13 +51,13 @@ if($_REQUEST['modfunc']=='search')
echo '</TABLE>';
echo '</TD></TR>';
echo '<TR class="valign-top"><TD><TABLE class="width-100p cellspacing-0 cellpadding-0">';
echo '<TR class="valign-top"><TD><TABLE class="width-100p cellspacing-0">';
if($_REQUEST['advanced']=='Y')
{
$extra['search'] = '';
Widgets('all',$extra);
echo '<TR><TD>';
echo '<TABLE class="postbox cellpadding-0 cellspacing-0"><TR><TH>';
echo '<TABLE class="postbox cellspacing-0"><TR><TH>';
// echo '<span style="color:'.Preferences('HEADER').'><B>'._('Widgets').'</B></span><BR />';
echo '<H3>'._('Widgets').'</H3></TH></TR>';
echo $extra['search'];
......@@ -65,7 +65,7 @@ if($_REQUEST['modfunc']=='search')
echo '</TABLE><br />';