From: Alan Pippin Date: Tue, 12 Oct 2010 01:36:56 +0000 (-0600) Subject: Fixed issues in embedded form IE incompatability in interview tool. X-Git-Tag: release_1_1_0~6^2~1 X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/x.gif?a=commitdiff_plain;h=379c1e9a8ade7cc17db21a5f8edf7455e9411ce5;p=eq%2F.git Fixed issues in embedded form IE incompatability in interview tool. Removed fixed table widths from interview scheduling tool. --- diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 7191469..6d40fdc 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -1659,7 +1659,6 @@ class tc $this->t->set_block('int_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('int_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view')); @@ -1671,13 +1670,11 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched&action=save')); $this->t->set_var('title','Hometeaching Interviews Scheduler'); - $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20; - $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width; - $header_row = "Individual"; - $header_row.= "Phone"; - $header_row.= "Priority"; - $header_row.= "Last Interview"; - $header_row.= "Scheduling Notes"; + $header_row = "Individual"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last Interview"; + $header_row.= "Scheduling Notes"; $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); @@ -1790,12 +1787,10 @@ class tc // APPOINTMENT TABLE $district = 1; - $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; - $appt_table_width=$date_width + $time_width + $indiv_width + $location_width; - $appt_header_row = "Date"; - $appt_header_row.= "Time"; - $appt_header_row.= "Individual"; - $appt_header_row.= "Location"; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Individual"; + $appt_header_row.= "Location"; $appt_table_data = ""; $total_comps=0; $comps_with_quarterly_int=0; @@ -1868,7 +1863,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); // INTERVIEW SCHEDULING TABLE @@ -1981,28 +1975,24 @@ class tc } } - $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; - $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Individual"; - $completed_header_row.= "Phone"; - $completed_header_row.= "Date"; - $completed_header_row.= "Interview Notes"; + $completed_header_row = "Individual"; + $completed_header_row.= "Phone"; + $completed_header_row.= "Date"; + $completed_header_row.= "Interview Notes"; - $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('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('lang_save_appt','Save Appts for ' . $districts[$d]['name']); + $this->t->set_var('lang_save_pri_notes','Save Pri / Notes for '. $districts[$d]['name']); $this->t->fp('indivlist','individual_list',True); } // End for each district loop - $indivs_width=300; $totals_width=100; - $totals_table_width=$indivs_width + $totals_width; - $totals_header_row = "Individuals"; - $totals_header_row.= "$year"; + $totals_header_row = "Individuals"; + $totals_header_row.= "$year"; $totals_data.= ""; $totals_data.= "Total Companionships with interviews completed:"; $totals_data.= "$comps_with_quarterly_int / $total_comps"; @@ -2016,7 +2006,6 @@ class tc $this->t->set_var('totals',$totals_data); $this->t->set_var('totals_header_row',$totals_header_row); - $this->t->set_var('totals_table_width',$totals_table_width); $this->t->pfp('out','int_sched_t'); $this->save_sessiondata(); diff --git a/templates/default/int_sched.tpl b/templates/default/int_sched.tpl index 1ddbae2..1c30939 100644 --- a/templates/default/int_sched.tpl +++ b/templates/default/int_sched.tpl @@ -1,6 +1,5 @@
-
- +
@@ -15,7 +14,7 @@
-
{title}
+
{appt_table_title} @@ -27,10 +26,10 @@
- +
- +     @@ -38,7 +37,8 @@
- + +
- -
{table_title} @@ -48,9 +48,8 @@ {table_data}
Note: The highest priority is 1, the lowest priority is 30
- +
+     @@ -59,7 +58,7 @@
- +
All Individuals with Interviews Completed @@ -70,7 +69,7 @@


- +
Total Hometeaching Interviews diff --git a/templates/default/ppi_sched.tpl b/templates/default/ppi_sched.tpl index 08d5eae..449648d 100644 --- a/templates/default/ppi_sched.tpl +++ b/templates/default/ppi_sched.tpl @@ -1,5 +1,5 @@
- +
@@ -14,7 +14,7 @@ -
{title}
+
{appt_table_title} @@ -26,7 +26,7 @@
- +
@@ -40,7 +40,7 @@
- +
@@ -68,7 +68,7 @@
- +
{completed_table_title} @@ -79,7 +79,7 @@


- +
Total {ppi_frequency_label} PPIs