2 files changed, 49 insertions, 8 deletions
diff --git a/modules/user/controllers/user.php b/modules/user/controllers/user.php
index b2160cda..41cb9da5 100644
--- a/modules/user/controllers/user.php
+++ b/modules/user/controllers/user.php
@@ -24,14 +24,21 @@ class User_Controller extends REST_Controller {
    * @see Rest_Controller::_get($resource)
    */
   public function _get($user) {
-    $template = new View("user_registration.html");
-
-    // @todo: this needs to be data-driven
-    $theme = new Theme("default", $template);
-
-    $template->set_global('user', Session::instance()->get('user', null));
-
-    print $template->render();
+    $userView = new View("user.html");
+    if (empty($user)) {
+      // @todo remove this when rest_controller is changed to handle a post with no id
+      $user = ORM::factory("user");
+      $user->save();
+      // @todo remove this when rest_controller is changed to handle a post with no id ^
+      $userView->user_id = $user->id;
+      $userView->action = _("User Registration");
+      $userView->button_text = _("Register");
+    } else {
+      $userView->user_id = $user->id;
+      $userView->action = _("User Modify");
+      $userView->button_text = _("Modify");
+    }
+    print $userView;
   }
 
   /**
diff --git a/modules/user/views/user.html.php b/modules/user/views/user.html.php
new file mode 100644
index 00000000..614645e5
--- /dev/null
+++ b/modules/user/views/user.html.php
@@ -0,0 +1,34 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<form id="gUser" action="<?= url::site("user/dispatch/$user_id") ?>">
+  <fieldset>
+    <legend><?=  $action ?></legend>
+    <ul>
+      <li>
+        <label for="gUsername"><?= _("Username") ?></label>
+        <input type="text" id="gUsername" />
+        <span id="gUsername_error" class="gStatus gError gDisplayNone"></span>
+      </li>
+      <li>
+        <label for="gPassword"><?= _("Password") ?></label>
+        <input type="password" id="gPassword" />
+        <span id="gPassword_error" class="gStatus gError gDisplayNone"></span>
+      </li>
+      <li>
+        <label for="gPassword_confirm"><?= _("Confirm Password") ?></label>
+        <input type="password" id="gPassword_confirm" />
+      </li>
+      <li>
+        <label for="gEmail"><?= _("Password") ?></label>
+        <input type="password" id="gEmail" />
+        <span id="gEmail_error" class="gStatus gError gDisplayNone"></span>
+      </li>
+      <li>
+        <label for="gEmail_confirm"><?= _("Confirm Email") ?></label>
+        <input type="password" id="gEmaild_confirm" />
+      </li>
+      <li>
+        <input type="submit" value="<?=$button_text?>" />
+      </li>
+    </ul>
+  </fieldset>
+</form>