added login form to register block

Signed-off-by: bachy <git@g-u-i.net>

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'] .= '<h3>'. t('or login if you already have an account') . '</h3>';
+        $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){