Removed comercial openid providers and refactored openid login form.

1 files changed, 36 insertions, 6 deletions

diff --git a/views/default/forms/openid_client/login.php b/views/default/forms/openid_client/login.php
index eba6dbe4b..1f440dc49 100644
--- a/views/default/forms/openid_client/login.php
+++ b/views/default/forms/openid_client/login.php
@@ -3,11 +3,41 @@
  * OpenID login if username or full url required
  */
 
-echo '<label>';
-echo elgg_echo('username');
-echo '</label>';
-echo elgg_view('input/text', array('name' => 'openid_username', 'class' => 'mbs'));
+$options_values = array_flip(elgg_get_config('openid_providers'));
+$options_values['others'] = elgg_echo('openid_client:others');
 
-echo elgg_view('input/hidden', array('name' => 'openid_provider'));
+?>
+<div>
+<label><?php echo elgg_echo('openid_client:login:header'); ?></label>
+<br />
+<?php
+echo elgg_view('input/dropdown', array(
+	'name' => 'openid_provider',
+	'options_values' => $options_values,
+));
+?>
+</div>
+
+<div class="openid-client-url hidden">
+<label><?php echo elgg_echo('openid_client:url'); ?> </label>
+
+<?php
+echo elgg_view('input/text', array('name' => 'openid_url', 'class' => 'mbs'));
+?>
+
+</div>
 
-echo elgg_view('input/submit', array('value' => elgg_echo('submit')));
\ No newline at end of file
+<div class="elgg-foot">
+	<label class="mtm float-alt">
+		<input type="checkbox" name="persistent" value="true" />
+		<?php echo elgg_echo('user:persistent'); ?>
+	</label>
+	
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
+	
+	<?php 
+	if (isset($vars['returntoreferer'])) {
+		echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
+	}
+	?>
+</div>
\ No newline at end of file