other half of membership renewal changes, pulled from trunk

templates/options.tpl

@@ -21,6 +21,13 @@
 			<div class="note">If your name has changed (e.g. through marriage), please contact a member of admin.</div>
 		</span>
 	</div>
+	<div class="row">
+		<label for="status">Membership status:</label>
+		<span class="textinput">
+			{$member.typename}
+			{if $member.id == 1 || $member.id == 2}(Paid Until: {$member.paid}){/if}
+		</span>
+	</div>
 	<div class="row">
 		<label for="groups">Groups: </label>
 		<span class="textinput"><span class="note"><a href="/Knowledge/Help/Admin%20Tools/Groups">What are &ldquo;Groups&rdquo;?</a></span></span>
@@ -159,6 +166,30 @@
 {/if}
 	</fieldset>
 	</form>
+
+{if ($member.type == 1 || $member.type == 2) && $member.paid != $paydate}
+	<form method="post" action="{$baseurl}{$path}">
+	<fieldset>
+	<legend> Membership Renewal </legend>
+	<input type="hidden" name="action" value="renew" />
+	<div class="row">
+		<label for="userid">ID:</label>
+		<span class="textinput">
+			<input type="text" name="userid" id="userid" value="" />
+		</span>
+		<label for="supass">Password:</label>
+		<span class="textinput">
+			<input type="text" name="supass" id="supass" value="" />
+			<div class="note">You may use a purchased signup slip to renew your account by entering its details here.</div>
+		</span>
+	</div>
+	<div class="row">
+		<input type="submit" value="Renew" />
+	</div>
+	</fieldset>
+	</form>
+{/if}
+
 	<div class="clear"></div>
 </form>
 </div>