bug fixes solved before pushing a new version to production

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

diff --git a/application/views/user/login_view.php b/application/views/user/login_view.php
index 2a3f945..5b6226d 100644 (file)
--- a/application/views/user/login_view.php
+++ b/application/views/user/login_view.php
@@ -1,30 +1,115 @@
 <?php echo form_open("user/login/$redirect") ?>
-<table class="form">
-       <tr>
-               <th><?php echo $this->lang->line('user_username_or_email'). ': ' ?></th>
-               <td>
-                       <input type="text" name="username" size="16" value="<?php echo set_value('username') ?>" />
-               </td>
-       </tr>
-       <tr>
-               <td></td>
-               <td><?php echo form_error('username') ?></td>
-       </tr>
-       <tr>
-               <th><?php echo $this->lang->line('user_password'). ': ' ?></th>
-               <td>
-                       <input type="password" name="password" size="16" value="" />
-               </td>
-       </tr>
-       <tr>
-               <td></td>
-               <td><?php echo form_error('password') ?></td>
-       </tr>
-       <tr>
-               <td></td>
-               <td>
-                       <input type="submit" value="<?php echo $this->lang->line('ui_nav_menu_log_in') ?>" />
-               </td>
-       </tr>
-</table>
-</form>
\ No newline at end of file
+<fieldset>
+       <legend><?php echo sprintf($this->lang->line('user_legend_login_normal'), $this->config->item('site_name')) ?></legend>
+       
+       <table class="form">
+               <tr>
+                       <th><?php echo $this->lang->line('user_username_or_email'). ': ' ?></th>
+                       <td>
+                               <input type="text" name="username" size="16" value="<?php echo set_value('username') ?>" />
+                       </td>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td><?php echo form_error('username') ?></td>
+               </tr>
+               <tr>
+                       <th><?php echo $this->lang->line('user_password'). ': ' ?></th>
+                       <td>
+                               <input type="password" name="password" size="16" value="" />
+                       </td>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td><?php echo form_error('password') ?></td>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td>
+                               <input type="submit" value="<?php echo $this->lang->line('ui_nav_menu_log_in') ?>" />
+                       </td>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td>
+                               <p><a href="<?php echo site_url('user/recover_password') ?>"><?php echo $this->lang->line('user_link_password_recovery') ?></a></p>
+                       </td>
+               </tr>
+       </table>
+</fieldset>
+</form>
+
+<?php echo form_open("user/login/$redirect") ?>
+<fieldset>
+       <legend><?php echo $this->lang->line('user_legend_login_openid') ?></legend>
+       
+       <!--<p></p>-->
+       <p>
+               <a class="login-openid" data-op="google" href="#">Google</a>
+               <a class="login-openid" data-op="yahoo" href="#">Yahoo!</a>
+               <a class="login-openid" data-op="myopenid" href="#">myOpenID</a>
+       </p>
+       
+       <table class="form">
+               <tr>
+                       <th><?php echo $this->lang->line('user_openid'). ': ' ?></th>
+                       <td>
+                               <input type="text" name="openid" size="64" value="<?php echo set_value('openid') ?>" />
+                       </td>
+               </tr>
+               <tr>
+                       <td></td>
+                       <td><?php echo form_error('openid') ?></td>
+               </tr>
+               
+               <tr>
+                       <td></td>
+                       <td>
+                               <input type="submit" value="<?php echo $this->lang->line('ui_nav_menu_log_in') ?>" />
+                       </td>
+               </tr>
+       </table>
+</fieldset>
+</form>
+
+<script type="text/javascript">
+       $(function() {
+               $('.login-openid')
+                       .click(function() {
+                               var op = $(this).data('op');
+                               var openId;
+                               
+                               switch (op)
+                               {
+                               case 'google':
+                                       openId = 'https://www.google.com/accounts/o8/id';
+                                       break;
+                               case 'yahoo':
+                                       openId = 'https://me.yahoo.com/';
+                                       break;
+                               case 'myopenid':
+                                       openId = 'https://myopenid.com/';
+                                       break;
+                               }
+                               
+                               $.post('<?php echo site_url('user/login') ?>',
+                                               {'openid': openId},
+                                               function(text) {
+                                                       document.open();
+                                                       document.write(text);
+                                                       document.close();
+                                               });
+                       })
+                       .each(function() {
+                               var op = $(this).data('op');
+                               
+                               $(this)
+                                       .button({
+                                               icons: {
+                                                       primary: 'ui-icon-' + op
+                                               }
+                                       });
+                       });
+               
+       });
+</script>
\ No newline at end of file