Projet

Général

Profil

« Précédent | Suivant » 

Révision ea5cd294

Ajouté par Josué Kouka il y a plus de 8 ans

translation updated, js/css fixed and redirect to post-login if account
already associated

Voir les différences:

locale/fr/LC_MESSAGES/django.po
8 8 
msgstr ""
9 9 
"Project-Id-Version: PACKAGE VERSION\n"
10 10 
"Report-Msgid-Bugs-To: \n"
11 
"POT-Creation-Date: 2015-12-07 08:37+0000\n"
11 
"POT-Creation-Date: 2015-12-14 08:54+0000\n"
12 12 
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 
"Language-Team: LANGUAGE <LL@li.org>\n"
......
22 22 
msgid "locators"
23 23 
msgstr "selecteurs"
24 24 

  		




  25
  
  
    
#: mandayejs/mandaye/templates/mandaye/panel.html:7


  		




  26
  
  
    
msgid "ca"


  		




  27
  
  
    
msgstr "compte citoyen"


  		




  28
  
  
    

  		




  29
  
  
    
#: mandayejs/mandaye/templates/mandaye/panel.html:9


  		




  
  25
  
    
#: mandayejs/mandaye/templates/mandaye/panel.html:10


  		




  30
  26
  
    
msgid "dissociate"


  		




  31
  27
  
    
msgstr "délier mon compte"


  		




  32
  28
  
    

  		




  33
  29
  
    
#: mandayejs/mandaye/templates/mandaye/panel.html:12


  		




  
  30
  
    
#: mandayejs/mandaye/templates/mandaye/panel.html:16


  		




  34
  31
  
    
msgid "associate"


  		




  35
  
  
    
msgstr "associate"


  		




  
  32
  
    
msgstr "lier mon compte"


  		




  36
  33
  
    

  		




  37
  34
  
    
#: mandayejs/mandaye/views.py:56


  		




  38
  35
  
    
msgid "login"


  		




  ......




  42
  39
  
    
msgid "logout"


  		




  43
  40
  
    
msgstr "se déconnecter"


  		




  44
  41
  
    

  		




  45
  
  
    
#: mandayejs/mandaye/views.py:90


  		




  
  42
  
    
#: mandayejs/mandaye/views.py:99


  		




  46
  43
  
    
msgid "submit"


  		




  47
  44
  
    
msgstr "valider"


  		




  48
  45
  
    

  		




  49
  
  
    
#: mandayejs/mandaye/views.py:91


  		




  
  46
  
    
#: mandayejs/mandaye/views.py:100


  		




  50
  47
  
    
msgid "associate your account"


  		




  51
  48
  
    
msgstr "associer mon compte"


  		




  
  49
  
    

  		




  
  50
  
    
#~ msgid "ca"


  		




  
  51
  
    
#~ msgstr "compte citoyen"


  		












  

    
      mandayejs/mandaye/static/mandaye.css
    
  





  6
  6
  
    
  line-height: 35px;


  		




  7
  7
  
    
  vertical-align: middle;


  		




  8
  8
  
    
  text-align : right;


  		




  9
  
  
    
  font-weight: bold;


  		




  10
  9
  
    
}


  		




  11
  10
  
    

  		




  12
  11
  
    
#mandaye-js a {


  		












  

    
      mandayejs/mandaye/templates/mandaye/panel.html
    
  





  13
  13
  
    
    {% endif %}


  		




  14
  14
  
    
    <div id="sso-url"><a href="{% url 'mellon_logout' %}">{{ logout_txt|capfirst }}</a></div>


  		




  15
  15
  
    
{% else %}


  		




  16
  
  
    
    <div><a id="sso-url" href="{% url 'mellon_login' %}">{{ login_txt|capfirst }}</a></div>


  		




  
  16
  
    
    <div id="sso-mandaye-link"><a href="{% url 'associate' %}">{% trans 'associate'|capfirst %}</a></div>


  		




  
  17
  
    
    <div id="sso-url"><a href="{% url 'mellon_login' %}">{{ login_txt|capfirst }}</a></div>


  		




  17
  18
  
    
{% endif %}


  		




  18
  19
  
    
</div>


  		












  

    
      mandayejs/mandaye/views.py
    
  





  94
  94
  
    
    else:


  		




  95
  95
  
    
        form = FormFactory(auto_id=True, locators=settings.SITE_LOCATORS)


  		




  96
  96
  
    
    if not form.is_valid():


  		




  
  97
  
    
        User = get_user_model()


  		




  
  98
  
    
        if User.objects.filter(username=request.user.username).exists():


  		




  
  99
  
    
            return HttpResponseRedirect(resolve_url('post-login'))


  		




  
  100
  
    
            


  		




  97
  101
  
    
        return render(request, 'mandaye/associate.html', {


  		




  98
  102
  
    
                    'form': form, 


  		




  99
  103
  
    
                    'submit': _('submit'), 


  		




  ......




  118
  122
  
    
    except (User.DoesNotExist,) as e:


  		




  119
  123
  
    
        return HttpResponseRedirect(resolve_url('associate'))


  		




  120
  124
  
    

  		




  
  125
  
    
@login_required


  		




  121
  126
  
    
def post_login_do(request, *args, **kwargs):


  		




  122
  
  
    
    if not request.user.is_authenticated():


  		




  123
  
  
    
        return HttpResponseRedirect(resolve_url('mellon_login'))


  		




  124
  127
  
    
    credentials = get_object_or_404(UserCredentials, user=request.user)


  		




  125
  128
  
    
    login_info = {


  		




  126
  129
  
    
        'address': request.build_absolute_uri(settings.SITE_LOGIN_PATH),


  		












  

    
      mandayejs/sites/vincennes/static/css/duonext.css
    
  





  19
  19
  
    
    background-image: url('/_mandaye/static/images/compte-citoyen.png');


  		




  20
  20
  
    
    padding: 0px 12px 20px 47px;


  		




  21
  21
  
    
    background-position: 10px 5px;


  		




  
  22
  
    
    font-weight : bold;


  		




  
  23
  
    
}


  		




  
  24
  
    

  		




  
  25
  
    
#sso-url {


  		




  
  26
  
    
    float: right;


  		




  
  27
  
    
    margin : 0 20px 0 20px ;


  		




  22
  28
  
    
}


  		




  23
  29
  
    

  		




  24
  30
  
    
#sso-mandaye-link {


  		




  25
  
  
    
    margin-left: 820px;


  		




  
  31
  
    
    float : right;


  		




  
  32
  
    
    margin : 0 20px 0 20px ;


  		




  26
  33
  
    
}


  		




  27
  34
  
    

  		




  28
  35
  
    
#demarches {


  		




  29
  36
  
    
    float: left;


  		




  30
  37
  
    
    margin-left: 20px;


  		




  31
  38
  
    
    margin-right: 20px;


  		




  
  39
  
    
    font-weight : bold;


  		




  32
  40
  
    
}


  		




  33
  41
  
    

  		




  34
  42
  
    
#imgMain {


  		




  35
  
  
    
    margin-right : 425px;;


  		




  
  43
  
    
    margin-right : 430px;;


  		




  36
  44
  
    
}


  		




  37
  45
  
    

  		




  38
  46
  
    
#lblClient {


  		












  

    
      mandayejs/sites/vincennes/static/js/duonext.js
    
  





  4
  4
  
    
  $('#mandaye-js').prepend('<div id="mandaye-vc-logo"><a href="https://www.vincennes.fr"><img src="/_mandaye/static/images/vincennes-logo.png" alt="vincennes-logo.png"></a></div>');


  		




  5
  5
  
    
  $('head').append('<link rel="stylesheet" href="/_mandaye/static/css/duonext.css"> type="text/css"');


  		




  6
  6
  
    
  $('#sso-username').after('<a id="demarches" href="https://demarches.vincennes.fr">Démarches en ligne</a>');


  		




  
  7
  
    
  if ($('#sso-username').length === 0){


  		




  
  8
  
    
      $('#imgMain').css({'margin-right':'210px'});


  		




  
  9
  
    
      console.log($('#mandaye-vc-logo'));


  		




  
  10
  
    
      $('#mandaye-vc-logo').after('<a id="demarches" href="https://demarches.vincennes.fr">Démarches en ligne</a>');


  		




  
  11
  
    
  }


  		




  
  12
  
    

  		




  
  13
  
    
  $('#sso-url').after($('#sso-mandaye-link'));


  		




  7
  14
  
    
});


  		












Formats disponibles :  Unified diff