From: Alan Pippin <apippin@pippins.net> Date: Tue, 12 Oct 2010 01:49:24 +0000 (-0600) Subject: Fixed the embedded form IE issue on the vis_view app X-Git-Tag: release_1_1_0~6^2 X-Git-Url: http://git.pippins.net/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=commitdiff_plain;h=ade813c87bbfeb4da401a2bd68d4859880f09263;p=eq%2F.git Fixed the embedded form IE issue on the vis_view app Removed table widths from vis_view app --- diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 6d40fdc..5d85a33 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -2019,7 +2019,6 @@ class tc $this->t->set_block('vis_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); - $this->t->set_var('lang_save','Save Appt / Pri / Notes'); $this->t->set_var('lang_reset','Clear Changes'); $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_view')); @@ -2031,13 +2030,11 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched&action=save')); $this->t->set_var('title','Presidency Yearly Visit Scheduler'); - $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20; - $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width; - $header_row = "<th width=$family_width><font size=-2>Family Name</th>"; - $header_row.= "<th width=$phone_width><font size=-2>Phone</th>"; - $header_row.= "<th width=$pri_width><font size=-2>Priority</th>"; - $header_row.= "<th width=$visit_date_width><font size=-2>Last Visit</th>"; - $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>"; + $header_row = "<th><font size=-2>Family Name</th>"; + $header_row.= "<th><font size=-2>Phone</th>"; + $header_row.= "<th><font size=-2>Priority</th>"; + $header_row.= "<th><font size=-2>Last Visit</th>"; + $header_row.= "<th><font size=-2>Scheduling Notes</th>"; $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); @@ -2107,12 +2104,10 @@ class tc } // APPOINTMENT TABLE - $date_width=250; $time_width=100; $family_width=250; $location_width=100; - $appt_table_width=$date_width + $time_width + $family_width + $location_width; - $appt_header_row = "<th width=$date_width><font size=-2>Date</th>"; - $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>"; - $appt_header_row.= "<th width=$family_width><font size=-2>Family</th>"; - $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>"; + $appt_header_row = "<th><font size=-2>Date</th>"; + $appt_header_row.= "<th><font size=-2>Time</th>"; + $appt_header_row.= "<th><font size=-2>Family</th>"; + $appt_header_row.= "<th><font size=-2>Location</th>"; $appt_table_data = ""; // Find out what the President ID is @@ -2177,7 +2172,6 @@ class tc $this->t->set_var('appt_table_data',$appt_table_data); $this->t->set_var('appt_header_row',$appt_header_row); - $this->t->set_var('appt_table_width',$appt_table_width); // VISIT SCHEDULING TABLE @@ -2258,17 +2252,13 @@ class tc } } - $name_width=190; $phone_width=100; $date_width=100; $notes_width=300; - $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "<th width=$name_width><font size=-2>Family Name</th>"; - $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>"; - $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>"; - $completed_header_row.= "<th width=$notes_width><font size=-2>Visit Notes</th>"; - - $family_width=300; $totals_width=100; - $totals_table_width=$family_width + $totals_width; - $totals_header_row = "<th width=$family_width><font size=-2>Families</th>"; - $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>"; + $completed_header_row = "<th><font size=-2>Family Name</th>"; + $completed_header_row.= "<th><font size=-2>Phone</th>"; + $completed_header_row.= "<th><font size=-2>Date</th>"; + $completed_header_row.= "<th><font size=-2>Visit Notes</th>"; + + $totals_header_row = "<th><font size=-2>Families</th>"; + $totals_header_row.= "<th><font size=-2>$year</th>"; $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">"; $totals_data.= "<td align=left><font size=-2><b>Total Families with yearly Visits completed:</b></font></td>"; $totals_data.= "<td align=center><font size=-2><b>$families_with_yearly_visit / $total_families</b></font></td>"; @@ -2280,16 +2270,15 @@ class tc $totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>"; $totals_data.= "</tr>"; - $this->t->set_var('table_width',$table_width); $this->t->set_var('header_row',$header_row); $this->t->set_var('table_data',$table_data); $this->t->set_var('totals_header_row',$totals_header_row); - $this->t->set_var('totals_table_width',$totals_table_width); $this->t->set_var('completed_header_row',$completed_header_row); - $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); $this->t->set_var('totals',$totals_data); $this->t->fp('familylist','family_list',True); + $this->t->set_var('lang_save_appt','Save Appts'); + $this->t->set_var('lang_save_pri_notes','Save Pri / Notes'); $this->t->fp('apptlist','appt_list',True); $this->t->pfp('out','vis_sched_t'); diff --git a/templates/default/schedule.tpl b/templates/default/schedule.tpl index 2e1880f..eca0fbc 100644 --- a/templates/default/schedule.tpl +++ b/templates/default/schedule.tpl @@ -24,8 +24,8 @@ {table_data} <tr> <tr><td colspan=5 align=center><i>Note: Choose an Individual or Family per slot. A blank Date will delete the slot. If the Location is left blank, it will be autofilled for you.</i></td></tr> - <td></td><td></td><td></td> - <td height="50" align="right"> + <tr> + <td height="50" colspan=5 align="right"> <font face="{font}"><input type="submit" name="save" value="{lang_save}"></font> <font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font> </td> diff --git a/templates/default/vis_sched.tpl b/templates/default/vis_sched.tpl index af97d9b..7d3590c 100644 --- a/templates/default/vis_sched.tpl +++ b/templates/default/vis_sched.tpl @@ -1,6 +1,5 @@ <center> - <form action="{actionurl}" method="POST"> - <table border="0" width="{table_width}" cellspacing="2" cellpadding="2"> + <table border="0" width="60%" cellspacing="2" cellpadding="2"> <tr> <td align="center" bgcolor="#c9c9c9"><font face="{font}"><b>{title}</b></font></td> </tr> @@ -11,10 +10,11 @@ <a href="{schedule_vis_link}">{schedule_vis_link_title}</a> <br><br> - <form action="{actionurl}" method="POST"> + <!-- BEGIN appt_list --> - <table border="0" width="{appt_table_width}" cellspacing="2" cellpadding="2"> + <form action="{actionurl}" method="POST"> + <table border="0" width="60%" cellspacing="2" cellpadding="2"> <tr> <td align="center" bgcolor="#c9c9c9" colspan=20> <font face="{font}"><b>Yearly Visits Appointment Slots</b></font> @@ -25,11 +25,9 @@ <tr> <td></td><td></td><td></td><td></td> </tr> - </table> - <table border="0" width="{table_width}" cellspacing="2" cellpadding="2"> <tr> - <td height="50" align="right"> - <font face="{font}"><input type="submit" name="save" value="{lang_save}"></font> + <td height="50" colspan=4 align="right"> + <font face="{font}"><input type="submit" name="save" value="{lang_save_appt}"></font> <font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font> </form> @@ -39,7 +37,8 @@ <!-- END appt_list --> <!-- BEGIN family_list --> - <table border="0" width="{table_width}" cellspacing="2" cellpadding="2"> + <form action="{actionurl}" method="POST"> + <table border="0" width="60%" cellspacing="2" cellpadding="2"> <tr> <td align="center" bgcolor="#c9c9c9" colspan=20> <font face="{font}"><b>All Families with Yearly Visit Not Completed</b></font> @@ -49,9 +48,9 @@ {table_data} <tr> <tr><td colspan=5 align=center><i>Note: The highest priority is 1, the lowest priority is 30</i></td></tr> - <td></td><td></td><td></td><td></td> - <td height="50" align="right"> - <font face="{font}"><input type="submit" name="save" value="{lang_save}"></font> + <tr> + <td height="50" colspan=5 align="right"> + <font face="{font}"><input type="submit" name="save" value="{lang_save_pri_notes}"></font> <font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font> </form> @@ -61,7 +60,7 @@ <!-- END family_list --> - <table border="0" width="{completed_table_width}" cellspacing="2" cellpadding="2"> + <table border="0" width="60%" cellspacing="2" cellpadding="2"> <tr> <td align="center" bgcolor="#c9c9c9" colspan=20> <font face="{font}"><b>All Families with Yearly Visit Completed</b></font> @@ -72,7 +71,7 @@ </table> <br><br> - <table border="0" width="{totals_table_width}" cellspacing="2" cellpadding="2"> + <table border="0" width="60%" cellspacing="2" cellpadding="2"> <tr> <td align="center" bgcolor="#c9c9c9" colspan=20> <font face="{font}"><b>Total Presidency Yearly Visits</b></font> diff --git a/templates/default/vis_view.tpl b/templates/default/vis_view.tpl index 8fe66b6..2c77492 100644 --- a/templates/default/vis_view.tpl +++ b/templates/default/vis_view.tpl @@ -8,7 +8,7 @@ <br><br> <form action="{filterurl}" method="POST"> - <table width="70%" border="0" cellspacing="2" cellpadding="2" align=center> + <table width="60%" border="0" cellspacing="2" cellpadding="2" align=center> <tr> <td align=center> Showing <input type=text size="2" name="num_years" value="{num_years}">