Commit c1db7617dcce674437e2678210ada69324eefe9c
1 parent
2523da11
Exists in
master
and in
2 other branches
Modified login screen to adjust languages submenu icons
Showing
1 changed file
with
20 additions
and
27 deletions
Show diff stats
users/templates/users/login.html
... | ... | @@ -31,7 +31,7 @@ |
31 | 31 | </div> |
32 | 32 | {% endfor %} |
33 | 33 | {% endif %} |
34 | - | |
34 | + | |
35 | 35 | <div class="card"> |
36 | 36 | <div class="card-block"> |
37 | 37 | <div class="row"> |
... | ... | @@ -39,7 +39,7 @@ |
39 | 39 | <h2 class="outside-title"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2> |
40 | 40 | </div> |
41 | 41 | </div> |
42 | - | |
42 | + | |
43 | 43 | <form id="form-login" method="post" action=""> |
44 | 44 | {% csrf_token %} |
45 | 45 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> |
... | ... | @@ -52,10 +52,10 @@ |
52 | 52 | <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}"> |
53 | 53 | </div> |
54 | 54 | </div> |
55 | - | |
55 | + | |
56 | 56 | </form> |
57 | - | |
58 | - | |
57 | + | |
58 | + | |
59 | 59 | <div class="row"> |
60 | 60 | <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> |
61 | 61 | {% if not deny_register %} |
... | ... | @@ -74,23 +74,23 @@ |
74 | 74 | </div> |
75 | 75 | <div class="row"> |
76 | 76 | |
77 | - | |
77 | + | |
78 | 78 | {% if not deny_register %} |
79 | 79 | <div class="col-sm-offset-1 col-md-10 col-lg-10 col-sm-10 col-xs-12"> |
80 | 80 | <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-right forgotPassword"> |
81 | 81 | <a class="pull-right" href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a> |
82 | - <li class="dropdown language-selector pull-right "> | |
82 | + <li class="dropdown language-selector pull-right "> | |
83 | 83 | {% get_current_language as LANGUAGE_CODE %} |
84 | 84 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> |
85 | 85 | |
86 | - {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %} | |
87 | - <img src="{% static image_static %}" /> | |
88 | - {% endwith %} | |
89 | - | |
86 | + | |
87 | + <span>[{{LANGUAGE_CODE}}] </span> | |
88 | + | |
90 | 89 | </a> |
90 | + <i class="glyphicon glyphicon-adjust"></i> | |
91 | 91 | <ul class="dropdown-menu"> |
92 | 92 | |
93 | - | |
93 | + | |
94 | 94 | {% get_available_languages as LANGUAGES %} |
95 | 95 | {% get_language_info_list for LANGUAGES as languages %} |
96 | 96 | {% for language in languages %} |
... | ... | @@ -99,13 +99,10 @@ |
99 | 99 | class="active" |
100 | 100 | {% endif %}> |
101 | 101 | <a class="language-item" value-lang="{{language.code}}"> |
102 | - {% with 'img/'|add:language.code|add:'.png' as image_static %} | |
103 | - <img src="{% static image_static %}" /> | |
104 | - {% endwith %} | |
105 | 102 | <span>{{language.code}}</span> |
106 | 103 | </a> |
107 | 104 | </li> |
108 | - | |
105 | + | |
109 | 106 | {% endfor %} |
110 | 107 | </ul> |
111 | 108 | </li> |
... | ... | @@ -116,15 +113,14 @@ |
116 | 113 | <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center forgotPassword"> |
117 | 114 | <a href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a> |
118 | 115 | |
119 | - <li class="dropdown language-selector pull-right "> | |
116 | + <li class="dropdown language-selector pull-right "> | |
120 | 117 | {% get_current_language as LANGUAGE_CODE %} |
121 | 118 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> |
122 | 119 | |
123 | - {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %} | |
124 | - <img src="{% static image_static %}" /> | |
125 | - {% endwith %} | |
126 | - | |
120 | + <span>[{{LANGUAGE_CODE}}] </span> | |
121 | + | |
127 | 122 | </a> |
123 | + <i class="glyphicon glyphicon-adjust"></i> | |
128 | 124 | <ul class="dropdown-menu"> |
129 | 125 | {% get_available_languages as LANGUAGES %} |
130 | 126 | {% get_language_info_list for LANGUAGES as languages %} |
... | ... | @@ -134,13 +130,10 @@ |
134 | 130 | class="active" |
135 | 131 | {% endif %}> |
136 | 132 | <a class="language-item" value-lang="{{language.code}}"> |
137 | - {% with 'img/'|add:language.code|add:'.png' as image_static %} | |
138 | - <img src="{% static image_static %}" /> | |
139 | - {% endwith %} | |
140 | 133 | <span>{{language.code}}</span> |
141 | 134 | </a> |
142 | 135 | </li> |
143 | - | |
136 | + | |
144 | 137 | {% endfor %} |
145 | 138 | </ul> |
146 | 139 | </li> |
... | ... | @@ -153,7 +146,7 @@ |
153 | 146 | </div> |
154 | 147 | </div> |
155 | 148 | |
156 | - | |
149 | + | |
157 | 150 | {% endblock%} |
158 | 151 | |
159 | 152 | {% block footer %} |
... | ... | @@ -171,4 +164,4 @@ |
171 | 164 | {% endblock %} |
172 | 165 | |
173 | 166 | {% block bottommenu %} |
174 | -{% endblock %} | |
175 | 167 | \ No newline at end of file |
168 | +{% endblock %} | ... | ... |