Commit 593cd44a4576025e92ac93a73f4f9ead651f328e
1 parent
97b24bce
Exists in
master
and in
3 other branches
language selector is almost done, error of alignment on home
Showing
5 changed files
with
66 additions
and
0 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
| @@ -15,6 +15,30 @@ a:focus { | @@ -15,6 +15,30 @@ a:focus { | ||
| 15 | width: 100%; | 15 | width: 100%; |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | +.language-selector{ | ||
| 19 | + margin-left: 8%; | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +.language-selector img{ | ||
| 23 | + width: 3%; | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +.language-selector > ul img{ | ||
| 27 | + width: 15%; | ||
| 28 | +} | ||
| 29 | + | ||
| 30 | +.language-selector-on-header img{ | ||
| 31 | + width: 15%; | ||
| 32 | + margin-top: 2%; | ||
| 33 | +} | ||
| 34 | +.language-selector-on-header > ul img{ | ||
| 35 | + width: 15%; | ||
| 36 | +} | ||
| 37 | + | ||
| 38 | +.navbar-header{ | ||
| 39 | + width: 20%; | ||
| 40 | +} | ||
| 41 | + | ||
| 18 | /* Initial page starts */ | 42 | /* Initial page starts */ |
| 19 | .users-cloud { | 43 | .users-cloud { |
| 20 | 44 |
19.9 KB
15.9 KB
amadeus/templates/base.html
| @@ -74,6 +74,26 @@ | @@ -74,6 +74,26 @@ | ||
| 74 | <img class="logo pull-left" src="{{ theme.small_logo_url }}" alt="Logo" /> | 74 | <img class="logo pull-left" src="{{ theme.small_logo_url }}" alt="Logo" /> |
| 75 | <span class="pull-right project_name">{{ theme.title }}</span> | 75 | <span class="pull-right project_name">{{ theme.title }}</span> |
| 76 | </a> | 76 | </a> |
| 77 | + | ||
| 78 | + <li class="dropdown language-selector-on-header"> | ||
| 79 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> | ||
| 80 | + <img src="{% static "img/brazilicon.png" %}" /> | ||
| 81 | + </a> | ||
| 82 | + <ul class="dropdown-menu"> | ||
| 83 | + <li class="active"> | ||
| 84 | + <a href="#"> | ||
| 85 | + <img src="{% static "img/brazilicon.png" %}" /> | ||
| 86 | + <span>{% trans "PT-BR" %}</span> | ||
| 87 | + </a> | ||
| 88 | + </li> | ||
| 89 | + <li > | ||
| 90 | + <a href="#"> | ||
| 91 | + <img src="{% static "img/euaicon.png" %}" /> | ||
| 92 | + <span>{% trans "EN" %}</span> | ||
| 93 | + </a> | ||
| 94 | + </li> | ||
| 95 | + </ul> | ||
| 96 | + </li> | ||
| 77 | </div> | 97 | </div> |
| 78 | <div class="navbar-collapse collapse navbar-responsive-collapse"> | 98 | <div class="navbar-collapse collapse navbar-responsive-collapse"> |
| 79 | <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center"> | 99 | <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center"> |
users/templates/users/login.html
| @@ -39,6 +39,7 @@ | @@ -39,6 +39,7 @@ | ||
| 39 | <h2 class="outside-title"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2> | 39 | <h2 class="outside-title"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2> |
| 40 | </div> | 40 | </div> |
| 41 | </div> | 41 | </div> |
| 42 | + <div class="row"> | ||
| 42 | <form id="form-login" method="post" action=""> | 43 | <form id="form-login" method="post" action=""> |
| 43 | {% csrf_token %} | 44 | {% csrf_token %} |
| 44 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> | 45 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> |
| @@ -51,7 +52,28 @@ | @@ -51,7 +52,28 @@ | ||
| 51 | <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}"> | 52 | <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}"> |
| 52 | </div> | 53 | </div> |
| 53 | </div> | 54 | </div> |
| 55 | + | ||
| 54 | </form> | 56 | </form> |
| 57 | + </div> | ||
| 58 | + <li class="dropdown language-selector"> | ||
| 59 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> | ||
| 60 | + <img src="{% static "img/brazilicon.png" %}" /> | ||
| 61 | + </a> | ||
| 62 | + <ul class="dropdown-menu"> | ||
| 63 | + <li class="active"> | ||
| 64 | + <a href="#"> | ||
| 65 | + <img src="{% static "img/brazilicon.png" %}" /> | ||
| 66 | + <span>{% trans "PT-BR" %}</span> | ||
| 67 | + </a> | ||
| 68 | + </li> | ||
| 69 | + <li > | ||
| 70 | + <a href="#"> | ||
| 71 | + <img src="{% static "img/euaicon.png" %}" /> | ||
| 72 | + <span>{% trans "EN" %}</span> | ||
| 73 | + </a> | ||
| 74 | + </li> | ||
| 75 | + </ul> | ||
| 76 | + </li> | ||
| 55 | <div class="row"> | 77 | <div class="row"> |
| 56 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> | 78 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> |
| 57 | {% if not deny_register %} | 79 | {% if not deny_register %} |