diff --git a/pylons_app/model/forms.py b/pylons_app/model/forms.py --- a/pylons_app/model/forms.py +++ b/pylons_app/model/forms.py @@ -256,7 +256,7 @@ class LoginForm(formencode.Schema): password = UnicodeString( strip=True, - min=8, + min=6, not_empty=True, messages={ 'empty':_('Please enter a password'), @@ -273,10 +273,10 @@ def UserForm(edit=False, old_data={}): filter_extra_fields = True username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data)) if edit: - new_password = All(UnicodeString(strip=True, min=8, not_empty=False), ValidPassword) + new_password = All(UnicodeString(strip=True, min=6, not_empty=False), ValidPassword) admin = StringBoolean(if_missing=False) else: - password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword) + password = All(UnicodeString(strip=True, min=6, not_empty=True), ValidPassword) active = StringBoolean(if_missing=False) name = UnicodeString(strip=True, min=1, not_empty=True) lastname = UnicodeString(strip=True, min=1, not_empty=True) diff --git a/pylons_app/public/css/style.css b/pylons_app/public/css/style.css --- a/pylons_app/public/css/style.css +++ b/pylons_app/public/css/style.css @@ -1161,7 +1161,7 @@ div.options a:hover #content div.box div.message { margin: 0 0 0px 0; - padding: 0 0 10px 0; + padding: 10px 0 10px 0; clear: both; overflow: hidden; } @@ -3058,7 +3058,9 @@ h3.files_location{ } #changeset_content .container { - height: 120px; + min-height: 120px; + font-size: 1.2em; + } #changeset_content .container .left { @@ -3190,7 +3192,6 @@ h3.files_location{ border: 1px solid #DDDDDD; display: block; float: right; - font-size: 0.75em; text-align: center; min-width: 15px; } diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html --- a/pylons_app/templates/changelog/changelog.html +++ b/pylons_app/templates/changelog/changelog.html @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Changelog - %s') % c.repo_name} + ${_('Changelog')} - ${c.repo_name} %def> <%def name="breadcrumbs_links()"> diff --git a/pylons_app/templates/changeset/changeset.html b/pylons_app/templates/changeset/changeset.html --- a/pylons_app/templates/changeset/changeset.html +++ b/pylons_app/templates/changeset/changeset.html @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Changeset')} + ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id} - ${c.repo_name} %def> <%def name="breadcrumbs_links()"> @@ -34,42 +34,56 @@ - -