From: Alan Pippin <apippin@pippins.net>
Date: Mon, 11 Oct 2010 18:33:32 +0000 (-0600)
Subject: Merge branch 'master' of git@github.com:apippin/tc
X-Git-Tag: release_1_1_0~6^2~3
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%7Bupdate_day%7D?a=commitdiff_plain;h=9e3770fc8b3456d646e43fe13f238324f8d85740;hp=1a6502e9a30c2fa28a6d251718bbe386b1700c7c;p=eq%2F.git

Merge branch 'master' of git@github.com:apippin/tc
---

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index b87659f..7f2700e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -1524,6 +1524,8 @@ 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);
+       		  $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
+
 		  $this->t->fp('apptlist','appt_list',True);
 		}
 		
@@ -1636,6 +1638,7 @@ class tc
 		$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','Save Pri / Notes'); 
 		$this->t->fp('indivlist','individual_list',True); 
 
 		$indivs_width=300; $totals_width=100;
diff --git a/templates/default/ppi_sched.tpl b/templates/default/ppi_sched.tpl
index 5a54af0..f694d4f 100644
--- a/templates/default/ppi_sched.tpl
+++ b/templates/default/ppi_sched.tpl
@@ -1,5 +1,4 @@
 <center>
-	<form action="{actionurl}" method="POST">
 	<table border="0" width="{table_width}" cellspacing="2" cellpadding="2">
 		<tr>
 			<td align="center" bgcolor="#c9c9c9"><font face="{font}"><b>{title}</b></font></td>
@@ -11,11 +10,10 @@
 	<a href="{schedule_ppi_link}">{schedule_ppi_link_title}</a>
 	<br><br>
 
-
+<hr>
 <!-- BEGIN appt_list -->
 	<form action="{actionurl}" method="POST">
 		<input type=hidden name=presidency_location value={presidency_location}>
-        <hr>
         <table border="0" width="{appt_table_width}" cellspacing="2" cellpadding="2">
 		<tr>
 			<td align="center" bgcolor="#c9c9c9" colspan=20>
@@ -34,14 +32,22 @@
 			<font face="{font}"><input type="submit" name="save" value="{lang_save}"></font>
 			&nbsp; &nbsp;
 			<font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font>
-			</form>
 		</td>
 		</tr>
 	</table>
+	</form>
 <!-- END appt_list -->
-
+<hr>
 <!-- BEGIN individual_list -->
+        <form action="{actionurl}" method="POST">
 	<table border="0" width="{table_width}" cellspacing="2" cellpadding="2">
+              	<tr>
+                	<td colspan=5 height="50" align="right">
+                        	<font face="{font}"><input type="submit" name="save" value="{lang_save}"></font>
+                        	&nbsp; &nbsp;
+                        	<font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font>
+                	</td>
+		</tr>
 		<tr>
 			<td align="center" bgcolor="#c9c9c9" colspan=20>
 				<font face="{font}"><b>{not_completed_table_title}</b></font>
@@ -56,10 +62,10 @@
 			<font face="{font}"><input type="submit" name="save" value="{lang_save}"></font>
 			&nbsp; &nbsp;
 			<font face="{font}"><input type="reset" name="reset" value="{lang_reset}"></font>
-			</form>
 		</td>
 		</tr>
 	</table>
+        </form>
 <!-- END individual_list -->
 	<hr>
 	<table border="0" width="{completed_table_width}" cellspacing="2" cellpadding="2">