From: Alan Pippin 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/embedvideo/.git/static/images/%7Badd%7D?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 = "Family Name"; - $header_row.= "Phone"; - $header_row.= "Priority"; - $header_row.= "Last Visit"; - $header_row.= "Scheduling Notes"; + $header_row = "Family Name"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last Visit"; + $header_row.= "Scheduling Notes"; $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 = "Date"; - $appt_header_row.= "Time"; - $appt_header_row.= "Family"; - $appt_header_row.= "Location"; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Family"; + $appt_header_row.= "Location"; $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 = "Family Name"; - $completed_header_row.= "Phone"; - $completed_header_row.= "Date"; - $completed_header_row.= "Visit Notes"; - - $family_width=300; $totals_width=100; - $totals_table_width=$family_width + $totals_width; - $totals_header_row = "Families"; - $totals_header_row.= "$year"; + $completed_header_row = "Family Name"; + $completed_header_row.= "Phone"; + $completed_header_row.= "Date"; + $completed_header_row.= "Visit Notes"; + + $totals_header_row = "Families"; + $totals_header_row.= "$year"; $totals_data.= ""; $totals_data.= "Total Families with yearly Visits completed:"; $totals_data.= "$families_with_yearly_visit / $total_families"; @@ -2280,16 +2270,15 @@ class tc $totals_data.= "$percent%"; $totals_data.= ""; - $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} 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. - - + + 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 @@
-
- +
@@ -11,10 +10,11 @@ {schedule_vis_link_title}

- + -
{title}
+ +
-
Yearly Visits Appointment Slots @@ -25,11 +25,9 @@
- -
- + +     @@ -39,7 +37,8 @@ - + +
- - +
All Families with Yearly Visit Not Completed @@ -49,9 +48,9 @@ {table_data}
Note: The highest priority is 1, the lowest priority is 30
- +
+     @@ -61,7 +60,7 @@ - +
All Families with Yearly Visit Completed @@ -72,7 +71,7 @@


- +
Total Presidency Yearly Visits 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 @@

- +
Showing