From 432b8ee65e7fa31375d7a429b5a60f1d02bddd30 Mon Sep 17 00:00:00 2001 From: bachy Date: Mon, 11 Feb 2013 15:11:27 +0100 Subject: [PATCH] added login form to register block Signed-off-by: bachy --- materio_user.module | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/materio_user.module b/materio_user.module index 2622ddeb..6329c7cc 100644 --- a/materio_user.module +++ b/materio_user.module @@ -49,6 +49,8 @@ function materio_user_block_view($delta = '') { if(isset($user->roles[1])){ $block['subject'] = t('Create your materiO\' account');//drupal_is_front_page() ? t('Your projects will born from here') : t('Create your materiO\' account'); $block['content'] = drupal_render(drupal_get_form('user_register_form')); + $block['content'] .= '

'. t('or login if you already have an account') . '

'; + $block['content'] .= drupal_render(drupal_get_form('user_login')); } break; case 'old_database_link': @@ -92,6 +94,15 @@ function materio_user_form_alter(&$form, &$form_state, $form_id) { $form['#submit'][] = "materio_user_user_register_form_submit"; } + if($form_id == "user_login" ){ + // dsm($form); + + $form['actions']['#type'] = "container"; + // $form['actions']['submit']['#value'] = t('Join'); + + // $form['#submit'][] = "materio_user_user_register_form_submit"; + + } } function materio_user_user_register_form_submit($form, &$form_state){