bug fixes solved before pushing a new version to production

[living-lab-site.git] / application / views / user / register_view.php

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 419353a..dd97e2e 100644 (file)
--- a/application/views/user/register_view.php
+++ b/application/views/user/register_view.php
@@ -31,16 +31,20 @@ else
        <tr><td></td><td>&nbsp;</td></tr>
 
        <tr>
-         <?php if (! $userdata): ?>
+         <?php if (! $userdata || ! empty($userdata['autogen_username'])): ?>
                <th><?php echo $this->lang->line('user_username'). ' <span class="required">*</span> : ' ?></th>
                <td>
+                 <?php if (empty($userdata['autogen_username'])): ?>
                        <input type="text" name="username" size="16" value="<?php echo _set_value($userdata, 'username') ?>" />
+                 <?php else: ?>
+                       <input type="text" name="username" size="16" value="<?php echo $userdata['autogen_username'] ?>" />
+                 <?php endif ?>
                </td>
          <?php else: ?>
                <th><?php echo $this->lang->line('user_username'). ' : ' ?></th>
                <td>
                        &nbsp;<em><?php echo $userdata['username'] ?></em>
-               </td>`
+               </td>
          <?php endif ?>
        </tr>
        <tr><td></td><td><?php echo form_error('username') ?></td></tr>
@@ -143,7 +147,7 @@ else
        <tr>
                <th><?php echo $this->lang->line('user_picture'). ' : ' ?></th>
                <td>
-                       <img src="<?php echo site_url("data/user_pictures/{$userdata['picture']}") ?>" alt="<?php echo $userdata['username'] ?>" />
+                       <a href="<?php echo $userdata['picture'] ?>"><img src="<?php echo $userdata['picture_thumb'] ?>" alt="<?php echo $userdata['username'] ?>" /></a>
                </td>
        </tr>
        <tr><td></td><td></td></tr>