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/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/%7Bview%7D?a=commitdiff_plain;h=9e3770fc8b3456d646e43fe13f238324f8d85740;p=eq%2F.git

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

9e3770fc8b3456d646e43fe13f238324f8d85740
diff --cc templates/default/ppi_sched.tpl
index 191a9a2,5a54af0..f694d4f
--- a/templates/default/ppi_sched.tpl
+++ b/templates/default/ppi_sched.tpl
@@@ -35,22 -37,14 +35,22 @@@
  		</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>{table_title}</b></font>
+ 				<font face="{font}"><b>{not_completed_table_title}</b></font>
  			</td>
  		</tr>
  		<tr bgcolor="#c9c9c9"><font face="{font}">{header_row}</tr>