mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
* Fixed wrong CSS into the login page (on resize)
* Always display the username into the 'identities' listing * Fixed a little mistake into the autocompleter plugin see #204
This commit is contained in:
@@ -163,8 +163,6 @@ class User(DUser):
|
||||
|
||||
@property
|
||||
def identity(self):
|
||||
if self.email != "":
|
||||
return self.email
|
||||
return self.username
|
||||
|
||||
@property
|
||||
|
||||
+2
-2
@@ -4,10 +4,10 @@ from django.utils.translation import ugettext as _
|
||||
class LoginForm(forms.Form):
|
||||
username = forms.CharField(
|
||||
label=_("Username"),
|
||||
widget=forms.TextInput()
|
||||
widget=forms.TextInput(attrs={"class" : "span3"})
|
||||
)
|
||||
password = forms.CharField(
|
||||
label=_("Password"),
|
||||
widget=forms.PasswordInput(),
|
||||
widget=forms.PasswordInput(attrs={"class" : "span3"}),
|
||||
help_text=_("Password used to authenticate")
|
||||
)
|
||||
|
||||
@@ -6,12 +6,6 @@
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
input[type="text"],
|
||||
input[type="password"] {
|
||||
width: 315px;
|
||||
padding: 7px;
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
background-color: transparent;
|
||||
padding-right: 0px;
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
keydown: function(evt) {
|
||||
evt.stopPropagation();
|
||||
|
||||
switch (evt.keyCode) {
|
||||
switch (evt.which) {
|
||||
case 13:
|
||||
case 27:
|
||||
evt.preventDefault();
|
||||
@@ -127,7 +127,7 @@
|
||||
evt.stopPropagation();
|
||||
evt.preventDefault();
|
||||
|
||||
switch (evt.keyCode) {
|
||||
switch (evt.which) {
|
||||
case 40:
|
||||
case 38:
|
||||
break;
|
||||
|
||||
@@ -17,15 +17,17 @@
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="span4 offset4">
|
||||
<div id="logo">
|
||||
<div class="offset4">
|
||||
<div class="row">
|
||||
<div id="logo" class="span3">
|
||||
<img src="{{ MEDIA_URL }}css/modoboa.png" />
|
||||
</div>
|
||||
<form method="post" action="{% url modoboa.auth.views.dologin %}" class="well">
|
||||
</div>
|
||||
<div class="row">
|
||||
<form method="post" action="{% url modoboa.auth.views.dologin %}"
|
||||
class="well span3">
|
||||
{% render_form form %}
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
<div class="form-actions">
|
||||
@@ -35,8 +37,12 @@
|
||||
<button class="btn btn-primary pull-right" type="submit">{% trans "Log in" %}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
{% if error %}{% alert error "error" %}{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user