diff --git a/sites/all/modules/gui/materiobasemod/js/materio_user.js b/sites/all/modules/gui/materiobasemod/js/materio_user.js index 91cd9e04..00574132 100755 --- a/sites/all/modules/gui/materiobasemod/js/materio_user.js +++ b/sites/all/modules/gui/materiobasemod/js/materio_user.js @@ -29,23 +29,23 @@ MaterioUser = function(){ href = $this.attr("href"), destination = href.match('/\?destination=([^,]+)'); - destination = "/" + destination[1].replace('%23', '#'); + destination = "/" + destination[1]; destination = destination.replace('//', '/'); // trace('destination', destination); - if($this.parents('.gratos').size()){ - loadRegisterBlock(destination); - }else{ + // if($this.parents('.gratos').size()){ + // loadRegisterBlock(destination); + // }else{ loadLoginAndRegisterBlock(destination); - } + // } return false; }); }; - function loadRegisterBlock (destination) { - // trace("loadRegisterBlock :: dest = "+destination); - $.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_user/registerblock', function(json){formLoaded(json, destination);}); - } + // function loadRegisterBlock (destination) { + // // trace("loadRegisterBlock :: dest = "+destination); + // $.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_user/registerblock', function(json){formLoaded(json, destination);}); + // } function loadLoginAndRegisterBlock(destination){ // trace('loadRegistrationBlock :: dest = '+destination); @@ -142,7 +142,7 @@ MaterioUser = function(){ }else{ // trace('destination = '+destination); - window.location.pathname = destination; + window.location = destination.replace('%23', '#'); } }; diff --git a/sites/all/modules/gui/materiobasemod/materio_user.module b/sites/all/modules/gui/materiobasemod/materio_user.module index 9a6f0587..96944856 100755 --- a/sites/all/modules/gui/materiobasemod/materio_user.module +++ b/sites/all/modules/gui/materiobasemod/materio_user.module @@ -5,7 +5,7 @@ * Implements hook_init(). */ function materio_user_init() { - drupal_add_js(drupal_get_path('module', 'materio_user').'/js/materio_user.min.js'); + drupal_add_js(drupal_get_path('module', 'materio_user').'/js/materio_user.js'); } diff --git a/sites/all/modules/gui/materiobasemod/materio_user.pages.inc b/sites/all/modules/gui/materiobasemod/materio_user.pages.inc index 9cc11058..294a95de 100644 --- a/sites/all/modules/gui/materiobasemod/materio_user.pages.inc +++ b/sites/all/modules/gui/materiobasemod/materio_user.pages.inc @@ -29,7 +29,7 @@ function materio_user_register_submit(){ }else{ $messages = drupal_get_messages('status'); // $return['messages'] = $messages; - drupal_set_message(t("Congratulations, you juste created your free materiO' account, welcome !"), 'status'); + // drupal_set_message(t("Congratulations, you juste created your free materiO' account, welcome !"), 'status'); foreach ($messages['status'] as $msg) { drupal_set_message($msg, 'status'); }