Mercurial > kallithea
changeset 527:6d44d3862ec4
fixes #36, removed username, name, lastname, minimal length restrictions,
fixed branches/tags icons in changelog and made them active links
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 30 Sep 2010 12:44:06 +0200 |
| parents | 804a14e086dc |
| children | 6d0d5e7d7356 |
| files | pylons_app/model/forms.py pylons_app/public/css/style.css pylons_app/templates/changelog/changelog.html |
| diffstat | 3 files changed, 20 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/model/forms.py Thu Sep 30 10:31:37 2010 +0200 +++ b/pylons_app/model/forms.py Thu Sep 30 12:44:06 2010 +0200 @@ -247,7 +247,7 @@ filter_extra_fields = True username = UnicodeString( strip=True, - min=3, + min=1, not_empty=True, messages={ 'empty':_('Please enter a login'), @@ -256,7 +256,7 @@ password = UnicodeString( strip=True, - min=3, + min=8, not_empty=True, messages={ 'empty':_('Please enter a password'), @@ -271,15 +271,15 @@ class _UserForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = True - username = All(UnicodeString(strip=True, min=3, not_empty=True), ValidUsername(edit, old_data)) + username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data)) if edit: - new_password = All(UnicodeString(strip=True, min=3, not_empty=False), ValidPassword) + new_password = All(UnicodeString(strip=True, min=8, not_empty=False), ValidPassword) admin = StringBoolean(if_missing=False) else: password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword) active = StringBoolean(if_missing=False) - name = UnicodeString(strip=True, min=3, not_empty=True) - lastname = UnicodeString(strip=True, min=3, not_empty=True) + name = UnicodeString(strip=True, min=1, not_empty=True) + lastname = UnicodeString(strip=True, min=1, not_empty=True) email = All(Email(not_empty=True), UniqSystemEmail(old_data)) return _UserForm @@ -298,7 +298,7 @@ allow_extra_fields = True filter_extra_fields = False repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data)) - description = UnicodeString(strip=True, min=3, not_empty=True) + description = UnicodeString(strip=True, min=1, not_empty=True) private = StringBoolean(if_missing=False) if edit: @@ -312,7 +312,7 @@ allow_extra_fields = True filter_extra_fields = False repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data)) - description = UnicodeString(strip=True, min=3, not_empty=True) + description = UnicodeString(strip=True, min=1, not_empty=True) private = StringBoolean(if_missing=False) chained_validators = [ValidPerms, ValidSettings] @@ -323,8 +323,8 @@ class _ApplicationSettingsForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False - hg_app_title = UnicodeString(strip=True, min=3, not_empty=True) - hg_app_realm = UnicodeString(strip=True, min=3, not_empty=True) + hg_app_title = UnicodeString(strip=True, min=1, not_empty=True) + hg_app_realm = UnicodeString(strip=True, min=1, not_empty=True) return _ApplicationSettingsForm @@ -333,7 +333,7 @@ allow_extra_fields = True filter_extra_fields = False web_push_ssl = OneOf(['true', 'false'], if_missing='false') - paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=3, not_empty=True)) + paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True)) hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False) hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False)
--- a/pylons_app/public/css/style.css Thu Sep 30 10:31:37 2010 +0200 +++ b/pylons_app/public/css/style.css Thu Sep 30 12:44:06 2010 +0200 @@ -3152,7 +3152,7 @@ border-bottom: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC; - min-height: 90px; + min-height: 80px; overflow: hidden; font-size:1.2em; } @@ -3223,14 +3223,14 @@ } .right .logtags .branchtag{ - background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 130px 9px; + background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat right 9px; display:block; - padding:12px 2px 2px 24px; + padding:12px 16px 0px 0px } .right .logtags .tagtag{ - background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 130px 9px; + background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat right 9px; display:block; - padding:12px 2px 2px 24px; + padding:12px 18px 0px 0px } /* -----------------------------------------------------------
--- a/pylons_app/templates/changelog/changelog.html Thu Sep 30 10:31:37 2010 +0200 +++ b/pylons_app/templates/changelog/changelog.html Thu Sep 30 12:44:06 2010 +0200 @@ -76,9 +76,11 @@ </div> %endfor <span class="logtags"> - <span class="branchtag">${cs.branch}</span> + <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> + ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span> %for tag in cs.tags: - <span class="tagtag">${tag}</span> + <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> + ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span> %endfor </span> </div>