Project

General

Profile

« Previous | Next » 

Revision 49622

Added by Sofia Baltzi over 6 years ago

Remove javascript for oganization field anf add message error for activation code

View differences:

modules/dnet-openaire-users/trunk/src/main/webapp/register.jsp
47 47 
        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
48 48 
            <h2 class="uk-h2 uk-margin-small-bottom">Create new OpenAIRE account</h2>
49 49 
            <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
50 
            <div uk-grid="" class="uk-grid uk-grid-stack">
51 50 
                <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
52 51 
                    <div class="uk-grid ">
53 52 
                        <!-- CENTER SIDE -->
modules/dnet-openaire-users/trunk/src/main/webapp/js/validation.js
34 34 
        }
35 35 
    }
36 36 

  		




  37
  
  
    
    // Check if organization is filled


  		




  38
  
  
    
    if($("#organization").val() != undefined) {


  		




  39
  
  
    
        if($.trim($("#organization").val()).length <= 0) {


  		




  40
  
  
    
            $("#organization").addClass('uk-input aai-form-danger');


  		




  41
  
  
    
            $(".msg_organization_error").show();


  		




  42
  
  
    
        } else {


  		




  43
  
  
    
            $(".msg_organization_error").hide();


  		




  44
  
  
    
            $("#organization").removeClass('aai-form-danger');


  		




  45
  
  
    
        }


  		




  46
  
  
    
    }


  		




  
  37
  
    
    // // Check if organization is filled


  		




  
  38
  
    
    // if($("#organization").val() != undefined) {


  		




  
  39
  
    
    //     if($.trim($("#organization").val()).length <= 0) {


  		




  
  40
  
    
    //         $("#organization").addClass('uk-input aai-form-danger');


  		




  
  41
  
    
    //         $(".msg_organization_error").show();


  		




  
  42
  
    
    //     } else {


  		




  
  43
  
    
    //         $(".msg_organization_error").hide();


  		




  
  44
  
    
    //         $("#organization").removeClass('aai-form-danger');


  		




  
  45
  
    
    //     }


  		




  
  46
  
    
    // }


  		




  47
  47
  
    

  		




  48
  48
  
    
    // Check if username is filled


  		




  49
  49
  
    
    if($("#username").val() != undefined) {


  		




  ......




  59
  59
  
    

  		




  60
  60
  
    
    if($("#verification_code").val() != undefined) {


  		




  61
  61
  
    
        if($.trim($("#verification_code").val()).length <= 0) {


  		




  62
  
  
    
            $("#username").addClass('uk-input aai-form-danger');


  		




  
  62
  
    
            $("#verification_code").addClass('uk-input aai-form-danger');


  		




  63
  63
  
    
            $(".msg_verification_code_error").show();


  		




  
  64
  
    
            $(".msg_activation_code_error").show();


  		




  64
  65
  
    
            hasError = true;


  		




  65
  66
  
    
        } else {


  		




  66
  67
  
    
            $(".msg_verification_code_error").hide();


  		




  
  68
  
    
            $(".msg_activation_code_error").hide();


  		




  67
  69
  
    
            $("#verification_code").removeClass('aai-form-danger');


  		




  68
  70
  
    
        }


  		




  69
  71
  
    
    }


  		












Also available in:  Unified diff