5 files changed, 66 insertions, 40 deletions
diff --git a/view/css/mod_zentity.css b/view/css/mod_zentity.css
index 2edb9e9a9..402572a38 100644
--- a/view/css/mod_zentity.css
+++ b/view/css/mod_zentity.css
@@ -4,29 +4,36 @@ h2 {
 	margin-top: 15%;
 }
 
-#zregister-form {
+#zentity-form {
 	font-size: 1.4em;	
 	margin-left: 15%;
 	margin-top: 5%;
+	width: 50%;
 }
 
-.zregister-label {
+#zentity-form .descriptive-paragraph {
+	color: #888;
+	margin-left: 20px;
+	margin-bottom: 25px;
+}
+
+.zentity-label {
 	float: left;
 	width: 275px;
 }
 
-.zregister-input {
+.zentity-input {
 	float: left;
 	width: 275px;
 	padding: 5px;
 }
 
-.zregister-feedback {
+.zentity-feedback {
 	float: left;
 	margin-left: 5px;
 }
 
-.zregister-field-end {
+.zentity-field-end {
 	clear: both;
 	margin-bottom: 20px;
 }
diff --git a/view/js/mod_zentity.js b/view/js/mod_zentity.js
new file mode 100644
index 000000000..ad78db7d4
--- /dev/null
+++ b/view/js/mod_zentity.js
@@ -0,0 +1,17 @@
+	$(document).ready(function() {
+		$("#zentity-name").blur(function() {
+			var zreg_name = $("#zentity-name").val();
+			$.get("zentity/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
+				$("#zentity-nickname").val(data);
+				zFormError("#zentity-name-feedback",data.error);
+			});
+		});
+		$("#zentity-nickname").blur(function() {
+			var zreg_nick = $("#zentity-nickname").val();
+			$.get("zentity/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
+				$("#zentity-nickname").val(data);
+				zFormError("#zentity-nickname-feedback",data.error);
+			});
+		});
+
+	});
diff --git a/view/php/default.php b/view/php/default.php
index 61f5f6863..80c8070b2 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,6 +10,7 @@
 	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
+		<div id="pause"></div>
 	</section>
 	<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
new file mode 100644
index 000000000..9349c56ae
--- /dev/null
+++ b/view/tpl/mood_content.tpl
@@ -0,0 +1,20 @@
+<h3>$title</h3>
+
+<div id="mood-desc">$desc</div>
+
+<form action="mood" method="get">
+<br />
+<br />
+
+<input id="mood-parent" type="hidden" value="$parent" name="parent" />
+
+<select name="verb" id="mood-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+
diff --git a/view/tpl/zentity.tpl b/view/tpl/zentity.tpl
index f34042d05..f41578117 100644
--- a/view/tpl/zentity.tpl
+++ b/view/tpl/zentity.tpl
@@ -1,46 +1,27 @@
 <h2>$title</h2>
 
-<form action="zregister" method="post" id="zregister-form">
+<form action="zentity" method="post" id="zentity-form">
 
-{{ if $registertext }}
-<div id="zregister-desc" style="color: #888; margin-bottom: 50px;" class="descriptive-paragraph">$registertext</div>
-{{ endif }}
+	<div id="zentity-desc" class="descriptive-paragraph">$desc</div>
 
-{{ if $invitations }}
-	<p id="register-invite-desc">$invite_desc</p>
+	<label for="zentity-name" id="label-zentity-name" class="zentity-label" >$label_name</label>
+	<input type="text" name="name" id="zentity-name" class="zentity-input" value="$name" />
+	<div id="zentity-name-feedback" class="zentity-feedback"></div>
+	<div id="zentity-name-end"  class="zentity-field-end"></div>
 
-	<label for="zregister-invite" id="label-zregister-invite" class="zregister-label">$label_invite</label>
-	<input type="text" maxlength="72" size="32" name="invite_id" id="zregister-invite" class="zregister-input" value="$invite_id" >
-	</div>
-	<div id="zregister-invite-feedback" class="zregister-feedback"></div>
-	<div id="zregister-invite-end" class="zregister-field-end"></div>
+	<label for="zentity-nickname" id="label-zentity-nickname" class="zentity-label" >$label_nick</label>
+	<input type="text" name="nickname" id="zentity-nickname" class="zentity-input" value="$nickname" />
+	<div id="zentity-nickname-feedback" class="zentity-feedback"></div>
+	<div id="zentity-nickname-end"  class="zentity-field-end"></div>
 
-{{ endif }}
+	<div id="zentity-nick-desc" class="descriptive-paragraph">$nick_desc</div>
 
 
-	<label for="zregister-email" id="label-zregister-email" class="zregister-label" >$label_email</label>
-	<input type="text" maxlength="72" size="32" name="email" id="zregister-email" class="zregister-input" value="$email" >
-	<div id="zregister-email-feedback" class="zregister-feedback"></div>
-	<div id="zregister-email-end"  class="zregister-field-end"></div>
+	<input type="checkbox" name="import" id="zentity-import" value="1" />
+	<label for="zentity-import" id="label-zentity-import">$label_import</label>
+	<div id="zentity-import-end" class="zentity-field-end"></div>
 
-	<label for="zregister-password" id="label-zregister-password" class="zregister-label" >$label_pass1</label>
-	<input type="text" maxlength="72" size="32" name="password" id="zregister-password" class="zregister-input" value="$pass1" >
-	<div id="zregister-password-feedback" class="zregister-feedback"></div>
-	<div id="zregister-password-end"  class="zregister-field-end"></div>
-
-	<div class="clear">
-	<div style="color: #888;">$label_pass2</div>
-	<div id="zregister-password2-end"  class="zregister-field-end"></div>
-
-	<div style="margin-bottom: 25px;">&nbsp;</div>
-
-
-	<input type="checkbox" name="tos" id="zregister-tos" value="1" >
-	<label for="zregister-tos" id="label-zregister-tos">$label_tos</label>
-	<div id="zregister-tos-feedback" class="zregister-feedback"></div>
-	<div id="zregister-tos-end"  class="zregister-field-end"></div>
-
-	<input type="submit" name="submit" id="zregister-submit-button" value="$submit" />
-	<div id="zregister-submit-end" class="zregister-field-end"></div>
+	<input type="submit" name="submit" id="zentity-submit-button" value="$submit" />
+	<div id="zentity-submit-end" class="zentity-field-end"></div>
 
 </form>