--- a/app/soc/templates/soc/site/user/profile/edit.html	Fri Sep 19 05:12:35 2008 +0000
+++ b/app/soc/templates/soc/site/user/profile/edit.html	Fri Sep 19 05:15:20 2008 +0000
@@ -14,16 +14,16 @@
 {% endcomment %}
 {% load forms_helpers %}
 {% block page_title %}
- {% if linkname_user %}
+ {% if existing_user %}
   Developer: Modify Existing User Profile
  {% else %}
   Developer: Create New User Profile
  {% endif %}
 {% endblock %}
 {% block header_title %}
- {% if linkname_user %}
-  Modify Existing User Profile for {{ linkname_user.nick_name }}
-   <a href="mailto:{{ linkname_user.id }} ">&lt;{{ linkname_user.id }}&gt;</a>
+ {% if existing_user %}
+  Modify Existing User Profile for {{ existing_user.nick_name }}
+   <a href="mailto:{{ existing_user.id }} ">&lt;{{ existing_user.id }}&gt;</a>
  {% else %}
   Create a New User Profile
  {% endif %}
@@ -38,19 +38,20 @@
 <form method="POST">
  <table>
   {% field_as_table_row form.id %}
+{% if lookup_error %}
+<tr>
+ <td>&nbsp;</td>
+ <td colspan="3" class="formfielderror">
+  {{ lookup_error }}
+ </td>
+</tr>
+{% endif %}
   {% field_as_table_row form.link_name %}
+  {% field_as_table_row form.nick_name %}
+  {% field_as_table_row form.is_developer %}
   <tr>
-   <td> 
-    <input type="submit" style="font-weight: bold" name="lookup" value="Look up User"/></span>
-   </td>
-   <td>&nbsp;</td>
-   <td>&nbsp;</td>
-   <td>
-    {% if lookup_message %}<b><i>{{ lookup_message }}</i></b>{% endif %}
-   </td>
-  <tr><td colspan="4">&nbsp;</td></tr>
+   <td colspan="4">&nbsp;</td>
   </tr>
-  {% field_as_table_row form.nick_name %}
   <tr>
    <td> 
     <input type="submit" style="font-weight: bold" name="save" value="Save Changes"/></span>
@@ -58,9 +59,16 @@
    <td>
     <input type="button" onclick="location.href='/'" value="Cancel"/>
    </td>
+   <td>&nbsp;</td>
+{% if submit_error %}
+   <td class="formfielderror">
+    {{ submit_error }}
+   </td>
+{% else %}
    <td>
-    {% if submit_message %}<b><i>{{ submit_message }}</i></b>{% endif %}
+    {% if submit_message %}<b><i>{{ submit_message }}</i></b>{% else %}&nbsp;{% endif %}
    </td>
+{% endif %}
   </tr>
  </table>
 </form>