Projet

Général

Profil

0001-formilize-id-name-in-templates-9671.patch

Josué Kouka, 15 janvier 2016 15:41

Télécharger (3,66 ko)

Voir les différences:

Subject: [PATCH] formilize id name in templates (#9671)

 mandayejs/mandaye/static/mandaye.css           | 26 +++++++++++++++++---------
 mandayejs/mandaye/templates/mandaye/panel.html | 18 +++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)
mandayejs/mandaye/static/mandaye.css
1 1
#mandaye-js {
2
  position: absolute;
3
  width: 100%;
4
  margin-bottom : 10px;
2 5
  background: black;
3 6
  color: white;
4 7
  padding: 5px 0;
......
16 19
    float: left;
17 20
}
18 21

  
19
#sso-advances{
22
#mandaye-advances{
20 23
    float: left;
21 24
    margin-left: 5px;
22 25
}
23 26

  
24
#sso-username {
27
#mandaye-username {
25 28
    float: left;
26 29
    margin-left: 5px;
27 30
}
28 31

  
29
#sso-mandaye-link {
30
    float: left;
31
    margin-left: 15px;
32
#mandaye-association-url {
33
    float: right;
34
    margin-right: 15px;
32 35
}
33 36

  
34
#sso-url {
37
#mandaye-logon-url {
38
    float: right;
35 39
    margin-right: 10px;
36 40
}
37 41

  
38
#sso-mandaye-link:first-letter {
42
#mandaye-username{
43
    text-transform:capitalize;
44
}
45

  
46
#mandaye-association-url:first-letter {
39 47
    text-transform : uppercase;
40 48
}
41 49

  
42
#sso-url:first-letter {
50
#mandaye-logon-url:first-letter {
43 51
    text-transform: uppercase;
44 52
}
45 53

  
46
#sso-advances:first-letter {
54
#mandaye-advances:first-letter {
47 55
    text-transform: uppercase;
48 56
}
mandayejs/mandaye/templates/mandaye/panel.html
8 8

  
9 9
<div id="mandaye-logo">
10 10
    <a href="{% static 'images/logo.png' %}">
11
        <img src="{% static 'images/logo.png' %}" alt="{% static 'images/logo.png' %}">
11
        <img src="{% static 'images/logo.png' %}" alt="logo.png">
12 12
    </a>
13 13
</div>
14 14
{% if user.is_authenticated %}
15
<div id="sso-username"><a href="{{idp_url}}/accounts">{{ user.get_full_name }}</a></div>
16
    <div id="sso-advances"><a href="{{wcs_url}}">{% trans 'advances' %}</a></div>
15
<div id="mandaye-username"><a href="{{idp_url}}/accounts">{{ user.get_full_name }}</a></div>
16
    <div id="mandaye-advances"><a href="{{wcs_url}}">{% trans 'advances' %}</a></div>
17
    <div id="mandaye-logon-url"><a href="{% url 'mellon_logout' %}">{% trans 'logout' %}</a></div>
17 18
    {% if is_linked %}
18
        <div id="sso-mandaye-link"><a href="{% url 'dissociate' %}">{% trans 'dissociate' %}</a></div>
19
        <div id="mandaye-association-url"><a href="{% url 'dissociate' %}">{% trans 'dissociate' %}</a></div>
19 20
    {% else %}
20
        <div id="sso-mandaye-link"><a href="{% url 'associate' %}">{% trans 'associate' %}</a></div>
21
        <div id="mandaye-association-url"><a href="{% url 'associate' %}">{% trans 'associate' %}</a></div>
21 22
    {% endif %}
22
    <div id="sso-url"><a href="{% url 'mellon_logout' %}">{% trans 'logout' %}</a></div>
23 23
{% else %}
24
    <div id="sso-advances"><a href="{{wcs_url}}">{% trans 'advances' %}</a></div>
25
    <div id="sso-mandaye-link"><a href="{% url 'associate' %}">{% trans 'associate' %}</a></div>
26
    <div id="sso-url"><a href="{% url 'mellon_login' %}">{% trans 'login' %}</a></div>
24
    <div id="mandaye-advances"><a href="{{wcs_url}}">{% trans 'advances' %}</a></div>
25
    <div id="mandaye-logon-url"><a href="{% url 'mellon_login' %}">{% trans 'login' %}</a></div>
26
    <div id="mandaye-association-url"><a href="{% url 'associate' %}">{% trans 'associate' %}</a></div>
27 27
{% endif %}
28 28
</div>
29
-